[Common] Updates in ZDC task for light ions

Common/TableProducer/zdcTaskLightIons.cxx

@@ -49,15 +49,18 @@ struct ZdcTaskLightIons {
   Configurable<float> tdcZNmaxcut{"tdcZNmaxcut", 2.5, "Max. ZN TDC cut value"};
   //
   // Event selections
-  Configurable<float> cfgEvSelVtxZ{"cfgEvSelVtxZ", 10, "Event selection: zVtx"};
+  Configurable<bool> cfgApplyZvtxCut{"cfgApplyZvtxCut", true, "Event selection: zVtx"};
+  Configurable<float> cfgEvSelVtxZ{"cfgEvSelVtxZ", 10, "Event selection: zVtx cut value"};
   Configurable<bool> cfgEvSelSel8{"cfgEvSelSel8", true, "Event selection: sel8"};
   Configurable<bool> cfgEvSelsDoOccupancySel{"cfgEvSelsDoOccupancySel", true, "Event selection: do occupancy selection"};
   Configurable<float> cfgEvSelsMaxOccupancy{"cfgEvSelsMaxOccupancy", 10000, "Event selection: set max occupancy"};
   Configurable<bool> cfgEvSelsNoSameBunchPileupCut{"cfgEvSelsNoSameBunchPileupCut", true, "Event selection: no same bunch pileup cut"};
   Configurable<bool> cfgEvSelsIsGoodZvtxFT0vsPV{"cfgEvSelsIsGoodZvtxFT0vsPV", true, "Event selection: is good ZVTX FT0 vs PV"};
   Configurable<bool> cfgEvSelsNoCollInTimeRangeStandard{"cfgEvSelsNoCollInTimeRangeStandard", true, "Event selection: no collision in time range standard"};
-  Configurable<bool> cfgEvSelsIsVertexITSTPC{"cfgEvSelsIsVertexITSTPC", true, "Event selection: is vertex ITSTPC"};
+  Configurable<bool> cfgNoTimeFrameBorder{"cfgNoTimeFrameBorder", true, "Event selection: no time frame border"};
+  Configurable<bool> cfgNoITSROFFrameBorder{"cfgNoITSROFFrameBorder", true, "Event selection: no ITS ROF frame border"};
   Configurable<bool> cfgEvSelsIsGoodITSLayersAll{"cfgEvSelsIsGoodITSLayersAll", true, "Event selection: is good ITS layers all"};
+  Configurable<bool> cfgIsTriggerTVX{"cfgIsTriggerTVX", true, "Event selection: is trigger TVX"};
   //
   HistogramRegistry registry{"Histos", {}, OutputObjHandlingPolicy::AnalysisObject};
 
@@ -68,9 +71,11 @@ struct ZdcTaskLightIons {
     evSel_kNoSameBunchPileup,
     evSel_kIsGoodZvtxFT0vsPV,
     evSel_kNoCollInTimeRangeStandard,
+    evSel_kNoTimeFrameBorder,
     evSel_kNoITSROFrameBorder,
     evSel_kIsGoodITSLayersAll,
     evSel_allEvents,
+    evSel_kIsTriggerTVX,
     nEventSelections
   };
 
@@ -79,28 +84,31 @@ struct ZdcTaskLightIons {
     registry.add("zdcDebunchHist", "ZN sum vs. diff; ZNA-ZNC (ns); ZNA+ZNC (ns)", {HistType::kTH2D, {{nBinsTiming, -20., 20.}, {nBinsTiming, -20., 20.}}});
 
     if (doprocessALICEcoll) {
-      registry.add("hEventCount", "Number of Event; Cut; #Events Passed Cut", {HistType::kTH1D, {{nEventSelections, 0, nEventSelections}}});
+      registry.add("hEventCount", "Number of events; Cut; # of selected events ", {HistType::kTH1D, {{nEventSelections, 0, nEventSelections}}});
       registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_allEvents + 1, "All events");
       registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_zvtx + 1, "vtxZ");
-      registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_sel8 + 1, "Sel8");
+      registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_sel8 + 1, "sel8");
       registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_occupancy + 1, "kOccupancy");
       registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kNoSameBunchPileup + 1, "kNoSameBunchPileup");
       registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kIsGoodZvtxFT0vsPV + 1, "kIsGoodZvtxFT0vsPV");
       registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kNoCollInTimeRangeStandard + 1, "kNoCollInTimeRangeStandard");
+      registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kNoTimeFrameBorder + 1, "kNoTimeFrameBorder");
       registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kNoITSROFrameBorder + 1, "kNoITSROFrameBorder");
       registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kIsGoodITSLayersAll + 1, "kkIsGoodITSLayersAll");
+      registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kIsTriggerTVX + 1, "kIsTriggerTVX");
     }
   }
 
   template <typename TCollision>
   uint8_t eventSelected(TCollision collision)
   {
     uint8_t selectionBits = 0;
-    bool selected;
+    bool selected = false;
 
     registry.fill(HIST("hEventCount"), evSel_allEvents);
 
-    selected = std::fabs(collision.posZ()) < cfgEvSelVtxZ;
+    if (cfgApplyZvtxCut)
+      selected = std::fabs(collision.posZ()) < cfgEvSelVtxZ;
     if (selected) {
       selectionBits |= (uint8_t)(0x1u << evSel_zvtx);
       registry.fill(HIST("hEventCount"), evSel_zvtx);
@@ -137,6 +145,12 @@ struct ZdcTaskLightIons {
       registry.fill(HIST("hEventCount"), evSel_kNoCollInTimeRangeStandard);
     }
 
+    selected = collision.selection_bit(o2::aod::evsel::kNoTimeFrameBorder);
+    if (selected) {
+      selectionBits |= (uint8_t)(0x1u << evSel_kNoTimeFrameBorder);
+      registry.fill(HIST("hEventCount"), evSel_kNoTimeFrameBorder);
+    }
+
     selected = collision.selection_bit(o2::aod::evsel::kNoITSROFrameBorder);
     if (selected) {
       selectionBits |= (uint8_t)(0x1u << evSel_kNoITSROFrameBorder);
@@ -149,6 +163,12 @@ struct ZdcTaskLightIons {
       registry.fill(HIST("hEventCount"), evSel_kIsGoodITSLayersAll);
     }
 
+    selected = collision.selection_bit(kIsTriggerTVX);
+    if (selected) {
+      selectionBits |= (uint8_t)(0x1u << evSel_kIsTriggerTVX);
+      registry.fill(HIST("hEventCount"), evSel_kIsTriggerTVX);
+    }
+
     return selectionBits;
   }
 
@@ -237,6 +257,14 @@ struct ZdcTaskLightIons {
 
       const auto& foundBC = collision.foundBC_as<BCsRun3>();
       uint8_t evSelection = eventSelected(collision);
+      //
+      // sel8
+      if (!collision.sel8())
+        continue;
+      // vertex cut
+      if (std::fabs(collision.posZ()) > cfgEvSelVtxZ)
+        continue;
+
       auto zv = collision.posZ();
       auto centralityFT0C = collision.centFT0C();
       auto centralityFT0A = collision.centFT0A();