Merge master into h3l

Common/CCDB/EventSelectionParams.cxx

@@ -65,7 +65,6 @@ const char* selectionLabels[kNsel] = {
   "kNoCollInTimeRangeNarrow",
   "kNoCollInTimeRangeStrict",
   "kNoCollInTimeRangeStandard",
-  "kNoCollInTimeRangeVzDependent",
   "kNoCollInRofStrict",
   "kNoCollInRofStandard",
   "kNoHighMultCollInPrevRof",

Common/CCDB/EventSelectionParams.h

@@ -24,58 +24,57 @@ namespace o2::aod::evsel
 {
 // Event selection criteria
 enum EventSelectionFlags {
-  kIsBBV0A = 0,                  // cell-averaged time in V0A in beam-beam window
-  kIsBBV0C,                      // cell-averaged time in V0C in beam-beam window (for Run 2 only)
-  kIsBBFDA,                      // cell-averaged time in FDA (or AD in Run2) in beam-beam window
-  kIsBBFDC,                      // cell-averaged time in FDC (or AD in Run2) in beam-beam window
-  kIsBBT0A,                      // cell-averaged time in T0A in beam-beam window
-  kIsBBT0C,                      // cell-averaged time in T0C in beam-beam window
-  kNoBGV0A,                      // cell-averaged time in V0A in beam-gas window
-  kNoBGV0C,                      // cell-averaged time in V0C in beam-gas window (for Run 2 only)
-  kNoBGFDA,                      // cell-averaged time in FDA (AD in Run2) in beam-gas window
-  kNoBGFDC,                      // cell-averaged time in FDC (AD in Run2) in beam-gas window
-  kNoBGT0A,                      // cell-averaged time in T0A in beam-gas window
-  kNoBGT0C,                      // cell-averaged time in T0C in beam-gas window
-  kIsBBZNA,                      // time in common ZNA channel in beam-beam window
-  kIsBBZNC,                      // time in common ZNC channel in beam-beam window
-  kIsBBZAC,                      // time in ZNA and ZNC in beam-beam window - circular cut in ZNA-ZNC plane
-  kNoBGZNA,                      // time in common ZNA channel is outside of beam-gas window
-  kNoBGZNC,                      // time in common ZNC channel is outside of beam-gas window
-  kNoV0MOnVsOfPileup,            // no out-of-bunch pileup according to online-vs-offline VOM correlation
-  kNoSPDOnVsOfPileup,            // no out-of-bunch pileup according to online-vs-offline SPD correlation
-  kNoV0Casymmetry,               // no beam-gas according to correlation of V0C multiplicities in V0C3 and V0C012
-  kIsGoodTimeRange,              // good time range
-  kNoIncompleteDAQ,              // complete event according to DAQ flags
-  kNoTPCLaserWarmUp,             // no TPC laser warm-up event (used in Run 1)
-  kNoTPCHVdip,                   // no TPC HV dip
-  kNoPileupFromSPD,              // no pileup according to SPD vertexer
-  kNoV0PFPileup,                 // no out-of-bunch pileup according to V0 past-future info
-  kNoSPDClsVsTklBG,              // no beam-gas according to cluster-vs-tracklet correlation
-  kNoV0C012vsTklBG,              // no beam-gas according to V0C012-vs-tracklet correlation
-  kNoInconsistentVtx,            // no inconsistency in SPD and Track vertices
-  kNoPileupInMultBins,           // no pileup according to multiplicity-differential pileup checks
-  kNoPileupMV,                   // no pileup according to multi-vertexer
-  kNoPileupTPC,                  // no pileup in TPC
-  kIsTriggerTVX,                 // FT0 vertex (acceptable FT0C-FT0A time difference) at trigger level
-  kIsINT1,                       // SPDGFO >= 1 || V0A || V0C
-  kNoITSROFrameBorder,           // bunch crossing is far from ITS RO Frame border
-  kNoTimeFrameBorder,            // bunch crossing is far from Time Frame borders
-  kNoSameBunchPileup,            // reject collisions in case of pileup with another collision in the same foundBC
-  kIsGoodZvtxFT0vsPV,            // small difference between z-vertex from PV and from FT0
-  kIsVertexITSTPC,               // at least one ITS-TPC track (reject vertices built from ITS-only tracks)
-  kIsVertexTOFmatched,           // at least one of vertex contributors is matched to TOF
-  kIsVertexTRDmatched,           // at least one of vertex contributors is matched to TRD
-  kNoCollInTimeRangeNarrow,      // no other collisions in specified time range (narrower than Strict)
-  kNoCollInTimeRangeStrict,      // no other collisions in specified time range
-  kNoCollInTimeRangeStandard,    // no other collisions in specified time range with per-collision multiplicity above threshold
-  kNoCollInTimeRangeVzDependent, // no other collisions in vZ-dependent time range near a given collision
-  kNoCollInRofStrict,            // no other collisions in this Readout Frame
-  kNoCollInRofStandard,          // no other collisions in this Readout Frame with per-collision multiplicity above threshold
-  kNoHighMultCollInPrevRof,      // veto an event if FT0C amplitude in previous ITS ROF is above threshold
-  kIsGoodITSLayer3,              // number of inactive chips on ITS layer 3 is below maximum allowed value
-  kIsGoodITSLayer0123,           // numbers of inactive chips on ITS layers 0-3 are below maximum allowed values
-  kIsGoodITSLayersAll,           // numbers of inactive chips on all ITS layers are below maximum allowed values
-  kNsel                          // counter
+  kIsBBV0A = 0,               // cell-averaged time in V0A in beam-beam window
+  kIsBBV0C,                   // cell-averaged time in V0C in beam-beam window (for Run 2 only)
+  kIsBBFDA,                   // cell-averaged time in FDA (or AD in Run2) in beam-beam window
+  kIsBBFDC,                   // cell-averaged time in FDC (or AD in Run2) in beam-beam window
+  kIsBBT0A,                   // cell-averaged time in T0A in beam-beam window
+  kIsBBT0C,                   // cell-averaged time in T0C in beam-beam window
+  kNoBGV0A,                   // cell-averaged time in V0A in beam-gas window
+  kNoBGV0C,                   // cell-averaged time in V0C in beam-gas window (for Run 2 only)
+  kNoBGFDA,                   // cell-averaged time in FDA (AD in Run2) in beam-gas window
+  kNoBGFDC,                   // cell-averaged time in FDC (AD in Run2) in beam-gas window
+  kNoBGT0A,                   // cell-averaged time in T0A in beam-gas window
+  kNoBGT0C,                   // cell-averaged time in T0C in beam-gas window
+  kIsBBZNA,                   // time in common ZNA channel in beam-beam window
+  kIsBBZNC,                   // time in common ZNC channel in beam-beam window
+  kIsBBZAC,                   // time in ZNA and ZNC in beam-beam window - circular cut in ZNA-ZNC plane
+  kNoBGZNA,                   // time in common ZNA channel is outside of beam-gas window
+  kNoBGZNC,                   // time in common ZNC channel is outside of beam-gas window
+  kNoV0MOnVsOfPileup,         // no out-of-bunch pileup according to online-vs-offline VOM correlation
+  kNoSPDOnVsOfPileup,         // no out-of-bunch pileup according to online-vs-offline SPD correlation
+  kNoV0Casymmetry,            // no beam-gas according to correlation of V0C multiplicities in V0C3 and V0C012
+  kIsGoodTimeRange,           // good time range
+  kNoIncompleteDAQ,           // complete event according to DAQ flags
+  kNoTPCLaserWarmUp,          // no TPC laser warm-up event (used in Run 1)
+  kNoTPCHVdip,                // no TPC HV dip
+  kNoPileupFromSPD,           // no pileup according to SPD vertexer
+  kNoV0PFPileup,              // no out-of-bunch pileup according to V0 past-future info
+  kNoSPDClsVsTklBG,           // no beam-gas according to cluster-vs-tracklet correlation
+  kNoV0C012vsTklBG,           // no beam-gas according to V0C012-vs-tracklet correlation
+  kNoInconsistentVtx,         // no inconsistency in SPD and Track vertices
+  kNoPileupInMultBins,        // no pileup according to multiplicity-differential pileup checks
+  kNoPileupMV,                // no pileup according to multi-vertexer
+  kNoPileupTPC,               // no pileup in TPC
+  kIsTriggerTVX,              // FT0 vertex (acceptable FT0C-FT0A time difference) at trigger level
+  kIsINT1,                    // SPDGFO >= 1 || V0A || V0C
+  kNoITSROFrameBorder,        // bunch crossing is far from ITS RO Frame border
+  kNoTimeFrameBorder,         // bunch crossing is far from Time Frame borders
+  kNoSameBunchPileup,         // reject collisions in case of pileup with another collision in the same foundBC
+  kIsGoodZvtxFT0vsPV,         // small difference between z-vertex from PV and from FT0
+  kIsVertexITSTPC,            // at least one ITS-TPC track (reject vertices built from ITS-only tracks)
+  kIsVertexTOFmatched,        // at least one of vertex contributors is matched to TOF
+  kIsVertexTRDmatched,        // at least one of vertex contributors is matched to TRD
+  kNoCollInTimeRangeNarrow,   // no other collisions in specified time range (narrower than Strict)
+  kNoCollInTimeRangeStrict,   // no other collisions in specified time range
+  kNoCollInTimeRangeStandard, // no other collisions in specified time range with per-collision multiplicity above threshold
+  kNoCollInRofStrict,         // no other collisions in this Readout Frame
+  kNoCollInRofStandard,       // no other collisions in this Readout Frame with per-collision multiplicity above threshold
+  kNoHighMultCollInPrevRof,   // veto an event if FT0C amplitude in previous ITS ROF is above threshold
+  kIsGoodITSLayer3,           // number of inactive chips on ITS layer 3 is below maximum allowed value
+  kIsGoodITSLayer0123,        // numbers of inactive chips on ITS layers 0-3 are below maximum allowed values
+  kIsGoodITSLayersAll,        // numbers of inactive chips on all ITS layers are below maximum allowed values
+  kNsel                       // counter
 };
 
 extern const char* selectionLabels[kNsel];

Common/DataModel/EventSelection.h

@@ -61,7 +61,6 @@ DECLARE_SOA_INDEX_COLUMN_FULL(FoundFT0, foundFT0, int, FT0s, "_foundFT0");  //!
 DECLARE_SOA_INDEX_COLUMN_FULL(FoundFV0, foundFV0, int, FV0As, "_foundFV0"); //! FV0 entry index in FV0As table (-1 if doesn't exist)
 DECLARE_SOA_INDEX_COLUMN_FULL(FoundFDD, foundFDD, int, FDDs, "_foundFDD");  //! FDD entry index in FDDs table (-1 if doesn't exist)
 DECLARE_SOA_INDEX_COLUMN_FULL(FoundZDC, foundZDC, int, Zdcs, "_foundZDC");  //! ZDC entry index in ZDCs table (-1 if doesn't exist)
-DECLARE_SOA_COLUMN(BcInTF, bcInTF, int);                                    //! Position of a (found) bunch crossing inside a given timeframe
 DECLARE_SOA_COLUMN(NumTracksInTimeRange, trackOccupancyInTimeRange, int);   //! Occupancy in specified time interval by a number of tracks from nearby collisions // o2-linter: disable=name/o2-column
 DECLARE_SOA_COLUMN(SumAmpFT0CInTimeRange, ft0cOccupancyInTimeRange, float); //! Occupancy in specified time interval by a sum of FT0C amplitudes from nearby collisions // o2-linter: disable=name/o2-column
 } // namespace evsel
@@ -83,7 +82,6 @@ DECLARE_SOA_TABLE(EvSels, "AOD", "EVSEL", //!
                   evsel::FoundFV0Id,
                   evsel::FoundFDDId,
                   evsel::FoundZDCId,
-                  evsel::BcInTF,
                   evsel::NumTracksInTimeRange,
                   evsel::SumAmpFT0CInTimeRange);
 using EvSel = EvSels::iterator;