diff --git a/benchmarks/clustering/options/full_cal_reco.py b/benchmarks/clustering/options/full_cal_reco.py index 8be58592639ad3fe0987b503f042c7df07e014e6..8bf69c4c2c53bc24c282e63b34948b16d1894096 100644 --- a/benchmarks/clustering/options/full_cal_reco.py +++ b/benchmarks/clustering/options/full_cal_reco.py @@ -205,7 +205,7 @@ if has_ecal_barrel_scfi: thresholdFactor=3, # about 20 keV readoutClass="EcalBarrelImagingHits", # readout class layerField="layer", # field to get layer id - sectorField="module", # field to get sector id + sectorField="sector", # field to get sector id samplingFraction=cb_ecal_sf, **cb_ecal_daq) algs.append(cb_ecal_reco) @@ -290,8 +290,8 @@ if has_ecal_barrel_scfi: thresholdFactor=5.0, readoutClass="EcalBarrelScFiHits", layerField="layer", - sectorField="module", - localDetFields=["system", "module"], # use local coordinates in each module (stave) + sectorField="sector", + localDetFields=["system", "sector"], # use local coordinates in each sector samplingFraction=scifi_barrel_sf, **scfi_barrel_daq) algs.append(scfi_barrel_reco) diff --git a/benchmarks/imaging_ecal/options/hybrid_cluster.py b/benchmarks/imaging_ecal/options/hybrid_cluster.py index dcb348d82bfe3b0a3127a13572cccfd3b6b50c47..1abbc750d78c2c5959d7d1c76366eb65b5cbbab0 100644 --- a/benchmarks/imaging_ecal/options/hybrid_cluster.py +++ b/benchmarks/imaging_ecal/options/hybrid_cluster.py @@ -106,7 +106,7 @@ if has_ecal_barrel_scfi: outputHitCollection='RecoEcalBarrelImagingHits', readoutClass='EcalBarrelImagingHits', layerField='layer', - sectorField='module', + sectorField='sector', samplingFraction=kwargs['img_sf'], **imcaldaq) algorithms.append(imcalreco) @@ -149,8 +149,8 @@ if has_ecal_barrel_scfi: thresholdFactor=5.0, readoutClass="EcalBarrelScFiHits", layerField="layer", - sectorField="module", - localDetFields=["system", "module"], # use local coordinates in each module (stave) + sectorField="sector", + localDetFields=["system", "sector"], # use local coordinates in each sector samplingFraction=kwargs['scfi_sf'], **scfi_barrel_daq) algorithms.append(scfi_barrel_reco) diff --git a/benchmarks/imaging_ecal/options/imaging_2dcluster.py b/benchmarks/imaging_ecal/options/imaging_2dcluster.py index 03a371f0e668c509c9d59ccb8eedc637143214d1..614eec91aa7ee10e7305cb197841d98c9eb1955f 100644 --- a/benchmarks/imaging_ecal/options/imaging_2dcluster.py +++ b/benchmarks/imaging_ecal/options/imaging_2dcluster.py @@ -57,7 +57,7 @@ imcal_barrel_reco = CalHitReco('imcal_barrel_reco', outputHitCollection='EcalBarrelImagingHitsReco', thresholdFactor=5.0, readoutClass='EcalBarrelImagingHits', - localDetFields=['system', 'module'], # use local coordinates in each module (stave) + localDetFields=['system', 'sector'], # use local coordinates in each sector **imcal_barrel_daq) # merge hits to eta, phi bins diff --git a/benchmarks/imaging_ecal/options/imaging_topocluster.py b/benchmarks/imaging_ecal/options/imaging_topocluster.py index 1194838ad7f58f6c0b9cc682444ce3f904f4abe3..dc6349b86616f2c00c0c4f60273b242b2aac978d 100644 --- a/benchmarks/imaging_ecal/options/imaging_topocluster.py +++ b/benchmarks/imaging_ecal/options/imaging_topocluster.py @@ -57,7 +57,7 @@ imcalreco = ImagingPixelReco("imcal_reco", outputHitCollection="RecoEcalBarrelImagingHits", readoutClass="EcalBarrelImagingHits", layerField="layer", - sectorField="module", + sectorField="sector", **daq_setting) imcalcluster = ImagingTopoCluster("imcal_cluster", diff --git a/benchmarks/imaging_ecal/options/scfi_cluster.py b/benchmarks/imaging_ecal/options/scfi_cluster.py index 8c7ede00117ccb61ce04d5854fc4d688813a4aeb..80345fabef81f62ab7da595959c11060adcf44b0 100644 --- a/benchmarks/imaging_ecal/options/scfi_cluster.py +++ b/benchmarks/imaging_ecal/options/scfi_cluster.py @@ -86,8 +86,8 @@ if has_ecal_barrel_scfi: thresholdFactor=5.0, readoutClass="EcalBarrelScFiHits", layerField="layer", - sectorField="module", - localDetFields=["system", "module"], # use local coordinates in each module (stave) + sectorField="sector", + localDetFields=["system", "sector"], # use local coordinates in each sector **scfi_barrel_daq) algorithms.append(scfi_barrel_reco)