NPM/numass-framework
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[no commit message]

Browse Source
This commit is contained in:
darksnake 2016-07-05 13:01:56 +03:00
parent 7937753445
commit 1a1c17a1ae
3 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
numass-main/src/main/java/inr/numass/actions/PrepareDataAction.java
View File

@ -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 = "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 = "lowerWindowSlope", type = "NUMBER", def = "0", info = "Slope for the window lowerWindow bound")
@ValueDef(name = "upperWindow", type = "NUMBER", info = "Upper bound for window") @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", @ValueDef(name = "underflow", type = "BOOLEAN", def = "true",
info = "Enables calculation of detector threshold underflow using exponential shape of energy spectrum tail. " info = "Enables calculation of detector threshold underflow using exponential shape of energy spectrum tail. "
+ "Not recomended to use with floating window.") + "Not recomended to use with floating window.")

66
numass-main/src/main/java/inr/numass/models/SterileNeutrinoSpectrum.java
View File

@ -25,38 +25,38 @@ public class SterileNeutrinoSpectrum extends AbstractParametricFunction {
super(list); super(list);
} }
/** // /**
* Transmission function including detector backscattering // * Transmission function including detector backscattering
* // *
* @param u // * @param u
* @param set // * @param set
* @return // * @return
*/ // */
private BivariateFunction transmission(double u, NamedValueSet set) { // private BivariateFunction transmission(double u, NamedValueSet set) {
//
} // }
//
/** // /**
* Loss function excluding trapping // * Loss function excluding trapping
* // *
* @param u // * @param u
* @param set // * @param set
* @return // * @return
*/ // */
private BivariateFunction loss(double u, NamedValueSet set) { // private BivariateFunction loss(double u, NamedValueSet set) {
//
} // }
//
/** // /**
* Trapping spectrum // * Trapping spectrum
* // *
* @param u // * @param u
* @param set // * @param set
* @return // * @return
*/ // */
private BivariateFunction trapping(double u, NamedValueSet set) { // private BivariateFunction trapping(double u, NamedValueSet set) {
//
} // }
/** /**
* Source spectrum including final states * Source spectrum including final states
@ -81,7 +81,7 @@ public class SterileNeutrinoSpectrum extends AbstractParametricFunction {
@Override @Override
public double value(double u, NamedValueSet set) { public double value(double u, NamedValueSet set) {
return 0;
} }
@Override @Override

3
numass-main/src/main/java/inr/numass/workbench/NumassWorkbenchController.java
View File

@ -36,7 +36,6 @@ import inr.numass.NumassIO;
import inr.numass.NumassProperties; import inr.numass.NumassProperties;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.PrintStream;
import java.net.URL; import java.net.URL;
import java.text.ParseException; import java.text.ParseException;
import java.util.ArrayList; import java.util.ArrayList;
@ -297,7 +296,7 @@ public class NumassWorkbenchController implements Initializable, StagePaneHolder
FileChooser fileChooser = new FileChooser(); FileChooser fileChooser = new FileChooser();
fileChooser.setTitle("Open Configuration File"); fileChooser.setTitle("Open Configuration File");
String storageRoot = NumassProperties.getNumassProperty("numass.workbench.root"); String storageRoot = NumassProperties.getNumassProperty("numass.workbench.root");
if (storageRoot == null) { if (storageRoot == null || !new File(storageRoot).exists()) {
fileChooser.setInitialDirectory(new File(".").getAbsoluteFile()); fileChooser.setInitialDirectory(new File(".").getAbsoluteFile());
} else { } else {
fileChooser.setInitialDirectory(new File(storageRoot)); fileChooser.setInitialDirectory(new File(storageRoot));