add fill scheme info in TOF event time checker

Author: noferini

Detectors/GlobalTrackingWorkflow/src/TOFEventTimeChecker.cxx

@@ -35,6 +35,7 @@
 
 // from TOF
 #include "TOFBase/Geo.h"
+#include "TOFBase/Utils.h"
 #include "DataFormatsTOF/Cluster.h"
 #include "TOFReconstruction/EventTimeMaker.h"
 //#include "GlobalTracking/MatchTOF.h"
@@ -75,7 +76,7 @@ using TimeSlewing = o2::dataformats::CalibTimeSlewingParamTOF;
 
 bool MyFilter(const MyTrack& tr)
 {
-  return (tr.mP < 2.0 && fabs(tr.mEta) < 0.8);
+  return (tr.mP < 2.0 && tr.mEta > o2::tof::Utils::mEtaMin && tr.mEta < o2::tof::Utils::mEtaMax);
 } // accept all
 
 namespace o2
@@ -150,12 +151,22 @@ void TOFEventTimeChecker::processEvent(std::vector<MyTrack>& tracks)
 {
   int nBC = int(tracks[0].tofSignalDouble() * o2::tof::Geo::BC_TIME_INPS_INV);
   for (auto& track : tracks) {
-    track.mSignal = float(track.mSignalDouble - double(o2::tof::Geo::BC_TIME_INPS) * nBC);
+    if (!o2::tof::Utils::hasFillScheme()) {
+      track.mSignal = float(track.mSignalDouble - double(o2::tof::Geo::BC_TIME_INPS) * nBC);
+    } else {
+      double localTime = track.mSignalDouble;
+
+      // get into orbit
+      int bcStarOrbit = int(localTime * o2::tof::Geo::BC_TIME_INPS_INV);
+      bcStarOrbit = (bcStarOrbit / o2::constants::lhc::LHCMaxBunches) * o2::constants::lhc::LHCMaxBunches; // truncation
+      localTime -= bcStarOrbit * o2::tof::Geo::BC_TIME_INPS;
+      track.mSignal = o2::tof::Utils::subtractInteractionBC(localTime);
+    }
   }
 
   auto evtime = o2::tof::evTimeMaker<std::vector<MyTrack>, MyTrack, MyFilter>(tracks);
 
-  if (evtime.eventTime < -2000 || evtime.eventTime > 2000) {
+  if (evtime.eventTime - o2::tof::Utils::mLHCPhase < -2000 || evtime.eventTime - o2::tof::Utils::mLHCPhase > 2000) {
     return;
   }
   //
@@ -437,14 +448,14 @@ void TOFEventTimeChecker::run(ProcessingContext& pc)
     tracks.emplace_back(mMyTracks[i]);
     for (; i < mMyTracks.size(); i++) {
       double timeCurrent = mMyTracks[i].tofSignalDouble();
-      if (timeCurrent - time > 25E3) {
+      if (timeCurrent - time > 100E3) {
         i--;
         break;
       }
       tracks.emplace_back(mMyTracks[i]);
       ntrk++;
     }
-    if (ntrk > 2) { // good candidate with time
+    if (ntrk > 0) { // good candidate with time
       processEvent(tracks);
     }
   }

Detectors/GlobalTrackingWorkflow/src/tof-eventtime-checker-workflow.cxx

@@ -26,6 +26,7 @@
 #include "DetectorsRaw/HBFUtilsInitializer.h"
 #include "Framework/CallbacksPolicy.h"
 #include "GlobalTrackingWorkflowHelpers/InputHelper.h"
+#include "TOFBase/Utils.h"
 
 using namespace o2::framework;
 using DetID = o2::detectors::DetID;
@@ -45,6 +46,11 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
     {"disable-root-input", o2::framework::VariantType::Bool, false, {"disable root-files input reader"}},
     {"disable-root-output", o2::framework::VariantType::Bool, false, {"disable root-files output writer"}},
     {"track-sources", VariantType::String, std::string{GID::ALL}, {"comma-separated list of sources to use: allowed TPC-TOF,ITS-TPC-TOF,TPC-TRD-TOF,ITS-TPC-TRD-TOF (all)"}},
+    {"event-time-spread", o2::framework::VariantType::Float, 200.0f, {"Event time spread"}},
+    {"lhc-phase", o2::framework::VariantType::Float, 0.0f, {"LHCp phase"}},
+    {"eta-min", o2::framework::VariantType::Float, -0.8f, {"min tof eta"}},
+    {"eta-max", o2::framework::VariantType::Float, 0.8f, {"max tof eta"}},
+    {"fill-mask", o2::framework::VariantType::String, "", {"fill scheme, collision bunches"}},
     {"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}}};
 
   std::swap(workflowOptions, options);
@@ -67,6 +73,33 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
   auto disableRootIn = configcontext.options().get<bool>("disable-root-input");
   auto disableRootOut = configcontext.options().get<bool>("disable-root-output");
 
+  auto spread = configcontext.options().get<float>("event-time-spread");
+  auto phase = configcontext.options().get<float>("lhc-phase");
+  auto minEta = configcontext.options().get<float>("eta-min");
+  auto maxEta = configcontext.options().get<float>("eta-max");
+  auto fillscheme = configcontext.options().get<std::string>("fill-mask");
+
+  o2::tof::Utils::mEventTimeSpread = spread;
+  o2::tof::Utils::mLHCPhase = phase;
+  o2::tof::Utils::mEtaMin = minEta;
+  o2::tof::Utils::mEtaMax = maxEta;
+
+  while (fillscheme.size()) {
+    int bc;
+    int res = sscanf(fillscheme.c_str(), "%d", &bc);
+    if (res) {
+      o2::tof::Utils::addInteractionBC(bc);
+    } else {
+      fillscheme.clear();
+    }
+    int next = fillscheme.find(",");
+    if (next < fillscheme.size()) {
+      fillscheme.erase(0, next + 1);
+    } else {
+      fillscheme.clear();
+    }
+  }
+
   LOG(DEBUG) << "TOF EVENTTIME CHECKER WORKFLOW configuration";
   LOG(DEBUG) << "TOF track inputs = " << configcontext.options().get<std::string>("track-sources");
   LOG(DEBUG) << "TOF disable-mc = " << configcontext.options().get<std::string>("disable-mc");

Detectors/TOF/base/include/TOFBase/Utils.h

@@ -39,6 +39,12 @@ class Utils
   static void init();
   static void printFillScheme();
 
+  // info can be tuned
+  static float mEventTimeSpread;
+  static float mEtaMin;
+  static float mEtaMax;
+  static float mLHCPhase;
+
  private:
   static std::vector<int> mFillScheme;
   static int mBCmult[o2::constants::lhc::LHCMaxBunches];

Detectors/TOF/base/src/Utils.cxx

@@ -29,6 +29,10 @@ int Utils::mBCmult[o2::constants::lhc::LHCMaxBunches];
 int Utils::mNautodet = 0;
 int Utils::mMaxBC = 0;
 bool Utils::mIsInit = false;
+float Utils::mEventTimeSpread = 200;
+float Utils::mEtaMin = -0.8;
+float Utils::mEtaMax = 0.8;
+float Utils::mLHCPhase = 0;
 
 void Utils::init()
 {

Detectors/TOF/reconstruction/include/TOFReconstruction/EventTimeMaker.h

@@ -17,6 +17,7 @@
 
 #include "TRandom.h"
 #include "TMath.h"
+#include "TOFBase/Utils.h"
 
 namespace o2
 {
@@ -68,7 +69,7 @@ struct eventTimeTrackTest : eventTimeTrack {
   int mHypo = 0;
 };
 
-void generateEvTimeTracks(std::vector<eventTimeTrackTest>& tracks, int ntracks, float evTime = 0.f);
+void generateEvTimeTracks(std::vector<eventTimeTrackTest>& tracks, int ntracks, float evTime = Utils::mLHCPhase);
 
 template <typename trackType>
 bool filterDummy(const trackType& tr)
@@ -80,7 +81,7 @@ void computeEvTime(const std::vector<eventTimeTrack>& tracks, const std::vector<
 int getStartTimeInSet(const std::vector<eventTimeTrack>& tracks, std::vector<int>& trackInSet, unsigned long& bestComb);
 
 template <typename trackTypeContainer, typename trackType, bool (*trackFilter)(const trackType&)>
-eventTimeContainer evTimeMaker(const trackTypeContainer& tracks, float diamond = 6. /* spread of primary verdex in cm */)
+eventTimeContainer evTimeMaker(const trackTypeContainer& tracks, float diamond = Utils::mEventTimeSpread * 0.029979246 /* spread of primary verdex in cm */)
 {
   static std::vector<eventTimeTrack> trkWork;
   trkWork.clear();

Detectors/TOF/reconstruction/src/Decoder.cxx

@@ -127,8 +127,8 @@ void Decoder::InsertDigit(int icrate, int itrm, int itdc, int ichain, int channe
 {
   DigitInfo digitInfo;
 
-  if (icrate % 2 == 1 && itrm == 3 && itdc / 3 > 0) { // Signal not coming from a TOF pad but -probably- from a TOF OR signal
-    // add operation on LTM (Trigger) if needed (not used)
+  if (itrm == 3 && ((icrate % 2 == 0) || (itdc / 3 > 0))) { // Signal not coming from a TOF pad but -probably- from a TOF OR signal
+    // add operation on LTM (Trigger) if needed (not used) if (crate % 2 == 1)
     return;
   }