bug fixes (M. Verweij)

diff --git a/PWG4/JetTasks/AliPWG4HighPtQAMC.cxx b/PWG4/JetTasks/AliPWG4HighPtQAMC.cxx
index 60409e3bf37e2d403b64b13d7370a1d6ee2aa15a..cfad16a5713f1387238eea78accd4ea00c460540 100644 (file)
--- a/PWG4/JetTasks/AliPWG4HighPtQAMC.cxx
+++ b/PWG4/JetTasks/AliPWG4HighPtQAMC.cxx
@@ -668,7 +668,7 @@ void AliPWG4HighPtQAMC::Exec(Option_t *) {
     else if(fTrackType==7) {
       //use global constrained track
       track = esdtrack;
-      track->Set(esdtrack->GetConstrainedParam()->GetX(),esdtrack->GetConstrainedParam()->GetAlpha(),esdtrack->GetConstrainedParam()->GetParameter(),esdtrack->GetConstrainedParam()->GetCovariance());
+      //      track->Set(esdtrack->GetConstrainedParam()->GetX(),esdtrack->GetConstrainedParam()->GetAlpha(),esdtrack->GetConstrainedParam()->GetParameter(),esdtrack->GetConstrainedParam()->GetCovariance());
     }
     else
       track = esdtrack;
@@ -691,6 +691,7 @@ void AliPWG4HighPtQAMC::Exec(Option_t *) {
       if(fTrackType==1 || fTrackType==2) delete track;
       continue;
     }
+
     TParticle *particle = fStack->Particle(label) ;
     if(!particle) {
       if(fTrackType==1 || fTrackType==2) {
@@ -701,14 +702,10 @@ void AliPWG4HighPtQAMC::Exec(Option_t *) {
 
     ptMC = particle->Pt();
 
-    pt  = track->Pt();
-    phi = track->Phi();
-    if(fTrackType==0) 
-      track->GetImpactParameters(dca2D,dcaZ);     //Global
-    else if(fTrackType==1 || fTrackType==2) 
+    if(fTrackType==1 || fTrackType==2) 
       track->GetImpactParametersTPC(dca2D,dcaZ);  //TPConly
-    else {continue;}
-
+    else
+      track->GetImpactParameters(dca2D,dcaZ);     //Global
     
     UChar_t itsMap = track->GetITSClusterMap();
     for (Int_t i=0; i < 6; i++) {
@@ -724,6 +721,16 @@ void AliPWG4HighPtQAMC::Exec(Option_t *) {
 
     if (fTrackCuts->AcceptTrack(track)) {
 
+      if(fTrackType==7) {
+       if(esdtrack->GetConstrainedParam()) 
+         track->Set(esdtrack->GetConstrainedParam()->GetX(),esdtrack->GetConstrainedParam()->GetAlpha(),esdtrack->GetConstrainedParam()->GetParameter(),esdtrack->GetConstrainedParam()->GetCovariance());
+       else
+         continue;
+      }
+
+      pt  = track->Pt();
+      phi = track->Phi();
+
       fPtSel->Fill(pt);
       if(track->GetLabel()<0) {
         fPtSelFakes->Fill(pt);

diff --git a/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx b/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx
index 93103d5094abfcc8919042d2b875ca2ed1418034..cb504f1a0c4fee00fce412aa8a4d9611ed863ce9 100644 (file)
--- a/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx
+++ b/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx
@@ -379,7 +379,7 @@ void AliPWG4HighPtSpectra::Exec(Option_t *)
       else if(fTrackType==7) {
        //use global constrained track
        track = esdtrack;
-       track->Set(esdtrack->GetConstrainedParam()->GetX(),esdtrack->GetConstrainedParam()->GetAlpha(),esdtrack->GetConstrainedParam()->GetParameter(),esdtrack->GetConstrainedParam()->GetCovariance());
+       //      track->Set(esdtrack->GetConstrainedParam()->GetX(),esdtrack->GetConstrainedParam()->GetAlpha(),esdtrack->GetConstrainedParam()->GetParameter(),esdtrack->GetConstrainedParam()->GetCovariance());
 
       }
       else
@@ -399,12 +399,21 @@ void AliPWG4HighPtSpectra::Exec(Option_t *)
       }
 
 
-      //fill the container
-      containerInputRec[0] = track->Pt();
-      containerInputRec[1] = track->Phi();
-      containerInputRec[2] = track->Eta();
-    
+   
       if (fTrackCuts->AcceptTrack(track)) {
+
+       if(fTrackType==7) {
+         if(esdtrack->GetConstrainedParam()) 
+           track->Set(esdtrack->GetConstrainedParam()->GetX(),esdtrack->GetConstrainedParam()->GetAlpha(),esdtrack->GetConstrainedParam()->GetParameter(),esdtrack->GetConstrainedParam()->GetCovariance());
+         else
+           continue;
+       }
+
+       //fill the container
+       containerInputRec[0] = track->Pt();
+       containerInputRec[1] = track->Phi();
+       containerInputRec[2] = track->Eta();
+
        if(track->GetSign()>0.) fCFManagerPos->GetParticleContainer()->Fill(containerInputRec,kStepReconstructed);
        if(track->GetSign()<0.) fCFManagerNeg->GetParticleContainer()->Fill(containerInputRec,kStepReconstructed);
 

diff --git a/PWG4/JetTasks/AliPWG4HighPtTrackQA.cxx b/PWG4/JetTasks/AliPWG4HighPtTrackQA.cxx
index f4862e30c9db08f343a30641b9d5e02c8d119329..22d1299c7b02fcfa51f7e8677a076a8d503e51ed 100644 (file)
--- a/PWG4/JetTasks/AliPWG4HighPtTrackQA.cxx
+++ b/PWG4/JetTasks/AliPWG4HighPtTrackQA.cxx
@@ -954,7 +954,7 @@ void AliPWG4HighPtTrackQA::DoAnalysisESD() {
     else if(fTrackType==7) {
       //use global constrained track
       track = esdtrack;
-      track->Set(esdtrack->GetConstrainedParam()->GetX(),esdtrack->GetConstrainedParam()->GetAlpha(),esdtrack->GetConstrainedParam()->GetParameter(),esdtrack->GetConstrainedParam()->GetCovariance());
+      //     track->Set(esdtrack->GetConstrainedParam()->GetX(),esdtrack->GetConstrainedParam()->GetAlpha(),esdtrack->GetConstrainedParam()->GetParameter(),esdtrack->GetConstrainedParam()->GetCovariance());
     }
     else
       track = esdtrack;
@@ -985,6 +985,13 @@ void AliPWG4HighPtTrackQA::DoAnalysisESD() {
       continue;
     }
 
+    if(fTrackType==7) {
+      if(esdtrack->GetConstrainedParam()) 
+       track->Set(esdtrack->GetConstrainedParam()->GetX(),esdtrack->GetConstrainedParam()->GetAlpha(),esdtrack->GetConstrainedParam()->GetParameter(),esdtrack->GetConstrainedParam()->GetCovariance());
+      else
+       continue;
+    }
+
     fh1NTracksSel->Fill(0.);
 
     fVariables->Reset(0.);
@@ -995,12 +1002,13 @@ void AliPWG4HighPtTrackQA::DoAnalysisESD() {
 
     Float_t dca2D = 0.;
     Float_t dcaz  = 0.;
-    if(fTrackType==0) {       //Global
-      track->GetImpactParameters(dca2D,dcaz);
-    }
-    else if(fTrackType==1 || fTrackType==2 || fTrackType==4) {  //TPConly
-      track->GetImpactParametersTPC(dca2D,dcaz);
+
+    if(fTrackType==1 || fTrackType==2 || fTrackType==4) {  
+      track->GetImpactParametersTPC(dca2D,dcaz); //TPConly
     }
+    else
+      track->GetImpactParameters(dca2D,dcaz);    //Global
+
     fVariables->SetAt(dca2D,3);
     fVariables->SetAt(dcaz,5);