From 5589a87d664d464f52a67a60f33a561a341d212a Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 15 Jan 2017 17:54:28 +0300 Subject: [PATCH] different fixes --- .../src/main/groovy/inr/numass/scripts/Underflow.groovy | 4 ++-- .../src/main/java/inr/numass/utils/UnderflowCorrection.java | 2 +- 2 files changed, 3 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 1ed9dc7a..f57f4fc1 100644 --- a/numass-main/src/main/groovy/inr/numass/scripts/Underflow.groovy +++ b/numass-main/src/main/groovy/inr/numass/scripts/Underflow.groovy @@ -15,8 +15,8 @@ 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_28") -File dataDir = new File("D:\\Work\\Numass\\data\\2016_10\\Adiabacity_19kV_4_dark\\set_1") +File dataDir = new File("D:\\Work\\Numass\\data\\2016_10\\Fill_1\\set_28") +//File dataDir = new File("D:\\Work\\Numass\\data\\2016_10\\Adiabacity_19kV_4_dark\\set_1") if(!dataDir.exists()){ println "dataDir directory does not exist" } diff --git a/numass-main/src/main/java/inr/numass/utils/UnderflowCorrection.java b/numass-main/src/main/java/inr/numass/utils/UnderflowCorrection.java index 402c4027..76ab74a7 100644 --- a/numass-main/src/main/java/inr/numass/utils/UnderflowCorrection.java +++ b/numass-main/src/main/java/inr/numass/utils/UnderflowCorrection.java @@ -90,7 +90,7 @@ public class UnderflowCorrection { .map(p -> new WeightedObservedPoint( 1d / p.getValue() * point.getLength() * point.getLength(), //weight p.getKey(), // x - p.getValue() / binning / point.getLength())//y + p.getValue() / binning / point.getLength()) //y ) .collect(Collectors.toList()); SimpleCurveFitter fitter = SimpleCurveFitter.create(new ExponentFunction(), new double[]{1d, 200d});