If the TRD geometry is not stored in the file, get it from gAlice

[u/mrichter/AliRoot.git] / TRD / AliTRDgeometry.cxx

diff --git a/TRD/AliTRDgeometry.cxx b/TRD/AliTRDgeometry.cxx
index 4641b32591cb23a060f16064ff650402cec7df14..9dda6b0c02c54416faa1a501ac9357ccdb46ca9b 100644 (file)
--- a/TRD/AliTRDgeometry.cxx
+++ b/TRD/AliTRDgeometry.cxx
@@ -28,6 +28,9 @@
 #include "AliTRDgeometry.h"
 #include "AliTRDparameter.h"
 
 #include "AliTRDgeometry.h"
 #include "AliTRDparameter.h"
 

+#include "AliRun.h"
+#include "AliTRD.h"
+

 ClassImp(AliTRDgeometry)
 
 //_____________________________________________________________________________
 ClassImp(AliTRDgeometry)
 
 //_____________________________________________________________________________


@@ -507,7 +510,15 @@ AliTRDgeometry* AliTRDgeometry::GetGeometry(AliRunLoader* runLoader)
   TDirectory* saveDir = gDirectory;
   runLoader->CdGAFile();
 
   TDirectory* saveDir = gDirectory;
   runLoader->CdGAFile();
 

+  // Try from the galice.root file

   AliTRDgeometry* geom = (AliTRDgeometry*) gDirectory->Get("TRDgeometry");
   AliTRDgeometry* geom = (AliTRDgeometry*) gDirectory->Get("TRDgeometry");

+
+  if (!geom) {
+    // It is not in the file, try to get it from gAlice, 
+    // which corresponds to the run loader 
+    AliTRD * trd = (AliTRD*)runLoader->GetAliRun()->GetDetector("TRD");
+    geom = trd->GetGeometry();
+  }

   if (!geom) ::Error("AliTRDgeometry::GetGeometry", "Geometry not found");
 
   saveDir->cd();
   if (!geom) ::Error("AliTRDgeometry::GetGeometry", "Geometry not found");
 
   saveDir->cd();