Updated track QA with cut 1005 (M. Verweij)

diff --git a/PWG4/macros/AddTaskPWG4HighPtQAMC.C b/PWG4/macros/AddTaskPWG4HighPtQAMC.C
index 2b42da4f0209653f6e205b5f585a8710716b648c..7bf377eada084fe1024a1e2d855596e6b4fcb316 100644 (file)
--- a/PWG4/macros/AddTaskPWG4HighPtQAMC.C
+++ b/PWG4/macros/AddTaskPWG4HighPtQAMC.C
@@ -1,12 +1,13 @@
 void AddTaskPWG4HighPtQAMCAll(char *prodType = "LHC10e14") {
 
   AliPWG4HighPtQAMC *taskQAMC00 = AddTaskPWG4HighPtQAMC(prodType,0,0);
-  AliPWG4HighPtQAMC *taskQAMC00 = AddTaskPWG4HighPtQAMC(prodType,0,1);
-  AliPWG4HighPtQAMC *taskQAMC00 = AddTaskPWG4HighPtQAMC(prodType,0,2);
+  AliPWG4HighPtQAMC *taskQAMC01 = AddTaskPWG4HighPtQAMC(prodType,0,1);
+  //  AliPWG4HighPtQAMC *taskQAMC02 = AddTaskPWG4HighPtQAMC(prodType,0,2);
   //  AliPWG4HighPtQAMC *taskQAMC10 = AddTaskPWG4HighPtQAMC(prodType,1,0);
   //  AliPWG4HighPtQAMC *taskQAMC20 = AddTaskPWG4HighPtQAMC(prodType,2,0);
   AliPWG4HighPtQAMC *taskQAMC70 = AddTaskPWG4HighPtQAMC(prodType,7,0);
-  AliPWG4HighPtQAMC *taskQAMC70 = AddTaskPWG4HighPtQAMC(prodType,7,1);
+  AliPWG4HighPtQAMC *taskQAMC71 = AddTaskPWG4HighPtQAMC(prodType,7,1);
+  AliPWG4HighPtQAMC *taskQAMC72 = AddTaskPWG4HighPtQAMC(prodType,7,2);
 }
 
 AliPWG4HighPtQAMC* AddTaskPWG4HighPtQAMC(char *prodType = "LHC10e14", Int_t trackType = 0, Int_t cuts =0)
@@ -55,21 +56,31 @@ AliPWG4HighPtQAMC* AddTaskPWG4HighPtQAMC(char *prodType = "LHC10e14", Int_t trac
   }
   if(trackType==0 && cuts==1) {
     //Cuts global tracks with ITSrefit requirement and SPDrequirement for jet analysis
-    trackCuts = CreateTrackCutsPWG4(10001004);
+    trackCuts = CreateTrackCutsPWG4(10001005);
    }
   if(trackType==0 && cuts==2) {
     //Cuts global tracks with ITSrefit requirement but without SPD
-    trackCuts = CreateTrackCutsPWG4(10011004);
+    trackCuts = CreateTrackCutsPWG4(10011005);
   }
   if(trackType==7 && cuts==0) {
     // tight global tracks
-    trackCuts = CreateTrackCutsPWG4(10041004);
-    trackCutsReject = CreateTrackCutsPWG4(1004);
+    trackCuts = CreateTrackCutsPWG4(10041005);
+    trackCutsReject = CreateTrackCutsPWG4(1005);
+    trackCutsReject->SetEtaRange(-0.9,0.9);
+    trackCutsReject->SetPtRange(0.15, 1e10);
   }
   if(trackType==7 && cuts==1) {
     // tight global tracks
-    trackCuts = CreateTrackCutsPWG4(10011004);
+    trackCuts = CreateTrackCutsPWG4(10011005);
   }
