From 53a695b604b23ff33a4314cca64fc026d7879e56 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Fri, 18 Feb 2022 11:27:26 -0600
Subject: [PATCH] mcparticles -> MCParticles
---
benchmarks/clustering/options/full_cal_reco.py | 4 ++--
benchmarks/ecal/options/barrel.py | 4 ++--
benchmarks/ecal/options/endcap_e.py | 4 ++--
benchmarks/ecal/options/endcap_i.py | 4 ++--
.../far_forward/options/far_forward_reconstruction.py | 6 +++---
benchmarks/far_forward/options/zdc_reconstruction.py | 2 +-
benchmarks/imaging_ecal/options/hybrid_cluster.py | 4 ++--
benchmarks/imaging_ecal/options/imaging_2dcluster.py | 2 +-
benchmarks/imaging_ecal/options/imaging_topocluster.py | 2 +-
benchmarks/imaging_ecal/options/scfi_cluster.py | 2 +-
benchmarks/imaging_shower_ML/options/imaging_ml_data.py | 4 ++--
benchmarks/rich/options/rich_reco.py | 4 ++--
benchmarks/track_finding/options/track_reconstruction.py | 6 +++---
benchmarks/track_fitting/options/track_reconstruction.py | 6 +++---
benchmarks/tracking/options/track_reconstruction.py | 6 +++---
15 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/benchmarks/clustering/options/full_cal_reco.py b/benchmarks/clustering/options/full_cal_reco.py
index 24ef7bbe..dc8a231c 100644
--- a/benchmarks/clustering/options/full_cal_reco.py
+++ b/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",
@@ -364,7 +364,7 @@ ce_hcal_clreco = RecoCoG("ce_hcal_clreco",
podout.outputCommands = ['drop *',
- 'keep mcparticles',
+ 'keep MCParticles',
'keep *Digi',
'keep *Reco*',
'keep *Cluster*',
diff --git a/benchmarks/ecal/options/barrel.py b/benchmarks/ecal/options/barrel.py
index 1919fbf0..0ef57127 100644
--- a/benchmarks/ecal/options/barrel.py
+++ b/benchmarks/ecal/options/barrel.py
@@ -38,7 +38,7 @@ from Configurables import Jug__Reco__ImagingClusterReco as ImagingClusterReco
# branches needed from simulation root file
sim_coll = [
- "mcparticles",
+ "MCParticles",
"EcalBarrelHits",
]
@@ -86,7 +86,7 @@ cb_ecal_clreco = ImagingClusterReco("cb_ecal_clreco",
mcHits="EcalBarrelHits")
podout.outputCommands = ['drop *',
- 'keep mcparticles',
+ 'keep MCParticles',
'keep *HitsReco',
'keep *HitsDigi',
'keep *Cluster*']
diff --git a/benchmarks/ecal/options/endcap_e.py b/benchmarks/ecal/options/endcap_e.py
index 9eb12ffe..73863468 100644
--- a/benchmarks/ecal/options/endcap_e.py
+++ b/benchmarks/ecal/options/endcap_e.py
@@ -31,7 +31,7 @@ from Configurables import Jug__Reco__ClusterRecoCoG as RecoCoG
# branches needed from simulation root file
sim_coll = [
- "mcparticles",
+ "MCParticles",
"EcalEndcapNHits",
]
@@ -80,7 +80,7 @@ ce_ecal_clreco = RecoCoG("ce_ecal_clreco",
logWeightBase=4.6)
podout.outputCommands = ['drop *',
- 'keep mcparticles',
+ 'keep MCParticles',
'keep *HitsReco',
'keep *HitsDigi',
'keep *Cluster*']
diff --git a/benchmarks/ecal/options/endcap_i.py b/benchmarks/ecal/options/endcap_i.py
index aaa00dc7..a6738127 100644
--- a/benchmarks/ecal/options/endcap_i.py
+++ b/benchmarks/ecal/options/endcap_i.py
@@ -34,7 +34,7 @@ from Configurables import Jug__Reco__ClusterRecoCoG as RecoCoG
# branches needed from simulation root file
sim_coll = [
- "mcparticles",
+ "MCParticles",
"EcalEndcapPHits",
]
@@ -89,7 +89,7 @@ ci_ecal_clreco = RecoCoG("ci_ecal_clreco",
samplingFraction=ci_ecal_sf)
podout.outputCommands = ['drop *',
- 'keep mcparticles',
+ 'keep MCParticles',
'keep *HitsReco*',
'keep *HitsDigi',
'keep *Cluster*']
diff --git a/benchmarks/far_forward/options/far_forward_reconstruction.py b/benchmarks/far_forward/options/far_forward_reconstruction.py
index ad009bca..59fc6494 100644
--- a/benchmarks/far_forward/options/far_forward_reconstruction.py
+++ b/benchmarks/far_forward/options/far_forward_reconstruction.py
@@ -30,7 +30,7 @@ from Configurables import Jug__Reco__ParticlesFromTrackFit as ParticlesFromTrack
from Configurables import Jug__Reco__TrackerHitReconstruction as TrackerHitReconstruction
sim_colls = [
- "mcparticles",
+ "MCParticles",
"B0TrackerHits",
"ForwardRomanPotHits",
"ForwardOffMTrackerHits"
@@ -98,7 +98,7 @@ algorithms.append(sourcelinker)
## Track param init
truth_trk_init = TrackParamTruthInit("truth_trk_init",
- inputMCParticles="mcparticles",
+ inputMCParticles="MCParticles",
outputInitialTrackParameters="InitTrackParams",
OutputLevel=INFO)
algorithms.append(truth_trk_init)
@@ -127,7 +127,7 @@ podout.outputCommands = [
"drop trajectories",
"drop outputSourceLinks",
"drop outputInitialTrackParameters",
- "keep mcparticles",
+ "keep MCParticles",
]
algorithms.append(podout)
diff --git a/benchmarks/far_forward/options/zdc_reconstruction.py b/benchmarks/far_forward/options/zdc_reconstruction.py
index e95c2dd9..7c01ba1f 100644
--- a/benchmarks/far_forward/options/zdc_reconstruction.py
+++ b/benchmarks/far_forward/options/zdc_reconstruction.py
@@ -30,7 +30,7 @@ geo_service = GeoSvc('GeoSvc', detectors=kwargs['compact'].split(','), OutputLev
podioevent = EICDataSvc('EventDataSvc', inputs=kwargs['input'].split(','), OutputLevel=DEBUG)
sim_colls = [
- 'mcparticles',
+ 'MCParticles',
'ZDCEcalHits',
'ZDCHcalHits'
]
diff --git a/benchmarks/imaging_ecal/options/hybrid_cluster.py b/benchmarks/imaging_ecal/options/hybrid_cluster.py
index f4d3388f..fcceba08 100644
--- a/benchmarks/imaging_ecal/options/hybrid_cluster.py
+++ b/benchmarks/imaging_ecal/options/hybrid_cluster.py
@@ -44,7 +44,7 @@ geo_service = GeoSvc('GeoSvc', detectors=kwargs['compact'].split(','), OutputLev
podioevent = EICDataSvc('EventDataSvc', inputs=kwargs['input'].split(','), OutputLevel=DEBUG)
sim_colls = [
- 'mcparticles',
+ 'MCParticles',
'EcalBarrelHits',
'EcalBarrelScFiHits',
]
@@ -142,7 +142,7 @@ scfi_barrel_clreco = RecoCoG("scfi_barrel_clreco",
# TODO: merge two types of clusters
podout.outputCommands = ['drop *',
- 'keep mcparticles',
+ 'keep MCParticles',
'keep *Reco*',
'keep *Digi*',
'keep *Cluster*',
diff --git a/benchmarks/imaging_ecal/options/imaging_2dcluster.py b/benchmarks/imaging_ecal/options/imaging_2dcluster.py
index b4ac4a6d..5f8536a7 100644
--- a/benchmarks/imaging_ecal/options/imaging_2dcluster.py
+++ b/benchmarks/imaging_ecal/options/imaging_2dcluster.py
@@ -34,7 +34,7 @@ print(kwargs)
geo_service = GeoSvc('GeoSvc', detectors=kwargs['compact'].split(','), OutputLevel=INFO)
podioevent = EICDataSvc('EventDataSvc', inputs=kwargs['input'].split(','), OutputLevel=DEBUG)
-podin = PodioInput('PodioReader', collections=['mcparticles', 'EcalBarrelHits'], OutputLevel=DEBUG)
+podin = PodioInput('PodioReader', collections=['MCParticles', 'EcalBarrelHits'], OutputLevel=DEBUG)
podout = PodioOutput('out', filename=kwargs['output'])
diff --git a/benchmarks/imaging_ecal/options/imaging_topocluster.py b/benchmarks/imaging_ecal/options/imaging_topocluster.py
index fe243a18..7ba72f4c 100644
--- a/benchmarks/imaging_ecal/options/imaging_topocluster.py
+++ b/benchmarks/imaging_ecal/options/imaging_topocluster.py
@@ -36,7 +36,7 @@ geo_service = GeoSvc("GeoSvc", detectors=kwargs['compact'].split(','), OutputLev
podioevent = EICDataSvc("EventDataSvc", inputs=kwargs['input'].split(','), OutputLevel=DEBUG)
out = PodioOutput("out", filename=kwargs['output'])
-podioinput = PodioInput("PodioReader", collections=["mcparticles", "EcalBarrelHits"], OutputLevel=DEBUG)
+podioinput = PodioInput("PodioReader", collections=["MCParticles", "EcalBarrelHits"], OutputLevel=DEBUG)
# use the same daq_setting for digi/reco pair
daq_setting = dict(
diff --git a/benchmarks/imaging_ecal/options/scfi_cluster.py b/benchmarks/imaging_ecal/options/scfi_cluster.py
index 741d124a..07469a52 100644
--- a/benchmarks/imaging_ecal/options/scfi_cluster.py
+++ b/benchmarks/imaging_ecal/options/scfi_cluster.py
@@ -36,7 +36,7 @@ sf = float(os.environ.get('CB_EMCAL_SAMP_FRAC', '1.0'))
geo_service = GeoSvc("GeoSvc", detectors=kwargs['compact'].split(','), OutputLevel=INFO)
podioevent = EICDataSvc("EventDataSvc", inputs=kwargs['input'].split(','), OutputLevel=DEBUG)
-podin = PodioInput("PodioReader", collections=["mcparticles", "EcalBarrelScFiHits"], OutputLevel=DEBUG)
+podin = PodioInput("PodioReader", collections=["MCParticles", "EcalBarrelScFiHits"], OutputLevel=DEBUG)
podout = PodioOutput("out", filename=kwargs['output'])
# use the same daq_setting for digi/reco pair
diff --git a/benchmarks/imaging_shower_ML/options/imaging_ml_data.py b/benchmarks/imaging_shower_ML/options/imaging_ml_data.py
index 6bf9d7c1..12bc3ef4 100644
--- a/benchmarks/imaging_shower_ML/options/imaging_ml_data.py
+++ b/benchmarks/imaging_shower_ML/options/imaging_ml_data.py
@@ -34,7 +34,7 @@ sf = float(os.environ.get('JUGGLER_SAMP_FRAC', '1.0'))
geo_service = GeoSvc('GeoSvc', detectors=[f.strip() for f in kwargs['compact'].split(',')])
podev = EICDataSvc('EventDataSvc', inputs=[f.strip() for f in kwargs['input'].split(',')])
-podin = PodioInput('PodioReader', collections=['mcparticles', 'EcalBarrelHits', 'EcalBarrelScFiHits'])
+podin = PodioInput('PodioReader', collections=['MCParticles', 'EcalBarrelHits', 'EcalBarrelScFiHits'])
podout = PodioOutput('out', filename=kwargs['output'])
# Central Barrel Ecal (Imaging Cal.)
@@ -127,7 +127,7 @@ podout.outputCommands = [
# 'keep *',
'drop *',
'keep EcalBarrel*Reco',
- 'keep mcparticles*',
+ 'keep MCParticles*',
'keep EcalBarrel*ML',
'keep *Corr',
]
diff --git a/benchmarks/rich/options/rich_reco.py b/benchmarks/rich/options/rich_reco.py
index 43a3d4bc..d851004c 100644
--- a/benchmarks/rich/options/rich_reco.py
+++ b/benchmarks/rich/options/rich_reco.py
@@ -23,12 +23,12 @@ from Configurables import Jug__Reco__PhotoMultiplierReco as PhotoMultiplierReco
from Configurables import Jug__Reco__PhotoRingClusters as PhotoRingClusters
qe_data = [(1.0, 0.25), (7.5, 0.25),]
-podioinput = PodioInput("PodioReader", collections=["mcparticles", "ForwardRICHHits"], OutputLevel=DEBUG)
+podioinput = PodioInput("PodioReader", collections=["MCParticles", "ForwardRICHHits"], OutputLevel=DEBUG)
pmtdigi = PhotoMultiplierDigi(inputHitCollection="ForwardRICHHits", outputHitCollection="DigiForwardRICHHits",
quantumEfficiency=[(a*units.eV, b) for a, b in qe_data])
pmtreco = PhotoMultiplierReco(inputHitCollection="DigiForwardRICHHits", outputHitCollection="RecoForwardRICHHits")
-richcluster = PhotoRingClusters(inputHitCollection="RecoForwardRICHHits", #inputTrackCollection="mcparticles",
+richcluster = PhotoRingClusters(inputHitCollection="RecoForwardRICHHits", #inputTrackCollection="MCParticles",
outputClusterCollection="RICHClusters")
out = PodioOutput("out", filename=output_rec_file)
diff --git a/benchmarks/track_finding/options/track_reconstruction.py b/benchmarks/track_finding/options/track_reconstruction.py
index 884ccaf0..88e6bb90 100644
--- a/benchmarks/track_finding/options/track_reconstruction.py
+++ b/benchmarks/track_finding/options/track_reconstruction.py
@@ -46,7 +46,7 @@ from Configurables import Jug__Reco__SimpleClustering as SimpleClustering
algorithms = [ ]
-input_collections = ['mcparticles','TrackerEndcapHits','TrackerBarrelHits','VertexBarrelHits','GEMTrackerEndcapHits']
+input_collections = ['MCParticles','TrackerEndcapHits','TrackerBarrelHits','VertexBarrelHits','GEMTrackerEndcapHits']
if 'acadia' in detector_version:
input_collections.append('VertexEndcapHits')
else:
@@ -158,7 +158,7 @@ algorithms.append( sourcelinker )
## Track param init
truth_trk_init = TrackParamTruthInit("truth_trk_init",
- inputMCParticles="mcparticles",
+ inputMCParticles="MCParticles",
outputInitialTrackParameters="InitTrackParams")
#OutputLevel=DEBUG)
algorithms.append( truth_trk_init )
@@ -204,7 +204,7 @@ out.outputCommands = ["keep *",
"drop trajectories",
"drop outputSourceLinks",
"drop outputInitialTrackParameters",
- "keep mcparticles"
+ "keep MCParticles"
]
algorithms.append(out)
diff --git a/benchmarks/track_fitting/options/track_reconstruction.py b/benchmarks/track_fitting/options/track_reconstruction.py
index 9622ba89..83f00b8d 100644
--- a/benchmarks/track_fitting/options/track_reconstruction.py
+++ b/benchmarks/track_fitting/options/track_reconstruction.py
@@ -46,7 +46,7 @@ from Configurables import Jug__Reco__SimpleClustering as SimpleClustering
algorithms = [ ]
-input_collections = ['mcparticles','TrackerEndcapHits','TrackerBarrelHits','VertexBarrelHits','GEMTrackerEndcapHits']
+input_collections = ['MCParticles','TrackerEndcapHits','TrackerBarrelHits','VertexBarrelHits','GEMTrackerEndcapHits']
if 'acadia' in detector_version:
input_collections.append('VertexEndcapHits')
else:
@@ -149,7 +149,7 @@ algorithms.append( sourcelinker )
## Track param init
truth_trk_init = TrackParamTruthInit("truth_trk_init",
- inputMCParticles="mcparticles",
+ inputMCParticles="MCParticles",
outputInitialTrackParameters="InitTrackParams",
OutputLevel=DEBUG)
#OutputLevel=DEBUG)
@@ -196,7 +196,7 @@ out.outputCommands = ["keep *",
"drop trajectories",
"drop outputSourceLinks",
"drop outputInitialTrackParameters",
- "keep mcparticles"
+ "keep MCParticles"
]
algorithms.append(out)
diff --git a/benchmarks/tracking/options/track_reconstruction.py b/benchmarks/tracking/options/track_reconstruction.py
index a79ccdf7..74a6c57a 100644
--- a/benchmarks/tracking/options/track_reconstruction.py
+++ b/benchmarks/tracking/options/track_reconstruction.py
@@ -58,7 +58,7 @@ from Configurables import Jug__Reco__SimpleClustering as SimpleClustering
algorithms = [ ]
-input_collections = ['mcparticles','TrackerEndcapHits','TrackerBarrelHits','VertexBarrelHits','GEMTrackerEndcapHits']
+input_collections = ['MCParticles','TrackerEndcapHits','TrackerBarrelHits','VertexBarrelHits','GEMTrackerEndcapHits']
if 'acadia' in detector_version:
input_collections.append('VertexEndcapHits')
else:
@@ -160,7 +160,7 @@ algorithms.append( sourcelinker )
## Track param init
truth_trk_init = TrackParamTruthInit("truth_trk_init",
- inputMCParticles="mcparticles",
+ inputMCParticles="MCParticles",
outputInitialTrackParameters="InitTrackParams")
algorithms.append( truth_trk_init )
@@ -192,7 +192,7 @@ out.outputCommands = ["keep *",
"drop trajectories",
"drop outputSourceLinks",
"drop outputInitialTrackParameters",
- "keep mcparticles"
+ "keep MCParticles"
]
algorithms.append(out)
--
GitLab