Incedent angle correction fixed

diff --git a/PHOS/AliPHOSEmcRecPoint.cxx b/PHOS/AliPHOSEmcRecPoint.cxx
index e7a07b5f070ef162f35ad162b82281884021e18d..2c9625246a11da7a1ccf806bcc7f7c999aeb9133 100644 (file)
--- a/PHOS/AliPHOSEmcRecPoint.cxx
+++ b/PHOS/AliPHOSEmcRecPoint.cxx
@@ -18,6 +18,9 @@
 /* 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
  *
@@ -774,8 +777,8 @@ void AliPHOSEmcRecPoint::EvalLocalPosition(Float_t logWeight, TVector3 &vtx, TCl
   Float_t depthx = 0.; 
   Float_t depthz = 0.;
   if (fAmp>0&&vInc.Y()!=0.) {
-    depthx = ( para * TMath::Log(fAmp) + parb ) * vInc.X()/vInc.Y() ;
-    depthz = ( para * TMath::Log(fAmp) + parb ) * vInc.Z()/vInc.Y() ;
+    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));

diff --git a/PHOS/AliPHOSGeometry.cxx b/PHOS/AliPHOSGeometry.cxx
index 373efbd286a507eb3a16bdaad3548f4a993925a1..e42391981d495b8d5636e3253e90b244bc250366 100644 (file)
--- a/PHOS/AliPHOSGeometry.cxx
+++ b/PHOS/AliPHOSGeometry.cxx
@@ -648,10 +648,11 @@ void AliPHOSGeometry::Global2Local(TVector3& localPosition,
 {
   // Transforms a global position of the rec.point to the local coordinate system
   //Return to PHOS local system
-  Double_t posG[3]={globalPosition.X(),globalPosition.Y(),globalPosition.Z()} ;
+  Double_t posG[3]={globalPosition.X(),globalPosition.Y(),-globalPosition.Z()} ;
   Double_t posL[3]={0.,0.,0.} ;
   char path[100] ;
-  sprintf(path,"/ALIC_1/PHOS_%d",module) ;
+  sprintf(path,"/ALIC_1/PHOS_%d/PEMC_1/PCOL_1/PTIO_1/PCOR_1/PAGA_1/PTII_1",module) ;
+//  sprintf(path,"/ALIC_1/PHOS_%d",module) ;
   if (!gGeoManager->cd(path)){
     AliFatal("Geo manager can not find path \n");
   }
@@ -702,9 +703,6 @@ void AliPHOSGeometry::Local2Global(Int_t mod, Float_t x, Float_t z,
 void AliPHOSGeometry::GetIncidentVector(const TVector3 &vtx, Int_t module, Float_t x,Float_t z, TVector3 &vInc) const {
   //Calculates vector pointing from vertex to current poisition in module local frame
 
-  TVector3 global ;
-  Local2Global(module,x,z,global) ;
-  global-=vtx ;
-  Global2Local(vInc,global,module) ; 
-
+  Global2Local(vInc,vtx,module) ; 
+  vInc.SetXYZ(vInc.X()+x,vInc.Y(),vInc.Z()+z) ;
 }

diff --git a/PHOS/AliPHOSPIDv1.cxx b/PHOS/AliPHOSPIDv1.cxx
index ba0ee55bf087a1f2bf7172083a4df6cd7599810c..8ca5f6787534111c661a09ad43773a0714bf7392 100644 (file)
--- a/PHOS/AliPHOSPIDv1.cxx
+++ b/PHOS/AliPHOSPIDv1.cxx
@@ -18,6 +18,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.107  2007/04/02 15:00:16  cvetan
+ * No more calls to gAlice in the reconstruction
+ *
  * Revision 1.106  2007/04/01 15:40:15  kharlov
  * Correction for actual vertex position implemented
  *
@@ -917,8 +920,8 @@ TVector3 AliPHOSPIDv1::GetMomentumDirection(AliPHOSEmcRecPoint * emc, AliPHOSCpv
   Float_t depthzOld = 0.;
   Float_t energy = emc->GetEnergy() ;
   if (energy > 0 && vInc.Y()!=0.) {
-    depthxOld = ( para * TMath::Log(energy) + parb ) * vInc.X()/vInc.Y() ;
-    depthzOld = ( para * TMath::Log(energy) + parb ) * vInc.Z()/vInc.Y() ;
+    depthxOld = ( para * TMath::Log(energy) + parb ) * vInc.X()/TMath::Abs(vInc.Y()) ;
+    depthzOld = ( para * TMath::Log(energy) + parb ) * vInc.Z()/TMath::Abs(vInc.Y()) ;
   }
   else{
     AliError("Cluster with zero energy \n");