+  if(trackType==7 && cuts==2) {
+    // no requirements on SPD and ITSrefit failed
+    trackCuts = CreateTrackCutsPWG4(10041005);       //no ITSrefit requirement filter 256
+    trackCutsReject = CreateTrackCutsPWG4(10001005); //ITSrefit requirement filter 16
+    trackCutsReject->SetEtaRange(-0.9,0.9);
+    trackCutsReject->SetPtRange(0.15, 1e10);
+  }
+
   //Set track cuts for TPConly tracks
   if(trackType==1 || trackType==2) { 
     //Set track cuts for TPConly tracks

diff --git a/PWG4/macros/AddTaskPWG4HighPtSpectra.C b/PWG4/macros/AddTaskPWG4HighPtSpectra.C
index e83a243a0eb2ff29eb9a5a574877faaae618a04f..20d5c71494839507d4ce569651c0a791dd41295d 100644 (file)
--- a/PWG4/macros/AddTaskPWG4HighPtSpectra.C
+++ b/PWG4/macros/AddTaskPWG4HighPtSpectra.C
@@ -15,21 +15,23 @@ void AddTaskPWG4HighPtSpectraAll(char *prodType = "LHC10h",Bool_t isPbPb=kTRUE,
 
   AliPWG4HighPtSpectra *taskSpectra00cent10 = AddTaskPWG4HighPtSpectra(prodType,isPbPb,cent,0,0);
   AliPWG4HighPtSpectra *taskSpectra01cent10 = AddTaskPWG4HighPtSpectra(prodType,isPbPb,cent,0,1);
-  AliPWG4HighPtSpectra *taskSpectra02cent10 = AddTaskPWG4HighPtSpectra(prodType,isPbPb,cent,0,2);
+  //  AliPWG4HighPtSpectra *taskSpectra02cent10 = AddTaskPWG4HighPtSpectra(prodType,isPbPb,cent,0,2);
   //  AliPWG4HighPtSpectra *taskSpectra10cent10 = AddTaskPWG4HighPtSpectra(prodType,isPbPb,cent,1,0);
   //  AliPWG4HighPtSpectra *taskSpectra20cent10 = AddTaskPWG4HighPtSpectra(prodType,isPbPb,cent,2,0);
   AliPWG4HighPtSpectra *taskSpectra70cent10 = AddTaskPWG4HighPtSpectra(prodType,isPbPb,cent,7,0);
   AliPWG4HighPtSpectra *taskSpectra71cent10 = AddTaskPWG4HighPtSpectra(prodType,isPbPb,cent,7,1);
+  AliPWG4HighPtSpectra *taskSpectra72cent10 = AddTaskPWG4HighPtSpectra(prodType,isPbPb,cent,7,2);
 
   if(isPbPb) {
     for(cent=0; cent<4; cent++) {
       AliPWG4HighPtSpectra *taskSpectra00 = AddTaskPWG4HighPtSpectra(prodType,isPbPb,cent,0,0);
       AliPWG4HighPtSpectra *taskSpectra01 = AddTaskPWG4HighPtSpectra(prodType,isPbPb,cent,0,1);
-      AliPWG4HighPtSpectra *taskSpectra02 = AddTaskPWG4HighPtSpectra(prodType,isPbPb,cent,0,2);
+      //      AliPWG4HighPtSpectra *taskSpectra02 = AddTaskPWG4HighPtSpectra(prodType,isPbPb,cent,0,2);
       //      AliPWG4HighPtSpectra *taskSpectra10 = AddTaskPWG4HighPtSpectra(prodType,isPbPb,cent,1,0);
       //      AliPWG4HighPtSpectra *taskSpectra20 = AddTaskPWG4HighPtSpectra(prodType,isPbPb,cent,2,0);
       AliPWG4HighPtSpectra *taskSpectra70 = AddTaskPWG4HighPtSpectra(prodType,isPbPb,cent,7,0);
       AliPWG4HighPtSpectra *taskSpectra71 = AddTaskPWG4HighPtSpectra(prodType,isPbPb,cent,7,1);
+      AliPWG4HighPtSpectra *taskSpectra72 = AddTaskPWG4HighPtSpectra(prodType,isPbPb,cent,7,2);
     }
   }
 
@@ -161,20 +163,29 @@ AliPWG4HighPtSpectra* AddTaskPWG4HighPtSpectra(char *prodType = "LHC10e14", Bool
   }
   if(trackType==0 && cuts==1) {
     //Cuts global tracks with ITSrefit requirement and SPDrequirement for jet analysis
-    trackCuts = CreateTrackCutsPWG4(10001004);
+    trackCuts = CreateTrackCutsPWG4(10001005);
   }
   if(trackType==0 && cuts==2) {
     //Cuts global tracks with ITSrefit requirement but without SPD
-    trackCuts = CreateTrackCutsPWG4(10011004);
+    trackCuts = CreateTrackCutsPWG4(10011005);
   }
   if(trackType==7 && cuts==0) {
-    // tight global tracks
-    trackCuts = CreateTrackCutsPWG4(10041004);
-    trackCutsReject = CreateTrackCutsPWG4(1004);
+    // no requirements on SPD and ITSrefit failed
+    trackCuts = CreateTrackCutsPWG4(10041005);   //no ITSrefit requirement
+    trackCutsReject = CreateTrackCutsPWG4(1005); //ITSrefit requirement
+    trackCutsReject->SetEtaRange(-0.9,0.9);
+    trackCutsReject->SetPtRange(0.15, 1e10);
   }
   if(trackType==7 && cuts==1) {
-    // tight global tracks
-    trackCuts = CreateTrackCutsPWG4(10011004);
+    //Cuts global tracks with ITSrefit requirement but without SPD
+    trackCuts = CreateTrackCutsPWG4(10011005);
+  }
+  if(trackType==7 && cuts==2) {
+    // no requirements on SPD and ITSrefit failed
+    trackCuts = CreateTrackCutsPWG4(10041005);       //no ITSrefit requirement filter 256
+    trackCutsReject = CreateTrackCutsPWG4(10001005); //ITSrefit requirement filter 16
+    trackCutsReject->SetEtaRange(-0.9,0.9);
+    trackCutsReject->SetPtRange(0.15, 1e10);
   }
 
   if(trackType==1 && cuts==0) {

diff --git a/PWG4/macros/AddTaskPWG4HighPtTrackQA.C b/PWG4/macros/AddTaskPWG4HighPtTrackQA.C
index 07160bf99b7207a28f95568bc7c9cbf4c1d5427f..8159356c45991faf1c0823b12b80ed75d3927f84 100644 (file)
--- a/PWG4/macros/AddTaskPWG4HighPtTrackQA.C
+++ b/PWG4/macros/AddTaskPWG4HighPtTrackQA.C
@@ -5,7 +5,7 @@ void AddTaskPWG4HighPtTrackQAAll(char *prodType = "LHC10h",Bool_t isPbPb=kTRUE,
   
   AliPWG4HighPtTrackQA *taskTrackQA00cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,0,0);
   AliPWG4HighPtTrackQA *taskTrackQA01cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,0,1);
-  AliPWG4HighPtTrackQA *taskTrackQA02cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,0,2);
+  //  AliPWG4HighPtTrackQA *taskTrackQA02cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,0,2);
   // AliPWG4HighPtTrackQA *taskTrackQA10cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,1,0);
   // AliPWG4HighPtTrackQA *taskTrackQA11cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,1,1);
   //  AliPWG4HighPtTrackQA *taskTrackQA20cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,2,0);
@@ -16,12 +16,13 @@ void AddTaskPWG4HighPtTrackQAAll(char *prodType = "LHC10h",Bool_t isPbPb=kTRUE,
   //  AliPWG4HighPtTrackQA *taskTrackQA60cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,6,0);
   AliPWG4HighPtTrackQA *taskTrackQA70cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,7,0);
   AliPWG4HighPtTrackQA *taskTrackQA71cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,7,1);
