X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSEmcRecPoint.cxx;h=63604ad2dfb8efc6a1effff3c2e1ea53af72a99a;hb=09b20ad1c29952cef09057dbfdfdb134149c5127;hp=b9249fa04dd1825e76fc9c9d17dae4cdbb9e529e;hpb=c307c6292ba899fcb5734b565a4f3643506f497c;p=u%2Fmrichter%2FAliRoot.git diff --git a/PHOS/AliPHOSEmcRecPoint.cxx b/PHOS/AliPHOSEmcRecPoint.cxx index b9249fa04dd..63604ad2dfb 100644 --- a/PHOS/AliPHOSEmcRecPoint.cxx +++ b/PHOS/AliPHOSEmcRecPoint.cxx @@ -18,6 +18,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.59 2007/10/18 15:12:22 kharlov + * Moved MakePrimary to EMCRecPoint to rpduce correct order of primaries + * * Revision 1.58 2007/04/16 09:03:37 kharlov * Incedent angle correction fixed * @@ -105,9 +108,8 @@ AliPHOSEmcRecPoint::AliPHOSEmcRecPoint(const AliPHOSEmcRecPoint & rp) : // cpy ctor fMulDigit = rp.fMulDigit ; fAmp = rp.fAmp ; - fEnergyList = new Float_t[rp.fMulDigit] ; - Int_t index ; - for(index = 0 ; index < fMulDigit ; index++) + if (rp.fMulDigit>0) fEnergyList = new Float_t[rp.fMulDigit] ; + for(Int_t index = 0 ; index < fMulDigit ; index++) fEnergyList[index] = rp.fEnergyList[index] ; } @@ -353,7 +355,7 @@ void AliPHOSEmcRecPoint::ExecuteEvent(Int_t event, Int_t, Int_t) /*const*/ } //____________________________________________________________________________ -void AliPHOSEmcRecPoint::EvalDispersion(Float_t logWeight,TClonesArray * digits, TVector3 &vInc) +void AliPHOSEmcRecPoint::EvalDispersion(Float_t logWeight,TClonesArray * digits, TVector3 & /* vInc */) { // Calculates the dispersion of the shower at the origine of the RecPoint //DP: should we correct dispersion for non-perpendicular hit???????? @@ -489,7 +491,7 @@ void AliPHOSEmcRecPoint::EvalCoreEnergy(Float_t logWeight, TClonesArray * digits } //____________________________________________________________________________ -void AliPHOSEmcRecPoint::EvalElipsAxis(Float_t logWeight,TClonesArray * digits, TVector3 &vInc) +void AliPHOSEmcRecPoint::EvalElipsAxis(Float_t logWeight,TClonesArray * digits, TVector3 & /* vInc */) { // Calculates the axis of the shower ellipsoid @@ -568,7 +570,7 @@ void AliPHOSEmcRecPoint::EvalElipsAxis(Float_t logWeight,TClonesArray * digits, } //____________________________________________________________________________ -void AliPHOSEmcRecPoint::EvalMoments(Float_t logWeight,TClonesArray * digits, TVector3 &vInc) +void AliPHOSEmcRecPoint::EvalMoments(Float_t logWeight,TClonesArray * digits, TVector3 & /* vInc */) { // Calculate the shower moments in the eigen reference system // M2x, M2z, M3x, M4z @@ -736,8 +738,8 @@ void AliPHOSEmcRecPoint::EvalPrimaries(TClonesArray * digits) Error("EvalPrimaries", "GetNprimaries ERROR > increase fMaxTrack" ) ; nprimaries = fMaxTrack; //skip the rest } - for(fMulTrack=1; fMulTrack<=nprimaries ; fMulTrack++){ - tempo[fMulTrack-1] = digit->GetPrimary(fMulTrack) ; + for(fMulTrack=0; fMulTrackGetPrimary(fMulTrack+1) ; } //Now add other digits contributions @@ -766,7 +768,6 @@ void AliPHOSEmcRecPoint::EvalPrimaries(TClonesArray * digits) } } } // all digits - if(fMulTrack > 0){ if(fTracksList)delete [] fTracksList; fTracksList = new Int_t[fMulTrack] ;