add option to run jet v2 task on LHC10h data

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetV2.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetV2.cxx
index fb64f66abd62a326ca6956ff38f60ad07dc562db..0175f05de1c655e32e6b9297dd191e7700575988 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetV2.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetV2.cxx
@@ -190,6 +190,13 @@ Bool_t AliAnalysisTaskJetV2::Notify()
     if(fRunNumber != InputEvent()->GetRunNumber()) {
         fRunNumber = InputEvent()->GetRunNumber();        // set the current run number
         if(fDebug > 0) printf("__FUNC__ %s > NEW RUNNUMBER DETECTED \n ", __func__);
+        // check if this is 10h or 11h data. for 10h we don't want to change the acceptance
+        switch (fCollisionType) {
+            case kPbPb10h : {
+                return kTRUE;
+            } break;
+            default : break;
+        }
         // reset the cuts. should be a pointless operation except for the case where the run number changes
         // from semi-good back to good on one node, which is not a likely scenario (unless trains will
         // run as one masterjob)
@@ -342,10 +349,17 @@ void AliAnalysisTaskJetV2::UserCreateOutputObjects()
         Int_t r[] =  {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 */};
         fExpectedRuns = new TArrayI(sizeof(r)/sizeof(r[0]), r);
     }
-    if(!fExpectedSemiGoodRuns) {
-        Int_t r[] = {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};
-        fExpectedSemiGoodRuns = new TArrayI(sizeof(r)/sizeof(r[0]), r);
+    // set default semi-good runs only for 11h data
+    switch (fCollisionType) {
+        case kPbPb10h : break;
+        default : {
+            if(!fExpectedSemiGoodRuns) {
+                Int_t r[] = {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};
+                fExpectedSemiGoodRuns = new TArrayI(sizeof(r)/sizeof(r[0]), r);
+            }
+        }
     }
+
     // global QA
     fHistCentrality =           BookTH1F("fHistCentrality", "centrality", 102, -2, 100);
     fHistVertexz =              BookTH1F("fHistVertexz", "vertex z (cm)", 100, -12, 12);

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetV2.h b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetV2.h
index d4ed615891d4062966f1a0199bdfca3fb43665a7..ec952fc4371153aa192ac24bcb791bfbd951c10e 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetV2.h
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetV2.h
@@ -30,7 +30,7 @@ class AliAnalysisTaskJetV2 : public AliAnalysisTaskEmcalJet {
          // enumerators
         enum fitModulationType  { kNoFit, kV2, kV3, kCombined, kFourierSeries, kIntegratedFlow, kQC2, kQC4 }; // fit type
         enum fitGoodnessTest    { kChi2ROOT, kChi2Poisson, kKolmogorov, kKolmogorovTOY, kLinearFit };
-        enum collisionType      { kPbPb, kPythia };                     // collision type
+        enum collisionType      { kPbPb, kPythia, kPbPb10h };           // collision type
         enum qcRecovery         { kFixedRho, kNegativeVn, kTryFit };    // how to deal with negative cn value for qcn value
         enum runModeType        { kLocal, kGrid };                      // run mode type
         enum dataType           { kESD, kAOD, kESDMC, kAODMC };         // data type

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskJetV2.C b/PWGJE/EMCALJetTasks/macros/AddTaskJetV2.C
index 81a923c94f1a501516c121771b36dd504528c935..5c5bae91c0c25746d2caf66c4bfa81418edd1e10 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskJetV2.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskJetV2.C
@@ -24,7 +24,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.
@@ -104,10 +105,19 @@ AliAnalysisTaskJetV2* AddTaskJetV2(
 
   // 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) task->SetCollisionType(AliAnalysisTaskJetV2::kPbPb10h);
 
   //-------------------------------------------------------
   // Final settings, pass to manager and set the containers