Add calculation of TF border check in VarManager

Author: sigurdnese

PWGDQ/Core/VarManager.cxx

@@ -60,6 +60,10 @@ int VarManager::fgITSROFbias = 0;
 int VarManager::fgITSROFlength = 100;
 int VarManager::fgITSROFBorderMarginLow = 0;
 int VarManager::fgITSROFBorderMarginHigh = 0;
+int64_t VarManager::fgBCSOR = -1;
+int64_t VarManager::fgNBCsPerTF = -1;
+int VarManager::fgTFBorderMarginLow = 300;
+int VarManager::fgTFBorderMarginHigh = 4000;
 uint64_t VarManager::fgSOR = 0;
 uint64_t VarManager::fgEOR = 0;
 ROOT::Math::PxPyPzEVector VarManager::fgBeamA(0, 0, 6799.99, 6800);  // GeV, beam from A-side 4-momentum vector
@@ -718,6 +722,14 @@ void VarManager::SetDefaultVarNames()
   fgVariableUnits[kMultDimuonsME] = "";
   fgVariableNames[kCentFT0C] = "Centrality FT0C";
   fgVariableUnits[kCentFT0C] = "%";
+  fgVariableNames[kIsNoTFBorder] = "Is not TF border";
+  fgVariableUnits[kIsNoTFBorder] = "";
+  fgVariableNames[kIsNoTFBorderRecomputed] = "Is not TF border";
+  fgVariableUnits[kIsNoTFBorderRecomputed] = "";
+  fgVariableNames[kIsNoITSROFBorder] = "Is not ITS ROF border";
+  fgVariableUnits[kIsNoITSROFBorder] = "";
+  fgVariableNames[kIsNoITSROFBorderRecomputed] = "Is not ITS ROF border";
+  fgVariableUnits[kIsNoITSROFBorderRecomputed] = "";
   fgVariableNames[kMCEventGeneratorId] = "MC Generator ID";
   fgVariableNames[kMCEventSubGeneratorId] = "MC SubGenerator ID";
   fgVariableNames[kMCVtxX] = "MC Vtx X";
@@ -1912,6 +1924,7 @@ void VarManager::SetDefaultVarNames()
   fgVarNamesMap["kIsPhysicsSelection"] = kIsPhysicsSelection;
   fgVarNamesMap["kIsTVXTriggered"] = kIsTVXTriggered;
   fgVarNamesMap["kIsNoTFBorder"] = kIsNoTFBorder;
+  fgVarNamesMap["kIsNoTFBorderRecomputed"] = kIsNoTFBorderRecomputed;
   fgVarNamesMap["kIsNoITSROFBorder"] = kIsNoITSROFBorder;
   fgVarNamesMap["kIsNoITSROFBorderRecomputed"] = kIsNoITSROFBorderRecomputed;
   fgVarNamesMap["kIsNoSameBunch"] = kIsNoSameBunch;

PWGDQ/Core/VarManager.h

@@ -218,7 +218,8 @@ class VarManager : public TObject
     kCollisionRandom, // random number generated per collision (if required, can be used to perform random selections at the collision level)
     kIsPhysicsSelection,
     kIsTVXTriggered,             // Is trigger TVX
-    kIsNoTFBorder,               // No time frame border
+    kIsNoTFBorder,               // No time frame border (from event selection)
+    kIsNoTFBorderRecomputed,     // No time frame border, computed here
     kIsNoITSROFBorder,           // No ITS read out frame border (from event selection)
     kIsNoITSROFBorderRecomputed, // No ITS read out frame border, computed here
     kIsNoSameBunch,              // No collisions with same T0 BC
@@ -1506,6 +1507,14 @@ class VarManager : public TObject
     fgITSROFBorderMarginHigh = marginHigh;
   }
 
