- reconstruction classes no using the reco param handlers to get the reconstruction...

[u/mrichter/AliRoot.git] / HLT / PHOS / AliHLTPHOSEmcCalibData.cxx

diff --git a/HLT/PHOS/AliHLTPHOSEmcCalibData.cxx b/HLT/PHOS/AliHLTPHOSEmcCalibData.cxx
index c5a70ef9064615fa1f5d8259494a46d21f9d4681..20cb9516197dc67657281a5acb368ec96d610d92 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSEmcCalibData.cxx
+++ b/HLT/PHOS/AliHLTPHOSEmcCalibData.cxx
@@ -1,3 +1,5 @@
+// $Id$
+
 /**************************************************************************
  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
@@ -59,10 +61,10 @@ AliHLTPHOSEmcCalibData::AliHLTPHOSEmcCalibData(const AliHLTPHOSEmcCalibData& cal
 
 
   //  for(Int_t gain = 0; gain < N_GAINS; gain ++){
-  for(Int_t module=0; module<N_MODULES; module++) {
-    for(Int_t column=0; column< N_COLUMNS_MOD; column++) {
-      for(Int_t row=0; row<N_ROWS_MOD; row++) {
-       for(Int_t gain = 0; gain < N_GAINS; gain ++){
+  for(Int_t module=0; module<NMODULES; module++) {
+    for(Int_t column=0; column< NXCOLUMNSMOD; column++) {
+      for(Int_t row=0; row<NZROWSMOD; row++) {
+       for(Int_t gain = 0; gain < NGAINS; gain ++){
          fADCchannelEnergy[module][column][row][gain] =  calibda.fADCchannelEnergy[module][column][row][gain];
          fADCpedestalEmcMeasured[module][column][row][gain] = calibda.fADCpedestalEmcMeasured[module][column][row][gain];
        }
@@ -81,10 +83,10 @@ AliHLTPHOSEmcCalibData &AliHLTPHOSEmcCalibData::operator =(const AliHLTPHOSEmcCa
     SetName(calibda.GetName());
     SetTitle(calibda.GetName());
     //    for(Int_t gain = 0; gain < N_GAINS; gain ++){
-    for(Int_t module=0; module<N_MODULES; module++) {
-      for(Int_t column=0; column< N_COLUMNS_MOD; column++) {
-       for(Int_t row=0; row<N_ROWS_MOD; row++) {
-         for(Int_t gain = 0; gain < N_GAINS; gain ++){
+    for(Int_t module=0; module<NMODULES; module++) {
+      for(Int_t column=0; column< NXCOLUMNSMOD; column++) {
+       for(Int_t row=0; row<NZROWSMOD; row++) {
+         for(Int_t gain = 0; gain < NGAINS; gain ++){
            fADCchannelEnergy[module][column][row][gain] = calibda.fADCchannelEnergy[module][column][row][gain];
            fADCpedestalEmcMeasured[module][column][row][gain] = calibda.fADCpedestalEmcMeasured[module][column][row][gain];
          }
@@ -107,10 +109,10 @@ void AliHLTPHOSEmcCalibData::Reset()
   // Set all pedestals and all ADC channels to its ideal values = 1.
 
   //  for(Int_t gain = 0; gain < PHOS_GAINS; gain ++){
-    for (Int_t module=0; module<N_MODULES; module++){
-      for (Int_t column=0; column< N_COLUMNS_MOD; column++){
-       for (Int_t row=0; row<N_ROWS_MOD; row++){
-         for(Int_t gain = 0; gain < N_GAINS; gain ++){
+    for (Int_t module=0; module<NMODULES; module++){
+      for (Int_t column=0; column< NXCOLUMNSMOD; column++){
+       for (Int_t row=0; row<NZROWSMOD; row++){
+         for(Int_t gain = 0; gain < NGAINS; gain ++){
          fADCpedestalEmcMeasured[module][column][row][gain] = 0.;
          fADCchannelEnergy[module][column][row][gain]  = 1.;
        }
@@ -127,11 +129,11 @@ void  AliHLTPHOSEmcCalibData::Print(Option_t *option) const
   if (strstr(option,"ped")) {
     printf("\n ----    EMC Pedestal values     ----\n\n");
     //    for(Int_t gain = 0; gain < N_GAINS; gain ++){
-      for (Int_t module=0; module<N_MODULES; module++){
+      for (Int_t module=0; module<NMODULES; module++){
        printf("============== Module %d\n",module+1);
-       for (Int_t column=0; column< N_COLUMNS_MOD; column++){
-         for (Int_t row=0; row<N_ROWS_MOD; row++){
-           for(Int_t gain = 0; gain < N_GAINS; gain ++){
+       for (Int_t column=0; column< NXCOLUMNSMOD; column++){
+         for (Int_t row=0; row<NZROWSMOD; row++){
+           for(Int_t gain = 0; gain < NGAINS; gain ++){
            printf("%4.1f",fADCpedestalEmcMeasured[module][column][row][gain]);
          }
          printf("\n");
@@ -142,12 +144,12 @@ void  AliHLTPHOSEmcCalibData::Print(Option_t *option) const
 
   if (strstr(option,"gain")) {
     printf("\n ----    EMC ADC channel values  ----\n\n");
-    //   for(Int_t gain = 0; gain < N_GAINS; gain ++){ 
-    for (Int_t module=0; module<N_MODULES; module++){
+    //   for(Int_t gain = 0; gain < NGAINS; gain ++){ 
+    for (Int_t module=0; module<NMODULES; module++){
       printf("============== Module %d\n",module+1);
-      for (Int_t column=0; column< N_COLUMNS_MOD; column++){
-       for (Int_t row=0; row<N_ROWS_MOD; row++){
-         for(Int_t gain = 0; gain < N_GAINS; gain ++){ 
+      for (Int_t column=0; column< NXCOLUMNSMOD; column++){
+       for (Int_t row=0; row<NZROWSMOD; row++){
+         for(Int_t gain = 0; gain < NGAINS; gain ++){ 
            printf("%4.1f",fADCchannelEnergy[module][column][row][gain]);
          }
          printf("\n");
@@ -161,11 +163,11 @@ void  AliHLTPHOSEmcCalibData::Print(Option_t *option) const
 void  
 AliHLTPHOSEmcCalibData::MakeADCpedestalCorrectionTable()
 {
-  for (Int_t module=0; module<N_MODULES; module++){
+  for (Int_t module=0; module<NMODULES; module++){
     printf("============== Module %d\n",module+1);
-    for (Int_t column=0; column< N_COLUMNS_MOD; column++){
-      for (Int_t row=0; row<N_ROWS_MOD; row++){
-       for(Int_t gain = 0; gain < N_GAINS; gain ++){ 
+    for (Int_t column=0; column< NXCOLUMNSMOD; column++){
+      for (Int_t row=0; row<NZROWSMOD; row++){
+       for(Int_t gain = 0; gain < NGAINS; gain ++){ 
          fADCpedestalCorrectionTable[module][column][row][gain] = fADCpedestalEmcMeasured[module][column][row][gain] - fADCpedestalAltroReg[module][column][row][gain];
          //      printf("%4.1f",fADCchannelEnergy[module][column][row][gain]);
          //