tof calib reader loading TFIDInfo

noferini · shahor02 · commit c5c5faf101a1 · 2022-07-24T21:57:47.000+02:00
diff --git a/Detectors/GlobalTrackingWorkflow/src/tof-matcher-workflow.cxx b/Detectors/GlobalTrackingWorkflow/src/tof-matcher-workflow.cxx
@@ -60,7 +60,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
     {"use-ccdb", o2::framework::VariantType::Bool, false, {"enable access to ccdb tof calibration objects"}},
     {"strict-matching", o2::framework::VariantType::Bool, false, {"High purity preliminary matching"}},
     {"output-type", o2::framework::VariantType::String, "matching-info,calib-info", {"matching-info, calib-info"}},
-    {"enable-dia", o2::framework::VariantType::Bool, false, {"to require diagnostic freq and then write to calib outputs"}},
+    {"enable-dia", o2::framework::VariantType::Bool, false, {"to require diagnostic freq and then write to calib outputs (obsolete since now default)"}},
     {"trd-extra-tolerance", o2::framework::VariantType::Float, 500.0f, {"Extra time tolerance for TRD tracks in ns"}},
     {"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}},
     {"combine-devices", o2::framework::VariantType::Bool, false, {"merge DPL source/writer devices"}}};
@@ -98,6 +98,10 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
   }
   if (outputType.rfind("calib-info") < outputType.size()) {
     writecalib = 1;
+    if (!diagnostic) {
+      diagnostic = true;
+      LOG(info) << "Diagnostic switched on since required for calibInfo time";
+    }
   }
 
   if (!writecalib) {
diff --git a/Detectors/TOF/workflowIO/include/TOFWorkflowIO/CalibInfoReaderSpec.h b/Detectors/TOF/workflowIO/include/TOFWorkflowIO/CalibInfoReaderSpec.h
@@ -49,9 +49,9 @@ class CalibInfoReader : public Task
   bool mTOFTPC = false;
   int mCurrentEntry = 0;
   int mGlobalEntry = 0;
-  bool mDiagnostic = false;
   std::vector<o2::dataformats::CalibInfoTOF> mVect, *mPvect = &mVect;
   o2::tof::Diagnostic mDia, *mPdia = &mDia;
+  std::vector<std::pair<int, unsigned long>> mIndices;
 };
 
 /// create a processor spec
diff --git a/Detectors/TOF/workflowIO/src/CalibInfoReaderSpec.cxx b/Detectors/TOF/workflowIO/src/CalibInfoReaderSpec.cxx
@@ -35,7 +35,6 @@ constexpr o2::header::DataDescription ddCalib{"CALIBDATA"}, ddCalib_tpc{"CALIBDA
 
 void CalibInfoReader::init(InitContext& ic)
 {
-  mDiagnostic = ic.options().get<bool>("enable-dia");
   LOG(debug) << "Init CalibInfo reader!";
   auto fname = o2::utils::Str::concat_string(o2::utils::Str::rectifyDirectory(ic.options().get<std::string>("input-dir")), mFileName);
   mFile = fopen(fname.c_str(), "r");
@@ -61,34 +60,39 @@ void CalibInfoReader::run(ProcessingContext& pc)
       mTree = (TTree*)fin->Get("calibTOF");
       mCurrentEntry = 0;
       mTree->SetBranchAddress("TOFCalibInfo", &mPvect);
-
-      if (mDiagnostic) {
-        mTree->SetBranchAddress("TOFDiaInfo", &mPdia);
-      }
+      mTree->SetBranchAddress("TOFDiaInfo", &mPdia);
 
       LOG(debug) << "Open " << filename;
-    }
-    if ((mGlobalEntry % mNinstances) == mInstance) {
-      mTree->GetEvent(mCurrentEntry);
 
-      if (mDiagnostic) {
-        // add TFIDInfo
+      mIndices.clear();
+      for (unsigned long i = 0; i < mTree->GetEntries(); i++) { // check time order inside the tree
+        mTree->GetEvent(i);
         const auto& info = mDia.getTFIDInfo();
-        timingInfo.firstTForbit = info.firstTForbit;
-        timingInfo.tfCounter = info.tfCounter;
-        timingInfo.runNumber = info.runNumber;
-        timingInfo.timeslice = info.startTime;
-        timingInfo.creation = info.creation;
-      } else if (mVect.size()) {
-        timingInfo.creation = uint64_t(mVect[0].getTimestamp()) * 1000;
+        mIndices.push_back(std::make_pair(i, info.tfCounter));
       }
+      std::sort(mIndices.begin(), mIndices.end(),
+                [&](const auto& a, const auto& b) {
+                  return a.second < b.second;
+                });
+    }
+    if ((mGlobalEntry % mNinstances) == mInstance) {
+      mTree->GetEvent(mIndices[mCurrentEntry].first);
+
+      // add TFIDInfo
+      const auto& info = mDia.getTFIDInfo();
+      timingInfo.firstTForbit = info.firstTForbit;
+      timingInfo.tfCounter = info.tfCounter;
+      timingInfo.runNumber = info.runNumber;
+      //    timingInfo.timeslice = info.startTime; // NOT TO BE SET (done by DPL)
+      timingInfo.creation = info.creation;
+      //        printf("TF=%ld, creationTime=%ld: firstTForbit=%ld, runNumber=%d, startTime=%ld\n",timingInfo.tfCounter,timingInfo.creation,timingInfo.firstTForbit,timingInfo.runNumber,timingInfo.timeslice);
 
       LOG(debug) << "Current entry " << mCurrentEntry;
       LOG(debug) << "Send " << mVect.size() << " calib infos";
+
       pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, mTOFTPC ? ddCalib_tpc : ddCalib, 0, Lifetime::Timeframe}, mVect);
 
       pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, ddDia, 0, Lifetime::Timeframe}, mDia);
-
       usleep(100);
     }
     mGlobalEntry++;
@@ -120,7 +124,7 @@ DataProcessorSpec getCalibInfoReaderSpec(int instance, int ninstances, const cha
     Inputs{},
     outputs,
     AlgorithmSpec{adaptFromTask<CalibInfoReader>(instance, ninstances, filename)},
-    Options{{"input-dir", VariantType::String, "none", {"Input directory"}}, {"enable-dia", VariantType::Bool, false, {"read also diagnostic frequency"}}}};
+    Options{{"input-dir", VariantType::String, "none", {"Input directory"}}}};
 }
 } // namespace tof
 } // namespace o2