+  AliPWG4HighPtTrackQA *taskTrackQA72cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,7,2);
 
   if(isPbPb) {
     for(cent=0; cent<4; cent++) {
       AliPWG4HighPtTrackQA *taskTrackQA00 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,0,0);
       AliPWG4HighPtTrackQA *taskTrackQA01 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,0,1);
-      AliPWG4HighPtTrackQA *taskTrackQA02 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,0,2);
+      //    AliPWG4HighPtTrackQA *taskTrackQA02 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,0,2);
       // AliPWG4HighPtTrackQA *taskTrackQA10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,1,0);
       // AliPWG4HighPtTrackQA *taskTrackQA11 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,1,1);
       //      AliPWG4HighPtTrackQA *taskTrackQA20 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,2,0);
@@ -32,6 +33,7 @@ void AddTaskPWG4HighPtTrackQAAll(char *prodType = "LHC10h",Bool_t isPbPb=kTRUE,
       //      AliPWG4HighPtTrackQA *taskTrackQA60 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,6,0);
       AliPWG4HighPtTrackQA *taskTrackQA70 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,7,0);
       AliPWG4HighPtTrackQA *taskTrackQA71 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,7,1);
+      AliPWG4HighPtTrackQA *taskTrackQA72 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,7,2);
     }
   }
 
@@ -49,6 +51,7 @@ void AddTaskPWG4HighPtTrackQAAllReduced(char *prodType = "LHC10h",Bool_t isPbPb=
       AliPWG4HighPtTrackQA *taskTrackQA02 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,0,2);
       AliPWG4HighPtTrackQA *taskTrackQA70 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,7,0);
       AliPWG4HighPtTrackQA *taskTrackQA71 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,7,1);
+      AliPWG4HighPtTrackQA *taskTrackQA72 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,7,2);
     }
   }
 
