Fix MFT-MCH-MID labeling for Event Display

pnwkw · davidrohr · commit d15d08ed4b50 · 2022-11-09T14:36:31.000+01:00
diff --git a/EventVisualisation/Workflow/include/EveWorkflow/O2DPLDisplay.h b/EventVisualisation/Workflow/include/EveWorkflow/O2DPLDisplay.h
@@ -47,7 +47,7 @@ class TPCFastTransform;
 class O2DPLDisplaySpec : public o2::framework::Task
 {
  public:
-  static constexpr auto allowedTracks = "ITS,TPC,MFT,MCH,MID,ITS-TPC,TPC-TRD,ITS-TPC-TOF,ITS-TPC-TRD,ITS-TPC-TRD-TOF,MCH-MID,MFT-MCH,PHS,EMC";
+  static constexpr auto allowedTracks = "ITS,TPC,MFT,MCH,MID,ITS-TPC,TPC-TRD,ITS-TPC-TOF,ITS-TPC-TRD,ITS-TPC-TRD-TOF,MCH-MID,MFT-MCH,MFT-MCH-MID,PHS,EMC";
   static constexpr auto allowedClusters = "ITS,TPC,TRD,TOF,MFT,MCH,MID,PHS,EMC";
 
   O2DPLDisplaySpec(bool disableWrite, bool useMC, o2::dataformats::GlobalTrackID::mask_t trkMask,
diff --git a/EventVisualisation/Workflow/src/EveWorkflowHelper.cxx b/EventVisualisation/Workflow/src/EveWorkflowHelper.cxx
@@ -183,7 +183,19 @@ void EveWorkflowHelper::selectTracks(const CalibObjectsConst* calib,
     return flag;
   };
 
-  auto creator = [maskTrk, this, &correctTrackTime, &flagTime](auto& trk, GID gid, float time, float terr) {
+  // MFT-MCH-MID tracks are labeled as MFT-MCH in the reco container
+  auto fixMFTMCHMIDLabel = [this](GID& gid) {
+    if (gid.getSource() == GID::MFTMCH) {
+      const auto& trFwd = mRecoCont->getGlobalFwdTrack(gid);
+      if (trFwd.getMIDTrackID() != -1) {
+        gid = GID{gid.getIndex(), GID::MFTMCHMID};
+      }
+    }
+  };
+
+  auto creator = [maskTrk, this, &correctTrackTime, &flagTime, &fixMFTMCHMIDLabel](auto& trk, GID gid, float time, float terr) {
+    fixMFTMCHMIDLabel(gid);
+
     const auto src = gid.getSource();
     mTotalDataTypes[src]++;
 
@@ -230,9 +242,12 @@ void EveWorkflowHelper::selectTracks(const CalibObjectsConst* calib,
 
         // TODO: fix TPC tracks?
 
+        GID gid = tvid;
+        fixMFTMCHMIDLabel(gid);
+
         // If a track was not rejected, associate it with its primary vertex
-        if (mGIDTrackTime.find(tvid) != mGIDTrackTime.end()) {
-          mPrimaryVertexTrackGIDs[iv].push_back(tvid);
+        if (mGIDTrackTime.find(gid) != mGIDTrackTime.end()) {
+          mPrimaryVertexTrackGIDs[iv].push_back(gid);
         }
       }
     }
@@ -692,7 +707,7 @@ void EveWorkflowHelper::drawMFTMCH(GID gid, float trackTime)
 
 void EveWorkflowHelper::drawMFTMCHMID(GID gid, float trackTime)
 {
-  const auto& trMFTMCHMID = mRecoCont->getGlobalFwdTrack(gid);
+  const auto& trMFTMCHMID = mRecoCont->getGlobalFwdTrack(GID{gid.getIndex(), GID::MFTMCH});
 
   const auto& trackParam = forwardTrackToMCHTrack(trMFTMCHMID);
 

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class TPCFastTransform;`
`47`	`47`	`class O2DPLDisplaySpec : public o2::framework::Task`
`48`	`48`	`{`
`49`	`49`	`public:`
`50`		`- static constexpr auto allowedTracks = "ITS,TPC,MFT,MCH,MID,ITS-TPC,TPC-TRD,ITS-TPC-TOF,ITS-TPC-TRD,ITS-TPC-TRD-TOF,MCH-MID,MFT-MCH,PHS,EMC";`
	`50`	`+ static constexpr auto allowedTracks = "ITS,TPC,MFT,MCH,MID,ITS-TPC,TPC-TRD,ITS-TPC-TOF,ITS-TPC-TRD,ITS-TPC-TRD-TOF,MCH-MID,MFT-MCH,MFT-MCH-MID,PHS,EMC";`
`51`	`51`	`static constexpr auto allowedClusters = "ITS,TPC,TRD,TOF,MFT,MCH,MID,PHS,EMC";`
`52`	`52`
`53`	`53`	`O2DPLDisplaySpec(bool disableWrite, bool useMC, o2::dataformats::GlobalTrackID::mask_t trkMask,`