From 1a1c17a1ae496d56b0bde67fd496d0ba88418c8c Mon Sep 17 00:00:00 2001
From: darksnake <darksnake@LUNA>
Date: Tue, 5 Jul 2016 13:01:56 +0300
Subject: [PATCH] [no commit message]

---
 .../inr/numass/actions/PrepareDataAction.java |  2 +-
 .../models/SterileNeutrinoSpectrum.java       | 66 +++++++++----------
 .../workbench/NumassWorkbenchController.java  |  3 +-
 3 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/numass-main/src/main/java/inr/numass/actions/PrepareDataAction.java b/numass-main/src/main/java/inr/numass/actions/PrepareDataAction.java
index 543336c9..fecd2027 100644
--- a/numass-main/src/main/java/inr/numass/actions/PrepareDataAction.java
+++ b/numass-main/src/main/java/inr/numass/actions/PrepareDataAction.java
@@ -55,7 +55,7 @@ import org.apache.commons.math3.fitting.WeightedObservedPoint;
 @ValueDef(name = "lowerWindow", type = "NUMBER", def = "0", info = "Base for the window lowerWindow bound")
 @ValueDef(name = "lowerWindowSlope", type = "NUMBER", def = "0", info = "Slope for the window lowerWindow bound")
 @ValueDef(name = "upperWindow", type = "NUMBER", info = "Upper bound for window")
-@ValueDef(name = "deadTime", type = "NUMBER", def = "0", info = "Dead time in us")
+@ValueDef(name = "deadTime", type = "[NUMBER, STRING]", def = "0", info = "Dead time in s. Could be an expression.")
 @ValueDef(name = "underflow", type = "BOOLEAN", def = "true",
         info = "Enables calculation of detector threshold underflow using exponential shape of energy spectrum tail. "
         + "Not recomended to use with floating window.")
diff --git a/numass-main/src/main/java/inr/numass/models/SterileNeutrinoSpectrum.java b/numass-main/src/main/java/inr/numass/models/SterileNeutrinoSpectrum.java
index da7a49b9..9aa60613 100644
--- a/numass-main/src/main/java/inr/numass/models/SterileNeutrinoSpectrum.java
+++ b/numass-main/src/main/java/inr/numass/models/SterileNeutrinoSpectrum.java
@@ -25,38 +25,38 @@ public class SterileNeutrinoSpectrum extends AbstractParametricFunction {
         super(list);
     }
 
-    /**
-     * Transmission function including detector backscattering
-     *
-     * @param u
-     * @param set
-     * @return
-     */
-    private BivariateFunction transmission(double u, NamedValueSet set) {
-
-    }
-
-    /**
-     * Loss function excluding trapping
-     *
-     * @param u
-     * @param set
-     * @return
-     */
-    private BivariateFunction loss(double u, NamedValueSet set) {
-
-    }
-
-    /**
-     * Trapping spectrum
-     *
-     * @param u
-     * @param set
-     * @return
-     */
-    private BivariateFunction trapping(double u, NamedValueSet set) {
-
-    }
+//    /**
+//     * Transmission function including detector backscattering
+//     *
+//     * @param u
+//     * @param set
+//     * @return
+//     */
+//    private BivariateFunction transmission(double u, NamedValueSet set) {
+//
+//    }
+//
+//    /**
+//     * Loss function excluding trapping
+//     *
+//     * @param u
+//     * @param set
+//     * @return
+//     */
+//    private BivariateFunction loss(double u, NamedValueSet set) {
+//
+//    }
+//
+//    /**
+//     * Trapping spectrum
+//     *
+//     * @param u
+//     * @param set
+//     * @return
+//     */
+//    private BivariateFunction trapping(double u, NamedValueSet set) {
+//
+//    }
 
     /**
      * Source spectrum including final states
@@ -81,7 +81,7 @@ public class SterileNeutrinoSpectrum extends AbstractParametricFunction {
 
     @Override
     public double value(double u, NamedValueSet set) {
-
+        return 0;
     }
 
     @Override
diff --git a/numass-main/src/main/java/inr/numass/workbench/NumassWorkbenchController.java b/numass-main/src/main/java/inr/numass/workbench/NumassWorkbenchController.java
index 3a55d3d0..fde344bc 100644
--- a/numass-main/src/main/java/inr/numass/workbench/NumassWorkbenchController.java
+++ b/numass-main/src/main/java/inr/numass/workbench/NumassWorkbenchController.java
@@ -36,7 +36,6 @@ import inr.numass.NumassIO;
 import inr.numass.NumassProperties;
 import java.io.File;
 import java.io.IOException;
-import java.io.PrintStream;
 import java.net.URL;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -297,7 +296,7 @@ public class NumassWorkbenchController implements Initializable, StagePaneHolder
         FileChooser fileChooser = new FileChooser();
         fileChooser.setTitle("Open Configuration File");
         String storageRoot = NumassProperties.getNumassProperty("numass.workbench.root");
-        if (storageRoot == null) {
+        if (storageRoot == null || !new File(storageRoot).exists()) {
             fileChooser.setInitialDirectory(new File(".").getAbsoluteFile());
         } else {
             fileChooser.setInitialDirectory(new File(storageRoot));