X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSEsdCluster.cxx;h=c443afd012c5fb395d449ed30f6a0e9f165f4950;hb=4f57cad750ef7b66eeb95265220c1f0be2e2e479;hp=3a7d87cb7967dcca7536777e0b8a25190d7f9d32;hpb=308fb9420c99d1c7c0fe86ac797c537ff337fff7;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSEsdCluster.cxx b/PHOS/AliPHOSEsdCluster.cxx
index 3a7d87cb796..c443afd012c 100644
--- a/PHOS/AliPHOSEsdCluster.cxx
+++ b/PHOS/AliPHOSEsdCluster.cxx
@@ -57,6 +57,8 @@ AliPHOSEsdCluster::~AliPHOSEsdCluster()
 //____________________________________________________________________________
 void AliPHOSEsdCluster::Recalibrate(AliPHOSCalibData * calibData,AliESDCaloCells *phsCells){
   //If not done yet, apply recalibration coefficients to energies list
+  //NOTE that after recalibration fCellsAmpFraction contains not FRACTION but FULL energy 
+  
   if(fRecalibrated)
    return ;
   
@@ -73,18 +75,8 @@ void AliPHOSEsdCluster::Recalibrate(AliPHOSCalibData * calibData,AliESDCaloCells
     Int_t   module = relId[0];
     Int_t   column = relId[3];
     Int_t   row    = relId[2];
-    Short_t pos ;
-    for(pos=0 ; pos<phsCells->GetNumberOfCells(); pos++){ 
-     if(fCellsAbsId[i]==phsCells->GetCellNumber(pos))
-       break ;
-    }
-    if(pos<phsCells->GetNumberOfCells()){
-//       Double_t energy = phsCells->GetAmplitude(pos) ;
-      fCellsAmpFraction[i]*=calibData->GetADCchannelEmc (module,column,row);
-    }
-    else{
-      AliFatal(Form("Digit %d is not in Cell List\n",fDigitIndex->At(i))) ;
-    }
+    Double_t energy = phsCells->GetCellAmplitude(fCellsAbsId[i]) ;
+    fCellsAmpFraction[i]*=energy*calibData->GetADCchannelEmc(module,column,row);
   }
   fRecalibrated=kTRUE; 
 }
@@ -170,7 +162,6 @@ void AliPHOSEsdCluster::EvalCoord(Float_t logWeight, TVector3 &vtx)
   Double_t dzz  = 0.;
   Double_t dxz  = 0.;
   for(Int_t iDigit=0; iDigit < fNCells; iDigit++) {
-    Int_t relid[4] ;
     Float_t xi ;
     Float_t zi ;
     phosgeom->AbsToRelNumbering(fCellsAbsId[iDigit], relid) ;