Fix: check for initDone was blocking next TF input

shahor02 · sawenzel · commit 9fee2ba77427 · 2020-06-08T11:43:45.000+02:00
The mInitDone flag, set during 1st TF processeing, was preventing setting the input of following TFs.
Introduced separate mWFInputAttached to flag that the DPL data was attached, in the DPL mode process
directly with overloaded run method w/o wrong check for init.
diff --git a/Detectors/GlobalTracking/include/GlobalTracking/MatchTOF.h b/Detectors/GlobalTracking/include/GlobalTracking/MatchTOF.h
@@ -84,8 +84,8 @@ class MatchTOF
   ///< perform all initializations
   void init();
 
-  ///< perform all initializations
-  void initWorkflow(const gsl::span<const o2::dataformats::TrackTPCITS>& trackArray, const gsl::span<const Cluster>& clusterArray, const o2::dataformats::MCTruthContainer<o2::MCCompLabel>& toflab, const gsl::span<const o2::MCCompLabel>& itslab, const gsl::span<const o2::MCCompLabel>& tpclab);
+  ///< attach DPL data and run
+  void run(const gsl::span<const o2::dataformats::TrackTPCITS>& trackArray, const gsl::span<const Cluster>& clusterArray, const o2::dataformats::MCTruthContainer<o2::MCCompLabel>& toflab, const gsl::span<const o2::MCCompLabel>& itslab, const gsl::span<const o2::MCCompLabel>& tpclab);
 
   ///< set tree/chain containing tracks
   void setInputTreeTracks(TTree* tree) { mInputTreeTracks = tree; }
@@ -211,7 +211,8 @@ class MatchTOF
 
   // Data members
 
-  bool mInitDone = false; ///< flag init already done
+  bool mSAInitDone = false;      ///< flag that standalone init already done
+  bool mWFInputAttached = false; ///< flag that the standalone input is attached
 
   float mXRef = Geo::RMIN; ///< reference radius to propage tracks for matching
 
diff --git a/Detectors/GlobalTracking/src/MatchTOF.cxx b/Detectors/GlobalTracking/src/MatchTOF.cxx
@@ -47,10 +47,10 @@ void MatchTOF::run()
 {
   ///< running the matching
 
-  if (!mInitDone) {
-    LOG(FATAL) << "init() was not done yet";
+  if (!mWFInputAttached && !mSAInitDone) {
+    LOG(ERROR) << "run called with mSAInitDone=" << mSAInitDone << " and mWFInputAttached=" << mWFInputAttached;
+    throw std::runtime_error("standalone init was not done or workflow input was not yet attached");
   }
-
   mTimerTot.Start();
 
   // we load all TOF clusters (to be checked if we need to split per time frame)
@@ -143,6 +143,8 @@ void MatchTOF::run()
     mDBGOut.reset();
 #endif
 
+  mWFInputAttached = false;
+
   mTimerTot.Stop();
   printf("Timing:\n");
   printf("Do Matching:        ");
@@ -158,14 +160,8 @@ void MatchTOF::fill()
 }
 
 //______________________________________________
-void MatchTOF::initWorkflow(const gsl::span<const o2::dataformats::TrackTPCITS>& trackArray, const gsl::span<const Cluster>& clusterArray, const o2::dataformats::MCTruthContainer<o2::MCCompLabel>& toflab, const gsl::span<const o2::MCCompLabel>& itslab, const gsl::span<const o2::MCCompLabel>& tpclab)
+void MatchTOF::run(const gsl::span<const o2::dataformats::TrackTPCITS>& trackArray, const gsl::span<const Cluster>& clusterArray, const o2::dataformats::MCTruthContainer<o2::MCCompLabel>& toflab, const gsl::span<const o2::MCCompLabel>& itslab, const gsl::span<const o2::MCCompLabel>& tpclab)
 {
-
-  if (mInitDone) {
-    LOG(ERROR) << "Initialization was already done";
-    return;
-  }
-
   mTracksArrayInp = trackArray;
   mTOFClustersArrayInp = clusterArray;
   mIsworkflowON = kTRUE;
@@ -174,20 +170,20 @@ void MatchTOF::initWorkflow(const gsl::span<const o2::dataformats::TrackTPCITS>&
   mITSLabels = itslab;
 
   mMCTruthON = (mTOFClusLabels.getNElements() && mTPCLabels.size() && mITSLabels.size());
-
-  mInitDone = true;
+  mWFInputAttached = true;
+  mSAInitDone = true;
+  run();
 }
 
 //______________________________________________
 void MatchTOF::init()
 {
   ///< initizalizations
 
-  if (mInitDone) {
+  if (mSAInitDone) {
     LOG(ERROR) << "Initialization was already done";
     return;
   }
-
   attachInputTrees();
 
   // create output branch with track-tof matching
@@ -224,7 +220,7 @@ void MatchTOF::init()
   }
 #endif
 
-  mInitDone = true;
+  mSAInitDone = true;
 
   {
     mTimerTot.Stop();
@@ -240,10 +236,6 @@ void MatchTOF::print() const
   ///< print the settings
 
   LOG(INFO) << "****** component for the matching of tracks to TOF clusters ******";
-  if (!mInitDone) {
-    LOG(INFO) << "init is not done yet - nothing to print";
-    return;
-  }
 
   LOG(INFO) << "MC truth: " << (mMCTruthON ? "on" : "off");
   LOG(INFO) << "Time tolerance: " << mTimeTolerance;
diff --git a/Detectors/GlobalTrackingWorkflow/tofworkflow/src/RecoWorkflowSpec.cxx b/Detectors/GlobalTrackingWorkflow/tofworkflow/src/RecoWorkflowSpec.cxx
@@ -100,8 +100,7 @@ class TOFDPLRecoWorkflowTask
       toflab = std::move(*toflabel);
     }
 
-    mMatcher.initWorkflow(tracksRO, clustersRO, toflab, itslab, tpclab);
-    mMatcher.run();
+    mMatcher.run(tracksRO, clustersRO, toflab, itslab, tpclab);
 
     // in run_match_tof aggiugnere esplicitamente la chiamata a fill del tree (nella classe MatchTOF) e il metodo per leggere i vettori di output
 

Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,7 @@ class TOFDPLRecoWorkflowTask`
`100`	`100`	`toflab = std::move(*toflabel);`
`101`	`101`	`}`
`102`	`102`
`103`		`- mMatcher.initWorkflow(tracksRO, clustersRO, toflab, itslab, tpclab);`
`104`		`- mMatcher.run();`
	`103`	`+ mMatcher.run(tracksRO, clustersRO, toflab, itslab, tpclab);`
`105`	`104`
`106`	`105`	`// in run_match_tof aggiugnere esplicitamente la chiamata a fill del tree (nella classe MatchTOF) e il metodo per leggere i vettori di output`
`107`	`106`