From ec14d287141ce94abfe732fe49ef2fe01a78877d Mon Sep 17 00:00:00 2001
From: darksnake <darksnake@LUNA.localdomain>
Date: Sun, 23 Oct 2016 18:44:24 +0300
Subject: [PATCH] minor fix

---
 .../src/main/groovy/inr/numass/scripts/Underflow.groovy     | 2 +-
 numass-main/src/main/java/inr/numass/NumassPlugin.java      | 6 +++++-
 .../java/inr/numass/viewer/NumassLoaderViewComponent.java   | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

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 27574aba..c2c5cf0c 100644
--- a/numass-main/src/main/groovy/inr/numass/scripts/Underflow.groovy
+++ b/numass-main/src/main/groovy/inr/numass/scripts/Underflow.groovy
@@ -14,7 +14,7 @@ import inr.numass.utils.UnderflowCorrection
 
 //File dataDir = new File("D:\\Work\\Numass\\data\\2016_04\\T2_data\\Fill_2_2\\set_7_b2a3433e54010000")
 //File dataDir = new File("D:\\Work\\Numass\\data\\2016_04\\T2_data\\Fill_2_2\\set_6_e26d123e54010000")
-File dataDir = new File("D:\\Work\\Numass\\data\\2016_10\\Fill_1\\set_2")
+File dataDir = new File("D:\\Work\\Numass\\data\\2016_10\\Fill_1\\set_3")
 if(!dataDir.exists()){
     println "dataDir directory does not exist"
 }
diff --git a/numass-main/src/main/java/inr/numass/NumassPlugin.java b/numass-main/src/main/java/inr/numass/NumassPlugin.java
index f01bb085..3d620fd1 100644
--- a/numass-main/src/main/java/inr/numass/NumassPlugin.java
+++ b/numass-main/src/main/java/inr/numass/NumassPlugin.java
@@ -102,7 +102,11 @@ public class NumassPlugin extends BasicPlugin {
 
     private void loadMath(MathPlugin math) {
         math.registerBivariate("numass.trap2016", (Ei, Ef) -> {
-            return 3.92e-5 * FastMath.exp(-(Ei - Ef) / 300d) + 1.97e-4 - 6.818e-9 * Ei;
+            return 3.92e-5 * FastMath.exp(-(Ei - Ef) / 300d) + 1.1e-4 - 4e-9 * Ei;
+        });
+
+        math.registerBivariate("numass.trap.nominal", (Ei, Ef) -> {
+            return 1.64e-5 * FastMath.exp(-(Ei - Ef) / 300d) + 1.97e-4 - 6.818e-9 * Ei;
         });
 
         math.registerBivariate("numass.resolutionTail", meta -> {
diff --git a/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderViewComponent.java b/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderViewComponent.java
index 0dc92158..16072c7a 100644
--- a/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderViewComponent.java
+++ b/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderViewComponent.java
@@ -415,7 +415,7 @@ public class NumassLoaderViewComponent extends AnchorPane implements Initializab
     private void onExportButtonClick(ActionEvent event) {
         FileChooser fileChooser = new FileChooser();
         fileChooser.setTitle("Choose text export destination");
-        fileChooser.setInitialFileName(data.getName() + "_detector.onComplete");
+        fileChooser.setInitialFileName(data.getName() + "_detector.out");
         File destination = fileChooser.showSaveDialog(detectorPlotPane.getScene().getWindow());
         if (destination != null) {
             Table detectorData = PlotDataUtils.collectXYDataFromPlot((XYPlotFrame) detectorPlot.getPlot(), true);