- adding cell info to ESDs

diff --git a/HLT/BASE/util/AliHLTESDCaloClusterMaker.cxx b/HLT/BASE/util/AliHLTESDCaloClusterMaker.cxx
index 6624139781aad7fa12f61363af3846ebdbd4d38d..cc030e2795d2060ce40e55366e3009eb1b86b775 100644 (file)
--- a/HLT/BASE/util/AliHLTESDCaloClusterMaker.cxx
+++ b/HLT/BASE/util/AliHLTESDCaloClusterMaker.cxx
@@ -80,27 +80,26 @@ AliHLTESDCaloClusterMaker::FillESD(AliESDEvent *esdPtr, const AliHLTCaloClusterH
       esdCluster.SetNExMax(caloClusterStructPtr->fNExMax);
       esdCluster.SetEmcCpvDistance(caloClusterStructPtr->fEmcCpvDistance);
       esdCluster.SetDistanceToBadChannel(caloClusterStructPtr->fDistToBadChannel);
-      //esdCluster.SetNCells(caloClusterStructPtr->fNCells);
-      esdCluster.SetNCells(0);
+      esdCluster.SetNCells(caloClusterStructPtr->fNCells);
+      //esdCluster.SetNCells(0);
       if(caloClusterStructPtr->GetNTracksMatched())
       {
         TArrayI tracksMatched(caloClusterStructPtr->GetNTracksMatched(), caloClusterStructPtr->fTracksMatched);
         esdCluster.AddTracksMatched(tracksMatched);
       }
-
-/*      UShort_t *idArrayPtr = new UShort_t[caloClusterStructPtr->fNCells];
-      Double32_t *ampFracArrayPtr = new Double32_t[caloClusterStructPtr->fNCells];
+      UShort_t *idArrayPtr = new UShort_t[caloClusterStructPtr->fNCells];
+     Double32_t *ampFracArrayPtr = new Double32_t[caloClusterStructPtr->fNCells];
       
       for(UInt_t index = 0; index < caloClusterStructPtr->fNCells; index++)
        {
            fClusterReaderPtr->GetCell(caloClusterStructPtr, idArrayPtr[index], ampFracArrayPtr[index], index);
-//         printf("EM: cellId: %d\n", idArrayPtr[index]);;
+           //printf("EM: cellId: %d\n", idArrayPtr[index]);;
        }
       esdCluster.SetCellsAbsId(idArrayPtr);
       esdCluster.SetCellsAmplitudeFraction(ampFracArrayPtr);
    
       delete [] idArrayPtr;
-      delete [] ampFracArrayPtr;*/
+      delete [] ampFracArrayPtr;
 //      idArrayPtr = 0;
       //ampFracArrayPtr = 0;
       

diff --git a/HLT/CALO/AliHLTCaloClusterAnalyser.cxx b/HLT/CALO/AliHLTCaloClusterAnalyser.cxx
index 4f8be183bb0f429061264a05edcf7d0c6aade4c8..44f3b604dad602a3a3bad9aa6b2dc8ddd5086d5d 100644 (file)
--- a/HLT/CALO/AliHLTCaloClusterAnalyser.cxx
+++ b/HLT/CALO/AliHLTCaloClusterAnalyser.cxx
@@ -211,6 +211,22 @@ AliHLTCaloClusterAnalyser::CreateClusters(Int_t nRecPoints, UInt_t availableSize
       totSize += sizeof(AliHLTCaloClusterDataStruct);
       
       caloClusterPtr = fCaloClusterDataPtr;
+      caloClusterPtr->fChi2 = 0;
+      caloClusterPtr->fClusterType = kUndef;
+      caloClusterPtr->fDispersion = 0;
+      caloClusterPtr->fDistanceToBadChannel = 0;
+      caloClusterPtr->fDistToBadChannel = 0;
+      caloClusterPtr->fEmcCpvDistance = 0;
+      caloClusterPtr->fEnergy = 0;
+      caloClusterPtr->fFitQuality = 0;
+      caloClusterPtr->fID = 0;
+      caloClusterPtr->fM02 = 0;
+      caloClusterPtr->fM20 = 0;
+      caloClusterPtr->fNCells = 0;
+      caloClusterPtr->fNExMax = 0;
+      caloClusterPtr->fTOF = 0;
+      caloClusterPtr->fTrackDx = 0;
+      caloClusterPtr->fTrackDz = 0;
      
       AliHLTCaloRecPointDataStruct *recPointPtr = fRecPointArray[i];
       
@@ -249,7 +265,6 @@ AliHLTCaloClusterAnalyser::CreateClusters(Int_t nRecPoints, UInt_t availableSize
       for(UInt_t j = 0; j < caloClusterPtr->fNCells; j++)
        {
           digitPtr = &(fDigitDataArray[*digitIndexPtr]);
-          id++;
           fGeometry->GetCellAbsId(recPointPtr->fModule, digitPtr->fX, digitPtr->fZ, id);
           
          cellPtr->fCellsAbsId= id;
@@ -257,7 +272,7 @@ AliHLTCaloClusterAnalyser::CreateClusters(Int_t nRecPoints, UInt_t availableSize
          //printf("Cell ID pointer: %x\n", cellIDPtr);
         //printf("Cell Amp Pointer: %x\n", cellAmpFracPtr);
         //printf("Cell pos: x = %d, z = %d\n", digitPtr->fX, digitPtr->fZ);
-        //printf("Cell ID: %d, pointer: %x\n", *cellIDPtr, cellIDPtr);
+//      printf("Cell ID: %d\n", cellPtr->fCellsAbsId);
         //printf("Cell Amp: %f, pointer: %x\n", *cellAmpFracPtr, cellAmpFracPtr);
          cellPtr++;
          digitIndexPtr++;
@@ -267,7 +282,7 @@ AliHLTCaloClusterAnalyser::CreateClusters(Int_t nRecPoints, UInt_t availableSize
       totSize += tmpSize;
 
       caloClusterPtr->fEnergy = recPointPtr->fAmp;
-
+      
       HLTDebug("Cluster global position: x = %f, y = %f, z = %f, energy: %f, number of cells: %d, cluster pointer: %x", globalCoord.fX, globalCoord.fY, globalCoord.fZ, caloClusterPtr->fEnergy, caloClusterPtr->fNCells,  caloClusterPtr);
 
       if(fDoClusterFit)