@@ -106,7 +109,7 @@ AliPWG4HighPtTrackQA* AddTaskPWG4HighPtTrackQA(char *prodType = "LHC10e14",Bool_
   //CREATE THE  CUTS -----------------------------------------------
   //Use AliESDtrackCuts
   AliESDtrackCuts *trackCuts = new AliESDtrackCuts("AliESDtrackCuts","Standard Cuts");
-  AliESDtrackCuts *trackCutsITSLoose = 0x0;
+  AliESDtrackCuts *trackCutsReject = 0x0;
   AliESDtrackCuts *trackCutsTPConly = new AliESDtrackCuts("AliESDtrackCutsTPConly","TPC only Cuts");
 
   //Standard Cuts
@@ -117,20 +120,29 @@ AliPWG4HighPtTrackQA* AddTaskPWG4HighPtTrackQA(char *prodType = "LHC10e14",Bool_
   }
   if(trackType==0 && cuts==1) {
     //Cuts global tracks with ITSrefit requirement and SPDrequirement for jet analysis
-    trackCuts = CreateTrackCutsPWG4(10001004);
+    trackCuts = CreateTrackCutsPWG4(10001005);
   }
   if(trackType==0 && cuts==2) {
     //Cuts global tracks with ITSrefit requirement but without SPD
-    trackCuts = CreateTrackCutsPWG4(10011004);
+    trackCuts = CreateTrackCutsPWG4(10011005);
   }
   if(trackType==7 && cuts==0) {
     // tight global tracks
-    trackCuts = CreateTrackCutsPWG4(10041004);
-    trackCutsITSLoose = CreateTrackCutsPWG4(1004);
+    trackCuts = CreateTrackCutsPWG4(10041005);
+    trackCutsReject = CreateTrackCutsPWG4(1005);
+    trackCutsReject->SetEtaRange(-0.9,0.9);
+    trackCutsReject->SetPtRange(0.15, 1e10);
   }
   if(trackType==7 && cuts==1) {
     // tight global tracks
-    trackCuts = CreateTrackCutsPWG4(10011004);
+    trackCuts = CreateTrackCutsPWG4(10011005);
+  }
+  if(trackType==7 && cuts==2) {
+    // no requirements on SPD and ITSrefit failed
+    trackCuts = CreateTrackCutsPWG4(10041005);       //no ITSrefit requirement filter 256
+    trackCutsReject = CreateTrackCutsPWG4(10001005); //ITSrefit requirement filter 16
+    trackCutsReject->SetEtaRange(-0.9,0.9);
+    trackCutsReject->SetPtRange(0.15, 1e10);
   }
 
   if(trackType==1 && cuts==0) {
@@ -163,12 +175,12 @@ AliPWG4HighPtTrackQA* AddTaskPWG4HighPtTrackQA(char *prodType = "LHC10e14",Bool_
     // tight global tracks
     trackCuts = CreateTrackCutsPWG4(1003);
 
-    trackCutsITSLoose = CreateTrackCutsPWG4(10021003); 
+    trackCutsReject = CreateTrackCutsPWG4(10021003); 
     
     trackCutsTPConly = CreateTrackCutsPWG4(2002);
 
-    trackCutsITSLoose->SetEtaRange(-0.9,0.9);
-    trackCutsITSLoose->SetPtRange(0.15, 1e10);
+    trackCutsReject->SetEtaRange(-0.9,0.9);
+    trackCutsReject->SetPtRange(0.15, 1e10);
     
     trackCutsTPConly->SetEtaRange(-0.9,0.9);
     trackCutsTPConly->SetPtRange(0.15, 1e10);

diff --git a/PWG4/macros/AnalysisTrainPWG4Jets.C b/PWG4/macros/AnalysisTrainPWG4Jets.C
index 4c9f2b87f218392137c6c68426f7ccafec802bf8..9a9b178057758709341337b864e21dfe266533c4 100644 (file)
--- a/PWG4/macros/AnalysisTrainPWG4Jets.C
+++ b/PWG4/macros/AnalysisTrainPWG4Jets.C
@@ -928,7 +928,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
        if(kDeltaAODJetName.Length()>0&&kFilterAOD)taskjetServ->SetFilterAODCollisions(kTRUE);
        //       else if(iAODanalysis)taskjetServ->SetFilterAODCollisions(kTRUE);
        //       taskjetServ->SetDebugLevel(3);
-       taskjetServ->SetZVertexCut(8.);
+       taskjetServ->SetZVertexCut(10.);
      }
      if(iAODanalysis){
        //