Workaround to compute conformal track parameters at vertex.

diff --git a/JETAN/AliJetParticle.cxx b/JETAN/AliJetParticle.cxx
index fc2855d67790dbfd2e7dfea91eb565ee4834e0b8..c1b320f9c2a6e8e5b55738ee85828f6943a388fb 100644 (file)
--- a/JETAN/AliJetParticle.cxx
+++ b/JETAN/AliJetParticle.cxx
@@ -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.;

diff --git a/JETAN/AliJetParticle.h b/JETAN/AliJetParticle.h
index 9d0dfe11486bdace3bf54c4a30e9d4c5d66c0223..7422bb15f6f7e72de77d0540492aad4711417d8f 100644 (file)
--- a/JETAN/AliJetParticle.h
+++ b/JETAN/AliJetParticle.h
@@ -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(){};

diff --git a/JETAN/AliJetParticlesReaderHLT.cxx b/JETAN/AliJetParticlesReaderHLT.cxx
index 3ae37f9dab78e997a8838d17a844623d18f40b56..46b3185ecd56093e394cb1a0f0fbe858e9acb753 100644 (file)
--- a/JETAN/AliJetParticlesReaderHLT.cxx
+++ b/JETAN/AliJetParticlesReaderHLT.cxx
@@ -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();

diff --git a/JETAN/AliJetParticlesReaderKine.cxx b/JETAN/AliJetParticlesReaderKine.cxx
index 0e7effeec09561a7c748b80b739c2eccfff92d22..b04942a8c3dce28f4770e490ab26286f3e503438 100644 (file)
--- a/JETAN/AliJetParticlesReaderKine.cxx
+++ b/JETAN/AliJetParticlesReaderKine.cxx
@@ -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++;

diff --git a/JETAN/libJETAN.pkg b/JETAN/libJETAN.pkg
index ab962abadbe9136bf784231b917682d88f501619..b23f91033b3615831aeda0d7bedd7d5bcbb86b09 100644 (file)
--- a/JETAN/libJETAN.pkg
+++ b/JETAN/libJETAN.pkg
@@ -9,5 +9,4 @@ HDRS:= $(SRCS:.cxx=.h)
 
 DHDR= JetAnalysisLinkDef.h
 
-EINCLUDE:= STEER ANALYSIS PYTHIA6
-
+EINCLUDE:= STEER ANALYSIS PYTHIA6 HLT/src