diff --git a/MC_co60_modulation.root b/MC_co60_modulation.root new file mode 120000 index 0000000..f12d4b5 --- /dev/null +++ b/MC_co60_modulation.root @@ -0,0 +1 @@ +/Users/cassiereuter/Documents/dev/mod/analysis/calibration/MC_co60_modulation.root \ No newline at end of file diff --git a/MC_cs137_modulation.root b/MC_cs137_modulation.root new file mode 120000 index 0000000..4b53ec0 --- /dev/null +++ b/MC_cs137_modulation.root @@ -0,0 +1 @@ +/Users/cassiereuter/Documents/dev/mod/analysis/calibration/MC_cs137_modulation.root \ No newline at end of file diff --git a/MC_ti44_modulation.root b/MC_ti44_modulation.root new file mode 120000 index 0000000..934874b --- /dev/null +++ b/MC_ti44_modulation.root @@ -0,0 +1 @@ +/Users/cassiereuter/Documents/dev/mod/analysis/calibration/MC_ti44_modulation.root \ No newline at end of file diff --git a/daqana.cc b/daqana.cc index 155b9b0..d0cd47e 100644 --- a/daqana.cc +++ b/daqana.cc @@ -4,6 +4,7 @@ #include #include #include +#include #include "driver.hh" #include "daq.hh" diff --git a/daqprocessor_single_calibrate.py b/daqprocessor_single_calibrate.py old mode 100644 new mode 100755 index 7bdc34d..9ea728f --- a/daqprocessor_single_calibrate.py +++ b/daqprocessor_single_calibrate.py @@ -22,12 +22,11 @@ # # A.P. Colijn - colijn@nikhef.nl # -modulation_basedir = "/Users/petman/Desktop/Modulation/" +modulation_basedir = "/Your/base/directory" # output_basedir to be set to directory where the output structure should be -#output_basedir = "/data/atlas/users/acolijn/Modulation" -output_basedir = "/Users/petman/Desktop/Modulation/Run2/processed" +output_basedir = "/Where/your/root/files/live" # run dir: where do you want all the scipts to live? -run_dir = modulation_basedir + "/stoomboot/scripts" +run_dir = modulation_basedir + "/daqana_scripts" ############################################################################################ import sys,os,argparse diff --git a/python/processorlib.pyc b/python/processorlib.pyc index 0e94064..6741f29 100644 Binary files a/python/processorlib.pyc and b/python/processorlib.pyc differ diff --git a/slowdaq.cc b/slowdaq.cc index 9cf6ff3..68f4601 100644 --- a/slowdaq.cc +++ b/slowdaq.cc @@ -2,6 +2,7 @@ #include #include #include +#include #include "driver.hh" #include "sdaq.hh" diff --git a/src/event.cc b/src/event.cc index 1be1ea8..929d5ea 100644 --- a/src/event.cc +++ b/src/event.cc @@ -1,6 +1,7 @@ #include "event.hh" #include #include +#include #include "TText.h" #include "TLatex.h" diff --git a/src/rootdriver.cc b/src/rootdriver.cc index 6b579fa..accf066 100644 --- a/src/rootdriver.cc +++ b/src/rootdriver.cc @@ -334,10 +334,19 @@ void rootdriver::writeParameters(driver *drv){ } void rootdriver::Close(){ - tree->Write(); - + f->cd(); + tree->Write(0, TObject::kWriteDelete, 0); + delete tree; f->Close(); - if(slowOn) fs->Close(); - - if(calFile != "NULL.root") _cal->Close(); + delete f; + + if(slowOn) { + temp_slowtree = NULL; + fs->Close(); + } + + if(calFile != "NULL.root") { + _cal_tree = NULL; + _cal->Close(); + } }