Only one TTree per TFile, fixed memory leaks

MC_co60_modulation.root

@@ -0,0 +1 @@
+/Users/cassiereuter/Documents/dev/mod/analysis/calibration/MC_co60_modulation.root

MC_cs137_modulation.root

@@ -0,0 +1 @@
+/Users/cassiereuter/Documents/dev/mod/analysis/calibration/MC_cs137_modulation.root

MC_ti44_modulation.root

@@ -0,0 +1 @@
+/Users/cassiereuter/Documents/dev/mod/analysis/calibration/MC_ti44_modulation.root

daqana.cc

@@ -4,6 +4,7 @@
 #include <sstream>
 #include <cstdio>
 #include <cstdlib>
+#include <unistd.h>
 
 #include "driver.hh"
 #include "daq.hh"

daqprocessor_single_calibrate.py

@@ -22,12 +22,11 @@
 #
 # A.P. Colijn - [email protected]
 #
-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

slowdaq.cc

@@ -2,6 +2,7 @@
 #include <sstream>
 #include <cstdio>
 #include <cstdlib>
+#include <unistd.h>
 
 #include "driver.hh"
 #include "sdaq.hh"

src/event.cc

@@ -1,6 +1,7 @@
 #include "event.hh"
 #include <iostream>
 #include <math.h>
+#include <unistd.h>
 
 #include "TText.h"
 #include "TLatex.h"

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();
+    }
 }