nicer printout

[u/mrichter/AliRoot.git] / macros / AliMergeSteer.C

diff --git a/macros/AliMergeSteer.C b/macros/AliMergeSteer.C
index 789ab6be2dcf11ec909321ec4d81c22ee7d10ef7..d858f6f5ed2309d988138ef181f89ed4cb85e8d4 100644 (file)
--- a/macros/AliMergeSteer.C
+++ b/macros/AliMergeSteer.C
@@ -24,7 +24,6 @@
 #include "TStopwatch.h"
 #include "TArrayF.h"
 #include "TSystem.h"
-#include "TGeometry.h"
 #include "TInterpreter.h"
 
 // --- AliRoot header files ---
@@ -137,7 +136,7 @@ private:
   Int_t   fPHOS;
   Int_t   fPMD;
   Int_t   fHMPID;
-  Int_t   fSTART;
+  Int_t   fT0;
   Int_t   fTOF;
   Int_t   fTPC;
   Int_t   fTRD;
@@ -191,7 +190,7 @@ AliMergeSteer::AliMergeSteer(const Text_t *name, const Text_t* title) : TTask(na
   fPHOS = 0;
   fPMD = 0;
   fHMPID = 0;
-  fSTART = 0;
+  fT0 = 0;
   fTOF = 0;
   fTPC = 0;
   fTRD = 0;
@@ -264,8 +263,8 @@ Int_t AliMergeSteer::GetDetectorFlag(Option_t* option)
     return fPMD;
   } else if (strstr(option,"HMPID")) {
     return fHMPID;
-  } else if (strstr(option,"START")) {
-    return fSTART;
+  } else if (strstr(option,"T0")) {
+    return fT0;
   } else if (strstr(option,"TOF")) {
     return fTOF;
   } else if (strstr(option,"TPC")) {
@@ -299,8 +298,8 @@ Bool_t AliMergeSteer::SetDetectorFlag(Option_t* option, Int_t flag)
     fPMD = flag;
   } else if (strstr(option,"HMPID")) {
     fHMPID = flag;
-  } else if (strstr(option,"START")) {
-    fSTART = flag;
+  } else if (strstr(option,"T0")) {
+    fT0 = flag;
   } else if (strstr(option,"TOF")) {
     fTOF = flag;
   } else if (strstr(option,"TPC")) {
@@ -607,16 +606,6 @@ Bool_t AliMergeSteer::AliCopy(TFile *inputFile, TFile *outputFile)
   treeENew->Write();
   if (fDEBUG) cout<<"done"<<endl;
 
-// copy AliceGeom
-  if (fDEBUG) cout<<"Copy AliceGeom: ";
-  TGeometry *AliceGeom = static_cast<TGeometry*>(inputFile->Get("AliceGeom"));
-  if (!AliceGeom) {
-    cerr<<"AliceGeom was not found in the input file "<<endl;
-    return kFALSE;
-  }
-  AliceGeom->Write();
-  if (fDEBUG) cout<<"done"<<endl;
-
   delete gAlice;
   gAlice = 0;