RecoContainer should create sharedClusterMap only if both clusters and tracks are requested

davidrohr · davidrohr · commit b19b082561c9 · 2021-05-08T20:03:53.000+02:00
diff --git a/DataFormats/Detectors/GlobalTracking/include/DataFormatsGlobalTracking/RecoContainer.h b/DataFormats/Detectors/GlobalTracking/include/DataFormatsGlobalTracking/RecoContainer.h
@@ -122,7 +122,7 @@ struct RecoContainer {
   void addTOFMatches(o2::framework::ProcessingContext& pc, bool mc);
 
   void addITSClusters(o2::framework::ProcessingContext& pc, bool mc);
-  void addTPCClusters(o2::framework::ProcessingContext& pc, bool mc);
+  void addTPCClusters(o2::framework::ProcessingContext& pc, bool mc, bool shmap);
   void addTOFClusters(o2::framework::ProcessingContext& pc, bool mc);
   void addTRDTracklets(o2::framework::ProcessingContext& pc);
 
diff --git a/DataFormats/Detectors/GlobalTracking/src/RecoContainer.cxx b/DataFormats/Detectors/GlobalTracking/src/RecoContainer.cxx
@@ -48,6 +48,9 @@ void DataRequest::requestTPCTracks(bool mc)
 {
   addInput({"trackTPC", "TPC", "TRACKS", 0, Lifetime::Timeframe});
   addInput({"trackTPCClRefs", "TPC", "CLUSREFS", 0, Lifetime::Timeframe});
+  if (requestMap.find("clusTPC") != requestMap.end()) {
+    addInput({"clusTPCshmap", "TPC", "CLSHAREDMAP", 0, Lifetime::Timeframe});
+  }
   if (mc) {
     addInput({"trackTPCMCTR", "TPC", "TRACKSMCLBL", 0, Lifetime::Timeframe});
   }
@@ -114,7 +117,9 @@ void DataRequest::requestITSClusters(bool mc)
 void DataRequest::requestTPCClusters(bool mc)
 {
   addInput({"clusTPC", ConcreteDataTypeMatcher{"TPC", "CLUSTERNATIVE"}, Lifetime::Timeframe});
-  addInput({"clusTPCshmap", "TPC", "CLSHAREDMAP", 0, Lifetime::Timeframe});
+  if (requestMap.find("trackTPC") != requestMap.end()) {
+    addInput({"clusTPCshmap", "TPC", "CLSHAREDMAP", 0, Lifetime::Timeframe});
+  }
   if (mc) {
     addInput({"clusITSMC", "ITS", "CLUSTERSMCTR", 0, Lifetime::Timeframe});
   }
@@ -246,7 +251,7 @@ void RecoContainer::collectData(ProcessingContext& pc, const DataRequest& reques
 
   req = reqMap.find("clusTPC");
   if (req != reqMap.end()) {
-    addTPCClusters(pc, req->second);
+    addTPCClusters(pc, req->second, reqMap.find("trackTPC") != reqMap.end());
   }
 
   req = reqMap.find("clusTOF");
@@ -336,10 +341,12 @@ void RecoContainer::addITSClusters(ProcessingContext& pc, bool mc)
 }
 
 //__________________________________________________________
-void RecoContainer::addTPCClusters(ProcessingContext& pc, bool mc)
+void RecoContainer::addTPCClusters(ProcessingContext& pc, bool mc, bool shmap)
 {
   inputsTPCclusters = o2::tpc::getWorkflowTPCInput(pc, 0, mc);
-  clusterShMapTPC = pc.inputs().get<gsl::span<unsigned char>>("clusTPCshmap");
+  if (shmap) {
+    clusterShMapTPC = pc.inputs().get<gsl::span<unsigned char>>("clusTPCshmap");
+  }
 }
 
 void RecoContainer::addTRDTracklets(ProcessingContext& pc)

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,9 @@ void DataRequest::requestTPCTracks(bool mc)`
`48`	`48`	`{`
`49`	`49`	`addInput({"trackTPC", "TPC", "TRACKS", 0, Lifetime::Timeframe});`
`50`	`50`	`addInput({"trackTPCClRefs", "TPC", "CLUSREFS", 0, Lifetime::Timeframe});`
	`51`	`+ if (requestMap.find("clusTPC") != requestMap.end()) {`
	`52`	`+ addInput({"clusTPCshmap", "TPC", "CLSHAREDMAP", 0, Lifetime::Timeframe});`
	`53`	`+ }`
`51`	`54`	`if (mc) {`
`52`	`55`	`addInput({"trackTPCMCTR", "TPC", "TRACKSMCLBL", 0, Lifetime::Timeframe});`
`53`	`56`	`}`
`@@ -114,7 +117,9 @@ void DataRequest::requestITSClusters(bool mc)`
`114`	`117`	`void DataRequest::requestTPCClusters(bool mc)`
`115`	`118`	`{`
`116`	`119`	`addInput({"clusTPC", ConcreteDataTypeMatcher{"TPC", "CLUSTERNATIVE"}, Lifetime::Timeframe});`
`117`		`- addInput({"clusTPCshmap", "TPC", "CLSHAREDMAP", 0, Lifetime::Timeframe});`
	`120`	`+ if (requestMap.find("trackTPC") != requestMap.end()) {`
	`121`	`+ addInput({"clusTPCshmap", "TPC", "CLSHAREDMAP", 0, Lifetime::Timeframe});`
	`122`	`+ }`
`118`	`123`	`if (mc) {`
`119`	`124`	`addInput({"clusITSMC", "ITS", "CLUSTERSMCTR", 0, Lifetime::Timeframe});`
`120`	`125`	`}`
`@@ -246,7 +251,7 @@ void RecoContainer::collectData(ProcessingContext& pc, const DataRequest& reques`
`246`	`251`
`247`	`252`	`req = reqMap.find("clusTPC");`
`248`	`253`	`if (req != reqMap.end()) {`
`249`		`- addTPCClusters(pc, req->second);`
	`254`	`+ addTPCClusters(pc, req->second, reqMap.find("trackTPC") != reqMap.end());`
`250`	`255`	`}`
`251`	`256`
`252`	`257`	`req = reqMap.find("clusTOF");`
`@@ -336,10 +341,12 @@ void RecoContainer::addITSClusters(ProcessingContext& pc, bool mc)`
`336`	`341`	`}`
`337`	`342`
`338`	`343`	`//__________________________________________________________`
`339`		`-void RecoContainer::addTPCClusters(ProcessingContext& pc, bool mc)`
	`344`	`+void RecoContainer::addTPCClusters(ProcessingContext& pc, bool mc, bool shmap)`
`340`	`345`	`{`
`341`	`346`	`inputsTPCclusters = o2::tpc::getWorkflowTPCInput(pc, 0, mc);`
`342`		`- clusterShMapTPC = pc.inputs().get<gsl::span<unsigned char>>("clusTPCshmap");`
	`347`	`+ if (shmap) {`
	`348`	`+ clusterShMapTPC = pc.inputs().get<gsl::span<unsigned char>>("clusTPCshmap");`
	`349`	`+ }`
`343`	`350`	`}`
`344`	`351`
`345`	`352`	`void RecoContainer::addTRDTracklets(ProcessingContext& pc)`