gAlice now only read by AliRunDigitizer. Therefore it is just deleted in AliTRDmerge.C

diff --git a/TRD/AliTRDdigitizer.cxx b/TRD/AliTRDdigitizer.cxx
index f41b4b33b6e540b55c148075fe9ca011c9ed1d03..9c6c06b250d3f98556a6393df89eb87f5ac8999c 100644 (file)
--- a/TRD/AliTRDdigitizer.cxx
+++ b/TRD/AliTRDdigitizer.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.37  2002/04/29 11:50:47  cblume
+Change initialization of gAlice in the merging case
+
 Revision 1.36  2002/04/12 12:13:23  cblume
 Add Jiris changes
 
@@ -438,6 +441,13 @@ void AliTRDdigitizer::Exec(Option_t* option)
       printf("Add input stream %d\n",iInput);
     }
 
+    // check if the input tree exists
+    if (!fManager->GetInputTreeTRDS(iInput)) {
+      printf("<AliTRDdigitizer::Exec> ");
+      printf("Input stream %d does not exist\n",iInput);
+      return;
+    } 
+
     // Read the s-digits via digits manager
     sdigitsManager = new AliTRDdigitsManager();
     sdigitsManager->SetDebug(fDebug);

diff --git a/TRD/AliTRDmerge.C b/TRD/AliTRDmerge.C
index 53084a8646fa04262afc39568db977e408c8f291..b1755b557c469276ad534c528feb938cdb02c03b 100644 (file)
--- a/TRD/AliTRDmerge.C
+++ b/TRD/AliTRDmerge.C
@@ -10,11 +10,9 @@ void AliTRDmerge()
   Char_t *fileBackground = "galice_background.root";
 
   if (gAlice) {
-    printf("<AliTRDmerge> Get AliRun object from signal file.\n");
-    TFile *fFileSignal = new TFile(fileSignal); 
+    printf("<AliTRDmerge> Delete the AliRun object from memory.\n");
     delete gAlice;
-    gAlice = (AliRun *) fFileSignal->Get("gAlice");
-    fFileSignal->Close();
+    gAlice = 0;
   }
 
   AliRunDigitizer *manager = new AliRunDigitizer(2,1);

diff --git a/TRD/AliTRDparameter.cxx b/TRD/AliTRDparameter.cxx
index e21e415a153c7f253f8616904abec914b87fc529..f2d2e46cbd755835f7cab0ceed317a8fe32208eb 100644 (file)
--- a/TRD/AliTRDparameter.cxx
+++ b/TRD/AliTRDparameter.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.4  2002/04/12 12:13:23  cblume
+Add Jiris changes
+
 Revision 1.3  2002/03/28 14:59:07  cblume
 Coding conventions
 
@@ -382,7 +385,8 @@ void AliTRDparameter::Init()
   SetTiltingAngle(5.0);
 
   // The magnetic field strength in Tesla
-  fField           = 0.2 * gAlice->Field()->Factor();
+  //fField           = 0.2 * gAlice->Field()->Factor();
+  fField           = 0.4;
 
   //
   // ----------------------------------------------------------------------------