Fix: eliminate ambiguous InputSpec binding in RecoContainer

shahor02 · shahor02 · commit 5b2852d3b737 · 2021-10-17T17:24:21.000+02:00
diff --git a/DataFormats/Detectors/GlobalTracking/src/RecoContainer.cxx b/DataFormats/Detectors/GlobalTracking/src/RecoContainer.cxx
@@ -61,7 +61,7 @@ void DataRequest::requestITSTracks(bool mc)
 {
   addInput({"trackITS", "ITS", "TRACKS", 0, Lifetime::Timeframe});
   addInput({"trackITSROF", "ITS", "ITSTrackROF", 0, Lifetime::Timeframe});
-  addInput({"trackClIdx", "ITS", "TRACKCLSID", 0, Lifetime::Timeframe});
+  addInput({"trackITSClIdx", "ITS", "TRACKCLSID", 0, Lifetime::Timeframe});
   if (mc) {
     addInput({"trackITSMCTR", "ITS", "TRACKSMCTR", 0, Lifetime::Timeframe});
   }
@@ -72,7 +72,7 @@ void DataRequest::requestMFTTracks(bool mc)
 {
   addInput({"trackMFT", "MFT", "TRACKS", 0, Lifetime::Timeframe});
   addInput({"trackMFTROF", "MFT", "MFTTrackROF", 0, Lifetime::Timeframe});
-  addInput({"trackClIdx", "MFT", "TRACKCLSID", 0, Lifetime::Timeframe});
+  addInput({"trackMFTClIdx", "MFT", "TRACKCLSID", 0, Lifetime::Timeframe});
   if (mc) {
     addInput({"trackMFTMCTR", "MFT", "TRACKSMCTR", 0, Lifetime::Timeframe});
   }
@@ -652,7 +652,7 @@ void RecoContainer::addCosmicTracks(ProcessingContext& pc, bool mc)
 void RecoContainer::addITSTracks(ProcessingContext& pc, bool mc)
 {
   commonPool[GTrackID::ITS].registerContainer(pc.inputs().get<gsl::span<o2::its::TrackITS>>("trackITS"), TRACKS);
-  commonPool[GTrackID::ITS].registerContainer(pc.inputs().get<gsl::span<int>>("trackClIdx"), INDICES);
+  commonPool[GTrackID::ITS].registerContainer(pc.inputs().get<gsl::span<int>>("trackITSClIdx"), INDICES);
   commonPool[GTrackID::ITS].registerContainer(pc.inputs().get<gsl::span<o2::itsmft::ROFRecord>>("trackITSROF"), TRACKREFS);
   if (mc) {
     commonPool[GTrackID::ITS].registerContainer(pc.inputs().get<gsl::span<o2::MCCompLabel>>("trackITSMCTR"), MCLABELS);
@@ -669,7 +669,7 @@ void RecoContainer::addIRFramesITS(ProcessingContext& pc)
 void RecoContainer::addMFTTracks(ProcessingContext& pc, bool mc)
 {
   commonPool[GTrackID::MFT].registerContainer(pc.inputs().get<gsl::span<o2::mft::TrackMFT>>("trackMFT"), TRACKS);
-  commonPool[GTrackID::MFT].registerContainer(pc.inputs().get<gsl::span<int>>("trackClIdx"), INDICES);
+  commonPool[GTrackID::MFT].registerContainer(pc.inputs().get<gsl::span<int>>("trackMFTClIdx"), INDICES);
   commonPool[GTrackID::MFT].registerContainer(pc.inputs().get<gsl::span<o2::itsmft::ROFRecord>>("trackMFTROF"), TRACKREFS);
   if (mc) {
     commonPool[GTrackID::MFT].registerContainer(pc.inputs().get<gsl::span<o2::MCCompLabel>>("trackMFTMCTR"), MCLABELS);

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ void DataRequest::requestITSTracks(bool mc)`
`61`	`61`	`{`
`62`	`62`	`addInput({"trackITS", "ITS", "TRACKS", 0, Lifetime::Timeframe});`
`63`	`63`	`addInput({"trackITSROF", "ITS", "ITSTrackROF", 0, Lifetime::Timeframe});`
`64`		`- addInput({"trackClIdx", "ITS", "TRACKCLSID", 0, Lifetime::Timeframe});`
	`64`	`+ addInput({"trackITSClIdx", "ITS", "TRACKCLSID", 0, Lifetime::Timeframe});`
`65`	`65`	`if (mc) {`
`66`	`66`	`addInput({"trackITSMCTR", "ITS", "TRACKSMCTR", 0, Lifetime::Timeframe});`
`67`	`67`	`}`
`@@ -72,7 +72,7 @@ void DataRequest::requestMFTTracks(bool mc)`
`72`	`72`	`{`
`73`	`73`	`addInput({"trackMFT", "MFT", "TRACKS", 0, Lifetime::Timeframe});`
`74`	`74`	`addInput({"trackMFTROF", "MFT", "MFTTrackROF", 0, Lifetime::Timeframe});`
`75`		`- addInput({"trackClIdx", "MFT", "TRACKCLSID", 0, Lifetime::Timeframe});`
	`75`	`+ addInput({"trackMFTClIdx", "MFT", "TRACKCLSID", 0, Lifetime::Timeframe});`
`76`	`76`	`if (mc) {`
`77`	`77`	`addInput({"trackMFTMCTR", "MFT", "TRACKSMCTR", 0, Lifetime::Timeframe});`
`78`	`78`	`}`
`@@ -652,7 +652,7 @@ void RecoContainer::addCosmicTracks(ProcessingContext& pc, bool mc)`
`652`	`652`	`void RecoContainer::addITSTracks(ProcessingContext& pc, bool mc)`
`653`	`653`	`{`
`654`	`654`	`commonPool[GTrackID::ITS].registerContainer(pc.inputs().get<gsl::span<o2::its::TrackITS>>("trackITS"), TRACKS);`
`655`		`- commonPool[GTrackID::ITS].registerContainer(pc.inputs().get<gsl::span<int>>("trackClIdx"), INDICES);`
	`655`	`+ commonPool[GTrackID::ITS].registerContainer(pc.inputs().get<gsl::span<int>>("trackITSClIdx"), INDICES);`
`656`	`656`	`commonPool[GTrackID::ITS].registerContainer(pc.inputs().get<gsl::span<o2::itsmft::ROFRecord>>("trackITSROF"), TRACKREFS);`
`657`	`657`	`if (mc) {`
`658`	`658`	`commonPool[GTrackID::ITS].registerContainer(pc.inputs().get<gsl::span<o2::MCCompLabel>>("trackITSMCTR"), MCLABELS);`
`@@ -669,7 +669,7 @@ void RecoContainer::addIRFramesITS(ProcessingContext& pc)`
`669`	`669`	`void RecoContainer::addMFTTracks(ProcessingContext& pc, bool mc)`
`670`	`670`	`{`
`671`	`671`	`commonPool[GTrackID::MFT].registerContainer(pc.inputs().get<gsl::span<o2::mft::TrackMFT>>("trackMFT"), TRACKS);`
`672`		`- commonPool[GTrackID::MFT].registerContainer(pc.inputs().get<gsl::span<int>>("trackClIdx"), INDICES);`
	`672`	`+ commonPool[GTrackID::MFT].registerContainer(pc.inputs().get<gsl::span<int>>("trackMFTClIdx"), INDICES);`
`673`	`673`	`commonPool[GTrackID::MFT].registerContainer(pc.inputs().get<gsl::span<o2::itsmft::ROFRecord>>("trackMFTROF"), TRACKREFS);`
`674`	`674`	`if (mc) {`
`675`	`675`	`commonPool[GTrackID::MFT].registerContainer(pc.inputs().get<gsl::span<o2::MCCompLabel>>("trackMFTMCTR"), MCLABELS);`