diff --git a/numass-control/msp/src/main/java/inr/numass/control/msp/fx/MspApp.java b/numass-control/msp/src/main/java/inr/numass/control/msp/fx/MspApp.java index 098a046e..d5b9b657 100644 --- a/numass-control/msp/src/main/java/inr/numass/control/msp/fx/MspApp.java +++ b/numass-control/msp/src/main/java/inr/numass/control/msp/fx/MspApp.java @@ -39,6 +39,13 @@ public class MspApp extends Application { MspViewController controller; + /** + * @param args the command line arguments + */ + public static void main(String[] args) { + launch(args); + } + @Override public void start(Stage primaryStage) throws Exception { Locale.setDefault(Locale.US);// чтобы отделение десятичных знаков было точкой @@ -56,7 +63,7 @@ public class MspApp extends Application { config = MetaFileReader.read(configFile).build(); } else { // 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")); @@ -85,11 +92,4 @@ public class MspApp extends Application { // System.exit(0); } - /** - * @param args the command line arguments - */ - public static void main(String[] args) { - launch(args); - } - } diff --git a/numass-main/src/main/groovy/inr/numass/scripts/Underflow.groovy b/numass-main/src/main/groovy/inr/numass/scripts/Underflow.groovy index cfb26a2c..69b60cb7 100644 --- a/numass-main/src/main/groovy/inr/numass/scripts/Underflow.groovy +++ b/numass-main/src/main/groovy/inr/numass/scripts/Underflow.groovy @@ -85,6 +85,6 @@ printPoint(data, [16200d, 16400d, 16800d, 17000d, 17200d, 17700d]) 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")