EDM4hep: mcparticles -> MCParticles

benchmarks/clustering/options/full_cal_reco.py

@@ -53,7 +53,7 @@ from Configurables import Jug__Reco__ImagingClusterReco as ImagingClusterReco
 
 # branches needed from simulation root file
 sim_coll = [
-    "mcparticles",
+    "MCParticles",
     "EcalEndcapNHits",
     "EcalEndcapPHits",
     "EcalBarrelHits",
@@ -87,6 +87,7 @@ ce_ecal_reco = CalHitReco("ce_ecal_reco",
         thresholdFactor=4,          # 4 sigma cut on pedestal sigma
         readoutClass="EcalEndcapNHits",
         sectorField="sector",
+        samplingFraction=0.998,      # this accounts for a small fraction of leakage
         **ce_ecal_daq)
 
 ce_ecal_cl = IslandCluster("ce_ecal_cl",
@@ -100,11 +101,8 @@ ce_ecal_cl = IslandCluster("ce_ecal_cl",
         dimScaledLocalDistXY=[1.8, 1.8])          # dimension scaled dist is good for hybrid sectors with different module size
 
 ce_ecal_clreco = RecoCoG("ce_ecal_clreco",
-        inputHitCollection=ce_ecal_cl.inputHitCollection,
         inputProtoClusterCollection=ce_ecal_cl.outputProtoClusterCollection,
         outputClusterCollection="EcalEndcapNClusters",
-        mcHits="EcalEndcapNHits",
-        samplingFraction=0.998,      # this accounts for a small fraction of leakage
         logWeightBase=4.6)
 
 # Endcap Sampling Ecal
@@ -123,6 +121,7 @@ ci_ecal_reco = CalHitReco("ci_ecal_reco",
         inputHitCollection=ci_ecal_digi.outputHitCollection,
         outputHitCollection="EcalEndcapPHitsReco",
         thresholdFactor=5.0,
+        samplingFraction=ci_ecal_sf,
         **ci_ecal_daq)
 
 # merge hits in different layer (projection to local x-y plane)
@@ -145,12 +144,9 @@ ci_ecal_cl = IslandCluster("ci_ecal_cl",
         localDistXY=[10*mm, 10*mm])
 
 ci_ecal_clreco = RecoCoG("ci_ecal_clreco",
-        inputHitCollection=ci_ecal_cl.inputHitCollection,
         inputProtoClusterCollection=ci_ecal_cl.outputProtoClusterCollection,
         outputClusterCollection="EcalEndcapPClusters",
-        mcHits="EcalEndcapPHits",
-        logWeightBase=6.2,
-        samplingFraction=ci_ecal_sf)
+        logWeightBase=6.2)
 
 # Central Barrel Ecal (Imaging Cal.)
 cb_ecal_daq = dict(
@@ -172,6 +168,7 @@ cb_ecal_reco = ImCalPixelReco("cb_ecal_reco",
         readoutClass="EcalBarrelHits",  # readout class
         layerField="layer",             # field to get layer id
         sectorField="module",           # field to get sector id
+        samplingFraction=cb_ecal_sf,
         **cb_ecal_daq)
 
 cb_ecal_cl = ImagingCluster("cb_ecal_cl",
@@ -183,12 +180,10 @@ cb_ecal_cl = ImagingCluster("cb_ecal_cl",
         sectorDist=3.*cm)                       # different sector
 
 cb_ecal_clreco = ImagingClusterReco("cb_ecal_clreco",
-        samplingFraction=cb_ecal_sf,
-        inputHitCollection=cb_ecal_cl.inputHitCollection,
-        inputProtoClusterCollection=cb_ecal_cl.outputProtoClusterCollection,
+        inputProtoClusters=cb_ecal_cl.outputProtoClusterCollection,
         mcHits="EcalBarrelHits",
-        outputClusterCollection="EcalBarrelImagingClusters",
-        outputLayerCollection="EcalBarrelImagingLayers")
+        outputClusters="EcalBarrelImagingClusters",
+        outputLayers="EcalBarrelImagingLayers")
 
 #Central ECAL SciFi
 # use the same daq_setting for digi/reco pair
@@ -211,6 +206,7 @@ scfi_barrel_reco = CalHitReco("scfi_barrel_reco",
         layerField="layer",
         sectorField="module",
         localDetFields=["system", "module"], # use local coordinates in each module (stave)
+        samplingFraction=scifi_barrel_sf,
         **scfi_barrel_daq)
 
 # merge hits in different layer (projection to local x-y plane)
@@ -231,12 +227,9 @@ scfi_barrel_cl = IslandCluster("scfi_barrel_cl",
         localDistXZ=[30*mm, 30*mm])
 
 scfi_barrel_clreco = RecoCoG("scfi_barrel_clreco",
-       inputHitCollection=scfi_barrel_cl.inputHitCollection,
        inputProtoClusterCollection=scfi_barrel_cl.outputProtoClusterCollection,
        outputClusterCollection="EcalBarrelScFiClusters",
-       mcHits="EcalBarrelScFiHits",
-       logWeightBase=6.2,
-       samplingFraction= scifi_barrel_sf)
+       logWeightBase=6.2)
 
 
 # Central Barrel Hcal
@@ -258,6 +251,7 @@ cb_hcal_reco = CalHitReco("cb_hcal_reco",
         readoutClass="HcalBarrelHits",
         layerField="layer",
         sectorField="module",
+        samplingFraction=cb_hcal_sf,
         **cb_hcal_daq)
 
 cb_hcal_merger = CalHitsMerger("cb_hcal_merger",
@@ -275,12 +269,9 @@ cb_hcal_cl = IslandCluster("cb_hcal_cl",
         localDistXY=[15.*cm, 15.*cm])
 
 cb_hcal_clreco = RecoCoG("cb_hcal_clreco",
-        inputHitCollection=cb_hcal_cl.inputHitCollection,
         inputProtoClusterCollection=cb_hcal_cl.outputProtoClusterCollection,
         outputClusterCollection="HcalBarrelClusters",
-        mcHits="HcalBarrelHits",
-        logWeightBase=6.2,
-        samplingFraction=cb_hcal_sf)
+        logWeightBase=6.2)
 
 
 # Hcal Hadron Endcap
@@ -298,6 +289,7 @@ ci_hcal_reco = CalHitReco("ci_hcal_reco",
         inputHitCollection=ci_hcal_digi.outputHitCollection,
         outputHitCollection="HcalEndcapPHitsReco",
         thresholdFactor=5.0,
+        samplingFraction=ci_hcal_sf,
         **ci_hcal_daq)
 
 ci_hcal_merger = CalHitsMerger("ci_hcal_merger",
@@ -315,12 +307,9 @@ ci_hcal_cl = IslandCluster("ci_hcal_cl",
         localDistXY=[15.*cm, 15.*cm])
 
 ci_hcal_clreco = RecoCoG("ci_hcal_clreco",
-        inputHitCollection=ci_hcal_cl.inputHitCollection,
         inputProtoClusterCollection=ci_hcal_cl.outputProtoClusterCollection,
         outputClusterCollection="HcalEndcapPClusters",
-        mcHits="HcalEndcapPHits",
-        logWeightBase=6.2,
-        samplingFraction=ci_hcal_sf)
+        logWeightBase=6.2)
 
 # Hcal Electron Endcap
 ce_hcal_daq = dict(
@@ -338,6 +327,7 @@ ce_hcal_reco = CalHitReco("ce_hcal_reco",
         inputHitCollection=ce_hcal_digi.outputHitCollection,
         outputHitCollection="HcalEndcapNHitsReco",
         thresholdFactor=5.0,
+        samplingFraction=ce_hcal_sf,
         **ce_hcal_daq)
 
 ce_hcal_merger = CalHitsMerger("ce_hcal_merger",
@@ -355,16 +345,13 @@ ce_hcal_cl = IslandCluster("ce_hcal_cl",
         localDistXY=[15.*cm, 15.*cm])
 
 ce_hcal_clreco = RecoCoG("ce_hcal_clreco",
-        inputHitCollection=ce_hcal_cl.inputHitCollection,
         inputProtoClusterCollection=ce_hcal_cl.outputProtoClusterCollection,
         outputClusterCollection="HcalEndcapNClusters",
-        mcHits="HcalEndcapNHits",
-        logWeightBase=6.2,
-        samplingFraction=ce_hcal_sf)
+        logWeightBase=6.2)
 
 
 podout.outputCommands = ['drop *',
-        'keep mcparticles',
+        'keep MCParticles',
         'keep *Digi',
         'keep *Reco*',
         'keep *Cluster*',