Workaround to compute conformal track parameters at vertex.
authorloizides <loizides@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 19 Nov 2004 13:25:13 +0000 (13:25 +0000)
committerloizides <loizides@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 19 Nov 2004 13:25:13 +0000 (13:25 +0000)
JETAN/AliJetParticle.cxx
JETAN/AliJetParticle.h
JETAN/AliJetParticlesReaderHLT.cxx
JETAN/AliJetParticlesReaderKine.cxx
JETAN/libJETAN.pkg

index fc2855d..c1b320f 100644 (file)
@@ -90,9 +90,9 @@ void AliJetParticle::Clear(Option_t* /*t*/)
   fPy=0.;
   fPz=0.;
   fE=0.;
-  fIdxInEvent=0;
+  fIdxInEvent=-1;
   fType=0;
-  fLabel=0;
+  fLabel=-1;
   fNhits=0;
   fPt=0.;
   fEta=0.;
index 9d0dfe1..7422bb1 100644 (file)
@@ -20,8 +20,8 @@ class AliJetParticle : public TObject
   public:
   AliJetParticle();
   AliJetParticle(const AliJetParticle& in); 
-  AliJetParticle(const TParticle* p, Int_t idx, Int_t l=0, Int_t ncl=0);
-  AliJetParticle(Float_t px, Float_t py, Float_t pz, Float_t etot, Int_t idx, Int_t l=0, Int_t ncl=0);
+  AliJetParticle(const TParticle* p, Int_t idx, Int_t l=-1, Int_t ncl=0);
+  AliJetParticle(Float_t px, Float_t py, Float_t pz, Float_t etot, Int_t idx, Int_t l=-1, Int_t ncl=0);
   AliJetParticle(Float_t px, Float_t py, Float_t pz, Float_t etot, Int_t idx, Int_t l, Int_t ncl,
                  Float_t pt, Float_t eta, Float_t phi);
   virtual ~AliJetParticle(){};
index 3ae37f9..46b3185 100644 (file)
@@ -17,6 +17,7 @@
 #include <AliESD.h>
 #include <AliESDtrack.h>
 #include <AliESDHLTtrack.h>
+#include <AliL3Track.h>
 #include <AliKalmanTrack.h>
 #include <AliJetEventParticles.h>
 #include "AliJetParticlesReaderHLT.h"
@@ -109,6 +110,7 @@ Int_t AliJetParticlesReaderHLT::ReadESD(AliESD* esd)
 
   fEventParticles->SetVertex(vertexpos[0],vertexpos[1],vertexpos[2]);
 
+  AliL3Track l3;
   for (Int_t i = 0;i<ntr; i++) {
     AliESDHLTtrack *kesdtrack;
     if(fTrackerType){
@@ -123,6 +125,19 @@ Int_t AliJetParticlesReaderHLT::ReadESD(AliESD* esd)
         continue;
       }
 
+    if(fTrackerType){
+      //if(!kesdtrack->ComesFromMainVertex()) continue;
+      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();
+      l3.SetFirstPoint(0,0,0);
+      l3.UpdateToFirstPoint();
+    }
+
     //const Float_t kpid=kesdtrack->GetPID();
     const Int_t knhits=kesdtrack->GetNHits();
     const Int_t kweight=kesdtrack->GetWeight();
index 0e7effe..b04942a 100644 (file)
@@ -237,7 +237,8 @@ Int_t AliJetParticlesReaderKine::ReadNext()
          //kinematic cuts
          if(IsAcceptedParticle(p)){ //put particle in event
            //if(p->Pt()>20){cout <<p->GetStatusCode() << " ";p->Print(); }
-           fEventParticles->AddParticle(p,i); 
+           fEventParticles->AddParticle(p,i,i);//what is the label in case 
+                                               //events have been merged 
          }
        }
       fCurrentEvent++;
index ab962ab..b23f910 100644 (file)
@@ -9,5 +9,4 @@ HDRS:= $(SRCS:.cxx=.h)
 
 DHDR= JetAnalysisLinkDef.h
 
-EINCLUDE:= STEER ANALYSIS PYTHIA6
-
+EINCLUDE:= STEER ANALYSIS PYTHIA6 HLT/src