New naming of online calibration directory

[u/mrichter/AliRoot.git] / PHOS / AliPHOSEmcRecPoint.cxx

diff --git a/PHOS/AliPHOSEmcRecPoint.cxx b/PHOS/AliPHOSEmcRecPoint.cxx
index 9614579aa4d4e51324cfc40085614a86c5d9dfb8..2c9625246a11da7a1ccf806bcc7f7c999aeb9133 100644 (file)
--- a/PHOS/AliPHOSEmcRecPoint.cxx
+++ b/PHOS/AliPHOSEmcRecPoint.cxx
@@ -18,6 +18,15 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.57  2007/04/05 10:18:58  policheh
+ * Introduced distance to nearest bad crystal.
+ *
+ * Revision 1.56  2007/03/06 06:47:28  kharlov
+ * DP:Possibility to use actual vertex position added
+ *
+ * Revision 1.55  2007/01/19 20:31:19  kharlov
+ * Improved formatting for Print()
+ *
  * Revision 1.54  2006/08/28 10:01:56  kharlov
  * Effective C++ warnings fixed (Timur Pocheptsov)
  *
@@ -60,7 +69,7 @@ AliPHOSEmcRecPoint::AliPHOSEmcRecPoint() :
   fCoreEnergy(0.), fDispersion(0.),
   fEnergyList(0), fTime(-1.), fNExMax(0),
   fM2x(0.), fM2z(0.), fM3x(0.), fM4z(0.),
