Combined event ID complaint with the DAQ software.

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

diff --git a/HLT/EMCAL/AliHLTEMCALConstants.cxx b/HLT/EMCAL/AliHLTEMCALConstants.cxx
index 6dba9a8f37b752584a2fc458acab7161712b3d6a..18c0d0e9f4879537f9862adb9918f2845a9824be 100644 (file)
--- a/HLT/EMCAL/AliHLTEMCALConstants.cxx
+++ b/HLT/EMCAL/AliHLTEMCALConstants.cxx
@@ -22,40 +22,15 @@
 /// @brief  Class containing constants for EMCAL and EMCAL
 ///         loaded libraries
 
-#include "AliHLTCaloConstants.h"
+
+//#include "AliHLTCaloConstants.h"
 #include "AliHLTEMCALConstants.h"
 
-ClassImp(AliHLTEMCALConstants);
+ClassImp(AliHLTEMCALConstants)
 
-AliHLTEMCALConstants::AliHLTEMCALConstants() :
-  AliHLTCaloConstants()
+AliHLTEMCALConstants::AliHLTEMCALConstants() : AliHLTCaloConstants()
 {
-  
- 
-  // fkNZROWSRCU =  56;
-  // fkNXCOLUMNSRCU = 16;
-  // fkNZROWSMOD = 48;
-  // fkNXCOLUMNSMOD = 24;
-  // fkNMODULES = 10;
-  // fkNRCUS = 4;
-  // fkNRCUSPERMODULE = 2;
-  // fkNRCUSPERTOTAL = fkNMODULES*fkNRCUSPERMODULE;
-  // fkNFEECS = 9;
-  // fkDETNAME = "EMCAL";
-  //   //  fkNBRANCHES(2), 
-  // fkCELLSTEP = 6.0;
-  // fkMAXCELLSTEPETA =6.32;   // FR: max tower dimension along eta
-  // fkMINCELLSTEPETA = 5.99;  // FR: min tower dimension along eta
-  // fkCELLSTEPPHI = 6.04667;  // FR: tower dimension along phi
-  // fkCELLHEIGHT =  27.74;    // FR: tower height
-  // fkCELLANGLE  =  1.50;             // FR: tower tapeiring angle (DEG)
-  // fkRADLENGTH  =  1.23;
-  // fkCRITICENERGY =  8;
-  // fkCJ  =   0.5;
-  // //  fkNRCUSPERSECTOR(4),
-  // fkDDLOFFSET =  4608;
-
-
+  InitConstants();
   //Default constructor
 }
 
@@ -68,29 +43,19 @@ AliHLTEMCALConstants::~AliHLTEMCALConstants()
 
 
 void 
-AliHLTEMCALConstants::InitConstants()
+AliHLTEMCALConstants::InitConstants() 
 {
-  fkNZROWSRCU =  56;
-  fkNXCOLUMNSRCU = 16;
-  fkNZROWSMOD = 48;
-  fkNXCOLUMNSMOD = 24;
-  fkNMODULES = 10;
-  fkNRCUS = 4;
-  fkNRCUSPERMODULE = 2;
-  fkNRCUSPERTOTAL = fkNMODULES*fkNRCUSPERMODULE;
-  fkNFEECS = 9;
   fkDETNAME = "EMCAL";
-  //  fkNBRANCHES(2), 
   fkCELLSTEP = 6.0;
-  fkMAXCELLSTEPETA =6.32;      // FR: max tower dimension along eta
+  fkDDLOFFSET =  4608;
+  fkMAXCELLSTEPETA = 6.32;     // FR: max tower dimension along eta
   fkMINCELLSTEPETA = 5.99;     // FR: min tower dimension along eta
   fkCELLSTEPPHI = 6.04667;     // FR: tower dimension along phi
-  fkCELLHEIGHT =  27.74;       // FR: tower height
-  fkCELLANGLE  =  1.50;                // FR: tower tapeiring angle (DEG)
-  fkRADLENGTH  =  1.23;
-  fkCRITICENERGY =  8;
-  fkCJ  =   0.5;
-  //  fkNRCUSPERSECTOR(4),
-  fkDDLOFFSET =  4608;
+  fkCELLHEIGHT = 27.74;        // FR: tower height
+  fkCELLANGLE = 1.50;                  // FR: tower tapeiring angle (DEG)
+  fkRADLENGTH = 1.23;
+  fkCRITICENERGY = 8.0;
+  fkCJ = 0.5 ;
+
 }