revised geometry, fully parametrized and including HCAL possibility

[u/mrichter/AliRoot.git] / TOF / AliTOFMerger.cxx

diff --git a/TOF/AliTOFMerger.cxx b/TOF/AliTOFMerger.cxx
index e8aead5f608ecd0c94408780717b817f7d1cb1e7..d85bf4be68d120cbee3108bcf8d695af138b920c 100644 (file)
--- a/TOF/AliTOFMerger.cxx
+++ b/TOF/AliTOFMerger.cxx
@@ -30,8 +30,8 @@
 #include "AliPDG.h"
 
 #include <stdlib.h>
-#include <iostream.h>
-#include <fstream.h>
+#include <Riostream.h>
+#include <Riostream.h>
 
 ClassImp(AliTOFMerger)
 
@@ -43,7 +43,11 @@ ClassImp(AliTOFMerger)
     fEvNrSig = 0;
     fEvNrBgr = 0;
     fMerge =kDigitize;
-    fFnBgr   = 0;
+    fDigits = 0;
+    fSDigits =0;
+    fFnBgr = 0;
+    fFnSig = 0;
+    fBgrFile = 0;
 }
 
 //------------------------------------------------------------------------
@@ -55,6 +59,16 @@ AliTOFMerger::~AliTOFMerger()
     delete fSDigits ;
     fSDigits = 0;
   }
+  delete fBgrFile;
+  fBgrFile = 0;
+  if(fFnBgr) {
+    delete[] fFnBgr;
+    fFnBgr = 0;
+  }
+  if(fFnSig) {
+    delete[] fFnSig;
+    fFnSig = 0;
+  }
 }