Unconditionally load PVs if requested

shahor02 · shahor02 · commit c2ff3e0077fa · 2024-10-03T16:03:00.000+02:00
diff --git a/DataFormats/Detectors/GlobalTracking/src/RecoContainer.cxx b/DataFormats/Detectors/GlobalTracking/src/RecoContainer.cxx
@@ -833,13 +833,11 @@ void RecoContainer::addSVertices(ProcessingContext& pc, bool)
 //____________________________________________________________
 void RecoContainer::addPVertices(ProcessingContext& pc, bool mc)
 {
-  if (!pvtxPool.isLoaded(PVTX)) { // in case was loaded via addPVerticesTMP
-    pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::dataformats::PrimaryVertex>>("pvtx"), PVTX);
-  }
+  pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::dataformats::PrimaryVertex>>("pvtx"), PVTX);
   pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::dataformats::VtxTrackIndex>>("pvtx_trmtc"), PVTX_TRMTC);
   pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::dataformats::VtxTrackRef>>("pvtx_tref"), PVTX_TRMTCREFS);
 
-  if (mc && !pvtxPool.isLoaded(PVTX_MCTR)) { // in case was loaded via addPVerticesTMP
+  if (mc) { // in case was loaded via addPVerticesTMP
     pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::MCEventLabel>>("pvtx_mc"), PVTX_MCTR);
   }
 }
@@ -856,13 +854,11 @@ void RecoContainer::addStrangeTracks(ProcessingContext& pc, bool mc)
 //____________________________________________________________
 void RecoContainer::addPVerticesTMP(ProcessingContext& pc, bool mc)
 {
-  if (!pvtxPool.isLoaded(PVTX)) { // in case was loaded via addPVertices
-    pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::dataformats::PrimaryVertex>>("pvtx"), PVTX);
-  }
+  pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::dataformats::PrimaryVertex>>("pvtx"), PVTX);
   pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::dataformats::VtxTrackIndex>>("pvtx_cont"), PVTX_CONTID);
   pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::dataformats::VtxTrackRef>>("pvtx_contref"), PVTX_CONTIDREFS);
 
-  if (mc && !pvtxPool.isLoaded(PVTX_MCTR)) { // in case was loaded via addPVertices
+  if (mc) { // in case was loaded via addPVertices
     pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::MCEventLabel>>("pvtx_mc"), PVTX_MCTR);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -833,13 +833,11 @@ void RecoContainer::addSVertices(ProcessingContext& pc, bool)`
`833`	`833`	`//____________________________________________________________`
`834`	`834`	`void RecoContainer::addPVertices(ProcessingContext& pc, bool mc)`
`835`	`835`	`{`
`836`		`- if (!pvtxPool.isLoaded(PVTX)) { // in case was loaded via addPVerticesTMP`
`837`		`- pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::dataformats::PrimaryVertex>>("pvtx"), PVTX);`
`838`		`- }`
	`836`	`+ pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::dataformats::PrimaryVertex>>("pvtx"), PVTX);`
`839`	`837`	`pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::dataformats::VtxTrackIndex>>("pvtx_trmtc"), PVTX_TRMTC);`
`840`	`838`	`pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::dataformats::VtxTrackRef>>("pvtx_tref"), PVTX_TRMTCREFS);`
`841`	`839`
`842`		`- if (mc && !pvtxPool.isLoaded(PVTX_MCTR)) { // in case was loaded via addPVerticesTMP`
	`840`	`+ if (mc) { // in case was loaded via addPVerticesTMP`
`843`	`841`	`pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::MCEventLabel>>("pvtx_mc"), PVTX_MCTR);`
`844`	`842`	`}`
`845`	`843`	`}`
`@@ -856,13 +854,11 @@ void RecoContainer::addStrangeTracks(ProcessingContext& pc, bool mc)`
`856`	`854`	`//____________________________________________________________`
`857`	`855`	`void RecoContainer::addPVerticesTMP(ProcessingContext& pc, bool mc)`
`858`	`856`	`{`
`859`		`- if (!pvtxPool.isLoaded(PVTX)) { // in case was loaded via addPVertices`
`860`		`- pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::dataformats::PrimaryVertex>>("pvtx"), PVTX);`
`861`		`- }`
	`857`	`+ pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::dataformats::PrimaryVertex>>("pvtx"), PVTX);`
`862`	`858`	`pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::dataformats::VtxTrackIndex>>("pvtx_cont"), PVTX_CONTID);`
`863`	`859`	`pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::dataformats::VtxTrackRef>>("pvtx_contref"), PVTX_CONTIDREFS);`
`864`	`860`
`865`		`- if (mc && !pvtxPool.isLoaded(PVTX_MCTR)) { // in case was loaded via addPVertices`
	`861`	`+ if (mc) { // in case was loaded via addPVertices`
`866`	`862`	`pvtxPool.registerContainer(pc.inputs().get<gsl::span<o2::MCEventLabel>>("pvtx_mc"), PVTX_MCTR);`
`867`	`863`	`}`
`868`	`864`	`}`