tfbuilder: log stfsender id with merging errors (FLP number)

AliceO2Group · Oct 27, 2021 · d0c1d14 · d0c1d14
1 parent 59a7467
commit d0c1d14
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/TfBuilder/TfBuilderInput.cxx b/src/TfBuilder/TfBuilderInput.cxx
@@ -532,7 +532,7 @@ void TfBuilderInput::StfMergerThread()
 
     // Add the rest of STFs
     for (auto lStfIter = std::next(lStfVector.begin()); lStfIter != lStfVector.end(); ++lStfIter) {
-      lTf->mergeStf(std::move(lStfIter->mStf));
+      lTf->mergeStf(std::move(lStfIter->mStf), lStfIter->mStfSenderId);
     }
     lNumBuiltTfs++;
 

diff --git a/src/common/SubTimeFrameDataModel.cxx b/src/common/SubTimeFrameDataModel.cxx
@@ -95,27 +95,29 @@ std::vector<EquipmentIdentifier> SubTimeFrame::getEquipmentIdentifiers() const
   return lKeys;
 }
 
-void SubTimeFrame::mergeStf(std::unique_ptr<SubTimeFrame> pStf)
+void SubTimeFrame::mergeStf(std::unique_ptr<SubTimeFrame> pStf, const std::string &mStfSenderId)
 {
   // make sure header values match
   if (mHeader.mOrigin != pStf->header().mOrigin) {
-    EDDLOG("Merging STFs error: STF origins do not match origin={} new_origin={}",
-      mHeader.mOrigin,  pStf->header().mOrigin);
+    EDDLOG_RL(1000, "Merging STFs error: STF origins do not match origin={} new_origin={} new_stfs_id={}",
+      mHeader.mOrigin,  pStf->header().mOrigin, mStfSenderId);
   }
 
   if (mHeader.mFirstOrbit != pStf->header().mFirstOrbit) {
-    EDDLOG("Merging STFs error: STF first orbits do not match firstOrbit={} new_firstOrbit={}",
-      mHeader.mFirstOrbit,  pStf->header().mFirstOrbit);
+    EDDLOG_RL(1000,"Merging STFs error: STF first orbits do not match firstOrbit={} new_firstOrbit={} diff={} new_stfs_id={}",
+      mHeader.mFirstOrbit,  pStf->header().mFirstOrbit, (std::int64_t(pStf->header().mFirstOrbit) - std::int64_t(mHeader.mFirstOrbit)),
+      mStfSenderId);
   }
 
   // make sure data equipment does not repeat
   std::set<EquipmentIdentifier> lUnionSet;
-  for (const auto& lId : getEquipmentIdentifiers())
+  for (const auto& lId : getEquipmentIdentifiers()) {
     lUnionSet.emplace(lId);
+  }
 
   for (const auto& lId : pStf->getEquipmentIdentifiers()) {
     if (lUnionSet.emplace(lId).second == false /* not inserted */) {
-      EDDLOG_RL(1000, "Merging STFs error: Equipment already present: fee={}", lId.info());
+      EDDLOG_RL(1000, "Merging STFs error: Equipment already present: fee={} new_stfs_id={}", lId.info(), mStfSenderId);
     }
   }
 

diff --git a/src/common/SubTimeFrameDataModel.h b/src/common/SubTimeFrameDataModel.h
@@ -300,7 +300,7 @@ class SubTimeFrame : public IDataModelObject
   SubTimeFrame& operator=(SubTimeFrame&& a) = default;
 
   // adopt all data from another STF
-  void mergeStf(std::unique_ptr<SubTimeFrame> pStf);
+  void mergeStf(std::unique_ptr<SubTimeFrame> pStf, const std::string &mStfSenderId);
 
   // get data size (not including o2 headers)
   std::uint64_t getDataSize() const { updateStf(); return mDataSize; }