Adding extra check for GPU_FORCE_64BIT_PTR env var

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

diff --git a/EMCAL/AliEMCALv2.cxx b/EMCAL/AliEMCALv2.cxx
index 729ff7527e0ec37c9a0a0d6c845200dce6187e3f..f8e81c40f4981540c6ab617b36749179c7aceb6d 100644 (file)
--- a/EMCAL/AliEMCALv2.cxx
+++ b/EMCAL/AliEMCALv2.cxx
@@ -57,8 +57,9 @@ AliEMCALv2::AliEMCALv2()
 }
 
 //______________________________________________________________________
-AliEMCALv2::AliEMCALv2(const char *name, const char *title)
-  : AliEMCALv1(name,title)
+AliEMCALv2::AliEMCALv2(const char *name, const char *title, 
+                       const Bool_t checkGeoAndRun)
+  : AliEMCALv1(name,title,checkGeoAndRun)
 {
     // Standard Creator.
 
@@ -68,7 +69,7 @@ AliEMCALv2::AliEMCALv2(const char *name, const char *title)
     fNhits    = 0;
     fIshunt   = 2; // All hits are associated with particles entering the calorimeter
     fTimeCut  = 30e-09;
-
+  
     fGeometry = GetGeometry(); 
 }
 
@@ -219,6 +220,7 @@ void AliEMCALv2::StepManager(void){
         gMC->CurrentVolOffID(1, yNumber);
         gMC->CurrentVolOffID(0, xNumber); // really x number now
         if(strcmp(gMC->CurrentVolOffName(4),"SM10")==0) supModuleNumber += 10; // 13-oct-05
+        if(strcmp(gMC->CurrentVolOffName(4),"SM3rd")==0) supModuleNumber += 10; // 1-feb-12
        // Nov 10,2006
         if(strcmp(gMC->CurrentVolOffName(0),vn) != 0) { // 3X3 case
           if     (strcmp(gMC->CurrentVolOffName(0),"SCX1")==0) xNumber=1;
@@ -249,7 +251,8 @@ void AliEMCALv2::StepManager(void){
        ieta = ((fGeometry->GetCentersOfCellsEtaDir()).GetSize()-1)-ieta;// 47-ieta, revert the ordering on A side in order to keep convention.
       }
       else {  
-       if(smNumber >= 10) smType = 2 ; //half supermodule
+       if(smNumber >= 10 && strcmp(gMC->CurrentVolOffName(4),"SM10")==0) smType = 2 ; //half supermodule. previous design/idea
+       if(smNumber >= 10 && strcmp(gMC->CurrentVolOffName(4),"SM3rd")==0) smType = 3 ; //one third (installed in 2012) supermodule
        iphi= ((fGeometry->GetCentersOfCellsPhiDir()).GetSize()/smType-1)-iphi;//23-iphi, revert the ordering on C side in order to keep convention.
       }