/* History of cvs commits:
*
* $Log$
+ * Revision 1.54 2006/08/28 10:01:56 kharlov
+ * Effective C++ warnings fixed (Timur Pocheptsov)
+ *
+ * Revision 1.53 2005/12/20 14:28:47 hristov
+ * Additional protection
+ *
+ * Revision 1.52 2005/05/28 14:19:04 schutz
+ * Compilation warnings fixed by T.P.
+ *
*/
//_________________________________________________________________________
ClassImp(AliPHOSEmcRecPoint)
//____________________________________________________________________________
-AliPHOSEmcRecPoint::AliPHOSEmcRecPoint() : AliPHOSRecPoint()
+AliPHOSEmcRecPoint::AliPHOSEmcRecPoint() :
+ AliPHOSRecPoint(),
+ fCoreEnergy(0.), fDispersion(0.),
+ fEnergyList(0), fTime(-1.), fNExMax(0),
+ fM2x(0.), fM2z(0.), fM3x(0.), fM4z(0.),
+ fPhixe(0.), fDebug(0)
{
// ctor
-
fMulDigit = 0 ;
fAmp = 0. ;
- fCoreEnergy = 0 ;
- fEnergyList = 0 ;
- fNExMax = 0 ; //Not unfolded yet
- fTime = -1. ;
fLocPos.SetX(1000000.) ; //Local position should be evaluated
- fDebug=0;
-
}
//____________________________________________________________________________
-AliPHOSEmcRecPoint::AliPHOSEmcRecPoint(const char * opt) : AliPHOSRecPoint(opt)
+AliPHOSEmcRecPoint::AliPHOSEmcRecPoint(const char * opt) :
+ AliPHOSRecPoint(opt),
+ fCoreEnergy(0.), fDispersion(0.),
+ fEnergyList(0), fTime(-1.), fNExMax(0),
+ fM2x(0.), fM2z(0.), fM3x(0.), fM4z(0.),
+ fPhixe(0.), fDebug(0)
{
// ctor
-
fMulDigit = 0 ;
fAmp = 0. ;
- fNExMax = 0 ; //Not unfolded yet
- fCoreEnergy = 0 ;
- fEnergyList = 0 ;
- fTime = -1. ;
fLocPos.SetX(1000000.) ; //Local position should be evaluated
- fDebug=0;
-
}
//____________________________________________________________________________
-AliPHOSEmcRecPoint::AliPHOSEmcRecPoint(const AliPHOSEmcRecPoint & rp) : AliPHOSRecPoint(rp)
+AliPHOSEmcRecPoint::AliPHOSEmcRecPoint(const AliPHOSEmcRecPoint & rp) :
+ AliPHOSRecPoint(rp),
+ fCoreEnergy(rp.fCoreEnergy), fDispersion(rp.fDispersion),
+ fEnergyList(0), fTime(rp.fTime), fNExMax(rp.fNExMax),
+ fM2x(rp.fM2x), fM2z(rp.fM2z), fM3x(rp.fM3x), fM4z(rp.fM4z),
+ fPhixe(rp.fPhixe), fDebug(rp.fDebug)
{
// cpy ctor
-
fMulDigit = rp.fMulDigit ;
fAmp = rp.fAmp ;
- fCoreEnergy = rp.fCoreEnergy ;
fEnergyList = new Float_t[rp.fMulDigit] ;
Int_t index ;
for(index = 0 ; index < fMulDigit ; index++)
fEnergyList[index] = rp.fEnergyList[index] ;
- fNExMax = rp.fNExMax ;
- fTime = rp.fTime ;
}
//____________________________________________________________________________
AliPHOSEmcRecPoint::~AliPHOSEmcRecPoint()
{
// dtor
-
if ( fEnergyList )
delete[] fEnergyList ;
}
Float_t zi ;
phosgeom->AbsToRelNumbering(digit->GetId(), relid) ;
phosgeom->RelPosInModule(relid, xi, zi);
- Float_t w = TMath::Max( 0., logWeight + TMath::Log( fEnergyList[iDigit] / fAmp ) ) ;
- x += xi * w ;
- z += zi * w ;
- wtot += w ;
+ if (fAmp>0 && fEnergyList[iDigit]>0) {
+ Float_t w = TMath::Max( 0., logWeight + TMath::Log( fEnergyList[iDigit] / fAmp ) ) ;
+ x += xi * w ;
+ z += zi * w ;
+ wtot += w ;
+ }
+ else
+ AliError(Form("Wrong energy %f and/or amplitude %f\n", fEnergyList[iDigit], fAmp));
}
- x /= wtot ;
- z /= wtot ;
+ if (wtot>0) {
+ x /= wtot ;
+ z /= wtot ;
+ }
+ else
+ AliError(Form("Wrong weight %f\n", wtot));
// Calculates the dispersion in coordinates
Float_t zi ;
phosgeom->AbsToRelNumbering(digit->GetId(), relid) ;
phosgeom->RelPosInModule(relid, xi, zi);
- Float_t w = TMath::Max(0.,logWeight+TMath::Log(fEnergyList[iDigit]/fAmp ) ) ;
- d += w*((xi-x)*(xi-x) + (zi-z)*(zi-z) ) ;
- wtot+=w ;
-
-
+ if (fAmp>0 && fEnergyList[iDigit]>0) {
+ Float_t w = TMath::Max(0.,logWeight+TMath::Log(fEnergyList[iDigit]/fAmp ) ) ;
+ d += w*((xi-x)*(xi-x) + (zi-z)*(zi-z) ) ;
+ wtot+=w ;
+ }
+ else
+ AliError(Form("Wrong energy %f and/or amplitude %f\n", fEnergyList[iDigit], fAmp));
}
- d /= wtot ;
+ if (wtot>0) {
+ d /= wtot ;
+ }
+ else
+ AliError(Form("Wrong weight %f\n", wtot));
- fDispersion = TMath::Sqrt(d) ;
+ fDispersion = 0;
+ if (d>=0)
+ fDispersion = TMath::Sqrt(d) ;
}
//______________________________________________________________________________
Float_t zi ;
phosgeom->AbsToRelNumbering(digit->GetId(), relid) ;
phosgeom->RelPosInModule(relid, xi, zi);
- Float_t w = TMath::Max( 0., logWeight + TMath::Log( fEnergyList[iDigit] / fAmp ) ) ;
- x += xi * w ;
- z += zi * w ;
- wtot += w ;
+ if (fAmp>0 && fEnergyList[iDigit]>0) {
+ Float_t w = TMath::Max( 0., logWeight + TMath::Log( fEnergyList[iDigit] / fAmp ) ) ;
+ x += xi * w ;
+ z += zi * w ;
+ wtot += w ;
+ }
+ else
+ AliError(Form("Wrong energy %f and/or amplitude %f\n", fEnergyList[iDigit], fAmp));
+ }
+ if (wtot>0) {
+ x /= wtot ;
+ z /= wtot ;
}
- x /= wtot ;
- z /= wtot ;
+ else
+ AliError(Form("Wrong weight %f\n", wtot));
for(iDigit=0; iDigit < fMulDigit; iDigit++) {
Float_t zi ;
phosgeom->AbsToRelNumbering(digit->GetId(), relid) ;
phosgeom->RelPosInModule(relid, xi, zi);
- Double_t w = TMath::Max(0.,logWeight+TMath::Log(fEnergyList[iDigit]/fAmp ) ) ;
- dxx += w * xi * xi ;
- x += w * xi ;
- dzz += w * zi * zi ;
- z += w * zi ;
- dxz += w * xi * zi ;
- wtot += w ;
+ if (fAmp>0 && fEnergyList[iDigit]>0) {
+ Double_t w = TMath::Max(0.,logWeight+TMath::Log(fEnergyList[iDigit]/fAmp ) ) ;
+ dxx += w * xi * xi ;
+ x += w * xi ;
+ dzz += w * zi * zi ;
+ z += w * zi ;
+ dxz += w * xi * zi ;
+ wtot += w ;
+ }
+ else
+ AliError(Form("Wrong energy %f and/or amplitude %f\n", fEnergyList[iDigit], fAmp));
}
- dxx /= wtot ;
- x /= wtot ;
- dxx -= x * x ;
- dzz /= wtot ;
- z /= wtot ;
- dzz -= z * z ;
- dxz /= wtot ;
- dxz -= x * z ;
+ if (wtot>0) {
+ dxx /= wtot ;
+ x /= wtot ;
+ dxx -= x * x ;
+ dzz /= wtot ;
+ z /= wtot ;
+ dzz -= z * z ;
+ dxz /= wtot ;
+ dxz -= x * z ;
// //Apply correction due to non-perpendicular incidence
// Double_t CosX ;
// dxz = dxz/(CosX*CosZ) ;
- fLambda[0] = 0.5 * (dxx + dzz) + TMath::Sqrt( 0.25 * (dxx - dzz) * (dxx - dzz) + dxz * dxz ) ;
- if(fLambda[0] > 0)
- fLambda[0] = TMath::Sqrt(fLambda[0]) ;
+ fLambda[0] = 0.5 * (dxx + dzz) + TMath::Sqrt( 0.25 * (dxx - dzz) * (dxx - dzz) + dxz * dxz ) ;
+ if(fLambda[0] > 0)
+ fLambda[0] = TMath::Sqrt(fLambda[0]) ;
- fLambda[1] = 0.5 * (dxx + dzz) - TMath::Sqrt( 0.25 * (dxx - dzz) * (dxx - dzz) + dxz * dxz ) ;
- if(fLambda[1] > 0) //To avoid exception if numerical errors lead to negative lambda.
- fLambda[1] = TMath::Sqrt(fLambda[1]) ;
- else
- fLambda[1]= 0. ;
+ fLambda[1] = 0.5 * (dxx + dzz) - TMath::Sqrt( 0.25 * (dxx - dzz) * (dxx - dzz) + dxz * dxz ) ;
+ if(fLambda[1] > 0) //To avoid exception if numerical errors lead to negative lambda.
+ fLambda[1] = TMath::Sqrt(fLambda[1]) ;
+ else
+ fLambda[1]= 0. ;
+ }
+ else {
+ AliError(Form("Wrong weight %f\n", wtot));
+ fLambda[0]=fLambda[1]=0.;
+ }
}
//____________________________________________________________________________
digit = (AliPHOSDigit *) digits->At(fDigitsList[iDigit]) ;
phosgeom->AbsToRelNumbering(digit->GetId(), relid) ;
phosgeom->RelPosInModule(relid, xi, zi);
- w = TMath::Max(0.,logWeight+TMath::Log(fEnergyList[iDigit]/fAmp ) ) ;
- x += w * xi ;
- z += w * zi ;
- dxx += w * xi * xi ;
- dzz += w * zi * zi ;
- dxz += w * xi * zi ;
- wtot += w ;
+ if (fAmp>0 && fEnergyList[iDigit]>0) {
+ w = TMath::Max(0.,logWeight+TMath::Log(fEnergyList[iDigit]/fAmp ) ) ;
+ x += w * xi ;
+ z += w * zi ;
+ dxx += w * xi * xi ;
+ dzz += w * zi * zi ;
+ dxz += w * xi * zi ;
+ wtot += w ;
+ }
+ else
+ AliError(Form("Wrong energy %f and/or amplitude %f\n", fEnergyList[iDigit], fAmp));
+
}
- x /= wtot ;
- z /= wtot ;
- dxx /= wtot ;
- dzz /= wtot ;
- dxz /= wtot ;
- dxx -= x * x ;
- dzz -= z * z ;
- dxz -= x * z ;
+ if (wtot>0) {
+ x /= wtot ;
+ z /= wtot ;
+ dxx /= wtot ;
+ dzz /= wtot ;
+ dxz /= wtot ;
+ dxx -= x * x ;
+ dzz -= z * z ;
+ dxz -= x * z ;
// 2) Find covariance matrix eigen values lambda0 and lambda1
- lambda0 = 0.5 * (dxx + dzz) + TMath::Sqrt( 0.25 * (dxx - dzz) * (dxx - dzz) + dxz * dxz ) ;
- lambda1 = 0.5 * (dxx + dzz) - TMath::Sqrt( 0.25 * (dxx - dzz) * (dxx - dzz) + dxz * dxz ) ;
+ lambda0 = 0.5 * (dxx + dzz) + TMath::Sqrt( 0.25 * (dxx - dzz) * (dxx - dzz) + dxz * dxz ) ;
+ lambda1 = 0.5 * (dxx + dzz) - TMath::Sqrt( 0.25 * (dxx - dzz) * (dxx - dzz) + dxz * dxz ) ;
+ }
+ else {
+ AliError(Form("Wrong weight %f\n", wtot));
+ lambda0=lambda1=0.;
+ }
// 3) Find covariance matrix eigen vectors e0 and e1
phosgeom->RelPosInModule(relid, xiPHOS, ziPHOS);
xi = xiPHOS*cosPhi + ziPHOS*sinPhi;
zi = ziPHOS*cosPhi - xiPHOS*sinPhi;
- w = TMath::Max(0.,logWeight+TMath::Log(fEnergyList[iDigit]/fAmp ) ) ;
- x += w * xi ;
- z += w * zi ;
- dxx += w * xi * xi ;
- dzz += w * zi * zi ;
- dxz += w * xi * zi ;
- dx3 += w * xi * xi * xi;
- dz3 += w * zi * zi * zi ;
- dz4 += w * zi * zi * zi * zi ;
- wtot += w ;
+ if (fAmp>0 && fEnergyList[iDigit]>0) {
+ w = TMath::Max(0.,logWeight+TMath::Log(fEnergyList[iDigit]/fAmp ) ) ;
+ x += w * xi ;
+ z += w * zi ;
+ dxx += w * xi * xi ;
+ dzz += w * zi * zi ;
+ dxz += w * xi * zi ;
+ dx3 += w * xi * xi * xi;
+ dz3 += w * zi * zi * zi ;
+ dz4 += w * zi * zi * zi * zi ;
+ wtot += w ;
+ }
+ else
+ AliError(Form("Wrong energy %f and/or amplitude %f\n", fEnergyList[iDigit], fAmp));
}
- x /= wtot ;
- z /= wtot ;
- dxx /= wtot ;
- dzz /= wtot ;
- dxz /= wtot ;
- dx3 /= wtot ;
- dz3 /= wtot ;
- dz4 /= wtot ;
- dx3 += -3*dxx*x + 2*x*x*x;
- dz4 += -4*dz3*z + 6*dzz*z*z -3*z*z*z*z;
- dxx -= x * x ;
- dzz -= z * z ;
- dxz -= x * z ;
+ if (wtot>0) {
+ x /= wtot ;
+ z /= wtot ;
+ dxx /= wtot ;
+ dzz /= wtot ;
+ dxz /= wtot ;
+ dx3 /= wtot ;
+ dz3 /= wtot ;
+ dz4 /= wtot ;
+ dx3 += -3*dxx*x + 2*x*x*x;
+ dz4 += -4*dz3*z + 6*dzz*z*z -3*z*z*z*z;
+ dxx -= x * x ;
+ dzz -= z * z ;
+ dxz -= x * z ;
+ }
+ else
+ AliError(Form("Wrong weight %f\n", wtot));
// 5) Find an angle between cluster center vector and eigen vector e0
- Float_t phi = TMath::ACos ((x*e0.X() + z*e0.Y()) / sqrt(x*x + z*z));
+ Float_t phi = 0;
+ if ( (x*x+z*z) > 0 )
+ phi = TMath::ACos ((x*e0.X() + z*e0.Y()) / sqrt(x*x + z*z));
fM2x = lambda0;
fM2z = lambda1;
Float_t zi ;
phosgeom->AbsToRelNumbering(digit->GetId(), relid) ;
phosgeom->RelPosInModule(relid, xi, zi);
- Float_t w = TMath::Max( 0., logWeight + TMath::Log( fEnergyList[iDigit] / fAmp ) ) ;
- x += xi * w ;
- z += zi * w ;
- wtot += w ;
-
+ if (fAmp>0 && fEnergyList[iDigit]>0) {
+ Float_t w = TMath::Max( 0., logWeight + TMath::Log( fEnergyList[iDigit] / fAmp ) ) ;
+ x += xi * w ;
+ z += zi * w ;
+ wtot += w ;
+ }
+ else
+ AliError(Form("Wrong energy %f and/or amplitude %f\n", fEnergyList[iDigit], fAmp));
+ }
+ if (wtot>0) {
+ x /= wtot ;
+ z /= wtot ;
}
- x /= wtot ;
- z /= wtot ;
+ else
+ AliError(Form("Wrong weight %f\n", wtot));
// Correction for the depth of the shower starting point (TDR p 127)
Float_t para = 0.925 ;
Float_t incidencephi = TMath::ATan((x-xoL ) / radius) ;
Float_t incidencetheta = TMath::ATan((z-zo) / radius) ;
- Float_t depthx = ( para * TMath::Log(fAmp) + parb ) * TMath::Sin(incidencephi) ;
- Float_t depthz = ( para * TMath::Log(fAmp) + parb ) * TMath::Sin(incidencetheta) ;
+ Float_t depthx = 0.;
+ Float_t depthz = 0.;
+ if (fAmp>0) {
+ depthx = ( para * TMath::Log(fAmp) + parb ) * TMath::Sin(incidencephi) ;
+ depthz = ( para * TMath::Log(fAmp) + parb ) * TMath::Sin(incidencetheta) ;
+ }
+ else
+ AliError(Form("Wrong amplitude %f\n", fAmp));
fLocPos.SetX(x - depthx) ;
fLocPos.SetY(0.) ;
TString message ;
message = "AliPHOSEmcRecPoint:\n" ;
- message += " digits # = " ;
- AliInfo(Form(message.Data())) ;
+ message += "Digit multiplicity = %d" ;
+ message += ", cluster Energy = %f" ;
+ message += ", number of primaries = %d" ;
+ message += ", rec.point index = %d \n" ;
+ printf(message.Data(), fMulDigit, fAmp, fMulTrack,GetIndexInList() ) ;
Int_t iDigit;
+ printf(" digits ids = ") ;
for(iDigit=0; iDigit<fMulDigit; iDigit++)
printf(" %d ", fDigitsList[iDigit] ) ;
- printf(" Energies = ") ;
+ printf("\n digit energies = ") ;
for(iDigit=0; iDigit<fMulDigit; iDigit++)
printf(" %f ", fEnergyList[iDigit] ) ;
- printf("\n") ;
- printf(" Primaries ") ;
+
+ printf("\n digit primaries ") ;
+ if (fMulTrack<1) printf("... no primaries");
for(iDigit = 0;iDigit < fMulTrack; iDigit++)
printf(" %d ", fTracksList[iDigit]) ;
printf("\n") ;
- message = " Multiplicity = %d" ;
- message += " Cluster Energy = %f" ;
- message += " Number of primaries %d" ;
- message += " Stored at position %d" ;
-
- printf(message.Data(), fMulDigit, fAmp, fMulTrack,GetIndexInList() ) ;
+
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff