Pass the name of the MC model (Geant3, Geant4, Fluka), and title (G4 Physics list...

[u/mrichter/AliRoot.git] / EMCAL / AliEMCAL.cxx

diff --git a/EMCAL/AliEMCAL.cxx b/EMCAL/AliEMCAL.cxx
index e1f925942bf46ba3c43afdda9a94aa9653e9ad3d..d9efcc179dd6ccbbd653ce9f064100dce2a001e6 100644 (file)
--- a/EMCAL/AliEMCAL.cxx
+++ b/EMCAL/AliEMCAL.cxx
@@ -440,12 +440,22 @@ AliEMCALGeometry* AliEMCAL::GetGeometry() const
 {
   //Initializes and returns geometry
   
+  // Pass the transpor model name (Geant3, Geant4, Fluka) and title to the geometry
+  TString mcname   = "";
+  TString mctitle  = "";
+  if(gMC){
+    mcname  = gMC->GetName()  ;
+    mctitle = gMC->GetTitle() ;
+  }
+  
   //Check if run number and requested geometry correspond to the same geometry as
   //in real data taking. To prevent errors in official simulation productions
   if(!(AliEMCALGeometry::GetInstance()))
   {
+    // Check the transport model name and option, set sampling fraction depending on it
+    
     if(!fCheckRunNumberAndGeoVersion){// Set geometry with the name used in the configuration file
-      return AliEMCALGeometry::GetInstance(GetTitle(),"EMCAL") ;
+      return AliEMCALGeometry::GetInstance(GetTitle(),"EMCAL",mcname,mctitle) ;
     }
     else{//Check run number and version and set the corresponding one.
       //Get run number
@@ -466,7 +476,7 @@ AliEMCALGeometry* AliEMCAL::GetGeometry() const
         else {
           AliDebug(1,"Initialized geometry with name <<EMCAL_FIRSTYEARV1>>");}
         
-        return AliEMCALGeometry::GetInstance("EMCAL_FIRSTYEARV1","EMCAL") ;// Set geometry with the name used in the configuration file
+        return AliEMCALGeometry::GetInstance("EMCAL_FIRSTYEARV1","EMCAL",mcname,mctitle) ;// Set geometry with the name used in the configuration file
       }
       else{ //Default geometry
         //Complete EMCAL geometry, 10 SM.
@@ -477,11 +487,12 @@ AliEMCALGeometry* AliEMCAL::GetGeometry() const
         else {
           AliDebug(1,"Initialized geometry with name <<EMCAL_COMPLETEV1>>");}
 
-        return AliEMCALGeometry::GetInstance("EMCAL_COMPLETEV1","EMCAL") ;// Set geometry with the name used in the configuration file
+        return AliEMCALGeometry::GetInstance("EMCAL_COMPLETEV1","EMCAL",mcname,mctitle) ;// Set geometry with the name used in the configuration file
       }
     }
   }// Init geometry for the first time
   
+  
   return AliEMCALGeometry::GetInstance();
     
 }