Change to AllHits for track_finding, track_fitting

benchmarks/track_finding/options/track_reconstruction.py

@@ -99,7 +99,7 @@ algorithms.append( podioinput )
 
 trk_b_coll = SimTrackerHitsCollector("trk_b_coll",
         inputSimTrackerHits = tracker_barrel_collections,
-        outputSimTrackerHits = "TrackerBarrelHits")
+        outputSimTrackerHits = "TrackerBarrelAllHits")
 algorithms.append( trk_b_coll )
 trk_b_digi = TrackerDigi("trk_b_digi",
         inputHitCollection = trk_b_coll.outputSimTrackerHits,
@@ -109,7 +109,7 @@ algorithms.append( trk_b_digi )
 
 trk_ec_coll = SimTrackerHitsCollector("trk_ec_coll",
         inputSimTrackerHits = tracker_endcap_collections,
-        outputSimTrackerHits = "TrackerEndcapHits")
+        outputSimTrackerHits = "TrackerEndcapAllHits")
 algorithms.append( trk_ec_coll )
 trk_ec_digi = TrackerDigi("trk_ec_digi",
         inputHitCollection = trk_ec_coll.outputSimTrackerHits,
@@ -119,7 +119,7 @@ algorithms.append( trk_ec_digi )
 
 vtx_b_coll = SimTrackerHitsCollector("vtx_b_coll",
         inputSimTrackerHits = vertex_barrel_collections,
-        outputSimTrackerHits = "VertexBarrelHits")
+        outputSimTrackerHits = "VertexBarrelAllHits")
 algorithms.append( vtx_b_coll )
 vtx_b_digi = TrackerDigi("vtx_b_digi",
         inputHitCollection = vtx_b_coll.outputSimTrackerHits,
@@ -130,7 +130,7 @@ algorithms.append( vtx_b_digi )
 if 'acadia' in detector_version:
     vtx_ec_coll = SimTrackerHitsCollector("vtx_ec_coll",
             inputSimTrackerHits = vertex_endcap_collections,
-            outputSimTrackerHits = "VertexEndcapHits")
+            outputSimTrackerHits = "VertexEndcapAllHits")
     algorithms.append( vtx_ec_coll )
     vtx_ec_digi = TrackerDigi("vtx_ec_digi",
             inputHitCollection = vtx_ec_coll.outputSimTrackerHits,
@@ -140,7 +140,7 @@ if 'acadia' in detector_version:
 else:
     mm_b_coll = SimTrackerHitsCollector("mm_b_coll",
             inputSimTrackerHits = mpgd_barrel_collections,
-            outputSimTrackerHits = "MPGDTrackerBarrelHits")
+            outputSimTrackerHits = "MPGDTrackerBarrelAllHits")
     algorithms.append( mm_b_coll )
     mm_b_digi = TrackerDigi("mm_b_digi",
             inputHitCollection = mm_b_coll.outputSimTrackerHits,
@@ -150,7 +150,7 @@ else:
 
 gem_ec_coll = SimTrackerHitsCollector("gem_ec_coll",
         inputSimTrackerHits = gem_endcap_collections,
-        outputSimTrackerHits = "GEMTrackerEndcapHits")
+        outputSimTrackerHits = "GEMTrackerEndcapAllHits")
 algorithms.append( gem_ec_coll )
 gem_ec_digi = TrackerDigi("gem_ec_digi",
         inputHitCollection = gem_ec_coll.outputSimTrackerHits,

benchmarks/track_fitting/options/track_reconstruction.py

@@ -98,7 +98,7 @@ algorithms.append( podioinput )
 
 trk_b_coll = SimTrackerHitsCollector("trk_b_coll",
         inputSimTrackerHits = tracker_barrel_collections,
-        outputSimTrackerHits = "TrackerBarrelHits")
+        outputSimTrackerHits = "TrackerBarrelAllHits")
 algorithms.append( trk_b_coll )
 trk_b_digi = TrackerDigi("trk_b_digi",
         inputHitCollection = trk_b_coll.outputSimTrackerHits,
@@ -108,7 +108,7 @@ algorithms.append( trk_b_digi )
 
 trk_ec_coll = SimTrackerHitsCollector("trk_ec_coll",
         inputSimTrackerHits = tracker_endcap_collections,
-        outputSimTrackerHits = "TrackerEndcapHits")
+        outputSimTrackerHits = "TrackerEndcapAllHits")
 algorithms.append( trk_ec_coll )
 trk_ec_digi = TrackerDigi("trk_ec_digi",
         inputHitCollection = trk_ec_coll.outputSimTrackerHits,
@@ -118,7 +118,7 @@ algorithms.append( trk_ec_digi )
 
 vtx_b_coll = SimTrackerHitsCollector("vtx_b_coll",
         inputSimTrackerHits = vertex_barrel_collections,
-        outputSimTrackerHits = "VertexBarrelHits")
+        outputSimTrackerHits = "VertexBarrelAllHits")
 algorithms.append( vtx_b_coll )
 vtx_b_digi = TrackerDigi("vtx_b_digi",
         inputHitCollection = vtx_b_coll.outputSimTrackerHits,
@@ -129,7 +129,7 @@ algorithms.append( vtx_b_digi )
 if 'acadia' in detector_version:
     vtx_ec_coll = SimTrackerHitsCollector("vtx_ec_coll",
             inputSimTrackerHits = vertex_endcap_collections,
-            outputSimTrackerHits = "VertexEndcapHits")
+            outputSimTrackerHits = "VertexEndcapAllHits")
     algorithms.append( vtx_ec_coll )
     vtx_ec_digi = TrackerDigi("vtx_ec_digi",
             inputHitCollection = vtx_ec_coll.outputSimTrackerHits,
@@ -139,7 +139,7 @@ if 'acadia' in detector_version:
 else:
     mm_b_coll = SimTrackerHitsCollector("mm_b_coll",
             inputSimTrackerHits = mpgd_barrel_collections,
-            outputSimTrackerHits = "MPGDTrackerBarrelHits")
+            outputSimTrackerHits = "MPGDTrackerBarrelAllHits")
     algorithms.append( mm_b_coll )
     mm_b_digi = TrackerDigi("mm_b_digi",
             inputHitCollection = mm_b_coll.outputSimTrackerHits,
@@ -149,7 +149,7 @@ else:
 
 gem_ec_coll = SimTrackerHitsCollector("gem_ec_coll",
         inputSimTrackerHits = gem_endcap_collections,
-        outputSimTrackerHits = "GEMTrackerEndcapHits")
+        outputSimTrackerHits = "GEMTrackerEndcapAllHits")
 algorithms.append( gem_ec_coll )
 gem_ec_digi = TrackerDigi("gem_ec_digi",
         inputHitCollection = gem_ec_coll.outputSimTrackerHits,