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

different fixes

Browse Source
This commit is contained in:
Alexander Nozik 2017-01-15 17:54:28 +03:00
parent 2c3f828c0b
commit 5589a87d66
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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_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_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\\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\\Adiabacity_19kV_4_dark\\set_1")
if(!dataDir.exists()){ if(!dataDir.exists()){
println "dataDir directory does not exist" println "dataDir directory does not exist"
} }

2
numass-main/src/main/java/inr/numass/utils/UnderflowCorrection.java
View File

@ -90,7 +90,7 @@ public class UnderflowCorrection {
.map(p -> new WeightedObservedPoint( .map(p -> new WeightedObservedPoint(
1d / p.getValue() * point.getLength() * point.getLength(), //weight 1d / p.getValue() * point.getLength() * point.getLength(), //weight
p.getKey(), // x p.getKey(), // x
p.getValue() / binning / point.getLength())//y p.getValue() / binning / point.getLength()) //y
) )
.collect(Collectors.toList()); .collect(Collectors.toList());
SimpleCurveFitter fitter = SimpleCurveFitter.create(new ExponentFunction(), new double[]{1d, 200d}); SimpleCurveFitter fitter = SimpleCurveFitter.create(new ExponentFunction(), new double[]{1d, 200d});