-  fPhixe(0.), fDebug(0)
+  fPhixe(0.), fDistToBadCrystal(-1),fDebug(0)
 {
   // ctor
   fMulDigit   = 0 ;  
@@ -74,7 +83,7 @@ AliPHOSEmcRecPoint::AliPHOSEmcRecPoint(const char * opt) :
   fCoreEnergy(0.), fDispersion(0.),
   fEnergyList(0), fTime(-1.), fNExMax(0),
   fM2x(0.), fM2z(0.), fM3x(0.), fM4z(0.),
-  fPhixe(0.), fDebug(0)
+  fPhixe(0.), fDistToBadCrystal(-1), fDebug(0)
 {
   // ctor
   fMulDigit   = 0 ;  
@@ -88,7 +97,7 @@ AliPHOSEmcRecPoint::AliPHOSEmcRecPoint(const AliPHOSEmcRecPoint & 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)
+  fPhixe(rp.fPhixe), fDistToBadCrystal(rp.fDistToBadCrystal), fDebug(rp.fDebug)
 {
   // cpy ctor
   fMulDigit   = rp.fMulDigit ;  
@@ -341,10 +350,11 @@ void AliPHOSEmcRecPoint::ExecuteEvent(Int_t event, Int_t, Int_t) /*const*/
 }
 
 //____________________________________________________________________________
-void  AliPHOSEmcRecPoint::EvalDispersion(Float_t logWeight,TClonesArray * digits)
+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????????
+ 
   Float_t d    = 0. ;
   Float_t wtot = 0. ;
 
@@ -411,6 +421,7 @@ void  AliPHOSEmcRecPoint::EvalDispersion(Float_t logWeight,TClonesArray * digits
   fDispersion = 0;
   if (d>=0)
     fDispersion = TMath::Sqrt(d) ;
+
  
 }
 //______________________________________________________________________________
@@ -420,6 +431,7 @@ void AliPHOSEmcRecPoint::EvalCoreEnergy(Float_t logWeight, TClonesArray * digits
   // i.e. within a radius rad = 3cm around the center. Beyond this radius
   // in accordance with shower profile the energy deposition 
   // should be less than 2%
+//DP: non-perpendicular incidence??????????????
 
   Float_t coreRadius = 3 ;
 
@@ -470,10 +482,11 @@ void AliPHOSEmcRecPoint::EvalCoreEnergy(Float_t logWeight, TClonesArray * digits
       fCoreEnergy += fEnergyList[iDigit] ;
   }
 
+
 }
 
 //____________________________________________________________________________
-void  AliPHOSEmcRecPoint::EvalElipsAxis(Float_t logWeight,TClonesArray * digits)
+void  AliPHOSEmcRecPoint::EvalElipsAxis(Float_t logWeight,TClonesArray * digits, TVector3 &vInc)
 {
   // Calculates the axis of the shower ellipsoid
 
@@ -525,7 +538,7 @@ void  AliPHOSEmcRecPoint::EvalElipsAxis(Float_t logWeight,TClonesArray * digits)
 //   Double_t CosZ ;
 //   AliPHOSGetter * gime = AliPHOSGetter::Instance() ; 
 //   AliPHOSGeometry * phosgeom =  (AliPHOSGeometry*)gime->PHOSGeometry();
-  //   Double_t DistanceToIP= (Double_t ) phosgeom->GetIPtoCrystalSurface() ;
+//   Double_t DistanceToIP= (Double_t ) phosgeom->GetIPtoCrystalSurface() ;
   
 //   CosX = DistanceToIP/TMath::Sqrt(DistanceToIP*DistanceToIP+x*x) ;
 //   CosZ = DistanceToIP/TMath::Sqrt(DistanceToIP*DistanceToIP+z*z) ;
@@ -552,7 +565,7 @@ void  AliPHOSEmcRecPoint::EvalElipsAxis(Float_t logWeight,TClonesArray * digits)
 }
 
 //____________________________________________________________________________
-void  AliPHOSEmcRecPoint::EvalMoments(Float_t logWeight,TClonesArray * digits)
+void  AliPHOSEmcRecPoint::EvalMoments(Float_t logWeight,TClonesArray * digits, TVector3 &vInc)
 {
   // Calculate the shower moments in the eigen reference system
   // M2x, M2z, M3x, M4z
@@ -701,17 +714,22 @@ void  AliPHOSEmcRecPoint::EvalMoments(Float_t logWeight,TClonesArray * digits)
 //____________________________________________________________________________
 void AliPHOSEmcRecPoint::EvalAll(Float_t logWeight, TClonesArray * digits )
 {
-  // Evaluates all shower parameters
-  EvalLocalPosition(logWeight, digits) ;
-  EvalElipsAxis(logWeight, digits) ;
-  EvalMoments(logWeight, digits) ;
-  EvalDispersion(logWeight, digits) ;
   EvalCoreEnergy(logWeight, digits);
   EvalTime(digits) ;
   AliPHOSRecPoint::EvalAll(digits) ;
 }
 //____________________________________________________________________________
-void AliPHOSEmcRecPoint::EvalLocalPosition(Float_t logWeight, TClonesArray * digits)
+void AliPHOSEmcRecPoint::EvalAll(Float_t logWeight, TVector3 &vtx, TClonesArray * digits )
+{
+  // Evaluates all shower parameters
+  TVector3 vInc ;
+  EvalLocalPosition(logWeight, vtx, digits,vInc) ;
+  EvalElipsAxis(logWeight, digits, vInc) ; //they are evaluated with momenta
+  EvalMoments(logWeight, digits, vInc) ;
+  EvalDispersion(logWeight, digits, vInc) ;
+}
+//____________________________________________________________________________
+void AliPHOSEmcRecPoint::EvalLocalPosition(Float_t logWeight, TVector3 &vtx, TClonesArray * digits, TVector3 &vInc)
 {
   // Calculates the center of gravity in the local PHOS-module coordinates 
   Float_t wtot = 0. ;
@@ -754,30 +772,13 @@ void AliPHOSEmcRecPoint::EvalLocalPosition(Float_t logWeight, TClonesArray * dig
   Float_t para = 0.925 ; 
   Float_t parb = 6.52 ; 
 
-  Float_t xo,yo,zo ; //Coordinates of the origin
-  //We should check all 3 possibilities to avoid seg.v.
-  if(gAlice && gAlice->GetMCApp() && gAlice->Generator())
-    gAlice->Generator()->GetOrigin(xo,yo,zo) ;
-  else{
-    xo=yo=zo=0.;
-  }
-  Float_t phi = phosgeom->GetPHOSAngle(relid[0]) ;
+  phosgeom->GetIncidentVector(vtx,GetPHOSMod(),x,z,vInc) ;
 
-  //Transform to the local ref.frame
-  Float_t xoL,yoL ;
-  xoL = xo*TMath::Cos(phi)-yo*TMath::Sin(phi) ;
-  yoL = xo*TMath::Sin(phi)+yo*TMath::Cos(phi) ;
-  
-  Float_t radius = phosgeom->GetIPtoCrystalSurface()-yoL;
- 
-  Float_t incidencephi = TMath::ATan((x-xoL ) / radius) ; 
-  Float_t incidencetheta = TMath::ATan((z-zo) / radius) ;
- 
   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) ; 
+  if (fAmp>0&&vInc.Y()!=0.) {
+    depthx = ( para * TMath::Log(fAmp) + parb ) * vInc.X()/TMath::Abs(vInc.Y()) ;
+    depthz = ( para * TMath::Log(fAmp) + parb ) * vInc.Z()/TMath::Abs(vInc.Y()) ;
   }
   else 
     AliError(Form("Wrong amplitude %f\n", fAmp));