Skip to content
Snippets Groups Projects
Commit 1508571f authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

Actually include the collector in the algorithm list

parent 0424d62a
No related branches found
No related tags found
1 merge request!242EDM4hep: mcparticles -> MCParticles
This commit is part of merge request !242. Comments created here will be created in the context of that merge request.
Show whitespace changes
Inline Side-by-side
benchmarks/far_forward/options/far_forward_reconstruction.py
+ 23
− 3
View file @ 1508571f
...@@ -16,7 +16,9 @@ geo_service = GeoSvc("GeoSvc", detectors=[compact_path], OutputLevel=WARNING) ...@@ -16,7 +16,9 @@ geo_service = GeoSvc("GeoSvc", detectors=[compact_path], OutputLevel=WARNING)
podioevent = EICDataSvc("EventDataSvc", inputs=input_sims, OutputLevel=WARNING) podioevent = EICDataSvc("EventDataSvc", inputs=input_sims, OutputLevel=WARNING)
from Configurables import PodioInput from Configurables import PodioInput
from Configurables import Jug__Digi__UFSDTrackerDigi as TrackerDigi
from Configurables import Jug__Digi__SimTrackerHitCollector as SimTrackerHitCollector
from Configurables import Jug__Digi__SiliconTrackerDigi as TrackerDigi
from Configurables import Jug__Reco__TrackerHitReconstruction as TrackerReco from Configurables import Jug__Reco__TrackerHitReconstruction as TrackerReco
from Configurables import Jug__Reco__TrackerSourceLinker as TrackerSourceLinker from Configurables import Jug__Reco__TrackerSourceLinker as TrackerSourceLinker
...@@ -32,8 +34,12 @@ from Configurables import Jug__Reco__TrackerHitReconstruction as TrackerHitRecon ...@@ -32,8 +34,12 @@ from Configurables import Jug__Reco__TrackerHitReconstruction as TrackerHitRecon
sim_colls = [ sim_colls = [
"MCParticles", "MCParticles",
"B0TrackerHits", "B0TrackerHits",
"ForwardRomanPotHits", "ForwardRomanPotHits1",
"ForwardOffMTrackerHits" "ForwardRomanPotHits2",
"ForwardOffMTrackerHits1"
"ForwardOffMTrackerHits2"
"ForwardOffMTrackerHits3"
"ForwardOffMTrackerHits4"
] ]
# list of algorithms # list of algorithms
...@@ -44,6 +50,12 @@ podin = PodioInput("PodioReader", collections=sim_colls) ...@@ -44,6 +50,12 @@ podin = PodioInput("PodioReader", collections=sim_colls)
algorithms.append(podin) algorithms.append(podin)
## Roman pots ## Roman pots
ffi_romanpot_coll = SimTrackerHitCollector("ffi_romanpot_coll",
inputSimTrackerHits = [
"ForwardRomanPotHits1",
"ForwardRomanPotHits2"],
outputSimTrackerHits = "ForwardRomanPotHits")
algorithms.append(ffi_romanpot_coll)
ffi_romanpot_digi = TrackerDigi("ffi_romanpot_digi", ffi_romanpot_digi = TrackerDigi("ffi_romanpot_digi",
inputHitCollection = "ForwardRomanPotHits", inputHitCollection = "ForwardRomanPotHits",
outputHitCollection = "ForwardRomanPotRawHits", outputHitCollection = "ForwardRomanPotRawHits",
...@@ -61,6 +73,14 @@ ffi_romanpot_parts = FarForwardParticles("ffi_romanpot_parts", ...@@ -61,6 +73,14 @@ ffi_romanpot_parts = FarForwardParticles("ffi_romanpot_parts",
algorithms.append(ffi_romanpot_parts) algorithms.append(ffi_romanpot_parts)
## Off momentum tracker ## Off momentum tracker
ffi_offmtracker_coll = SimTrackerHitCollector("ffi_offmtracker_coll",
inputSimTrackerHits = [
"ForwardOffMTrackerHits1",
"ForwardOffMTrackerHits2",
"ForwardOffMTrackerHits3",
"ForwardOffMTrackerHits4"],
outputSimTrackerHits = "ForwardOffMTrackerHits")
algorithms.append(ffi_romanpot_coll)
ffi_offmtracker_digi = TrackerDigi("ffi_offmtracker_digi", ffi_offmtracker_digi = TrackerDigi("ffi_offmtracker_digi",
inputHitCollection = "ForwardOffMTrackerHits", inputHitCollection = "ForwardOffMTrackerHits",
outputHitCollection = "ForwardOffMTrackerRawHits", outputHitCollection = "ForwardOffMTrackerRawHits",
......
benchmarks/track_finding/options/track_reconstruction.py
+ 7
− 1
View file @ 1508571f
...@@ -100,6 +100,7 @@ algorithms.append( podioinput ) ...@@ -100,6 +100,7 @@ algorithms.append( podioinput )
trk_b_coll = SimTrackerHitsCollector("trk_b_coll", trk_b_coll = SimTrackerHitsCollector("trk_b_coll",
inputSimTrackerHits = tracker_barrel_collections, inputSimTrackerHits = tracker_barrel_collections,
outputSimTrackerHits = "TrackerBarrelHits") outputSimTrackerHits = "TrackerBarrelHits")
algorithms.append( trk_b_coll )
trk_b_digi = TrackerDigi("trk_b_digi", trk_b_digi = TrackerDigi("trk_b_digi",
inputHitCollection = trk_b_coll.outputSimTrackerHits, inputHitCollection = trk_b_coll.outputSimTrackerHits,
outputHitCollection = "TrackerBarrelRawHits", outputHitCollection = "TrackerBarrelRawHits",
...@@ -109,6 +110,7 @@ algorithms.append( trk_b_digi ) ...@@ -109,6 +110,7 @@ algorithms.append( trk_b_digi )
trk_ec_coll = SimTrackerHitsCollector("trk_ec_coll", trk_ec_coll = SimTrackerHitsCollector("trk_ec_coll",
inputSimTrackerHits = tracker_endcap_collections, inputSimTrackerHits = tracker_endcap_collections,
outputSimTrackerHits = "TrackerEndcapHits") outputSimTrackerHits = "TrackerEndcapHits")
algorithms.append( trk_ec_coll )
trk_ec_digi = TrackerDigi("trk_ec_digi", trk_ec_digi = TrackerDigi("trk_ec_digi",
inputHitCollection = trk_ec_coll.outputSimTrackerHits, inputHitCollection = trk_ec_coll.outputSimTrackerHits,
outputHitCollection = "TrackerEndcapRawHits", outputHitCollection = "TrackerEndcapRawHits",
...@@ -118,6 +120,7 @@ algorithms.append( trk_ec_digi ) ...@@ -118,6 +120,7 @@ algorithms.append( trk_ec_digi )
vtx_b_coll = SimTrackerHitsCollector("vtx_b_coll", vtx_b_coll = SimTrackerHitsCollector("vtx_b_coll",
inputSimTrackerHits = vertex_barrel_collections, inputSimTrackerHits = vertex_barrel_collections,
outputSimTrackerHits = "VertexBarrelHits") outputSimTrackerHits = "VertexBarrelHits")
algorithms.append( vtx_b_coll )
vtx_b_digi = TrackerDigi("vtx_b_digi", vtx_b_digi = TrackerDigi("vtx_b_digi",
inputHitCollection = vtx_b_coll.outputSimTrackerHits, inputHitCollection = vtx_b_coll.outputSimTrackerHits,
outputHitCollection = "VertexBarrelRawHits", outputHitCollection = "VertexBarrelRawHits",
...@@ -128,6 +131,7 @@ if 'acadia' in detector_version: ...@@ -128,6 +131,7 @@ if 'acadia' in detector_version:
vtx_ec_coll = SimTrackerHitsCollector("vtx_ec_coll", vtx_ec_coll = SimTrackerHitsCollector("vtx_ec_coll",
inputSimTrackerHits = vertex_endcap_collections, inputSimTrackerHits = vertex_endcap_collections,
outputSimTrackerHits = "VertexEndcapHits") outputSimTrackerHits = "VertexEndcapHits")
algorithms.append( vtx_ec_coll )
vtx_ec_digi = TrackerDigi("vtx_ec_digi", vtx_ec_digi = TrackerDigi("vtx_ec_digi",
inputHitCollection = vtx_ec_coll.outputSimTrackerHits, inputHitCollection = vtx_ec_coll.outputSimTrackerHits,
outputHitCollection = "VertexEndcapRawHits", outputHitCollection = "VertexEndcapRawHits",
...@@ -137,6 +141,7 @@ else: ...@@ -137,6 +141,7 @@ else:
mm_b_coll = SimTrackerHitsCollector("mm_b_coll", mm_b_coll = SimTrackerHitsCollector("mm_b_coll",
inputSimTrackerHits = mpgd_barrel_collections, inputSimTrackerHits = mpgd_barrel_collections,
outputSimTrackerHits = "MPGDTrackerBarrelHits") outputSimTrackerHits = "MPGDTrackerBarrelHits")
algorithms.append( mm_b_coll )
mm_b_digi = TrackerDigi("mm_b_digi", mm_b_digi = TrackerDigi("mm_b_digi",
inputHitCollection = mm_b_coll.outputSimTrackerHits, inputHitCollection = mm_b_coll.outputSimTrackerHits,
outputHitCollection = "MPGDTrackerBarrelRawHits", outputHitCollection = "MPGDTrackerBarrelRawHits",
...@@ -146,6 +151,7 @@ else: ...@@ -146,6 +151,7 @@ else:
gem_ec_coll = SimTrackerHitsCollector("gem_ec_coll", gem_ec_coll = SimTrackerHitsCollector("gem_ec_coll",
inputSimTrackerHits = gem_endcap_collections, inputSimTrackerHits = gem_endcap_collections,
outputSimTrackerHits = "GEMTrackerEndcapHits") outputSimTrackerHits = "GEMTrackerEndcapHits")
algorithms.append( gem_ec_coll )
gem_ec_digi = TrackerDigi("gem_ec_digi", gem_ec_digi = TrackerDigi("gem_ec_digi",
inputHitCollection = gem_ec_coll.outputSimTrackerHits, inputHitCollection = gem_ec_coll.outputSimTrackerHits,
outputHitCollection = "GEMTrackerEndcapRawHits", outputHitCollection = "GEMTrackerEndcapRawHits",
......
benchmarks/track_fitting/options/track_reconstruction.py
+ 7
− 1
View file @ 1508571f
...@@ -99,6 +99,7 @@ algorithms.append( podioinput ) ...@@ -99,6 +99,7 @@ algorithms.append( podioinput )
trk_b_coll = SimTrackerHitsCollector("trk_b_coll", trk_b_coll = SimTrackerHitsCollector("trk_b_coll",
inputSimTrackerHits = tracker_barrel_collections, inputSimTrackerHits = tracker_barrel_collections,
outputSimTrackerHits = "TrackerBarrelHits") outputSimTrackerHits = "TrackerBarrelHits")
algorithms.append( trk_b_coll )
trk_b_digi = TrackerDigi("trk_b_digi", trk_b_digi = TrackerDigi("trk_b_digi",
inputHitCollection = trk_b_coll.outputSimTrackerHits, inputHitCollection = trk_b_coll.outputSimTrackerHits,
outputHitCollection = "TrackerBarrelRawHits", outputHitCollection = "TrackerBarrelRawHits",
...@@ -108,6 +109,7 @@ algorithms.append( trk_b_digi ) ...@@ -108,6 +109,7 @@ algorithms.append( trk_b_digi )
trk_ec_coll = SimTrackerHitsCollector("trk_ec_coll", trk_ec_coll = SimTrackerHitsCollector("trk_ec_coll",
inputSimTrackerHits = tracker_endcap_collections, inputSimTrackerHits = tracker_endcap_collections,
outputSimTrackerHits = "TrackerEndcapHits") outputSimTrackerHits = "TrackerEndcapHits")
algorithms.append( trk_ec_coll )
trk_ec_digi = TrackerDigi("trk_ec_digi", trk_ec_digi = TrackerDigi("trk_ec_digi",
inputHitCollection = trk_ec_coll.outputSimTrackerHits, inputHitCollection = trk_ec_coll.outputSimTrackerHits,
outputHitCollection = "TrackerEndcapRawHits", outputHitCollection = "TrackerEndcapRawHits",
...@@ -117,6 +119,7 @@ algorithms.append( trk_ec_digi ) ...@@ -117,6 +119,7 @@ algorithms.append( trk_ec_digi )
vtx_b_coll = SimTrackerHitsCollector("vtx_b_coll", vtx_b_coll = SimTrackerHitsCollector("vtx_b_coll",
inputSimTrackerHits = vertex_barrel_collections, inputSimTrackerHits = vertex_barrel_collections,
outputSimTrackerHits = "VertexBarrelHits") outputSimTrackerHits = "VertexBarrelHits")
algorithms.append( vtx_b_coll )
vtx_b_digi = TrackerDigi("vtx_b_digi", vtx_b_digi = TrackerDigi("vtx_b_digi",
inputHitCollection = vtx_b_coll.outputSimTrackerHits, inputHitCollection = vtx_b_coll.outputSimTrackerHits,
outputHitCollection = "VertexBarrelRawHits", outputHitCollection = "VertexBarrelRawHits",
...@@ -127,6 +130,7 @@ if 'acadia' in detector_version: ...@@ -127,6 +130,7 @@ if 'acadia' in detector_version:
vtx_ec_coll = SimTrackerHitsCollector("vtx_ec_coll", vtx_ec_coll = SimTrackerHitsCollector("vtx_ec_coll",
inputSimTrackerHits = vertex_endcap_collections, inputSimTrackerHits = vertex_endcap_collections,
outputSimTrackerHits = "VertexEndcapHits") outputSimTrackerHits = "VertexEndcapHits")
algorithms.append( vtx_ec_coll )
vtx_ec_digi = TrackerDigi("vtx_ec_digi", vtx_ec_digi = TrackerDigi("vtx_ec_digi",
inputHitCollection = vtx_ec_coll.outputSimTrackerHits, inputHitCollection = vtx_ec_coll.outputSimTrackerHits,
outputHitCollection = "VertexEndcapRawHits", outputHitCollection = "VertexEndcapRawHits",
...@@ -136,6 +140,7 @@ else: ...@@ -136,6 +140,7 @@ else:
mm_b_coll = SimTrackerHitsCollector("mm_b_coll", mm_b_coll = SimTrackerHitsCollector("mm_b_coll",
inputSimTrackerHits = mpgd_barrel_collections, inputSimTrackerHits = mpgd_barrel_collections,
outputSimTrackerHits = "MPGDTrackerBarrelHits") outputSimTrackerHits = "MPGDTrackerBarrelHits")
algorithms.append( mm_b_coll )
mm_b_digi = TrackerDigi("mm_b_digi", mm_b_digi = TrackerDigi("mm_b_digi",
inputHitCollection = mm_b_coll.outputSimTrackerHits, inputHitCollection = mm_b_coll.outputSimTrackerHits,
outputHitCollection = "MPGDTrackerBarrelRawHits", outputHitCollection = "MPGDTrackerBarrelRawHits",
...@@ -145,6 +150,7 @@ else: ...@@ -145,6 +150,7 @@ else:
gem_ec_coll = SimTrackerHitsCollector("gem_ec_coll", gem_ec_coll = SimTrackerHitsCollector("gem_ec_coll",
inputSimTrackerHits = gem_endcap_collections, inputSimTrackerHits = gem_endcap_collections,
outputSimTrackerHits = "GEMTrackerEndcapHits") outputSimTrackerHits = "GEMTrackerEndcapHits")
algorithms.append( gem_ec_coll )
gem_ec_digi = TrackerDigi("gem_ec_digi", gem_ec_digi = TrackerDigi("gem_ec_digi",
inputHitCollection = gem_ec_coll.outputSimTrackerHits, inputHitCollection = gem_ec_coll.outputSimTrackerHits,
outputHitCollection = "GEMTrackerEndcapRawHits", outputHitCollection = "GEMTrackerEndcapRawHits",
......
benchmarks/tracking/options/track_reconstruction.py
+ 7
− 1
View file @ 1508571f
...@@ -100,6 +100,7 @@ algorithms.append( podioinput ) ...@@ -100,6 +100,7 @@ algorithms.append( podioinput )
trk_b_coll = SimTrackerHitsCollector("trk_b_coll", trk_b_coll = SimTrackerHitsCollector("trk_b_coll",
inputSimTrackerHits = tracker_barrel_collections, inputSimTrackerHits = tracker_barrel_collections,
outputSimTrackerHits = "TrackerBarrelHits") outputSimTrackerHits = "TrackerBarrelHits")
algorithms.append( trk_b_coll )
trk_b_digi = TrackerDigi("trk_b_digi", trk_b_digi = TrackerDigi("trk_b_digi",
inputHitCollection = trk_b_coll.outputSimTrackerHits, inputHitCollection = trk_b_coll.outputSimTrackerHits,
outputHitCollection = "TrackerBarrelRawHits", outputHitCollection = "TrackerBarrelRawHits",
...@@ -109,6 +110,7 @@ algorithms.append( trk_b_digi ) ...@@ -109,6 +110,7 @@ algorithms.append( trk_b_digi )
trk_ec_coll = SimTrackerHitsCollector("trk_ec_coll", trk_ec_coll = SimTrackerHitsCollector("trk_ec_coll",
inputSimTrackerHits = tracker_endcap_collections, inputSimTrackerHits = tracker_endcap_collections,
outputSimTrackerHits = "TrackerEndcapHits") outputSimTrackerHits = "TrackerEndcapHits")
algorithms.append( trk_ec_coll )
trk_ec_digi = TrackerDigi("trk_ec_digi", trk_ec_digi = TrackerDigi("trk_ec_digi",
inputHitCollection = trk_ec_coll.outputSimTrackerHits, inputHitCollection = trk_ec_coll.outputSimTrackerHits,
outputHitCollection = "TrackerEndcapRawHits", outputHitCollection = "TrackerEndcapRawHits",
...@@ -118,6 +120,7 @@ algorithms.append( trk_ec_digi ) ...@@ -118,6 +120,7 @@ algorithms.append( trk_ec_digi )
vtx_b_coll = SimTrackerHitsCollector("vtx_b_coll", vtx_b_coll = SimTrackerHitsCollector("vtx_b_coll",
inputSimTrackerHits = vertex_barrel_collections, inputSimTrackerHits = vertex_barrel_collections,
outputSimTrackerHits = "VertexBarrelHits") outputSimTrackerHits = "VertexBarrelHits")
algorithms.append( vtx_b_coll )
vtx_b_digi = TrackerDigi("vtx_b_digi", vtx_b_digi = TrackerDigi("vtx_b_digi",
inputHitCollection = vtx_b_coll.outputSimTrackerHits, inputHitCollection = vtx_b_coll.outputSimTrackerHits,
outputHitCollection = "VertexBarrelRawHits", outputHitCollection = "VertexBarrelRawHits",
...@@ -128,6 +131,7 @@ if 'acadia' in detector_version: ...@@ -128,6 +131,7 @@ if 'acadia' in detector_version:
vtx_ec_coll = SimTrackerHitsCollector("vtx_ec_coll", vtx_ec_coll = SimTrackerHitsCollector("vtx_ec_coll",
inputSimTrackerHits = vertex_endcap_collections, inputSimTrackerHits = vertex_endcap_collections,
outputSimTrackerHits = "VertexEndcapHits") outputSimTrackerHits = "VertexEndcapHits")
algorithms.append( vtx_ec_coll )
vtx_ec_digi = TrackerDigi("vtx_ec_digi", vtx_ec_digi = TrackerDigi("vtx_ec_digi",
inputHitCollection = vtx_ec_coll.outputSimTrackerHits, inputHitCollection = vtx_ec_coll.outputSimTrackerHits,
outputHitCollection = "VertexEndcapRawHits", outputHitCollection = "VertexEndcapRawHits",
...@@ -137,6 +141,7 @@ else: ...@@ -137,6 +141,7 @@ else:
mm_b_coll = SimTrackerHitsCollector("mm_b_coll", mm_b_coll = SimTrackerHitsCollector("mm_b_coll",
inputSimTrackerHits = mpgd_barrel_collections, inputSimTrackerHits = mpgd_barrel_collections,
outputSimTrackerHits = "MPGDTrackerBarrelHits") outputSimTrackerHits = "MPGDTrackerBarrelHits")
algorithms.append( mm_b_coll )
mm_b_digi = TrackerDigi("mm_b_digi", mm_b_digi = TrackerDigi("mm_b_digi",
inputHitCollection = mm_b_coll.outputSimTrackerHits, inputHitCollection = mm_b_coll.outputSimTrackerHits,
outputHitCollection = "MPGDTrackerBarrelRawHits", outputHitCollection = "MPGDTrackerBarrelRawHits",
...@@ -146,6 +151,7 @@ else: ...@@ -146,6 +151,7 @@ else:
gem_ec_coll = SimTrackerHitsCollector("gem_ec_coll", gem_ec_coll = SimTrackerHitsCollector("gem_ec_coll",
inputSimTrackerHits = gem_endcap_collections, inputSimTrackerHits = gem_endcap_collections,
outputSimTrackerHits = "GEMTrackerEndcapHits") outputSimTrackerHits = "GEMTrackerEndcapHits")
algorithms.append( gem_ec_coll )
gem_ec_digi = TrackerDigi("gem_ec_digi", gem_ec_digi = TrackerDigi("gem_ec_digi",
inputHitCollection = gem_ec_coll.outputSimTrackerHits, inputHitCollection = gem_ec_coll.outputSimTrackerHits,
outputHitCollection = "GEMTrackerEndcapRawHits", outputHitCollection = "GEMTrackerEndcapRawHits",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment