Very last updates to account for very displaced vertices

[u/mrichter/AliRoot.git] / HLT / EMCAL / AliHLTEMCALRcuCellAccumulatedEnergyDataStruct.h

diff --git a/HLT/EMCAL/AliHLTEMCALRcuCellAccumulatedEnergyDataStruct.h b/HLT/EMCAL/AliHLTEMCALRcuCellAccumulatedEnergyDataStruct.h
index 2af7cb3843340d7145a540a49483746fe650555f..f3289dcd14da37c2602bca82e5457885eadbf123 100644 (file)
--- a/HLT/EMCAL/AliHLTEMCALRcuCellAccumulatedEnergyDataStruct.h
+++ b/HLT/EMCAL/AliHLTEMCALRcuCellAccumulatedEnergyDataStruct.h
@@ -19,12 +19,15 @@
  * provided "as is" without express or implied warranty.                   *
  **************************************************************************/
 
+//#include "AliHLTEMCALConstant.h"
+//using namespace EmcalHLTConst;
 
-//#include "AliHLTPHOSCommonDefs.h"
-#include "AliHLTCaloConstants.h"
-// using namespace PhosHLTConst;
-using namespace CaloHLTConst;
 
+#include "AliHLTCaloConstant.h"
+
+using EMCAL::NXCOLUMNSMOD;
+using EMCAL::NZROWSMOD;
+using EMCAL::NGAINS;
 
 struct AliHLTCaloRcuCellAccumulatedEnergyDataStruct
 {
@@ -33,17 +36,7 @@ struct AliHLTCaloRcuCellAccumulatedEnergyDataStruct
   AliHLTUInt8_t fRcuZ; 
   float fAccumulatedEnergies[NXCOLUMNSMOD][NZROWSMOD][NGAINS];
   AliHLTUInt32_t fHits[NXCOLUMNSMOD][NZROWSMOD][NGAINS];
-  AliHLTUInt32_t fDeadChannelMap[NXCOLUMNSMOD][NZROWSMOD][NGAINS];
-
-  /*
-  AliHLTUInt8_t fModuleID;
-  AliHLTUInt8_t fRcuX;
-  AliHLTUInt8_t fRcuZ; 
-  float fAccumulatedEnergies[NXCOLUMNSRCU][NZROWSRCU][NGAINS];
-  AliHLTUInt32_t fHits[NXCOLUMNSRCU][NZROWSRCU][NGAINS];
-  AliHLTUInt32_t fDeadChannelMap[NXCOLUMNSRCU][NZROWSRCU][NGAINS];
-  */
-
+  AliHLTUInt32_t fDeadChannelMap[NXCOLUMNSMOD][NZROWSMOD][NGAINS]; 
 };