Applying the new standard cuts in the QA Task, run the same task twice with different...

diff --git a/PWG4/JetTasks/AliPWG4HighPtQATPConly.cxx b/PWG4/JetTasks/AliPWG4HighPtQATPConly.cxx
index 4aa71443860720cb3456cfda3a938c28c59751a1..fdb8d872ec131375d6179cc70f7d28dab8bcfcfc 100644 (file)
--- a/PWG4/JetTasks/AliPWG4HighPtQATPConly.cxx
+++ b/PWG4/JetTasks/AliPWG4HighPtQATPConly.cxx
@@ -994,8 +994,8 @@ void AliPWG4HighPtQATPConly::Exec(Option_t *) {
       if(nClustersTPC>0.) fPtITSminPtTPCvsPtITSNPointTPCS->Fill(pt,(1./pt-1./ptTPC)/(1./pt),track->GetTPCnclsS()/nClustersTPC);
       fPtITSminPtTPCvsPtITSDCAR->Fill(pt,(1./pt-1./ptTPC)/(1./pt),dca2D);
       fPtITSminPtTPCvsPtITSDCAZ->Fill(pt,(1./pt-1./ptTPC)/(1./pt),dcaZ);
-      fPtITSminPtTPCvsPtITSPhi->Fill(pt,(pt-ptTPC)/(pt),phi);
-      fPtITSminPtTPCvsPtITSNPointITS->Fill(pt,(pt-ptTPC)/(pt),nPointITS);
+      fPtITSminPtTPCvsPtITSPhi->Fill(pt,(1./pt-1./ptTPC)/(1./pt),phi);
+      fPtITSminPtTPCvsPtITSNPointITS->Fill(pt,(1./pt-1./ptTPC)/(1./pt),nPointITS);
       fPtITSminPtTPCvsPtITSNSigmaToVertex->Fill(pt,(1./pt-1./ptTPC)/(1./pt),nSigmaToVertex);
       fPtITSminPtTPCvsPtITSChi2C->Fill(pt,(1./pt-1./ptTPC)/(1./pt),chi2C);
       fPtITSminPtTPCvsPtITSRel1PtUncertainty->Fill(pt,(1./pt-1./ptTPC)/(1./pt),relUncertainty1Pt);

diff --git a/PWG4/macros/AddTaskPWG4HighPtQATPConly.C b/PWG4/macros/AddTaskPWG4HighPtQATPConly.C
index ed82a6d940b89e879e12949615fd531c0b748b59..8287a31ac351969a33dfb2c90ba8944bdf5565d4 100644 (file)
--- a/PWG4/macros/AddTaskPWG4HighPtQATPConly.C
+++ b/PWG4/macros/AddTaskPWG4HighPtQATPConly.C
@@ -1,6 +1,6 @@
 //DEFINITION OF A FEW CONSTANTS
 
-AliPWG4HighPtQATPConly* AddTaskPWG4HighPtQATPConly()//<some_parameters>)
+AliPWG4HighPtQATPConly* AddTaskPWG4HighPtQATPConly(int cuts=1)//1: Standard Cuts 2009 2: GetStandardITSTPCTrackCuts2009
 {
   // Creates HighPtQATPConly analysis task and adds it to the analysis manager.
   
@@ -28,34 +28,49 @@ AliPWG4HighPtQATPConly* AddTaskPWG4HighPtQATPConly()//<some_parameters>)
   //CREATE THE  CUTS -----------------------------------------------
   //Use AliESDtrackCuts
   AliESDtrackCuts *trackCuts = new AliESDtrackCuts("AliESDtrackCuts","Standard Cuts");
-  //Standard Cuts
-  trackCuts->SetAcceptKinkDaughters(kFALSE);//
-  trackCuts->SetRequireTPCRefit(kTRUE);
-  trackCuts->SetEtaRange(-0.9,0.9);//-0.5,0.5);//
-  trackCuts->SetMaxCovDiagonalElements(2,2,0.5,0.5,2);//
-  trackCuts->SetPtRange(0.15, 1e10);//
-  trackCuts->SetMinNClustersTPC(70);//
-  trackCuts->SetMaxChi2PerClusterTPC(3.5);//
-  //trackCuts->SetRequireITSRefit(kTRUE);
-  trackCuts->SetMaxDCAToVertexXY(2.4);
-  trackCuts->SetMaxDCAToVertexZ(3.2);
-  trackCuts->SetDCAToVertex2D(kTRUE);
-  
+  if(cuts==1) {
+    //Standard Cuts
+    trackCuts->SetAcceptKinkDaughters(kFALSE);
+    trackCuts->SetRequireTPCStandAlone(kTRUE); 
+    trackCuts->SetRequireTPCRefit(kTRUE);
+    trackCuts->SetMinNClustersTPC(70);
+    trackCuts->SetEtaRange(-0.9,0.9);
+    trackCuts->SetMaxCovDiagonalElements(2,2,0.5,0.5,2);
+    trackCuts->SetPtRange(0.15, 1e10);
+    trackCuts->SetMaxChi2PerClusterTPC(3.5);
+    trackCuts->SetMaxDCAToVertexXY(2.4);
+    trackCuts->SetMaxDCAToVertexZ(3.2);
+    trackCuts->SetDCAToVertex2D(kTRUE);
+  }
+  else if(cuts==2) {
+    trackCuts->SetEtaRange(-0.9,0.9);
+    trackCuts->SetPtRange(0.15, 1e10);
+    trackCuts->GetStandardITSTPCTrackCuts2009(kTRUE);//Primary Track Selection
+    trackCuts->SetRequireITSRefit(kFALSE);
+  }
+
   AliESDtrackCuts *trackCutsITS = new AliESDtrackCuts("AliESDtrackCuts","Standard Cuts with ITSrefit");
-  trackCutsITS->SetAcceptKinkDaughters(kFALSE);//
-  trackCutsITS->SetRequireTPCRefit(kTRUE);//
-  trackCutsITS->SetEtaRange(-0.9,0.9);//-0.5,0.5);//
-  trackCutsITS->SetMaxCovDiagonalElements(2,2,0.5,0.5,2);//
-  trackCutsITS->SetPtRange(0.15, 1e10);//
-  trackCutsITS->SetMinNClustersTPC(70);//
-  trackCutsITS->SetMaxChi2PerClusterTPC(3.5);//
-  trackCutsITS->SetRequireITSRefit(kTRUE);
-  trackCutsITS->SetMaxDCAToVertexXY(2.4);
-  trackCutsITS->SetMaxDCAToVertexZ(3.2);
-  trackCutsITS->SetDCAToVertex2D(kTRUE); 
+  if(cuts==1) {
+    trackCutsITS->SetAcceptKinkDaughters(kFALSE);
+    trackCutsITS->SetRequireTPCRefit(kTRUE);
+    trackCutsITS->SetEtaRange(-0.9,0.9);
+    trackCutsITS->SetMaxCovDiagonalElements(2,2,0.5,0.5,2);
+    trackCutsITS->SetPtRange(0.15, 1e10);
+    trackCutsITS->SetMinNClustersTPC(70);
+    trackCutsITS->SetMaxChi2PerClusterTPC(3.5);
+    trackCutsITS->SetRequireITSRefit(kTRUE);
+    trackCutsITS->SetMaxDCAToVertexXY(2.4);
+    trackCutsITS->SetMaxDCAToVertexZ(3.2);
+    trackCutsITS->SetDCAToVertex2D(kTRUE); 
+  }
+ else if(cuts==2) {
+   trackCutsITS->GetStandardITSTPCTrackCuts2009(kTRUE);//Primary Track Selection
+   trackCutsITS->SetEtaRange(-0.9,0.9);
+   trackCutsITS->SetPtRange(0.15, 1e10);
+ }
 
-  //Create the task
-  AliPWG4HighPtQATPConly *taskPWG4QA = new AliPWG4HighPtQATPConly("AliPWG4HighPtQATPConly");
+//Create the task
+  AliPWG4HighPtQATPConly *taskPWG4QA = new AliPWG4HighPtQATPConly(Form("AliPWG4HighPtQATPConly%d",cuts));
   taskPWG4QA->SetCuts(trackCuts);
   taskPWG4QA->SetCutsITS(trackCutsITS);
   taskPWG4QA->SetMaxCosmicAngle(0.008);
@@ -67,13 +82,27 @@ AliPWG4HighPtQATPConly* AddTaskPWG4HighPtQATPConly()//<some_parameters>)
 
   //------ input data ------
   //  AliAnalysisDataContainer *cinput0  = mgr->GetCommonInputContainer();
-  TString outputfile = AliAnalysisManager::GetCommonFileName();
-  outputfile += ":PWG4_HighPtQATPConly"; 
-  //char *outputfile = "outputAliPWG4HighPtQATPConlyTestTrain.root";
-  AliAnalysisDataContainer *cout_hist0 = mgr->CreateContainer("qa_hists", TList::Class(), AliAnalysisManager::kOutputContainer,outputfile);
-  AliAnalysisDataContainer *cout_hist1 = mgr->CreateContainer("qa_histsTPC", TList::Class(), AliAnalysisManager::kOutputContainer,outputfile);
-  AliAnalysisDataContainer *cout_hist2 = mgr->CreateContainer("qa_histsITS", TList::Class(), AliAnalysisManager::kOutputContainer,outputfile);  
-  AliAnalysisDataContainer *cout_hist3 = mgr->CreateContainer("qa_histsCosmics", TList::Class(), AliAnalysisManager::kOutputContainer,outputfile);  
+  TString outputfile = "";
+  outputfile = AliAnalysisManager::GetCommonFileName();
+  outputfile += Form(":PWG4_HighPtQATPConly%d",cuts);
+  
+  AliAnalysisDataContainer *cout_hist0;
+  AliAnalysisDataContainer *cout_hist1;
+  AliAnalysisDataContainer *cout_hist2;
+  AliAnalysisDataContainer *cout_hist3;
+
+  if(cuts==1) {
+    cout_hist0 = mgr->CreateContainer("qa_histsCuts1", TList::Class(), AliAnalysisManager::kOutputContainer,outputfile);
+    cout_hist1 = mgr->CreateContainer("qa_histsTPCCuts1", TList::Class(), AliAnalysisManager::kOutputContainer,outputfile);
+    cout_hist2 = mgr->CreateContainer("qa_histsITSCuts1", TList::Class(), AliAnalysisManager::kOutputContainer,outputfile);  
+    cout_hist3 = mgr->CreateContainer("qa_histsCosmicsCuts1", TList::Class(), AliAnalysisManager::kOutputContainer,outputfile);  
+  }
+  else if(cuts==2) {
+    cout_hist0 = mgr->CreateContainer("qa_histsCuts2", TList::Class(), AliAnalysisManager::kOutputContainer,outputfile);
+    cout_hist1 = mgr->CreateContainer("qa_histsTPCCuts2", TList::Class(), AliAnalysisManager::kOutputContainer,outputfile);
+    cout_hist2 = mgr->CreateContainer("qa_histsITSCuts2", TList::Class(), AliAnalysisManager::kOutputContainer,outputfile);  
+    cout_hist3 = mgr->CreateContainer("qa_histsCosmicsCuts2", TList::Class(), AliAnalysisManager::kOutputContainer,outputfile);  
+  }
  
   mgr->AddTask(taskPWG4QA);
 

diff --git a/PWG4/macros/AddTaskPWG4HighPtSpectra.C b/PWG4/macros/AddTaskPWG4HighPtSpectra.C
index dbd38f1648bd8af8ce3c7943f0719bf5fca9d452..47fc5ec574e0b4f44b540de0c0b76ade412bd14e 100644 (file)
--- a/PWG4/macros/AddTaskPWG4HighPtSpectra.C
+++ b/PWG4/macros/AddTaskPWG4HighPtSpectra.C
@@ -21,7 +21,7 @@ const Int_t   mintrackrefsTPC = 1;
 const Int_t   mintrackrefsITS = 1;
 const Int_t   charge  = 1;
 
-AliPWG4HighPtSpectra* AddTaskPWG4HighPtSpectra()//<some_parameters>)
+AliPWG4HighPtSpectra* AddTaskPWG4HighPtSpectra()
 {
   // Creates HighPtSpectra analysis task and adds it to the analysis manager.
   
@@ -119,18 +119,22 @@ AliPWG4HighPtSpectra* AddTaskPWG4HighPtSpectra()//<some_parameters>)
   //CREATE THE  CUTS -----------------------------------------------
   //Use AliESDtrackCuts
   AliESDtrackCuts *trackCuts = new AliESDtrackCuts("AliESDtrackCuts","Standard Cuts");
-  //Standard Cuts
-  trackCuts->SetAcceptKinkDaughters(kFALSE);//
-  trackCuts->SetRequireTPCRefit(kTRUE);//
-  trackCuts->SetEtaRange(-0.9,0.9);//-0.5,0.5);//
-  trackCuts->SetMaxCovDiagonalElements(2,2,0.5,0.5,2);//
-  trackCuts->SetPtRange(0.15, 1e10);//
-  trackCuts->SetMinNClustersTPC(70);//
-  trackCuts->SetMaxChi2PerClusterTPC(3.5);//
-  trackCuts->SetRequireITSRefit(kTRUE);
-  trackCuts->SetMaxDCAToVertexXY(2.4);
-  trackCuts->SetMaxDCAToVertexZ(3.2);
-  trackCuts->SetDCAToVertex2D(kTRUE);
+//     //Standard Cuts
+//     trackCuts->SetAcceptKinkDaughters(kFALSE);
+//     trackCuts->SetRequireTPCStandAlone(kTRUE); 
+//     trackCuts->SetRequireTPCRefit(kTRUE);
+//     trackCuts->SetMinNClustersTPC(70);
+//     trackCuts->SetEtaRange(-0.9,0.9);
+//     trackCuts->SetMaxCovDiagonalElements(2,2,0.5,0.5,2);
+//     trackCuts->SetPtRange(0.15, 1e10);
+//     trackCuts->SetMaxChi2PerClusterTPC(3.5);
+//     trackCuts->SetMaxDCAToVertexXY(2.4);
+//     trackCuts->SetMaxDCAToVertexZ(3.2);
+//     trackCuts->SetDCAToVertex2D(kTRUE);
+//     trackCuts->SetRequireITSRefit(kTRUE);
+  trackCuts->SetEtaRange(-0.9,0.9);
+  trackCuts->SetPtRange(0.15, 1e10);
+  trackCuts->GetStandardITSTPCTrackCuts2009(kTRUE);//Primary Track Selection
 
  // Gen-Level kinematic cuts
   AliCFTrackKineCuts *mcKineCuts = new AliCFTrackKineCuts("mcKineCuts","MC-level kinematic cuts");
@@ -188,11 +192,11 @@ AliPWG4HighPtSpectra* AddTaskPWG4HighPtSpectra()//<some_parameters>)
 //  char *outputfile = "outputAliPWG4HighPtSpectraTestTrain.root";
   TString outputfile = AliAnalysisManager::GetCommonFileName();
   outputfile += ":PWG4_HighPtSpectra"; 
+
   AliAnalysisDataContainer *coutput0 = mgr->CreateContainer("chist0HighPtSpectra", TList::Class(),AliAnalysisManager::kOutputContainer,outputfile);
   AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("ccontainer0HighPtSpectra", AliCFContainer::Class(),AliAnalysisManager::kOutputContainer,outputfile);
   AliAnalysisDataContainer *coutput2 = mgr->CreateContainer("ccontainer1HighPtSpectra", AliCFContainer::Class(),AliAnalysisManager::kOutputContainer,outputfile);
-
-
+  
   mgr->AddTask(taskPWG4HighPtSpectra);
 
   mgr->ConnectInput(taskPWG4HighPtSpectra,0,mgr->GetCommonInputContainer());

diff --git a/PWG4/macros/AnalysisTrainPWG4Jets.C b/PWG4/macros/AnalysisTrainPWG4Jets.C
index 4d12bd7a0cb7d3fff6b3c60c07f60c73e15196c0..290f8a1ecee68a0bd947dcaa2a968b4d19c87e50 100644 (file)
--- a/PWG4/macros/AnalysisTrainPWG4Jets.C
+++ b/PWG4/macros/AnalysisTrainPWG4Jets.C
@@ -115,7 +115,7 @@ Int_t       kProofOffset = 0;
 //== grid plugin setup variables
 Bool_t      kPluginUse         = kTRUE;   // do not change
 Bool_t      kPluginUseProductionMode  = kFALSE;   // use the plugin in production mode
-TString     kPluginRootVersion       = "v5-26-00b-2";  // *CHANGE ME IF MORE RECENT IN GRID*
+TString     kPluginRootVersion       = "v5-26-00b-4";  // *CHANGE ME IF MORE RECENT IN GRID*
 TString     kPluginAliRootVersion    = "v4-19-04-AN";  // *CHANGE ME IF MORE RECENT IN GRID*                                          
 Bool_t      kPluginMergeViaJDL       = kTRUE;  // merge via JDL
 Bool_t      kPluginFastReadOption   = kFALSE;  // use xrootd tweaks
@@ -460,8 +460,11 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
 
    if(iPWG4PtQATPC){
      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskPWG4HighPtQATPConly.C");
-     AliPWG4HighPtQATPConly *taskQATPC = AddTaskPWG4HighPtQATPConly();
-     if (!taskQATPC) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskQATPC cannot run for this train conditions - EXCLUDED");
+     AliPWG4HighPtQATPConly *taskQATPC = 0;
+     if(iPWG4PtQATPC&1)taskQATPC = AddTaskPWG4HighPtQATPConly(1);
+     if(iPWG4PtQATPC&2)taskQATPC = AddTaskPWG4HighPtQATPConly(2);
+
+ if (!taskQATPC) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskQATPC cannot run for this train conditions - EXCLUDED");
    }
 
    if(iPWG4PtSpectra){