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

Test fix

Browse Source
This commit is contained in:
darksnake 2017-03-09 16:29:46 +03:00
parent 3f04679207
commit 2ad98725a0
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
numass-control/msp/src/main/java/inr/numass/control/msp/fx/MspApp.java
View File

@ -39,6 +39,13 @@ public class MspApp extends Application {
MspViewController controller; MspViewController controller;
/**
* @param args the command line arguments
*/
public static void main(String[] args) {
launch(args);
}
@Override @Override
public void start(Stage primaryStage) throws Exception { public void start(Stage primaryStage) throws Exception {
Locale.setDefault(Locale.US);// чтобы отделение десятичных знаков было точкой Locale.setDefault(Locale.US);// чтобы отделение десятичных знаков было точкой
@ -56,7 +63,7 @@ public class MspApp extends Application {
config = MetaFileReader.read(configFile).build(); config = MetaFileReader.read(configFile).build();
} else { } else {
// throw new RuntimeException("Configuration file not found"); // throw new RuntimeException("Configuration file not found");
config = new XMLMetaReader().read(MspApp.class.getClassLoader().getResourceAsStream("config/msp-config.xml"), -1, null); config = new XMLMetaReader().read(MspApp.class.getClassLoader().getResourceAsStream("config/msp-config.xml"), -1);
} }
FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/MspView.fxml")); FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/MspView.fxml"));
@ -85,11 +92,4 @@ public class MspApp extends Application {
// System.exit(0); // System.exit(0);
} }
/**
* @param args the command line arguments
*/
public static void main(String[] args) {
launch(args);
}
} }

2
numass-main/src/main/groovy/inr/numass/scripts/Underflow.groovy
View File

@ -85,6 +85,6 @@ printPoint(data, [16200d, 16400d, 16800d, 17000d, 17200d, 17700d])
println() println()
Table t = new UnderflowCorrection().fitAllPoints(data, 400, 650, 3100, 20); Table t = new UnderflowCorrection().fitAllPoints(data, 400, 600, 3100, 20);
ColumnedDataWriter.writeDataSet(System.out, t, "underflow parameters") ColumnedDataWriter.writeDataSet(System.out, t, "underflow parameters")