diff --git a/options/reconstruction.py b/options/reconstruction.py index 1b803fbb8fe469fff8fd825d8051e17b45e64923..f859d2b6501691f0ff989a6c3b3702f338b8b15d 100644 --- a/options/reconstruction.py +++ b/options/reconstruction.py @@ -223,36 +223,26 @@ if has_ecal_barrel_scfi: sim_coll += ecal_barrel_scfi_collections forward_romanpot_collections = [ - "ForwardRomanPotHits1", - "ForwardRomanPotHits2", + "ForwardRomanPotHits", ] forward_offmtracker_collections = [ - "ForwardOffMTrackerHits1", - "ForwardOffMTrackerHits2", - "ForwardOffMTrackerHits3", - "ForwardOffMTrackerHits4", + "ForwardOffMTrackerHits", ] sim_coll += forward_romanpot_collections + forward_offmtracker_collections tracker_endcap_collections = [ - "InnerTrackerEndcapPHits", - "InnerTrackerEndcapNHits", - "MiddleTrackerEndcapPHits", - "MiddleTrackerEndcapNHits", - "OuterTrackerEndcapPHits", - "OuterTrackerEndcapNHits", + "TrackerEndcapHits", ] tracker_barrel_collections = [ - "SagittaSiBarrelHits", - "OuterSiBarrelHits", + "SiBarrelHits", ] vertex_barrel_collections = [ "VertexBarrelHits", ] mpgd_barrel_collections = [ - "InnerMPGDBarrelHits", - "OuterMPGDBarrelHits", + "MPGDBarrelHits", ] + sim_coll += ( tracker_endcap_collections + tracker_barrel_collections diff --git a/options/reconstruction.raw.py b/options/reconstruction.raw.py index 6a3b2c84139cb6b0c934ee80b45b3594903579c7..bd1759d5afced7155042c5eb250e2ca707b94d7a 100644 --- a/options/reconstruction.raw.py +++ b/options/reconstruction.raw.py @@ -99,36 +99,26 @@ if has_ecal_barrel_scfi: sim_coll += ecal_barrel_scfi_collections forward_romanpot_collections = [ - "ForwardRomanPotHits1", - "ForwardRomanPotHits2", + "ForwardRomanPotHits", ] forward_offmtracker_collections = [ - "ForwardOffMTrackerHits1", - "ForwardOffMTrackerHits2", - "ForwardOffMTrackerHits3", - "ForwardOffMTrackerHits4", + "ForwardOffMTrackerHits", ] sim_coll += forward_romanpot_collections + forward_offmtracker_collections tracker_endcap_collections = [ - "InnerTrackerEndcapPHits", - "InnerTrackerEndcapNHits", - "MiddleTrackerEndcapPHits", - "MiddleTrackerEndcapNHits", - "OuterTrackerEndcapPHits", - "OuterTrackerEndcapNHits", + "TrackerEndcapHits", ] tracker_barrel_collections = [ - "SagittaSiBarrelHits", - "OuterSiBarrelHits", + "SiBarrelHits", ] vertex_barrel_collections = [ "VertexBarrelHits", ] mpgd_barrel_collections = [ - "InnerMPGDBarrelHits", - "OuterMPGDBarrelHits", + "MPGDBarrelHits", ] + sim_coll += ( tracker_endcap_collections + tracker_barrel_collections