+  static void SetTFBorderselection(int64_t bcSOR, int64_t nBCsPerTF, int marginLow, int marginHigh)
+  {
+    fgBCSOR = bcSOR;
+    fgNBCsPerTF = nBCsPerTF;
+    fgTFBorderMarginLow = marginLow;
+    fgTFBorderMarginHigh = marginHigh;
+  }
+
   static void SetSORandEOR(uint64_t sor, uint64_t eor)
   {
     fgSOR = sor;
@@ -1535,6 +1544,10 @@ class VarManager : public TObject
   static int fgITSROFlength;                // ITS ROF length (from ALPIDE parameters)
   static int fgITSROFBorderMarginLow;       // ITS ROF border low margin
   static int fgITSROFBorderMarginHigh;      // ITS ROF border high margin
+  static int64_t fgBCSOR;                   // BC for start of run
+  static int64_t fgNBCsPerTF;               // duration of TF in bcs, should be 128*3564 or 32*3564 
+  static int fgTFBorderMarginLow;           // TF border low margin
+  static int fgTFBorderMarginHigh;          // TF border high margin
   static uint64_t fgSOR;                    // Timestamp for start of run
   static uint64_t fgEOR;                    // Timestamp for end of run
   static ROOT::Math::PxPyPzEVector fgBeamA; // beam from A-side 4-momentum vector
@@ -2118,7 +2131,7 @@ void VarManager::FillEvent(T const& event, float* values)
     values[kCentVZERO] = event.centRun2V0M();
     values[kCentFT0C] = event.centFT0C();
     if (fgUsedVars[kIsNoITSROFBorderRecomputed]) {
-      uint16_t bcInITSROF = (event.globalBC() + 3564 - fgITSROFbias) % fgITSROFlength;
+      uint16_t bcInITSROF = (event.globalBC() + o2::constants::lhc::LHCMaxBunches - fgITSROFbias) % fgITSROFlength;
       values[kIsNoITSROFBorderRecomputed] = bcInITSROF > fgITSROFBorderMarginLow && bcInITSROF < fgITSROFlength - fgITSROFBorderMarginHigh ? 1.0 : 0.0;
     }
     if (fgUsedVars[kIsNoITSROFBorder]) {
@@ -2127,6 +2140,10 @@ void VarManager::FillEvent(T const& event, float* values)
     if (fgUsedVars[kIsTVXTriggered]) {
       values[kIsTVXTriggered] = (event.selection_bit(o2::aod::evsel::kIsTriggerTVX) > 0);
     }
+    if (fgUsedVars[kIsNoTFBorderRecomputed]) {
+      int64_t bcInTF = (event.globalBC() - fgBCSOR) % fgNBCsPerTF;
+      values[kIsNoTFBorderRecomputed] = bcInTF > fgTFBorderMarginLow && bcInTF < fgNBCsPerTF - fgTFBorderMarginHigh ? 1.0 : 0.0;
+    }
     if (fgUsedVars[kIsNoTFBorder]) {
       values[kIsNoTFBorder] = (event.selection_bit(o2::aod::evsel::kNoTimeFrameBorder) > 0);
     }

PWGDQ/Tasks/tableReader_withAssoc.cxx

@@ -31,6 +31,7 @@
 #include <CCDB/CcdbApi.h>
 #include <CommonConstants/MathConstants.h>
 #include <DataFormatsITSMFT/DPLAlpideParam.h>
+#include <DataFormatsParameters/AggregatedRunInfo.h>
 #include <DataFormatsParameters/GRPLHCIFData.h>
 #include <DataFormatsParameters/GRPMagField.h>
 #include <DetectorsBase/GeometryManager.h>
@@ -314,6 +315,9 @@ struct AnalysisEventSelection {
 
   Configurable<int> fConfigITSROFrameStartBorderMargin{"cfgITSROFrameStartBorderMargin", -1, "Number of bcs at the start of ITS RO Frame border. Take from CCDB if -1"};
   Configurable<int> fConfigITSROFrameEndBorderMargin{"cfgITSROFrameEndBorderMargin", -1, "Number of bcs at the end of ITS RO Frame border. Take from CCDB if -1"};
+  Configurable<int> fConfigTFStartBorderMargin{"cfgTFStartBorderMargin", -1, "Number of bcs at the start of TF border. Take from CCDB if -1"};
+  Configurable<int> fConfigTFEndBorderMargin{"cfgTFEndBorderMargin", -1, "Number of bcs at the end of TF border. Take from CCDB if -1"};
+  Configurable<int> fConfigNumberOfOrbitsPerTF{"cfgNumberOfOrbitsPerTF", -1, "Number of orbits per Time Frame. Take from CCDB if -1"};
 
   Configurable<float> fConfigSplitCollisionsDeltaZ{"cfgSplitCollisionsDeltaZ", 1.0, "maximum delta-z (cm) between two collisions to consider them as split candidates"};
   Configurable<unsigned int> fConfigSplitCollisionsDeltaBC{"cfgSplitCollisionsDeltaBC", 100, "maximum delta-BC between two collisions to consider them as split candidates; do not apply if value is negative"};
@@ -424,6 +428,14 @@ struct AnalysisEventSelection {
       int itsROFrameStartBorderMargin = fConfigITSROFrameStartBorderMargin < 0 ? par->fITSROFrameStartBorderMargin : fConfigITSROFrameStartBorderMargin;
       int itsROFrameEndBorderMargin = fConfigITSROFrameEndBorderMargin < 0 ? par->fITSROFrameEndBorderMargin : fConfigITSROFrameEndBorderMargin;
       VarManager::SetITSROFBorderselection(alppar->roFrameBiasInBC, alppar->roFrameLengthInBC, itsROFrameStartBorderMargin, itsROFrameEndBorderMargin);
+
+      int timeFrameStartBorderMargin = fConfigTFStartBorderMargin < 0 ? par->fTimeFrameStartBorderMargin : fConfigTFStartBorderMargin;
+      int timeFrameEndBorderMargin = fConfigTFEndBorderMargin < 0 ? par->fTimeFrameEndBorderMargin : fConfigTFEndBorderMargin;
+      auto runInfo = o2::parameters::AggregatedRunInfo::buildAggregatedRunInfo(o2::ccdb::BasicCCDBManager::instance(), events.begin().runNumber());
+      int64_t bcSOR = runInfo.orbitSOR * o2::constants::lhc::LHCMaxBunches;
+      int64_t nBCsPerTF = fConfigNumberOfOrbitsPerTF < 0 ? runInfo.orbitsPerTF * o2::constants::lhc::LHCMaxBunches : fConfigNumberOfOrbitsPerTF * o2::constants::lhc::LHCMaxBunches;
+      VarManager::SetTFBorderselection(bcSOR, nBCsPerTF, timeFrameStartBorderMargin, timeFrameEndBorderMargin);
+
       fCurrentRun = events.begin().runNumber();
     }