X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliCaloConstants.h;h=be71ce1e42d4b4ae36df06ac769d311537cc672a;hb=d39cba7e4c3f4fee92762a66dabaed8e83318d23;hp=8c9f3af98c20d58a1c01151ed01906f35fb2ed01;hpb=92d9f31756fbed289bb86e1ca378c8db95224dd0;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/AliCaloConstants.h b/EMCAL/AliCaloConstants.h
index 8c9f3af98c2..be71ce1e42d 100644
--- a/EMCAL/AliCaloConstants.h
+++ b/EMCAL/AliCaloConstants.h
@@ -49,7 +49,7 @@ namespace CaloConstants
     const int NALTROS        =   4;      // Number of ALTROs per frontend card
     const int NALTROCHANNELS =  16;      // Number of readout channels per ALTRO chip
     const int MINHARDWAREADDRESS = -2;   // Smallest possible HW address ( in offline )
-    const int MAXHARDWAREADDRESS = 4096; // Max harware address,  ( its to high ) 
+    //    const int MAXHARDWAREADDRESS = 4096; // Max harware address,  ( its to high ) 
     const int MAXBINVALUE = 1023;        // Max possible ALTRO ADC value ( 10 bit )
     const int NGAINS         =   2;      // Number of gains ( high + low )
     const int HIGHGAIN    =   1;         // Mnemonic for High Gain
@@ -61,23 +61,18 @@ namespace CaloConstants
   //FEE constants common to PHOS EMCAL
   const int CSPSPERFEE       =   32;    // Charge Sensitive Preamplifiers (CSPs) per FEE
   const int NBRANCHES        =    2;    // Branches per RCU   
-  const int MAXHWADDRESSES   = 4096;    // Highest possible harware address
+  //  const int MAXHWADDRESSES   = 4096;    // Highest possible harware address
   
   namespace EMCALConstants
   {
-    // const int NZROWSMOD      =  48;   // Number of rows per module
-    // const int NXCOLUMNSMOD   =  24;   // Number of columns per module 
+    const int MAXHWADDR = 3279;
+    const int MAXCHANNELS = 1408;
     const double ECENTRALHIT = 0.845678; //Percentage of total enegry contain in a single tower for a central hit  
-    
-    const int NZROWSMOD      =  24;   // Number of rows per module
-    const int NXCOLUMNSMOD   =  48;   // Number of columns per module 
-    
+    const int NZROWSMOD      =  48;   // Number of columns per module
+    const int NXCOLUMNSMOD   =  24;   // Number of rows per module 
     const int NROWSMOD     = NZROWSMOD;   // Number of rows per module
     const int NCOLUMNSMOD  = NXCOLUMNSMOD;   // Number of columns per module 
     
-    //   const int NZROWSMOD      =  24;   // Number of rows per module
-    //   const int NXCOLUMNSMOD   =  48;   // Number of columns per module 
-    
     const int NRCUSPERSECTOR = 4;     // Number of RCUs per sector
     const int NMODULES    =    10;    // Number of modules of the EMCAL detector
     const int NRCUSPERMODULE =  2 ;   // Number of RCUs per Module
@@ -91,6 +86,8 @@ namespace CaloConstants
 
   namespace PHOSConstants
   {
+    const int MAXHWADDR = 4096; 
+    //    const int MAXHARDWAREADDRESS = 4096; // Max harware address,  ( its to high )  
     const int NZROWSMOD      =  56;   // Number of rows per module       
     const int NXCOLUMNSMOD   =  64;   // Number of columns per module
     const int NMODULES    =     5;    // Number of modules of the PHOS detector
@@ -98,13 +95,14 @@ namespace CaloConstants
     const int NFEECS         =  14;   // Number of Frontend cards per branch
   }
 
-
+  
   namespace FitAlgorithm
   {
-    enum fitAlgorithm { kStandard = 0, kCrude = 1, kPeakFinder = 2, kNeuralNet = 3, kFastFit= 4,
-			kLogFit = 5, kLMS = 6,  kLMSOffline = 7, kFakeAltro = 9, kNONE = 8}; // possible return values
+    enum fitAlgorithm { kStandard = 0, kCrude = 1, kPeakFinder = 2, kNeuralNet = 3, kFastFit= 4, kFakeAltro = 9, kNONE = 8}; // possible return values
   }
 
+  
+  
   namespace ReturnCodes
   {
     enum kReturnCode {kFitPar=1, kDummy=-1, kCrude=-9, kNoFit=-99, kInvalid=-9999};  // possible return values