Remove TrackerBarrelHits2, DRICHHits2; RecHitsXY -> MergedHits

benchmarks/full/options/full_reconstruction.py

@@ -117,16 +117,6 @@ copier = MCCopier("MCCopier",
         outputCollection="mcparticles2")
 algorithms.append(copier)
 
-trkcopier = TrkCopier("TrkCopier",
-        inputCollection="TrackerBarrelHits",
-        outputCollection="TrackerBarrelHits2")
-algorithms.append(trkcopier)
-
-pmtcopier = PMTCopier("PMTCopier",
-        inputCollection="DRICHHits",
-        outputCollection="DRICHHits2")
-algorithms.append(pmtcopier)
-
 # Generated particles
 dummy = MC2DummyParticle("dummy",
         inputCollection="mcparticles",
@@ -171,6 +161,7 @@ ce_ecal_clreco = RecoCoG("ce_ecal_clreco",
         inputHitCollection=ce_ecal_cl.inputHitCollection,
         inputProtoClusterCollection=ce_ecal_cl.outputProtoClusterCollection,
         outputClusterCollection="EcalEndcapNClusters",
+        outputInfoCollection="EcalEndcapNClusterInfo",
         samplingFraction=0.998,      # this accounts for a small fraction of leakage
         logWeightBase=4.6)
 algorithms.append(ce_ecal_clreco)
@@ -198,7 +189,7 @@ algorithms.append(ci_ecal_reco)
 # merge hits in different layer (projection to local x-y plane)
 ci_ecal_merger = CalHitsMerger("ci_ecal_merger",
         inputHitCollection=ci_ecal_reco.outputHitCollection,
-        outputHitCollection="EcalEndcapPRecHitsXY",
+        outputHitCollection="EcalEndcapPRecMergedHits",
         fields=["layer", "slice"],
         fieldRefNumbers=[1, 0],
         readoutClass="EcalEndcapPHits")
@@ -290,7 +281,7 @@ algorithms.append(scfi_barrel_reco)
 # merge hits in different layer (projection to local x-y plane)
 scfi_barrel_merger = CalHitsMerger("scfi_barrel_merger",
          inputHitCollection=scfi_barrel_reco.outputHitCollection,
-         outputHitCollection="EcalBarrelScFiGridReco",
+         outputHitCollection="EcalBarrelScFiMergedHits",
          fields=["fiber"],
          fieldRefNumbers=[1],
          readoutClass="EcalBarrelScFiHits")
@@ -338,7 +329,7 @@ algorithms.append(cb_hcal_reco)
 
 cb_hcal_merger = CalHitsMerger("cb_hcal_merger",
         inputHitCollection=cb_hcal_reco.outputHitCollection,
-        outputHitCollection="HcalBarrelRecHitsXY",
+        outputHitCollection="HcalBarrelMergedHits",
         readoutClass="HcalBarrelHits",
         fields=["layer", "slice"],
         fieldRefNumbers=[1, 0])
@@ -383,7 +374,7 @@ algorithms.append(ci_hcal_reco)
 
 ci_hcal_merger = CalHitsMerger("ci_hcal_merger",
         inputHitCollection=ci_hcal_reco.outputHitCollection,
-        outputHitCollection="HcalEndcapPRecHitsXY",
+        outputHitCollection="HcalEndcapPMergedHits",
         readoutClass="HcalEndcapPHits",
         fields=["layer", "slice"],
         fieldRefNumbers=[1, 0])
@@ -428,7 +419,7 @@ algorithms.append(ce_hcal_reco)
 
 ce_hcal_merger = CalHitsMerger("ce_hcal_merger",
         inputHitCollection=ce_hcal_reco.outputHitCollection,
-        outputHitCollection="HcalEndcapNRecHitsXY",
+        outputHitCollection="HcalEndcapNMergedHits",
         readoutClass="HcalEndcapNHits",
         fields=["layer", "slice"],
         fieldRefNumbers=[1, 0])
@@ -593,11 +584,11 @@ algorithms.append(mrich_reco)
 podout = PodioOutput("out", filename=output_rec)
 podout.outputCommands = [
         "keep *",
-        "drop *Digi",
-        "keep *Reco*",
-        "keep *ClusterHits",
-        "keep *Clusters",
+        "drop *Hits",
         "keep *Layers",
+        "keep *Clusters",
+        "drop *ProtoClusters",
+        "drop outputParticles",
         "drop InitTrackParams",
         ] + [ "drop " + c for c in sim_coll]
 algorithms.append(podout)