Optimisation

[u/mrichter/AliRoot.git] / HLT / EMCAL / AliHLTEMCALMapper.cxx

diff --git a/HLT/EMCAL/AliHLTEMCALMapper.cxx b/HLT/EMCAL/AliHLTEMCALMapper.cxx
index 721d99f6b48615c1d5d88a97cc25af4c6ead0357..efda341a25709dd147a4fcb2571b0129c3093c7c 100644 (file)
--- a/HLT/EMCAL/AliHLTEMCALMapper.cxx
+++ b/HLT/EMCAL/AliHLTEMCALMapper.cxx
@@ -15,24 +15,30 @@
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
-#include "AliHLTEMCALMapper.h"
 
-#include "AliHLTEMCALConstants.h"
-#include "assert.h"
+#include "AliHLTEMCALMapper.h"
 
+//#include "AliHLTEMCALConstant.h"
+// #include "AliHLTCaloConstant.h"
 
-using namespace EmcalHLTConst;
+#include "assert.h"
 
-//AliHLTCaloMapper
+//using namespace EmcalHLTConst;
 
+#include "AliHLTCaloConstants.h"
 
+using EMCAL::NXCOLUMNSMOD;
+using EMCAL::NZROWSMOD;
+using EMCAL::NMODULES;
+using EMCAL::NRCUSPERMODULE;
+using EMCAL::NRCUSPERSECTOR;
 
-AliHLTEMCALMapper::AliHLTEMCALMapper(const unsigned long specification ) : AliHLTCaloMapper(specification)
+AliHLTEMCALMapper::AliHLTEMCALMapper(const unsigned long specification ) : AliHLTCaloMapper(specification, "EMCAL")
 {
   fCellSize = 6;
   InitAltroMapping(specification);
   InitDDLSpecificationMapping();
-  fIsInitializedMapping = true; //CRAP PTH, must check is the initilization actually went ok
+  fIsInitializedMapping = true; //CRAP PTH, must check if the initilization actually went ok
 }
 
 
@@ -42,10 +48,6 @@ AliHLTEMCALMapper::~AliHLTEMCALMapper()
 }
   
 
-
-// channelCoord[0] = (static_cast<Float_t>(channelId&0x3f) - NXCOLUMNSMOD/2)* fCellStep;
-// channelCoord[1] = (static_cast<Float_t>((channelId >> 6)&0x3f) - NZROWSMOD/2) * fCellStep;
-
 void 
 AliHLTEMCALMapper::GetLocalCoord(const int channelId, Float_t* localCoord) const
 {
@@ -54,7 +56,7 @@ AliHLTEMCALMapper::GetLocalCoord(const int channelId, Float_t* localCoord) const
 }
 
 
-void 
+Bool_t 
 AliHLTEMCALMapper::InitAltroMapping(const unsigned long specification )
 {
   char *base =  getenv("ALICE_ROOT");
@@ -68,16 +70,9 @@ AliHLTEMCALMapper::InitAltroMapping(const unsigned long specification )
   
   if(base !=0)
     {
-      //      int tmpddlindex =  GetDDLFromSpec( specification )%2; 
-
       sprintf(fFilepath, "%s/EMCAL/mapping/%s", base,   DDL2RcuMapFileName( GetDDLFromSpec( specification ) ) ); 
       sprintf(fFilepath, "%s/EMCAL/mapping/%s", base,   DDL2RcuMapFileName( GetDDLFromSpec( specification ) ) ); 
 
-      //   assert("DDL spec is  %d", GetDDLFromSpec( specification ) );
-     
-      cout << __FILE__ <<":"<< __LINE__ <<"DDL spec is " <<   GetDDLFromSpec( specification )  << endl;
-      cout << __FILE__ <<":"<< __LINE__ <<"mapping filename is " <<  fFilepath << endl;
-       // sprintf(fFilepath,"%s/PHOS/mapping/RCU0.data", base);
       FILE *fp = fopen(fFilepath, "r");
       if(fp != 0)
        {
@@ -95,8 +90,6 @@ AliHLTEMCALMapper::InitAltroMapping(const unsigned long specification )
            {
              res = fscanf(fp, "%d %d %d %d\n", &tmpHwaddr, &tmpXCol, &tmpZRow,  &tmpGain);
              
-             //              cout << __FILE__ << __LINE__ << "  tmpHwaddr  = " << tmpHwaddr << ", tmpXCol = " << (int)tmpXCol <<  ", tmpZRow = "<< (int)tmpZRow <<  ", tmpGain= "<< (int)tmpGain << endl;
-             
              if(tmpGain < 2)
                {
                  fHw2geomapPtr[tmpHwaddr].fXCol   = (char)tmpXCol;
@@ -109,7 +102,6 @@ AliHLTEMCALMapper::InitAltroMapping(const unsigned long specification )
        }
       else
        {
-         cout << __FUNCTION__ << ":"<<__FILE__<<":"<< __LINE__ << "ERROR, could not open mapping file %s" <<  fFilepath << endl;
          fIsInitializedMapping = false;          
        }
     }
@@ -117,17 +109,19 @@ AliHLTEMCALMapper::InitAltroMapping(const unsigned long specification )
     {
       fIsInitializedMapping = false;
     }
+    
+    return fIsInitializedMapping;
 }
 
 
 void 
 AliHLTEMCALMapper::InitDDLSpecificationMapping()
 {
-  fSpecificationMapPtr = new fDDLSpecificationMap[EmcalHLTConst::NMODULES*EmcalHLTConst::NRCUSPERMODULE];
+  fSpecificationMapPtr = new fDDLSpecificationMap[NMODULES*NRCUSPERMODULE];
   
-  for(Int_t ddl = 0; ddl < EmcalHLTConst::NMODULES*EmcalHLTConst::NRCUSPERMODULE; ddl++)
+  for(Int_t ddl = 0; ddl < NMODULES*NRCUSPERMODULE; ddl++)
     {
-      fSpecificationMapPtr[ddl].fModId = ddl/(EmcalHLTConst::NRCUSPERMODULE);
+      fSpecificationMapPtr[ddl].fModId = ddl/( NRCUSPERMODULE );
     }
 }