Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / PWGJE / EMCALJetTasks / macros / AddTaskJetV2.C

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskJetV2.C b/PWGJE/EMCALJetTasks/macros/AddTaskJetV2.C
index 81a923c94f1a501516c121771b36dd504528c935..83e647f990d0327e5cd6b855b58081b2eac366a1 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskJetV2.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskJetV2.C
@@ -1,10 +1,8 @@
 /*
- * AddTask macro for class 
+ * AddTask macro for Jet V2 task 
  * Redmer Alexander Bertens, rbertens@cern.ch
  * Utrecht University, Utrecht, Netherlands
  *
- * Note: this macro is pretty much a copy of AddTaskEmcalJetSample.C
- *
  */
 
 AliAnalysisTaskJetV2* AddTaskJetV2(
@@ -24,7 +22,8 @@ AliAnalysisTaskJetV2* AddTaskJetV2(
   UInt_t     fitType            = AliAnalysisTaskJetV2::kFourierSeries,
   TArrayD    *centralities      = 0x0,
   TRandom3   *randomizer        = 0x0,
-  Double_t   trackptcut         = .15
+  Double_t   trackptcut         = .15,
+  Bool_t     LHC10h             = kFALSE
   )
 {  
   // Get the pointer to the existing analysis manager via the static access method.
@@ -99,15 +98,25 @@ AliAnalysisTaskJetV2* AddTaskJetV2(
      Double_t c[] = {0., 10., 30., 50., 70., 90.};
      jetTask->SetCentralityClasses(new TArrayD(sizeof(c)/sizeof(c[0]), c));
   }
+  else jetTask->SetCentralityClasses(centralities);
   // if a randomized hasn't specified use a safe default 
   if(!randomizer) jetTask->SetRandomSeed(new TRandom3(0));
 
   // pass the expected run lists to the task. the total list is used for QA plots which are stored per run-number, the semi-good list is used to change the phi acceptance of jets and pico trakcs, and - if an alternatie is provided - switch to a 'small rho' task, which also runs on limited acceptance
   Int_t totalRuns[] = {167813, 167988, 168066, 168068, 168069, 168076, 168104, 168212, 168311, 168322, 168325, 168341, 168361, 168362, 168458, 168460, 168461, 168992, 169091, 169094, 169138, 169143, 169167, 169417, 169835, 169837, 169838, 169846, 169855, 169858, 169859, 169923, 169956, 170027, 170036, 170081, /* up till here original good TPC list */169975, 169981, 170038, 170040, 170083, 170084, 170085, 170088, 170089, 170091, 170152, 170155, 170159, 170163, 170193, 170195, 170203, 170204, 170205, 170228, 170230, 170264, 170268, 170269, 170270, 170306, 170308, 170309, /* original semi-good tpc list */169415, 169411, 169035, 168988, 168984, 168826, 168777, 168512, 168511, 168467, 168464, 168342, 168310, 168115, 168108, 168107, 167987, 167915, 167903, /*new runs, good according to RCT */ 169238, 169160, 169156, 169148, 169145, 169144 /* run swith missing OROC 8 but seem ok in QA */};
-  jetTask->SetExpectedRuns(new TArrayI(sizeof(totalRuns)/sizeof(totalRuns[0]), totalRuns));
+
+  Int_t totalRuns10h[] = {139510, 139507, 139505, 139503, 139465, 139438, 139437, 139360, 139329, 139328, 139314, 139310, 139309, 139173, 139107, 139105, 139038, 139037, 139036, 139029, 139028, 138872, 138871, 138870, 138837, 138732, 138730, 138666, 138662, 138653, 138652, 138638, 138624, 138621, 138583, 138582, 138579, 138578, 138534, 138469, 138442, 138439, 138438, 138396, 138364, 138275, 138225, 138201, 138197, 138192, 138190, 137848, 137844, 137752, 137751, 137724, 137722, 137718, 137704, 137693, 137692, 137691, 137686, 137685, 137639, 137638, 137608, 137595, 137549, 137544, 137541, 137539, 137443, 137441, 137440, 137439, 137434, 137432, 137431, 137430, 137366, 137243, 137236, 137235, 137232, 137231, 137230, 137162, 137161, 137135};
+
+  // set the runnumbers for either 10h or 11h
+  (LHC10h) ? jetTask->SetExpectedRuns(new TArrayI(sizeof(totalRuns10h)/sizeof(totalRuns10h[0]), totalRuns10h)) : jetTask->SetExpectedRuns(new TArrayI(sizeof(totalRuns)/sizeof(totalRuns[0]), totalRuns));
 
   Int_t semiGoodRuns[] = {169975, 169981, 170038, 170040, 170083, 170084, 170085, 170088, 170089, 170091, 170152, 170155, 170159, 170163, 170193, 170195, 170203, 170204, 170205, 170228, 170230, 170264, 170268, 170269, 170270, 170306, 170308, 170309};
-  jetTask->SetExpectedSemiGoodRuns(new TArrayI(sizeof(semiGoodRuns)/sizeof(semiGoodRuns[0]), semiGoodRuns));
+
+  // set the semi-good runnumbers for 10h or 11h (10h has no semi-good numbers, so pass a NULL pointer)
+  (LHC10h) ? jetTask->SetExpectedSemiGoodRuns(0x0) : jetTask->SetExpectedSemiGoodRuns(new TArrayI(sizeof(semiGoodRuns)/sizeof(semiGoodRuns[0]), semiGoodRuns));
+
+  // and if 10h, pass this info to the task so acceptance isn't changed
+  if(LHC10h) jetTask->SetCollisionType(AliAnalysisTaskJetV2::kPbPb10h);
 
   //-------------------------------------------------------
   // Final settings, pass to manager and set the containers