Change initialization of gAlice in the merging case

[u/mrichter/AliRoot.git] / TRD / AliTRDmerge.C

diff --git a/TRD/AliTRDmerge.C b/TRD/AliTRDmerge.C
index 2daa903009c39124992df007a8eda0eebe9a5e21..53084a8646fa04262afc39568db977e408c8f291 100644 (file)
--- a/TRD/AliTRDmerge.C
+++ b/TRD/AliTRDmerge.C
@@ -6,9 +6,20 @@ void AliTRDmerge()
   //
   /////////////////////////////////////////////////////////////////////////
 
+  Char_t *fileSignal     = "galice_signal.root";
+  Char_t *fileBackground = "galice_background.root";
+
+  if (gAlice) {
+    printf("<AliTRDmerge> Get AliRun object from signal file.\n");
+    TFile *fFileSignal = new TFile(fileSignal); 
+    delete gAlice;
+    gAlice = (AliRun *) fFileSignal->Get("gAlice");
+    fFileSignal->Close();
+  }
+
   AliRunDigitizer *manager = new AliRunDigitizer(2,1);
-  manager->SetInputStream(0,"galice_signal.root");
-  manager->SetInputStream(1,"galice_background.root");
+  manager->SetInputStream(0,fileSignal);
+  manager->SetInputStream(1,fileBackground);
 
   AliTRDdigitizer *digitizer = new AliTRDdigitizer(manager
                                                   ,"TRDdigitizer"