From 96f2e76d4928cbe5e84adb298014f3197177cc79 Mon Sep 17 00:00:00 2001
From: Victor Gonzalez <victor.gonzalez@cern.ch>
Date: Wed, 4 Sep 2024 01:05:26 +0200
Subject: [PATCH] PWGCF: DptDpt, Addressing extra event selection checks
 separately (#7552)

* PWGCF: DptDpt, Addressing extra event selection checks separately

* Please consider the following formatting changes

---------

Co-authored-by: Victor <victor@cern.ch>
Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
---
 PWGCF/TableProducer/dptdptfilter.h | 49 +++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/PWGCF/TableProducer/dptdptfilter.h b/PWGCF/TableProducer/dptdptfilter.h
index de9b2c9a598..8866784f1e4 100644
--- a/PWGCF/TableProducer/dptdptfilter.h
+++ b/PWGCF/TableProducer/dptdptfilter.h
@@ -94,12 +94,16 @@ enum CentMultEstimatorType {
 /// \enum TriggerSelectionType
 /// \brief The type of trigger to apply for event selection
 enum TriggerSelectionType {
-  kNONE = 0,         ///< do not use trigger selection
-  kMB,               ///< Minimum bias trigger
-  kVTXTOFMATCHED,    ///< at least one vertex contributor is matched to TOF
-  kVTXTRDMATCHED,    ///< at least one vertex contributor is matched to TRD
-  kVTXTRDTOFMATCHED, ///< at least one vertex contributor is matched to TRD and TOF
-  knEventSelection   ///< number of triggers for event selection
+  kNONE = 0,              ///< do not use trigger selection
+  kMB,                    ///< Minimum bias trigger
+  kMBEXTRA,               ///< Additional Run3 event quality
+  kVTXTOFMATCHED,         ///< at least one vertex contributor is matched to TOF
+  kVTXTRDMATCHED,         ///< at least one vertex contributor is matched to TRD
+  kVTXTRDTOFMATCHED,      ///< at least one vertex contributor is matched to TRD and TOF
+  kEXTRAVTXTOFMATCHED,    ///< Additional Run3 event quality and at least one vertex contributor is matched to TOF
+  kEXTRAVTXTRDMATCHED,    ///< Additional Run3 event quality and at least one vertex contributor is matched to TRD
+  kEXTRAVTXTRDTOFMATCHED, ///< Additional Run3 event quality and at least one vertex contributor is matched to TRD and TOF
+  knEventSelection        ///< number of triggers for event selection
 };
 
 /// \enum StrongDebugging
@@ -312,12 +316,20 @@ inline TriggerSelectionType getTriggerSelection(std::string const& triggstr)
 {
   if (triggstr.empty() || triggstr == "MB") {
     return kMB;
+  } else if (triggstr == "MBEXTRA") {
+    return kMBEXTRA;
   } else if (triggstr == "VTXTOFMATCHED") {
     return kVTXTOFMATCHED;
   } else if (triggstr == "VTXTRDMATCHED") {
     return kVTXTRDMATCHED;
   } else if (triggstr == "VTXTRDTOFMATCHED") {
     return kVTXTRDTOFMATCHED;
+  } else if (triggstr == "EXTRAVTXTOFMATCHED") {
+    return kEXTRAVTXTOFMATCHED;
+  } else if (triggstr == "EXTRAVTXTRDMATCHED") {
+    return kEXTRAVTXTRDMATCHED;
+  } else if (triggstr == "EXTRAVTXTRDTOFMATCHED") {
+    return kEXTRAVTXTRDTOFMATCHED;
   } else if (triggstr == "None") {
     return kNONE;
   } else {
@@ -481,9 +493,10 @@ inline bool triggerSelectionReco(CollisionObject const& collision)
     case kppRun3:
     case kPbPbRun3: {
       auto run3Accepted = [](auto const& coll) {
+        return coll.sel8();
+      };
+      auto run3ExtraAccepted = [](auto const& coll) {
         return coll.sel8() &&
-               coll.selection_bit(aod::evsel::kNoITSROFrameBorder) &&
-               coll.selection_bit(aod::evsel::kNoTimeFrameBorder) &&
                coll.selection_bit(aod::evsel::kNoSameBunchPileup) &&
                coll.selection_bit(aod::evsel::kIsGoodZvtxFT0vsPV) &&
                coll.selection_bit(aod::evsel::kIsVertexITSTPC);
@@ -494,6 +507,11 @@ inline bool triggerSelectionReco(CollisionObject const& collision)
             trigsel = true;
           }
           break;
+        case kMBEXTRA:
+          if (run3ExtraAccepted(collision)) {
+            trigsel = true;
+          }
+          break;
         case kVTXTOFMATCHED:
           if (run3Accepted(collision) && collision.selection_bit(aod::evsel::kIsVertexTOFmatched)) {
             trigsel = true;
@@ -509,6 +527,21 @@ inline bool triggerSelectionReco(CollisionObject const& collision)
             trigsel = true;
           }
           break;
+        case kEXTRAVTXTOFMATCHED:
+          if (run3ExtraAccepted(collision) && collision.selection_bit(aod::evsel::kIsVertexTOFmatched)) {
+            trigsel = true;
+          }
+          break;
+        case kEXTRAVTXTRDMATCHED:
+          if (run3ExtraAccepted(collision) && collision.selection_bit(aod::evsel::kIsVertexTRDmatched)) {
+            trigsel = true;
+          }
+          break;
+        case kEXTRAVTXTRDTOFMATCHED:
+          if (run3ExtraAccepted(collision) && collision.selection_bit(aod::evsel::kIsVertexTRDmatched) && collision.selection_bit(aod::evsel::kIsVertexTOFmatched)) {
+            trigsel = true;
+          }
+          break;
         case kNONE:
           trigsel = true;
           break;