geometry 12 + 24 && recent media properties

[u/mrichter/AliRoot.git] / JETAN / AliJetParticlesReaderHLT.cxx

diff --git a/JETAN/AliJetParticlesReaderHLT.cxx b/JETAN/AliJetParticlesReaderHLT.cxx
index 3ae37f9dab78e997a8838d17a844623d18f40b56..ad15bfd761c863cfe3fa07e47fb4a657177f2a08 100644 (file)
--- a/JETAN/AliJetParticlesReaderHLT.cxx
+++ b/JETAN/AliJetParticlesReaderHLT.cxx
@@ -17,6 +17,9 @@
 #include <AliESD.h>
 #include <AliESDtrack.h>
 #include <AliESDHLTtrack.h>
+#include <AliL3Track.h>
+#include <AliL3ITStrack.h>
+#include <AliL3Vertex.h>
 #include <AliKalmanTrack.h>
 #include <AliJetEventParticles.h>
 #include "AliJetParticlesReaderHLT.h"
@@ -108,6 +111,11 @@ Int_t AliJetParticlesReaderHLT::ReadESD(AliESD* esd)
    }
 
   fEventParticles->SetVertex(vertexpos[0],vertexpos[1],vertexpos[2]);
+  //cout << vertexpos[0] << " " << vertexpos[1] << " " << vertexpos[2] << endl;
+  AliL3Vertex v;
+  v.SetX(vertexpos[0]);
+  v.SetY(vertexpos[1]);
+  v.SetZ(vertexpos[2]);
 
   for (Int_t i = 0;i<ntr; i++) {
     AliESDHLTtrack *kesdtrack;
@@ -131,16 +139,58 @@ Int_t AliJetParticlesReaderHLT::ReadESD(AliESD* esd)
     if(kweight>1000) continue; //avoid ghosts 
     if((fMinWeight>0) && (kweight<fMinWeight)) continue;
 
-    const Float_t kpx=kesdtrack->GetPx();
-    const Float_t kpy=kesdtrack->GetPy();
-    const Float_t kpz=kesdtrack->GetPz();
-    const Float_t kpt=kesdtrack->GetPt();
-    const Float_t kp=TMath::Sqrt(kpz*kpz+kpt*kpt);
-    const Float_t keta=0.5*TMath::Log((kp+kpz+1e-30)/(kp-kpz+1e-30)); 
-    const Float_t kphi=TMath::Pi()+TMath::ATan2(-kpy,-kpx);
+    Float_t px=kesdtrack->GetPx();
+    Float_t py=kesdtrack->GetPy();
+    Float_t pz=kesdtrack->GetPz();
+    if(TMath::IsNaN(px)||TMath::IsNaN(py)||TMath::IsNaN(pz)) continue;
+    if(TMath::Abs(px)>1e3||TMath::Abs(py)>1e3||TMath::Abs(pz)>1e3) continue;
+    //cout << px << " " << py << " " << pz <<  " " << TMath::Sqrt(px*px+py*py) << endl;
+
+    if(0&&fTrackerType){
+#if 0
+      //kesdtrack->SetCharge(-kesdtrack->GetCharge());
+      try {
+       Double_t mom[3];
+       AliL3ITStrack l3(*kesdtrack,0);
+       if(!l3.GetPxPyPzAt(0,mom)) continue;
+       px=mom[0];
+       py=mom[1];
+       pz=mom[2];
+      } catch (const Char_t *msg) {
+        //Warning("Clusters2Tracks",msg);
+        continue;
+      }
+#else
+      AliL3Track l3;
+      //if(!kesdtrack->ComesFromMainVertex()) continue;
+      //cout << "Pos: " << kesdtrack->GetFirstPointX() << " " << kesdtrack->GetFirstPointY() << " " << kesdtrack->GetFirstPointZ() << endl;      
+      l3.SetFirstPoint(kesdtrack->GetFirstPointX(),kesdtrack->GetFirstPointY(),kesdtrack->GetFirstPointZ());
+      l3.SetLastPoint(kesdtrack->GetLastPointX(),kesdtrack->GetLastPointY(),kesdtrack->GetLastPointZ());
+      l3.SetCharge(kesdtrack->GetCharge());
+      l3.SetPt(kesdtrack->GetPt());
+      l3.SetTgl(kesdtrack->GetTgl());
+      l3.SetPsi(kesdtrack->GetPsi());
+      l3.CalculateHelix();
+      Double_t xc=0.,yc=0.,zc=0.;
+      l3.GetClosestPoint(&v,xc,yc,zc);
+      if(TMath::Abs(zc)>10.) continue;
+      l3.SetFirstPoint(0,0,0);
+      //cout << "Pos: " << xc << " " << yc << " " << zc << endl;
+      l3.UpdateToFirstPoint();
+      px=l3.GetPx();
+      py=l3.GetPy();
+      pz=l3.GetPz();
+#endif
+    }
+    const Float_t kpt=TMath::Sqrt(px*px+py*py);
+    //cout << px << " " << py << " " << pz <<  " " << kpt << endl;
+
+    const Float_t kp=TMath::Sqrt(pz*pz+kpt*kpt);
+    const Float_t keta=0.5*TMath::Log((kp+pz+1e-30)/(kp-pz+1e-30)); 
+    const Float_t kphi=TMath::Pi()+TMath::ATan2(-py,-px);
 
     if(IsAcceptedParticle(kpt,kphi,keta))
-      fEventParticles->AddParticle(kpx,kpy,kpz,kp,i,kesdtrack->GetMCid(),knhits,kpt,kphi,keta);
+      fEventParticles->AddParticle(px,py,pz,kp,i,kesdtrack->GetMCid(),knhits,kpt,kphi,keta);
   } //loop over tracks
 
   return kTRUE;