Merge branch 'master' of https://github.com/AliceO2Group/O2Physics

Author: rbailhac

Common/CCDB/EventSelectionParams.cxx

@@ -45,7 +45,7 @@ const char* selectionLabels[kNsel] = {
   "kNoInconsistentVtx",
   "kNoPileupInMultBins",
   "kNoPilupMV",
-  "kNoPileupTPC"
+  "kNoPileupTPC",
   "kIsTriggerTVX",
   "kIsINT1"};
 }

Common/TableProducer/eventSelection.cxx

@@ -162,6 +162,7 @@ struct BcSelectionTask {
       selection[kNoPileupMV] = (eventCuts & 1 << aod::kPileUpMV) > 0;
       selection[kNoPileupTPC] = (eventCuts & 1 << aod::kTPCPileUp) > 0;
       selection[kIsTriggerTVX] = bc.has_ft0() ? (bc.ft0().triggerMask() & BIT(o2::ft0::Triggers::bitVertex)) > 0 : 0;
+      selection[kIsINT1] = bbV0A || bbV0C || ofSPD > 0;
 
       int32_t foundFT0 = bc.has_ft0() ? bc.ft0().globalIndex() : -1;
       int32_t foundFV0 = bc.has_fv0a() ? bc.fv0a().globalIndex() : -1;
@@ -383,16 +384,17 @@ struct EventSelectionTask {
       sel7 &= applySelection[i] ? selection[i] : 1;
     }
 
-    // TODO apply other cuts for sel8
-    // TODO introduce sel1 etc?
     // TODO introduce array of sel[0]... sel[8] or similar?
-    bool sel8 = selection[kIsBBT0A] & selection[kIsBBT0C];
+    bool sel8 = selection[kIsBBT0A] & selection[kIsBBT0C]; // TODO apply other cuts for sel8
+    bool sel1 = selection[kIsINT1] & selection[kNoBGV0A] & selection[kNoBGV0C] & selection[kNoTPCLaserWarmUp] & selection[kNoTPCHVdip];
 
-    // fill counters
+    // INT1 (SPDFO>0 | V0A | V0C) mimimum bias trigger logic used in pp2010 and pp2011
+    bool isINT1period = bc.runNumber() <= 136377 || (bc.runNumber() >= 144871 && bc.runNumber() <= 159582);
 
-    if (isMC || alias[kINT7]) {
+    // fill counters
+    if (isMC || (!isINT1period && alias[kINT7]) || (isINT1period && alias[kINT1])) {
       histos.get<TH1>(HIST("hColCounterAll"))->Fill(Form("%d", bc.runNumber()), 1);
-      if (sel7) {
+      if ((!isINT1period && sel7) || (isINT1period && sel1)) {
         histos.get<TH1>(HIST("hColCounterAcc"))->Fill(Form("%d", bc.runNumber()), 1);
       }
     }

Common/Tasks/eventSelectionQa.cxx

@@ -227,13 +227,15 @@ struct EventSelectionQaTask {
     aod::FT0s const& ft0s,
     aod::FDDs const& fdds)
   {
+    bool isINT1period = 0;
     if (!applySelection) {
       auto first_bc = bcs.iteratorAt(0);
       EventSelectionParams* par = ccdb->getForTimeStamp<EventSelectionParams>("EventSelection/EventSelectionParams", first_bc.timestamp());
       applySelection = par->GetSelection(0);
       for (int i = 0; i < kNsel; i++) {
         histos.get<TH1>(HIST("hSelMask"))->SetBinContent(i + 1, applySelection[i]);
       }
+      isINT1period = first_bc.runNumber() <= 136377 || (first_bc.runNumber() >= 144871 && first_bc.runNumber() <= 159582);
     }
 
     // bc-based event selection qa
@@ -245,19 +247,24 @@ struct EventSelectionQaTask {
 
     // collision-based event selection qa
     for (auto& col : cols) {
+      auto selection = col.selection();
+      bool sel1 = selection[kIsINT1] & selection[kNoBGV0A] & selection[kNoBGV0C] & selection[kNoTPCLaserWarmUp] & selection[kNoTPCHVdip];
+
       for (int iAlias = 0; iAlias < kNaliases; iAlias++) {
         if (!col.alias()[iAlias]) {
           continue;
         }
         histos.fill(HIST("hColCounterAll"), iAlias, 1);
-        if (!col.sel7()) {
-          continue;
+        if ((!isINT1period && col.sel7()) || (isINT1period && sel1)) {
+          histos.fill(HIST("hColCounterAcc"), iAlias, 1);
         }
-        histos.fill(HIST("hColCounterAcc"), iAlias, 1);
       }
 
+      bool mb = isMC;
+      mb |= !isINT1period && col.alias()[kINT7];
+      mb |= isINT1period && col.alias()[kINT1];
       // further checks just on minimum bias triggers
-      if (!isMC && !col.alias()[kINT7]) {
+      if (!mb) {
         continue;
       }
       for (int i = 0; i < kNsel; i++) {
@@ -354,7 +361,10 @@ struct EventSelectionQaTask {
       histos.fill(HIST("hV0C012vsTklCol"), nTracklets, multRingV0C012);
 
       // filling plots for accepted events
-      if (!col.sel7()) {
+      bool accepted = 0;
+      accepted |= !isINT1period & col.sel7();
+      accepted |= isINT1period & sel1;
+      if (!accepted) {
         continue;
       }
 

PWGCF/FemtoDream/FemtoDreamTrackSelection.h

@@ -59,7 +59,8 @@ enum TrackContainerPosition {
 class FemtoDreamTrackSelection : public FemtoDreamObjectSelection<float, femtoDreamTrackSelection::TrackSel>
 {
  public:
-  FemtoDreamTrackSelection() : nPtMinSel(0),
+  FemtoDreamTrackSelection() : nRejectNotPropagatedTracks(false),
+                               nPtMinSel(0),
                                nPtMaxSel(0),
                                nEtaSel(0),
                                nTPCnMinSel(0),
@@ -193,7 +194,13 @@ class FemtoDreamTrackSelection : public FemtoDreamObjectSelection<float, femtoDr
     return nSigmaPIDMax;
   }
 
+  void setRejectNotPropagatedTracks(bool reject)
+  {
+    nRejectNotPropagatedTracks = reject;
+  }
+
  private:
+  bool nRejectNotPropagatedTracks;
   int nPtMinSel;
   int nPtMaxSel;
   int nEtaSel;
@@ -415,7 +422,7 @@ bool FemtoDreamTrackSelection::isSelectedMinimal(T const& track)
   if (nDCAMinSel > 0 && std::abs(dca) < dcaMin) {
     return false;
   }
-  if (std::abs(dca) > 1e3) {
+  if (nRejectNotPropagatedTracks && std::abs(dca) > 1e3) {
     return false;
   }
 

PWGCF/FemtoDream/FemtoDreamV0Selection.h

@@ -165,6 +165,15 @@ class FemtoDreamV0Selection : public FemtoDreamObjectSelection<float, femtoDream
     fInvMassUpLimit = upLimit;
   }
 
+  void setChildRejectNotPropagatedTracks(femtoDreamV0Selection::ChildTrackType child, bool reject)
+  {
+    if (child == femtoDreamV0Selection::kPosTrack) {
+      PosDaughTrack.setRejectNotPropagatedTracks(reject);
+    } else if (child == femtoDreamV0Selection::kNegTrack) {
+      NegDaughTrack.setRejectNotPropagatedTracks(reject);
+    }
+  }
+
  private:
   int nPtV0MinSel;
   int nPtV0MaxSel;

PWGCF/FemtoDream/femtoDreamProducerTaskV0Only.cxx

@@ -93,7 +93,7 @@ struct femtoDreamProducerTaskV0Only {
   Configurable<bool> ConfEvtOfflineCheck{"ConfEvtOfflineCheck", false, "Evt sel: check for offline selection"};
 
   Configurable<bool> ConfStoreV0{"ConfStoreV0", true, "True: store V0 table"};
-
+  Configurable<bool> ConfRejectNotPropagatedTracks{"ConfRejectNotPropagatedTracks", false, "True: reject not propagated tracks"};
   FemtoDreamV0Selection v0Cuts;
   /// \todo Labeled array (see Track-Track task)
 
@@ -152,6 +152,8 @@ struct femtoDreamProducerTaskV0Only {
       v0Cuts.setChildPIDSpecies(femtoDreamV0Selection::kNegTrack, ConfV0DaughTPIDspecies);
       v0Cuts.init<aod::femtodreamparticle::ParticleType::kV0, aod::femtodreamparticle::ParticleType::kV0Child, aod::femtodreamparticle::cutContainerType>(&qaRegistry);
       v0Cuts.setInvMassLimits(ConfInvMassLowLimit, ConfInvMassUpLimit);
+      v0Cuts.setChildRejectNotPropagatedTracks(femtoDreamV0Selection::kPosTrack, ConfRejectNotPropagatedTracks);
+      v0Cuts.setChildRejectNotPropagatedTracks(femtoDreamV0Selection::kNegTrack, ConfRejectNotPropagatedTracks);
     }
   }