Federico's contribution : introduction mecanics and hlt description

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

diff --git a/EMCAL/AliEMCAL.cxx b/EMCAL/AliEMCAL.cxx
index 12484cbef6240481e72364ca1f59a14abf9a374c..bdee1008f6e55aea00844fd458ddef0d095ba22b 100644 (file)
--- a/EMCAL/AliEMCAL.cxx
+++ b/EMCAL/AliEMCAL.cxx
@@ -80,13 +80,14 @@ AliEMCAL::AliEMCAL()
 }
 
 //____________________________________________________________________________
-AliEMCAL::AliEMCAL(const char* name, const char* title)
+AliEMCAL::AliEMCAL(const char* name, const char* title, 
+                   const Bool_t checkGeoAndRun)
   : AliDetector(name,title),
     fBirkC0(0),
     fBirkC1(0.),
     fBirkC2(0.),
     fGeometry(0), 
-    fCheckRunNumberAndGeoVersion(kTRUE),
+    fCheckRunNumberAndGeoVersion(checkGeoAndRun),
     fTriggerData(0x0)
 {
   //   ctor : title is used to identify the layout
@@ -441,14 +442,16 @@ AliEMCALGeometry* AliEMCAL::GetGeometry() const
     mcname  = gMC->GetName()  ;
     mctitle = gMC->GetTitle() ;
   }
+ 
+  TString geoName(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
+      AliInfo(Form("Geometry name in use <<%s>>, requested via Config file", geoName.Data()));
       return AliEMCALGeometry::GetInstance(GetTitle(),"EMCAL",mcname,mctitle) ;
     }
     else
@@ -461,7 +464,6 @@ AliEMCALGeometry* AliEMCAL::GetGeometry() const
       Int_t runNumber = man->GetRun();
       
       //Instanciate geometry depending on the run number
-      TString geoName(GetTitle());
       if(runNumber >= 104064 && runNumber < 140000 ){//2009-2010 runs
         //First year geometry, 4 SM.
         
@@ -474,13 +476,12 @@ AliEMCALGeometry* AliEMCAL::GetGeometry() const
         {
           AliDebug(1,"Initialized geometry with name <<EMCAL_FIRSTYEARV1>>");
         }
-        printf("Initialized geometry with name <<EMCAL_FIRSTYEARV1>>\n");
 
         return AliEMCALGeometry::GetInstance("EMCAL_FIRSTYEARV1","EMCAL",mcname,mctitle) ;// Set geometry with the name used in the configuration file
       }
       else if(runNumber >= 140000 && runNumber <= 170593)
-      {//Default geometry
-        //Complete EMCAL geometry, 10 SM.
+      {
+        //Almost complete EMCAL geometry, 10 SM. Year 2011 configuration
         
         if(!geoName.Contains("COMPLETEV1"))
         {
@@ -491,12 +492,12 @@ AliEMCALGeometry* AliEMCAL::GetGeometry() const
         {
           AliDebug(1,"Initialized geometry with name <<EMCAL_COMPLETEV1>>");
         }
-        printf("Initialized geometry with name <<EMCAL_COMPLETEV1>>\n");
-
+        
         return AliEMCALGeometry::GetInstance("EMCAL_COMPLETEV1","EMCAL",mcname,mctitle) ;// Set geometry with the name used in the configuration file
       }
-      else{ //Default geometry
-        //Complete EMCAL geometry, 10 SM.
+      else{ 
+        //Default geometry
+        //Complete EMCAL geometry, 12 SM. Year 2012 and on
         
         if(!geoName.Contains("COMPLETE12SMV1"))
         {
@@ -507,9 +508,7 @@ AliEMCALGeometry* AliEMCAL::GetGeometry() const
         {
           AliDebug(1,"Initialized geometry with name <<EMCAL_COMPLETE12SMV1>>");
         }
-        
-        printf("Initialized geometry with name <<EMCAL_COMPLETE12SMV1>>\n");
-        
+                
         return AliEMCALGeometry::GetInstance("EMCAL_COMPLETE12SMV1","EMCAL",mcname,mctitle) ;// Set geometry with the name used in the configuration file
       }
     }