[PWGCF] DptDpt - Event selection tune (#9710)

Co-authored-by: Victor <victor@cern.ch>

Author: victor-gonzalez

PWGCF/TableProducer/dptdptfilter.cxx

@@ -105,6 +105,8 @@ const char* eventSelectionSteps[knCollisionSelectionFlags] = {
   "ISVERTEXITSTPC",
   "ISVERTEXTOFMATCHED",
   "ISVERTEXTRDMATCHED",
+  "NOCOLLINTIMERANGE",
+  "NOCOLLINROF",
   "OCCUPANCY",
   "ISGOODITSLAYER3",
   "ISGOODITSLAYER0123",
@@ -364,11 +366,16 @@ struct DptDptFilter {
   } cfginputfile;
   Configurable<bool> cfgFullDerivedData{"fullderiveddata", false, "Produce the full derived data for external storage. Default false"};
   Configurable<std::string> cfgCentMultEstimator{"centmultestimator", "V0M", "Centrality/multiplicity estimator detector: V0M,CL0,CL1,FV0A,FT0M,FT0A,FT0C,NTPV,NOCM: none. Default V0M"};
-  Configurable<std::string> cfgOccupancyEstimation{"occestimation", "None", "Occupancy estimation: None, Tracks, FT0C. Default None"};
-  Configurable<float> cfgMaxOccupancy{"occmax", 1e6f, "Maximum allowed occupancy. Depends on the occupancy estimation"};
+
   struct : ConfigurableGroup {
     std::string prefix = "cfgEventSelection";
     Configurable<std::string> itsDeadMaps{"itsDeadMaps", "", "Level of inactive chips: nocheck(empty), goodIts3, goodIts0123, goodItsAll. Default empty"};
+    struct : ConfigurableGroup {
+      std::string prefix = "cfgOccupancySelection";
+      Configurable<std::string> cfgOccupancyEstimation{"cfgOccupancyEstimation", "None", "Occupancy estimation: None, Tracks, FT0C. Default None"};
+      Configurable<float> cfgMinOccupancy{"cfgMinOccupancy", 0.0f, "Minimum allowed occupancy. Depends on the occupancy estimation"};
+      Configurable<float> cfgMaxOccupancy{"cfgMaxOccupancy", 1e6f, "Maximum allowed occupancy. Depends on the occupancy estimation"};
+    } cfgOccupancySelection;
   } cfgEventSelection;
   Configurable<std::string> cfgSystem{"syst", "PbPb", "System: pp, PbPb, Pbp, pPb, XeXe, ppRun3, PbPbRun3. Default PbPb"};
   Configurable<std::string> cfgDataType{"datatype", "data", "Data type: data, datanoevsel, MC, FastMC, OnTheFlyMC. Default data"};
@@ -426,8 +433,9 @@ struct DptDptFilter {
       fCentMultEstimator = getCentMultEstimator(cfgCentMultEstimator);
     }
     /* the occupancy selection */
-    fOccupancyEstimation = getOccupancyEstimator(cfgOccupancyEstimation);
-    fMaxOccupancy = cfgMaxOccupancy;
+    fOccupancyEstimation = getOccupancyEstimator(cfgEventSelection.cfgOccupancySelection.cfgOccupancyEstimation);
+    fMinOccupancy = cfgEventSelection.cfgOccupancySelection.cfgMinOccupancy;
+    fMaxOccupancy = cfgEventSelection.cfgOccupancySelection.cfgMaxOccupancy;
     /* the ITS dead map check */
     fItsDeadMapCheck = getItsDeadMapCheck(cfgEventSelection.itsDeadMaps);
 

PWGCF/TableProducer/dptdptfilter.h

@@ -134,6 +134,8 @@ enum CollisionSelectionFlags {
   kISVERTEXITSTPCBIT,       ///< is vertex TPC and ITS
   kISVERTEXTOFMATCHEDBIT,   ///< vertex contributor with TOF matched
   kISVERTEXTRDMATCHEDBIT,   ///< vertex contributor with TRD matche
+  kNOCOLLINTIMERANGEBIT,    ///< no collision in time range
+  kNOCOLLINROFBIT,          ///< no collision in readout
   kOCCUPANCYBIT,            ///< occupancy within limits
   kISGOODITSLAYER3BIT,      ///< right level of inactive chips for ITS layer 3
   kISGOODITSLAYER0123BIT,   ///< right level of inactive chips for ITS layers 0,1,2, and 3
@@ -381,6 +383,7 @@ TriggerSelectionType fTriggerSelection = kMB;
 OccupancyEstimationType fOccupancyEstimation = kNOOCC; /* the occupancy estimator to use */
 ItsDeadMapsCheckType fItsDeadMapCheck = kNOCHECK;      /* the check of the ITS dead maps to use */
 
+float fMinOccupancy = 0.0f; /* the minimum allowed occupancy */
 float fMaxOccupancy = 1e6f; /* the maximum allowed occupancy */
 
 /* adaptations for the pp nightly checks */
@@ -612,7 +615,9 @@ inline bool triggerSelectionReco(CollisionObject const& collision)
     case kppRun3:
     case kPbPbRun3: {
       auto run3Accepted = [](auto const& coll) {
-        return coll.sel8();
+        return coll.sel8() &&
+               coll.selection_bit(aod::evsel::kNoCollInTimeRangeStandard) &&
+               coll.selection_bit(aod::evsel::kNoCollInRofStandard);
       };
       auto run3ExtraAccepted = [](auto const& coll) {
         return coll.sel8() &&
@@ -627,6 +632,8 @@ inline bool triggerSelectionReco(CollisionObject const& collision)
         flags.set(kISVERTEXITSTPCBIT, coll.selection_bit(aod::evsel::kIsVertexITSTPC));
         flags.set(kISVERTEXTOFMATCHEDBIT, coll.selection_bit(aod::evsel::kIsVertexTOFmatched));
         flags.set(kISVERTEXTRDMATCHEDBIT, coll.selection_bit(aod::evsel::kIsVertexTRDmatched));
+        flags.set(kNOCOLLINTIMERANGEBIT, coll.selection_bit(aod::evsel::kNoCollInTimeRangeStandard));
+        flags.set(kNOCOLLINROFBIT, coll.selection_bit(aod::evsel::kNoCollInRofStandard));
         flags.set(kISGOODITSLAYER3BIT, coll.selection_bit(aod::evsel::kIsGoodITSLayer3));
         flags.set(kISGOODITSLAYER0123BIT, coll.selection_bit(aod::evsel::kIsGoodITSLayer0123));
         flags.set(kISGOODITSLAYERALLBIT, coll.selection_bit(aod::evsel::kIsGoodITSLayersAll));
@@ -932,14 +939,14 @@ inline bool selectOnOccupancy(CollisionObject collision)
       collisionFlags.set(kOCCUPANCYBIT);
       return true;
     case kTRACKSOCC:
-      if (collision.trackOccupancyInTimeRange() < fMaxOccupancy) {
+      if ((fMinOccupancy <= collision.trackOccupancyInTimeRange()) && (collision.trackOccupancyInTimeRange() < fMaxOccupancy)) {
         collisionFlags.set(kOCCUPANCYBIT);
         return true;
       } else {
         return false;
       }
     case kFT0COCC:
-      if (collision.ft0cOccupancyInTimeRange() < fMaxOccupancy) {
+      if ((fMinOccupancy <= collision.ft0cOccupancyInTimeRange()) && (collision.ft0cOccupancyInTimeRange() < fMaxOccupancy)) {
         collisionFlags.set(kOCCUPANCYBIT);
         return true;
       } else {