Changed the data format to pass to the Make methods

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

diff --git a/HLT/PHOS/AliHLTPHOSClusterizer.cxx b/HLT/PHOS/AliHLTPHOSClusterizer.cxx
index ea4599907aa70be7a8ca534ed7074df4fc8f387a..626a5e889786b99f20071facaad4ac79243517e0 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSClusterizer.cxx
+++ b/HLT/PHOS/AliHLTPHOSClusterizer.cxx
@@ -21,9 +21,9 @@
 
 
 
-#include "AliHLTPHOSPhysicsDefinitions.h"
+//#include "AliHLTPHOSDefinitions.h"
 #include "AliHLTPHOSClusterizer.h"
-#include "AliHLTPHOSCommonDefs.h"
+//#include "AliHLTPHOSCommonDefs.h"
 #include "TVector3.h"
 #include "TMath.h"
 #include "AliHLTPHOSRcuCellEnergyDataStruct.h"
@@ -31,30 +31,35 @@
 #include "AliHLTPHOSValidCellDataStruct.h"
 #include "AliHLTPHOSRecPointDataStruct.h"
 #include "AliHLTPHOSClusterDataStruct.h"
-#include "AliHLTPHOSConstants.h"
+//#include "AliHLTPHOSConstants.h"
 
-using namespace PhosHLTConst;
+//using namespace PhosHLTConst;
 
 
-ClassImp(AliHLTPHOSClusterizer);
+
+ClassImp(AliHLTPHOSClusterizer)
 
 /**
 * Main constructor
 **/
-AliHLTPHOSClusterizer::AliHLTPHOSClusterizer():fPHOSModule(0), fThreshold(0), fClusterThreshold(0), 
+AliHLTPHOSClusterizer::AliHLTPHOSClusterizer():AliHLTPHOSBase(),fPHOSModule(0), fThreshold(0), fClusterThreshold(0), 
                                               fHighGainFactor(0.005), fLowGainFactor(0.08),
                                               fArraySize(3), fMultiplicity(fArraySize*fArraySize)
+//AliHLTPHOSClusterizer::AliHLTPHOSClusterizer():AliHLTPHOSProcessor(),fPHOSModule(0), fThreshold(0), fClusterThreshold(0), 
+//                                            fHighGainFactor(0.005), fLowGainFactor(0.08),
+//                                            fArraySize(3), fMultiplicity(fArraySize*fArraySize)
 {
   //See header file for documentation
   
 }//end
 
-AliHLTPHOSClusterizer::AliHLTPHOSClusterizer(const AliHLTPHOSClusterizer &):fPHOSModule(0), fThreshold(0), fClusterThreshold(0), 
-                                                                           fHighGainFactor(0.005), fLowGainFactor(0.08),
-                                                                           fArraySize(3), fMultiplicity(fArraySize*fArraySize)
-{
+// PTH AliHLTPHOSClusterizer::AliHLTPHOSClusterizer(const AliHLTPHOSClusterizer &):AliHLTPHOSBase(),fPHOSModule(0), fThreshold(0), fClusterThreshold(0), 
+//                                                                         fHighGainFactor(0.005), fLowGainFactor(0.08),
+//                                                                         fArraySize(3), fMultiplicity(fArraySize*fArraySize)
+
+//{
   //Copy constructor, not implemented
-}//end
+//}//end
 
 AliHLTPHOSClusterizer:: ~AliHLTPHOSClusterizer()  
 {
@@ -88,8 +93,8 @@ AliHLTPHOSClusterizer::BuildCellEnergyArray(AliHLTPHOSRcuCellEnergyDataStruct* c
       x = (cellData->fValidData[cell]).fX;
       gain = (cellData->fValidData[cell]).fGain;
 
-      zMod = z + (cellData->fRcuZ)*N_ROWS_RCU;
-      xMod = x + (cellData->fRcuX)*N_COLUMNS_RCU;
+      zMod = z + (cellData->fRcuZ)*N_ZROWS_RCU;
+      xMod = x + (cellData->fRcuX)*N_XCOLUMNS_RCU;
       
       energyCount = (cellData->fValidData[cell]).fEnergy;
 
@@ -165,12 +170,12 @@ AliHLTPHOSClusterizer::CreateRecPointStructArray(AliHLTPHOSRecPointDataStruct* r
       x = list[point].fX;
       if(z == -1) continue;
 
-      if((z-fArraySize/2) < 0/*= - N_ROWS_MOD/2*/ || (z+fArraySize/2) >= N_ROWS_MOD/*/2*/) 
+      if((z-fArraySize/2) < 0/*= - N_ZROWS_MOD/2*/ || (z+fArraySize/2) >= N_ZROWS_MOD/*/2*/) 
        {
          edgeFlagRows = 1;
          continue;
        }
-      if((x-fArraySize/2) < 0/*= - N_COLUMNS_MOD/2*/ || (x+fArraySize/2) >= N_COLUMNS_MOD) 
+      if((x-fArraySize/2) < 0/*= - N_COLUMNS_MOD/2*/ || (x+fArraySize/2) >= N_XCOLUMNS_MOD) 
        {
          edgeFlagCols = 1;
          continue;
@@ -215,7 +220,6 @@ AliHLTPHOSClusterizer::CreateRecPointStructArray(AliHLTPHOSRecPointDataStruct* r
          nRecPoints++;
        }
     }
-
   if(energiesList)
     {
       delete [] energiesList;
@@ -314,7 +318,9 @@ AliHLTPHOSClusterizer::CalculateMoments(AliHLTPHOSRecPointDataStruct* recPointPt
          zj = zc + j;
          if (fEnergyArray[xi][zj] > 0) 
            {
-             w     = TMath::Max(0.,logWeight + log( fEnergyArray[xi][zj]/fEnergyArray[xc][zc] ) ) ;
+
+             //              w     = TMath::Max(0.,logWeight + log( fEnergyArray[xi][zj]/fEnergyArray[xc][zc] ) ) ;
+
              //printf("log in mom: %f\n", TMath::Log( fEnergyArray[xi][zj] / fEnergyArray[xc][zc]));
              x    += w * xi ;
              z    += w * zj ; 
@@ -439,7 +445,7 @@ AliHLTPHOSClusterizer::CalculateMoments(AliHLTPHOSRecPointDataStruct* recPointPt
 * Create a simpler data struct for a rec point, containing
 * only coordinates, energy and timing
 * @param recPointPtr pointer to the rec point
-* @clusterStructPtr pointer to the cluster struct
+* @param clusterStructPtr pointer to the cluster struct
 **/
 int
 AliHLTPHOSClusterizer::ClusterizeStruct(AliHLTPHOSRecPointDataStruct* recPointPtr, AliHLTPHOSClusterDataStruct* clusterStructPtr)
@@ -475,9 +481,9 @@ AliHLTPHOSClusterizer::ResetCellEnergyArray()
 {
   //ResetCellEnergyArray
 
-  for(Int_t x = 0; x < N_ROWS_MOD; x++)
+  for(Int_t x = 0; x < N_ZROWS_MOD; x++)
     {
-      for(Int_t z = 0; z < N_COLUMNS_MOD; z++)
+      for(Int_t z = 0; z < N_XCOLUMNS_MOD; z++)
        {
          fEnergyArray[x][z] = 0;
        }