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

Some fixes

Browse Source
This commit is contained in:
darksnake 2017-01-21 17:41:51 +03:00
parent 5589a87d66
commit 48a6acb756
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,19 +10,18 @@ import hep.dataforge.io.ColumnedDataWriter
import hep.dataforge.tables.Table import hep.dataforge.tables.Table
import inr.numass.storage.NumassData import inr.numass.storage.NumassData
import inr.numass.storage.NumassDataLoader import inr.numass.storage.NumassDataLoader
import inr.numass.storage.RawNMPoint
import inr.numass.utils.UnderflowCorrection 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\\Fill_2_wide\\set_31")
if(!dataDir.exists()){ if(!dataDir.exists()){
println "dataDir directory does not exist" println "dataDir directory does not exist"
} }
NumassData data = NumassDataLoader.fromLocalDir(null, dataDir) NumassData data = NumassDataLoader.fromLocalDir(null, dataDir)
//NumassData data = NMFile.readFile(new File("D:\\Work\\Numass\\sterilie2013-2014\\dat\\2013\\SCAN06.DAT" )) //NumassData data = NMFile.readFile(new File("D:\\Work\\Numass\\sterilie2013-2014\\dat\\2013\\SCAN06.DAT" ))
Table t = new UnderflowCorrection().fitAllPoints(data, 400, 650, RawNMPoint.MAX_CHANEL, 20); Table t = new UnderflowCorrection().fitAllPoints(data, 400, 650, 3100, 20);
ColumnedDataWriter.writeDataSet(System.out, t, "underflow parameters") ColumnedDataWriter.writeDataSet(System.out, t, "underflow parameters")

5
numass-main/src/main/java/inr/numass/workspace/NumassSubstractEmptySourceTask.java
View File

@ -52,8 +52,9 @@ public class NumassSubstractEmptySourceTask extends AbstractTask<Table> {
Data<? extends Table> res = subtractBackground(input, emptySource); Data<? extends Table> res = subtractBackground(input, emptySource);
res.getGoal().onComplete((r, err) -> { res.getGoal().onComplete((r, err) -> {
if (r != null) { if (r != null) {
OutputStream out = model.getContext().io().out("merge", input.getName()); OutputStream out = model.getContext().io().out("merge", input.getName() + ".subtract");
ColumnedDataWriter.writeDataSet(out, r, input.meta().toString()); ColumnedDataWriter.writeDataSet(out, r,
input.meta().getBuilder().setNode("empty", emptySource.meta()).toString());
} }
}); });