Use RecHits, RawHits

benchmarks/full/options/full_reconstruction.py

@@ -152,13 +152,13 @@ ce_ecal_daq = dict(
 
 ce_ecal_digi = CalHitDigi("ce_ecal_digi",
         inputHitCollection="EcalEndcapNHits",
-        outputHitCollection="EcalEndcapNHitsDigi",
+        outputHitCollection="EcalEndcapNRawHits",
         energyResolutions=[0., 0.02, 0.],
         **ce_ecal_daq)
 
 ce_ecal_reco = CalHitReco("ce_ecal_reco",
         inputHitCollection=ce_ecal_digi.outputHitCollection,
-        outputHitCollection="EcalEndcapNHitsReco",
+        outputHitCollection="EcalEndcapNRecHits",
         thresholdFactor=4,          # 4 sigma cut on pedestal sigma
         readoutClass="EcalEndcapNHits",
         sectorField="sector",
@@ -189,19 +189,19 @@ ci_ecal_daq = dict(
 
 ci_ecal_digi = CalHitDigi("ci_ecal_digi",
         inputHitCollection="EcalEndcapPHits",
-        outputHitCollection="EcalEndcapPHitsDigi",
+        outputHitCollection="EcalEndcapPRawHits",
         **ci_ecal_daq)
 
 ci_ecal_reco = CalHitReco("ci_ecal_reco",
         inputHitCollection=ci_ecal_digi.outputHitCollection,
-        outputHitCollection="EcalEndcapPHitsReco",
+        outputHitCollection="EcalEndcapPRecHits",
         thresholdFactor=5.0,
         **ci_ecal_daq)
 
 # merge hits in different layer (projection to local x-y plane)
 ci_ecal_merger = CalHitsMerger("ci_ecal_merger",
         inputHitCollection=ci_ecal_reco.outputHitCollection,
-        outputHitCollection="EcalEndcapPHitsRecoXY",
+        outputHitCollection="EcalEndcapPRecHitsXY",
         fields=["layer", "slice"],
         fieldRefNumbers=[1, 0],
         readoutClass="EcalEndcapPHits")
@@ -268,12 +268,12 @@ scfi_barrel_daq = dict(
 
 scfi_barrel_digi = CalHitDigi("scfi_barrel_digi",
         inputHitCollection="EcalBarrelScFiHits",
-        outputHitCollection="EcalBarrelScFiHitsDigi",
+        outputHitCollection="EcalBarrelScFiRawHits",
         **scfi_barrel_daq)
 
 scfi_barrel_reco = CalHitReco("scfi_barrel_reco",
         inputHitCollection=scfi_barrel_digi.outputHitCollection,
-        outputHitCollection="EcalBarrelScFiHitsReco",
+        outputHitCollection="EcalBarrelScFiRecHits",
         thresholdFactor=5.0,
         readoutClass="EcalBarrelScFiHits",
         layerField="layer",
@@ -313,12 +313,12 @@ cb_hcal_daq = dict(
 
 cb_hcal_digi = CalHitDigi("cb_hcal_digi",
          inputHitCollection="HcalBarrelHits",
-         outputHitCollection="HcalBarrelHitsDigi",
+         outputHitCollection="HcalBarrelRawHits",
          **cb_hcal_daq)
 
 cb_hcal_reco = CalHitReco("cb_hcal_reco",
         inputHitCollection=cb_hcal_digi.outputHitCollection,
-        outputHitCollection="HcalBarrelHitsReco",
+        outputHitCollection="HcalBarrelRecHits",
         thresholdFactor=5.0,
         readoutClass="HcalBarrelHits",
         layerField="layer",
@@ -327,7 +327,7 @@ cb_hcal_reco = CalHitReco("cb_hcal_reco",
 
 cb_hcal_merger = CalHitsMerger("cb_hcal_merger",
         inputHitCollection=cb_hcal_reco.outputHitCollection,
-        outputHitCollection="HcalBarrelHitsRecoXY",
+        outputHitCollection="HcalBarrelRecHitsXY",
         readoutClass="HcalBarrelHits",
         fields=["layer", "slice"],
         fieldRefNumbers=[1, 0])
@@ -356,18 +356,18 @@ ci_hcal_daq = dict(
          pedestalSigma=10)
 ci_hcal_digi = CalHitDigi("ci_hcal_digi",
          inputHitCollection="HcalEndcapPHits",
-         outputHitCollection="HcalEndcapPHitsDigi",
+         outputHitCollection="HcalEndcapPRawHits",
          **ci_hcal_daq)
 
 ci_hcal_reco = CalHitReco("ci_hcal_reco",
         inputHitCollection=ci_hcal_digi.outputHitCollection,
-        outputHitCollection="HcalEndcapPHitsReco",
+        outputHitCollection="HcalEndcapPRecHits",
         thresholdFactor=5.0,
         **ci_hcal_daq)
 
 ci_hcal_merger = CalHitsMerger("ci_hcal_merger",
         inputHitCollection=ci_hcal_reco.outputHitCollection,
-        outputHitCollection="HcalEndcapPHitsRecoXY",
+        outputHitCollection="HcalEndcapPRecHitsXY",
         readoutClass="HcalEndcapPHits",
         fields=["layer", "slice"],
         fieldRefNumbers=[1, 0])
@@ -396,18 +396,18 @@ ce_hcal_daq = dict(
 
 ce_hcal_digi = CalHitDigi("ce_hcal_digi",
         inputHitCollection="HcalEndcapNHits",
-        outputHitCollection="HcalEndcapNHitsDigi",
+        outputHitCollection="HcalEndcapNRawHits",
         **ce_hcal_daq)
 
 ce_hcal_reco = CalHitReco("ce_hcal_reco",
         inputHitCollection=ce_hcal_digi.outputHitCollection,
-        outputHitCollection="HcalEndcapNHitsReco",
+        outputHitCollection="HcalEndcapNRecHits",
         thresholdFactor=5.0,
         **ce_hcal_daq)
 
 ce_hcal_merger = CalHitsMerger("ce_hcal_merger",
         inputHitCollection=ce_hcal_reco.outputHitCollection,
-        outputHitCollection="HcalEndcapNHitsRecoXY",
+        outputHitCollection="HcalEndcapNRecHitsXY",
         readoutClass="HcalEndcapNHits",
         fields=["layer", "slice"],
         fieldRefNumbers=[1, 0])
@@ -539,16 +539,16 @@ parts_from_fit = ParticlesFromTrackFit("parts_from_fit",
 
 pmtdigi = PhotoMultiplierDigi("pmtdigi",
         inputHitCollection="DRICHHits",
-        outputHitCollection="DRICHHitsDigi",
+        outputHitCollection="DRICHRawHits",
         quantumEfficiency=[(a*units.eV, b) for a, b in qe_data])
 
 pmtreco = PhotoMultiplierReco("pmtreco",
-        inputHitCollection="DRICHHitsDigi",
-        outputHitCollection="DRICHHitsReco")
+        inputHitCollection=pmtdigi.outputHitCollection,
+        outputHitCollection="DRICHRecHits")
 
 # FIXME
 #richcluster = PhotoRingClusters("richcluster",
-#        inputHitCollection="ForwardRICHHitsReco",
+#        inputHitCollection=pmtreco.outputHitCollection,
 #        #inputTrackCollection="ReconstructedParticles",
 #        outputClusterCollection="ForwardRICHClusters")