gobla evnt plane calculation, new common track cuts

diff --git a/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx b/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx
index f68feb4a3c1d313a95935d1394912300fcf552ba..1807e63e431311b5f0905fa33d48afd967a8e024 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx
+++ b/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx
@@ -1,3 +1,4 @@
+
 // **************************************
 // Task used for the correction of determiantion of reconstructed jet spectra
 // Compares input (gen) and output (rec) jets   
@@ -549,6 +550,9 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
 
   if(aod){
     const AliAODVertex *vtxAOD = aod->GetPrimaryVertex();
+    if(!vtxAOD){
+      aod->Print();
+    }
     aodVtxValid = IsVertexValid(vtxAOD);
     aodVtxIn = IsVertexIn(vtxAOD);
     Float_t zvtx = vtxAOD->GetZ();
@@ -597,7 +601,11 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
 
       TList recTracks;
       GetListOfTracks(&recTracks);
-      CalculateReactionPlaneAngle(&recTracks);
+      //      CalculateReactionPlaneAngle(&recTracks);
+      fRPAngle = aod->GetHeader()->GetEventplane();
+      fh1RP->Fill(fRPAngle);
+      fh2RPCentrality->Fill(fCentrality,fRPAngle);
+
       AliAnalysisHelperJetTasks::ReactionPlane(kTRUE,fRPAngle); // set slection to false
       if(fUseAODInput&&fCentrality<=80){
        if(fFilterAODCollisions&&aod){
@@ -726,6 +734,10 @@ Bool_t  AliAnalysisTaskJetServices::IsVertexValid ( const AliESDVertex* vtx) {
   // SPD       SPDVertex             vertexer: 3D
   // SPD       SPDVertex             vertexer: Z
   
+  if(!vtx){
+    Printf("%s:%d No ESD vertex found",(char*)__FILE__,__LINE__);
+    return kFALSE;
+  }
   Int_t nCont = vtx->GetNContributors();
   if(nCont>=1){
     fEventCutInfoESD |= kContributorsCut1;    
@@ -768,6 +780,12 @@ Bool_t  AliAnalysisTaskJetServices::IsVertexValid ( const AliAODVertex* vtx) con
   // SPD       SPDVertex             vertexer: 3D
   // SPD       SPDVertex             vertexer: Z
 
+  if(!vtx){
+    Printf("%s:%d No AOD vertex found",(char*)__FILE__,__LINE__);
+    return kFALSE;
+  }
+
+
   if(fDebug){
     Printf(" n contrib %d",vtx->GetNContributors());
     vtx->Print();

diff --git a/PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx b/PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx
index 04675f0699582f02f6ef0dddb8d496b9018dd525..cf72798ed87f92186df95fae181790ee9c16f1ae 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx
+++ b/PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx
@@ -812,8 +812,8 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/){
   nT = GetListOfTracks(&genParticles,fTrackTypeGen);
   if(fDebug>2)Printf("%s:%d Selected Gen tracks: %d %d",(char*)__FILE__,__LINE__,nT,genParticles.GetEntries());
 
-  CalculateReactionPlaneAngle(&recParticles);
-
+  //  CalculateReactionPlaneAngle(&recParticles);
+  fRPAngle = aod->GetHeader()->GetEventplane();
   // Event control and counting ...  
   // MC
   fh1PtHard->Fill(ptHard,eventW);

diff --git a/PWG4/JetTasks/AliPWG4HighPtQAMC.cxx b/PWG4/JetTasks/AliPWG4HighPtQAMC.cxx
index c71b6f62f1402c77a2255a1ef231cf7f501d3552..60409e3bf37e2d403b64b13d7370a1d6ee2aa15a 100644 (file)
--- a/PWG4/JetTasks/AliPWG4HighPtQAMC.cxx
+++ b/PWG4/JetTasks/AliPWG4HighPtQAMC.cxx
@@ -665,6 +665,11 @@ void AliPWG4HighPtQAMC::Exec(Option_t *) {
       }
       track->Set(exParam.GetX(),exParam.GetAlpha(),exParam.GetParameter(),exParam.GetCovariance());
     }
+    else if(fTrackType==7) {
+      //use global constrained track
+      track = esdtrack;
+      track->Set(esdtrack->GetConstrainedParam()->GetX(),esdtrack->GetConstrainedParam()->GetAlpha(),esdtrack->GetConstrainedParam()->GetParameter(),esdtrack->GetConstrainedParam()->GetCovariance());
+    }
     else
       track = esdtrack;
     

diff --git a/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx b/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx
index b41b29b302d0f40e3df3b29cc77cb8b4efeddb03..93103d5094abfcc8919042d2b875ca2ed1418034 100644 (file)
--- a/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx
+++ b/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx
@@ -376,6 +376,12 @@ void AliPWG4HighPtSpectra::Exec(Option_t *)
        }
        track->Set(exParam.GetX(),exParam.GetAlpha(),exParam.GetParameter(),exParam.GetCovariance());
       }
+      else if(fTrackType==7) {
+       //use global constrained track
+       track = esdtrack;
+       track->Set(esdtrack->GetConstrainedParam()->GetX(),esdtrack->GetConstrainedParam()->GetAlpha(),esdtrack->GetConstrainedParam()->GetParameter(),esdtrack->GetConstrainedParam()->GetCovariance());
+
+      }
       else
        track = esdtrack;
     

diff --git a/PWG4/JetTasks/AliPWG4HighPtTrackQA.cxx b/PWG4/JetTasks/AliPWG4HighPtTrackQA.cxx
index 53016cb03195ec8438fdca0d9bbef292ede08aa7..f4862e30c9db08f343a30641b9d5e02c8d119329 100644 (file)
--- a/PWG4/JetTasks/AliPWG4HighPtTrackQA.cxx
+++ b/PWG4/JetTasks/AliPWG4HighPtTrackQA.cxx
@@ -951,6 +951,11 @@ 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());
+    }
     else
       track = esdtrack;
     

diff --git a/PWG4/macros/ConfigTrainGrid.C b/PWG4/macros/ConfigTrainGrid.C
index 918f552c201e317880bdddd9ec46828b63a27746..634d38bf0dd351507171362832f46955e65cacce 100644 (file)
--- a/PWG4/macros/ConfigTrainGrid.C
+++ b/PWG4/macros/ConfigTrainGrid.C
@@ -39,7 +39,7 @@
   // bextra == 0 4 plus
   // bextra == 1 large pass1 split..
   // bextra == 2 3 plus
-  Int_t bRun = 802; Int_t bExtra = 0;  char* cDate = "110706a";
+  Int_t bRun = 802; Int_t bExtra = 0;  char* cDate = "110717a";
   iAODanalysis = 0; 
   // 1 == Read Jets and tracks form the input AOD
   // needs the jet branchnames set explicitly
@@ -48,8 +48,8 @@
   // 1 =  write the Full AOD for all events 
   // 2 =  write the Full AOD for triggered events
   // 3 =  write the deltaAOD for all events
-  iFilterAnalysis = 2; 
-
+  iFilterAnalysis = 2;kJetTriggerPtCut = 40; 
+  
   if (kPluginMode.Contains("merge")){
     // currently merging this one...
     //    cDate = "110421a";
@@ -512,7 +512,7 @@
       iPWG4JetSpectrum = 1; 
       iPWG4JetServices  = 1; // !!!!!!!!!!! 
       iPWG4Cluster      = 1;// not 5....
-      kHighPtFilterMask = 1<<4; // Global tracks no SPD requirment
+      kHighPtFilterMask = 1<<4|1<<8; // Global tracks with SPD requirment global constraitn for the rest
       iPWG4Fragmentation = 1;
     //
     }// version1
@@ -1099,6 +1099,7 @@
   }
 
   if (kPluginMode.Contains("test")){
+    kJetTriggerPtCut = 0.01; 
     if(kAnalysisMode.Contains("grid")){
       //      kPluginExecutableCommand = "source ~/setup_root.txt; alienroot -b -q";      
       kPluginExecutableCommand = "root -b -q";      

diff --git a/PWG4/macros/CreateTrackCutsPWG4.C b/PWG4/macros/CreateTrackCutsPWG4.C
index e4bd4e90754c39368132dcaac2c75aa9b8807182..12686ec229afce481424f587297c26dc21e67deb 100644 (file)
--- a/PWG4/macros/CreateTrackCutsPWG4.C
+++ b/PWG4/macros/CreateTrackCutsPWG4.C
@@ -98,6 +98,25 @@ AliESDtrackCuts *CreateTrackCutsPWG4(Int_t cutMode) {
 
   }
 
+  if(stdCutMode == 1003) {
+
+    bStdCutsDefined = kTRUE;
+
+    // tight global tracks
+    trackCuts = AliESDtrackCuts::GetStandardITSTPCTrackCuts2010(kFALSE,1);
+    trackCuts->SetMinNClustersTPC(0);
+    trackCuts->SetMinNCrossedRowsTPC(120);
+    trackCuts->SetMinRatioCrossedRowsOverFindableClustersTPC(0.1);// essentially switches it off
+    trackCuts->SetMaxDCAToVertexXY(2.4);
+    trackCuts->SetMaxDCAToVertexZ(3.2);
+    trackCuts->SetDCAToVertex2D(kTRUE);
+    trackCuts->SetMaxChi2PerClusterITS(36);
+    trackCuts->SetMaxFractionSharedTPCClusters(0.4);
+
+    tag = "Global tracks ITSTPC2010 + NCrossedRows + loose ITS";
+
+  }
+
   if(stdCutMode == 2000) {
 
     bStdCutsDefined = kTRUE;
@@ -139,6 +158,23 @@ AliESDtrackCuts *CreateTrackCutsPWG4(Int_t cutMode) {
 
   }
 
+  if(stdCutMode == 2002) {
+
+    bStdCutsDefined = kTRUE;
+
+    trackCuts = AliESDtrackCuts::GetStandardTPCOnlyTrackCuts(); 
+    trackCuts->SetMinNClustersTPC(0);
+    trackCuts->SetMinNCrossedRowsTPC(120);
+    trackCuts->SetMinRatioCrossedRowsOverFindableClustersTPC(0.1);// essentially switches it off  
+
+    trackCuts->SetEtaRange(-0.9,0.9);
+    trackCuts->SetPtRange(0.15, 100.);
+
+ 
+    tag = "TPConly track cuts, loose cuts, NCls=70, no ITS requirements";
+
+  }
+
   if(!bStdCutsDefined) {
     printf("last 4 digits do not represent a predefined set of standard cuts. Returning 0\n");
     return 0;
@@ -186,6 +222,14 @@ AliESDtrackCuts *CreateTrackCutsPWG4(Int_t cutMode) {
 
   }
 
+  if(addCutMode == 1004) {
+
+    trackCuts->SetRequireITSRefit(kFALSE);
+
+    tag += " + additional: ITSrefit=kFALSE";
+
+  }
+
   Printf("Created track cuts for: %s", tag.Data());
 
   return trackCuts;