X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HLT%2FEMCAL%2FAliHLTEMCALConstants.cxx;h=325fb78652b5fe5edb9b1c66eba172a0978f4e60;hb=78c25bbca76fc88a092c7aba3ba59acf02f6abb0;hp=4951b1c530b733569288545971a8af0966524fc2;hpb=4e944263a72ef91404d2f028c180c4509b3b8109;p=u%2Fmrichter%2FAliRoot.git

diff --git a/HLT/EMCAL/AliHLTEMCALConstants.cxx b/HLT/EMCAL/AliHLTEMCALConstants.cxx
index 4951b1c530b..325fb78652b 100644
--- a/HLT/EMCAL/AliHLTEMCALConstants.cxx
+++ b/HLT/EMCAL/AliHLTEMCALConstants.cxx
@@ -22,65 +22,38 @@
 /// @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(),
-  fkMAXHOSTS(20),
-  fkDEFAULTEVENTPORT(42001),
-  fkNZROWSRCU(56),
-  fkNXCOLUMNSRCU(16),
-  fkNZROWSMOD(48),
-  fkNXCOLUMNSMOD(24),
-  fkNDATATYPES(10),
-  fkPFMAXPATHLENGTH(256),
-  fkPFDEFAULTNSAMPLES(70),
-  fkPFDEFAULTSTARTINDEX(0),
-  fkDEFAULTTAU(0.2),
-  fkDEFAULTFS(10),
-  fkMODULE0(0),
-  fkMODULE1(1),
-  fkMODULE2(2),
-  fkMODULE3(3),
-  fkMODULE4(4),
-  fkCSPSPERFEE(32),
-  fkRCU0(0),
-  fkRCU1(1),
-  fkRCU2(2),
-  fkRCU3(3),
-  fkZ0(0),
-  fkZ1(1),
-  fkX0(0),
-  fkX1(1),
-  fkNMODULES(10),
-  fkNRCUS(4),
-  fkNRCUSPERMODULE(2),
-  fkNRCUSPERTOTAL(fkNMODULES*fkNRCUSPERMODULE),
-  fkNFEECS(9),
-  fkNALTROS(4),
-  fkNALTROCHANNELS(16),
-  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),
-  fkDETNAME("EMCAL")
+AliHLTEMCALConstants::AliHLTEMCALConstants() : AliHLTCaloConstants()
 {
+  InitConstants();
   //Default constructor
 }
 
+
+
 AliHLTEMCALConstants::~AliHLTEMCALConstants()
 {
   //Default destructor
 }
 
+
+void 
+AliHLTEMCALConstants::InitConstants() 
+{
+  fkDETNAME = "EMCAL";
+  fkCELLSTEP = 6.0;
+  fkDDLOFFSET =  4608;
+  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.0;
+  fkCJ = 0.5 ;
+
+}
+