From 3ae6731170b111aeceb9a512e9269fc5d5f40690 Mon Sep 17 00:00:00 2001 From: Sebastien Ponce Date: Tue, 6 Sep 2022 16:47:00 +0200 Subject: [PATCH 1/5] Adapted configuration to changes in Calo monitor algos --- .../hlt1_reco_allen_calo_efficiency.py | 4 +- .../python/RecoConf/calo_data_monitoring.py | 74 ++++++------------- 2 files changed, 25 insertions(+), 53 deletions(-) diff --git a/Hlt/RecoConf/options/hlt1_reco_allen_calo_efficiency.py b/Hlt/RecoConf/options/hlt1_reco_allen_calo_efficiency.py index 666bc97cc0e..bf6d20fa78d 100644 --- a/Hlt/RecoConf/options/hlt1_reco_allen_calo_efficiency.py +++ b/Hlt/RecoConf/options/hlt1_reco_allen_calo_efficiency.py @@ -16,12 +16,12 @@ from RecoConf.calorimeter_reconstruction import make_calo_reduced from RecoConf.hlt1_allen import make_allen_calo_clusters, allen_gaudi_config from AllenCore.gaudi_allen_generator import allen_runtime_options -from PyConf.Algorithms import CaloFutureClusterMonitor +from PyConf.Algorithms import CaloFutureClusterECALMonitor from GaudiKernel.SystemOfUnits import GeV def monitor_calo_clusters(clusters): - ecal_clus_moni = CaloFutureClusterMonitor( + ecal_clus_moni = CaloFutureClusterECALMonitor( Input=clusters, HistoMultiplicityMax=400, HistoEnergyMax=50. * GeV, diff --git a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py index a7d0c27a777..b641f7a989a 100644 --- a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py +++ b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py @@ -12,9 +12,10 @@ from GaudiKernel.SystemOfUnits import GeV from PyConf import configurable from PyConf.application import make_odin from PyConf.Algorithms import ( - CaloChargedPIDsMonitor, CaloFutureClusterMonitor, CaloFutureDigitMonitor, - CaloFutureTimeAlignment, CaloTAEData, CaloFuturePedestal, - CaloFutureLEDMonitor) + CaloChargedPIDsMonitor, CaloFutureClusterECALMonitor, + CaloFutureDigitECALMonitor, CaloFutureDigitHCALMonitor, + CaloFutureECALTimeAlignment, CaloFutureHCALTimeAlignment, CaloTAEData, + CaloFutureECALPedestal, CaloFutureHCALPedestal, CaloFutureLEDECALMonitor, CaloFutureLEDHCALMonitor) from PyConf.Algorithms import CaloFutureRawToDigits from PyConf.application import default_raw_banks from DDDB.CheckDD4Hep import UseDD4Hep @@ -22,7 +23,7 @@ from DDDB.CheckDD4Hep import UseDD4Hep @configurable def monitor_calo_clusters(calo, split_clusters=True): - nodes = (CaloFutureClusterMonitor( + nodes = (CaloFutureClusterECALMonitor( name="ClusterMonitorEcalClusters", Input=calo["ecalClusters"], HistoMultiplicityMax=400, @@ -31,7 +32,7 @@ def monitor_calo_clusters(calo, split_clusters=True): HistoSizeMax=30, ), ) if split_clusters: - nodes += (CaloFutureClusterMonitor( + nodes += (CaloFutureClusterECALMonitor( name="ClusterMonitorEcalSplitClusters", Input=calo["ecalSplitClusters"], HistoMultiplicityMax=50, @@ -52,20 +53,17 @@ def monitor_calo_digits(calo, histoAdcBin=4196, HistoMultiplicityMaxEcal=8000, HistoMultiplicityBinEcal=8000, - HistoMultiplicityMaxHCal=2000, + HistoMultiplicityMaxHcal=2000, HistoMultiplicityBinHcal=2000, Calib_BXIDsA=[], - Calib_BXIDsB=[], - perBXIDlist=[], - spectrum=False): - ecal_digit_moni = CaloFutureDigitMonitor( + Calib_BXIDsB=[]): + ecal_digit_moni = CaloFutureDigitECALMonitor( name="DigitMonitorEcal", Input=calo["digitsEcal"], ODINLocation=make_odin(), HistoMultiplicityMax=HistoMultiplicityMaxEcal, HistoMultiplicityBin=HistoMultiplicityBinEcal, HistoEtMax=5. * GeV, - HistoSizeMax=30, HistoAdcMin=histoAdcMin, HistoAdcMax=histoAdcMax, HistoAdcBin=histoAdcBin, @@ -77,19 +75,16 @@ def monitor_calo_digits(calo, HistoYBin=52, Calib_BXIDsA=Calib_BXIDsA, Calib_BXIDsB=Calib_BXIDsB, - perBXIDlist=perBXIDlist, ADCFilter=adcFilterEcal, EnergyFilter=eFilter, - EtFilter=etFilter, - Spectrum=spectrum) - hcal_digit_moni = CaloFutureDigitMonitor( + EtFilter=etFilter) + hcal_digit_moni = CaloFutureDigitHCALMonitor( name="DigitMonitorHcal", Input=calo["digitsHcal"], ODINLocation=make_odin(), HistoMultiplicityMax=HistoMultiplicityMaxHCal, HistoMultiplicityBin=HistoMultiplicityBinHcal, HistoEtMax=5. * GeV, - HistoSizeMax=30, HistoAdcMin=histoAdcMin, HistoAdcMax=histoAdcMax, HistoAdcBin=histoAdcBin, @@ -101,11 +96,9 @@ def monitor_calo_digits(calo, HistoYBin=26, Calib_BXIDsA=Calib_BXIDsA, Calib_BXIDsB=Calib_BXIDsB, - perBXIDlist=perBXIDlist, ADCFilter=adcFilterHcal, EnergyFilter=eFilter, - EtFilter=etFilter, - Spectrum=spectrum) + EtFilter=etFilter) return ecal_digit_moni, hcal_digit_moni @@ -125,7 +118,7 @@ def monitor_calo_led(calo): DetectorLocation=ecalpath, DecodePinData=True) - ecal_led_moni = CaloFutureLEDMonitor( + ecal_led_moni = CaloFutureLEDECALMonitor( name="LEDMonitorEcal", InputODIN=make_odin(), Input=adc_alg_ecal.OutputDigitData, @@ -142,7 +135,7 @@ def monitor_calo_led(calo): DetectorLocation=hcalpath, DecodePinData=True) - hcal_led_moni = CaloFutureLEDMonitor( + hcal_led_moni = CaloFutureLEDHCALMonitor( name="LEDMonitorHcal", InputODIN=make_odin(), Input=adc_alg_hcal.OutputDigitData, @@ -159,29 +152,19 @@ def monitor_calo_led(calo): def monitor_calo_time_alignment(calo, adcFilterEcal=-100, adcFilterHcal=-100, - histoEnergyMax=250. * GeV, histoAdcMax=4000, taHistoYBin=100, - TAE_BXIDs=[1000, 2000], - spectrum=False): - ecal_ta_moni = CaloFutureTimeAlignment( - name="CaloFutureECALTimeAlignment", + TAE_BXIDs=[1000, 2000]): + ecal_ta_moni = CaloFutureECALTimeAlignment( Input=calo["digitsEcal"], ODINLocation=make_odin(), ADCFilter=adcFilterEcal, - HistoEnergyMax=histoEnergyMax, - HistoAdcMax=histoAdcMax, - TAHistoYBin=taHistoYBin, - TAE_BXIDs=TAE_BXIDs, - Spectrum=spectrum) - hcal_ta_moni = CaloFutureTimeAlignment( - name="CaloFutureHCALTimeAlignment", + TAE_BXIDs=TAE_BXIDs) + hcal_ta_moni = CaloFutureHCALTimeAlignment( Input=calo["digitsHcal"], ODINLocation=make_odin(), ADCFilter=adcFilterHcal, - TAHistoYBin=taHistoYBin, - TAE_BXIDs=TAE_BXIDs, - Spectrum=spectrum) + TAE_BXIDs=TAE_BXIDs) tae_data = CaloTAEData( name="CaloTAEData", Input=calo["digitsEcal"], ODINLocation=make_odin()) return ecal_ta_moni, hcal_ta_moni, tae_data @@ -189,37 +172,26 @@ def monitor_calo_time_alignment(calo, @configurable def monitor_calo_pedestal(calo, - ecal_name="CaloFutureECALPedestal", - hcal_name="CaloFutureHCALPedestal", adcFilterEcal=-100, adcFilterHcal=-100, histoAdcMin=-100.5, histoAdcMax=100.5, - histoAdcBin=201, - spectrum=False): - ecal_pedestal_moni = CaloFuturePedestal( - name=ecal_name, + histoAdcBin=201): + ecal_pedestal_moni = CaloFutureECALPedestal( Input=calo["digitsEcal"], ODINLocation=make_odin(), ADCFilter=adcFilterEcal, HistoAdcMin=histoAdcMin, HistoAdcMax=histoAdcMax, HistoAdcBin=histoAdcBin, - Spectrum=spectrum, - Profile=True, - ProfileError="s" # only applied to 1D Profiles ) - hcal_pedestal_moni = CaloFuturePedestal( - name=hcal_name, + hcal_pedestal_moni = CaloFutureHCALPedestal( Input=calo["digitsHcal"], ODINLocation=make_odin(), ADCFilter=adcFilterHcal, HistoAdcMin=histoAdcMin, HistoAdcMax=histoAdcMax, HistoAdcBin=histoAdcBin, - Spectrum=spectrum, - Profile=True, - ProfileError="s" # only applied to 1D Profiles ) return ecal_pedestal_moni, hcal_pedestal_moni @@ -248,6 +220,6 @@ def monitor_calo_charged(calo, def monitor_calo(calo, tracks=None): monitors = ( monitor_calo_clusters(calo) + monitor_calo_digits(calo) + - monitor_calo_time_alignment(calo) + monitor_calo_pedestal(calo)) + monitor_calo_time_alignment(calo) + monitor_calo_pedestal(calo)) if tracks: monitors += (monitor_calo_charged(calo, tracks)) return monitors -- GitLab From 921ed9708a363044f73c4cdcc3363432742ec149 Mon Sep 17 00:00:00 2001 From: Sebastien Ponce Date: Fri, 4 Nov 2022 14:59:39 +0100 Subject: [PATCH 2/5] use standard method for calo_clusters in Allen, do not replicate code --- .../hlt1_reco_allen_calo_efficiency.py | 20 ++------ .../python/RecoConf/calo_data_monitoring.py | 46 ++++++++++--------- 2 files changed, 28 insertions(+), 38 deletions(-) diff --git a/Hlt/RecoConf/options/hlt1_reco_allen_calo_efficiency.py b/Hlt/RecoConf/options/hlt1_reco_allen_calo_efficiency.py index bf6d20fa78d..f6341993112 100644 --- a/Hlt/RecoConf/options/hlt1_reco_allen_calo_efficiency.py +++ b/Hlt/RecoConf/options/hlt1_reco_allen_calo_efficiency.py @@ -13,27 +13,12 @@ from Moore import options from RecoConf.calorimeter_mc_checking import check_calo_cluster_efficiency from RecoConf.calorimeter_reconstruction import make_calo_reduced +from RecoConf.calo_data_monitoring import monitor_calo_clusters from RecoConf.hlt1_allen import make_allen_calo_clusters, allen_gaudi_config from AllenCore.gaudi_allen_generator import allen_runtime_options -from PyConf.Algorithms import CaloFutureClusterECALMonitor -from GaudiKernel.SystemOfUnits import GeV - - -def monitor_calo_clusters(clusters): - ecal_clus_moni = CaloFutureClusterECALMonitor( - Input=clusters, - HistoMultiplicityMax=400, - HistoEnergyMax=50. * GeV, - HistoEtMax=5. * GeV, - HistoSizeMax=30, - ) - return ecal_clus_moni - def make_reconstruction(): - data_producers = [] - # Get Allen calo clusters allen_calo_clusters = make_allen_calo_clusters() ecal_clusters_allen = allen_calo_clusters["ecal_clusters"] @@ -42,7 +27,7 @@ def make_reconstruction(): calo = make_calo_reduced() # Build CaloFutureClusterMonitor - data_producers += [monitor_calo_clusters(ecal_clusters_allen)] + data_producers = monitor_calo_clusters(ecal_clusters_allen) # Build CaloClusterEfficiency calo["ecalClusters"] = ecal_clusters_allen # for mc checking @@ -55,6 +40,7 @@ def make_reconstruction(): options.evt_max = 1000 options.histo_file = "Hlt1RecoAllenCaloEfficiencyHistos.root" options.ntuple_file = "Hlt1RecoAllenCaloEfficiencyNTuple.root" +options.histo_calo = True with (allen_gaudi_config.bind(sequence='hlt1_cosmics'), allen_runtime_options.bind(filename="allen_calo_eff_monitor.root")): diff --git a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py index b641f7a989a..438d745cae2 100644 --- a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py +++ b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py @@ -22,23 +22,26 @@ from DDDB.CheckDD4Hep import UseDD4Hep @configurable -def monitor_calo_clusters(calo, split_clusters=True): - nodes = (CaloFutureClusterECALMonitor( - name="ClusterMonitorEcalClusters", - Input=calo["ecalClusters"], - HistoMultiplicityMax=400, - HistoEnergyMax=50. * GeV, - HistoEtMax=5. * GeV, - HistoSizeMax=30, - ), ) +def monitor_calo_clusters(clusters, split_clusters=None): + nodes = [ + CaloFutureClusterECALMonitor( + name="ClusterMonitorEcalClusters", + Input=clusters, + HistoMultiplicityMax=400, + HistoEnergyMax=50. * GeV, + HistoEtMax=5. * GeV, + HistoSizeMax=30, + ), + ] if split_clusters: - nodes += (CaloFutureClusterECALMonitor( - name="ClusterMonitorEcalSplitClusters", - Input=calo["ecalSplitClusters"], - HistoMultiplicityMax=50, - HistoEnergyMax=100. * GeV, - HistoEtMax=10. * GeV, - ), ) + nodes.append( + CaloFutureClusterECALMonitor( + name="ClusterMonitorEcalSplitClusters", + Input=split_clusters, + HistoMultiplicityMax=50, + HistoEnergyMax=100. * GeV, + HistoEtMax=10. * GeV, + )) return nodes @@ -99,7 +102,7 @@ def monitor_calo_digits(calo, ADCFilter=adcFilterHcal, EnergyFilter=eFilter, EtFilter=etFilter) - return ecal_digit_moni, hcal_digit_moni + return [ecal_digit_moni, hcal_digit_moni] @configurable @@ -167,7 +170,7 @@ def monitor_calo_time_alignment(calo, TAE_BXIDs=TAE_BXIDs) tae_data = CaloTAEData( name="CaloTAEData", Input=calo["digitsEcal"], ODINLocation=make_odin()) - return ecal_ta_moni, hcal_ta_moni, tae_data + return [ecal_ta_moni, hcal_ta_moni, tae_data] @configurable @@ -193,7 +196,7 @@ def monitor_calo_pedestal(calo, HistoAdcMax=histoAdcMax, HistoAdcBin=histoAdcBin, ) - return ecal_pedestal_moni, hcal_pedestal_moni + return [ecal_pedestal_moni, hcal_pedestal_moni] @configurable @@ -219,7 +222,8 @@ def monitor_calo_charged(calo, def monitor_calo(calo, tracks=None): monitors = ( - monitor_calo_clusters(calo) + monitor_calo_digits(calo) + - monitor_calo_time_alignment(calo) + monitor_calo_pedestal(calo)) + monitor_calo_clusters(calo["ecalClusters"], calo["ecalSplitClusters"]) + + monitor_calo_digits(calo) + monitor_calo_time_alignment(calo) + + monitor_calo_pedestal(calo)) if tracks: monitors += (monitor_calo_charged(calo, tracks)) return monitors -- GitLab From b34015ac4998bffe098de109a8892720ba05ee3f Mon Sep 17 00:00:00 2001 From: Sebastien Ponce Date: Fri, 4 Nov 2022 14:59:59 +0100 Subject: [PATCH 3/5] Create calo specific histograms on tests needing them --- Hlt/Hlt2Conf/python/Hlt2Conf/lines/iftPbPb/spruce_iftPbPb.py | 2 ++ .../options/examples/hlt2_reco_seeding_with_mcchecking.py | 1 + .../hlt2_default_reco_track_master_fitter_with_mcchecking.py | 1 + Hlt/RecoConf/options/hlt2_reco_baseline_with_cheatedseeding.py | 1 + .../hlt2_reco_baseline_with_mcchecking_mpp_with_bfield.py | 1 + Hlt/RecoConf/options/hlt2_reco_calo_only.py | 1 + .../hlt2_reco_baseline_with_mchit_resolutions.py | 1 + 7 files changed, 8 insertions(+) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/iftPbPb/spruce_iftPbPb.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/iftPbPb/spruce_iftPbPb.py index 400911805e4..9b7cb5c9bae 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/iftPbPb/spruce_iftPbPb.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/iftPbPb/spruce_iftPbPb.py @@ -13,9 +13,11 @@ from Moore.config import SpruceLine, register_line_builder from RecoConf.reconstruction_objects import upfront_reconstruction from PyConf import configurable from RecoConf.event_filters import require_gec +from Moore import options sprucing_lines = {} PROCESS = "spruce" +options.histo_calo = True hlt2_ion_triggers = [ 'Hlt2IFT_PassThroughDecision', 'Hlt2IFT_PbPbMicroBiasDecision' diff --git a/Hlt/RecoConf/options/examples/hlt2_reco_seeding_with_mcchecking.py b/Hlt/RecoConf/options/examples/hlt2_reco_seeding_with_mcchecking.py index b3acd36943d..2033910124a 100644 --- a/Hlt/RecoConf/options/examples/hlt2_reco_seeding_with_mcchecking.py +++ b/Hlt/RecoConf/options/examples/hlt2_reco_seeding_with_mcchecking.py @@ -13,6 +13,7 @@ from RecoConf.standalone import standalone_hlt2_seeding options.ntuple_file = 'hlt2_reco_seeding_UT_with_mcchecking_tuple.root' options.histo_file = 'hlt2_reco_seeding_UT_with_mcchecking.root' +options.histo_calo = True with standalone_hlt2_seeding.bind( do_mc_checking=True, do_data_monitoring=True): diff --git a/Hlt/RecoConf/options/hlt2_default_reco_track_master_fitter_with_mcchecking.py b/Hlt/RecoConf/options/hlt2_default_reco_track_master_fitter_with_mcchecking.py index 51f74d3cb27..8643db2f470 100644 --- a/Hlt/RecoConf/options/hlt2_default_reco_track_master_fitter_with_mcchecking.py +++ b/Hlt/RecoConf/options/hlt2_default_reco_track_master_fitter_with_mcchecking.py @@ -22,6 +22,7 @@ options.histo_file = (options.getProp("histo_file") or 'hlt2_track_monitoring_with_mc_histos.root') options.ntuple_file = (options.getProp("ntuple_file") or 'hlt2_track_monitoring_with_mc_ntuples.root') +options.histo_calo = True with standalone_hlt2_reco.bind(do_mc_checking=True, do_data_monitoring=True), \ check_track_resolution.bind(per_hit_resolutions=True, split_per_type=True): diff --git a/Hlt/RecoConf/options/hlt2_reco_baseline_with_cheatedseeding.py b/Hlt/RecoConf/options/hlt2_reco_baseline_with_cheatedseeding.py index 6b4ba9b2c07..e4c7fad1b9d 100644 --- a/Hlt/RecoConf/options/hlt2_reco_baseline_with_cheatedseeding.py +++ b/Hlt/RecoConf/options/hlt2_reco_baseline_with_cheatedseeding.py @@ -24,6 +24,7 @@ options.histo_file = (options.getProp("histo_file") or 'hlt2_reco_baseline_with_cheatedseeding_histos.root') options.ntuple_file = (options.getProp("ntuple_file") or 'hlt2_reco_baseline_with_cheatedseeding_ntuples.root') +options.histo_calo = True with standalone_hlt2_reco.bind(do_mc_checking=True, do_data_monitoring=True), \ check_track_resolution.bind(per_hit_resolutions=False, split_per_type=True), \ diff --git a/Hlt/RecoConf/options/hlt2_reco_baseline_with_mcchecking_mpp_with_bfield.py b/Hlt/RecoConf/options/hlt2_reco_baseline_with_mcchecking_mpp_with_bfield.py index 608eddae5d0..c40bfc14eff 100644 --- a/Hlt/RecoConf/options/hlt2_reco_baseline_with_mcchecking_mpp_with_bfield.py +++ b/Hlt/RecoConf/options/hlt2_reco_baseline_with_mcchecking_mpp_with_bfield.py @@ -30,6 +30,7 @@ options.histo_file = ( options.ntuple_file = ( options.getProp("ntuple_file") or 'hlt2_reco_baseline_with_mcchecking_mpp_with_bfield_ntuples.root') +options.histo_calo = True with standalone_hlt2_reco.bind(do_mc_checking=True, do_data_monitoring=True), \ check_track_resolution.bind(per_hit_resolutions=True, split_per_type=True), \ diff --git a/Hlt/RecoConf/options/hlt2_reco_calo_only.py b/Hlt/RecoConf/options/hlt2_reco_calo_only.py index f938da0b892..48ac0b3e093 100644 --- a/Hlt/RecoConf/options/hlt2_reco_calo_only.py +++ b/Hlt/RecoConf/options/hlt2_reco_calo_only.py @@ -14,6 +14,7 @@ from DDDB.CheckDD4Hep import UseDD4Hep # save output file with histograms options.histo_file = 'hlt2_reco_calo_only_with_monitoring.root' +options.histo_calo = True if UseDD4Hep: from Configurables import LHCb__Det__LbDD4hep__DD4hepSvc as DD4hepSvc diff --git a/Hlt/RecoConf/options/tracking_developments/hlt2_reco_baseline_with_mchit_resolutions.py b/Hlt/RecoConf/options/tracking_developments/hlt2_reco_baseline_with_mchit_resolutions.py index 7e7e0b39b6a..30d00aa2c48 100644 --- a/Hlt/RecoConf/options/tracking_developments/hlt2_reco_baseline_with_mchit_resolutions.py +++ b/Hlt/RecoConf/options/tracking_developments/hlt2_reco_baseline_with_mchit_resolutions.py @@ -21,6 +21,7 @@ from RecoConf.mc_checking import check_track_resolution options.histo_file = 'hlt2_reco_baseline_with_mchit_resolutions_histos.root' options.ntuple_file = 'hlt2_reco_baseline_with_mchit_resolutions_ntuples.root' +options.histo_calo = True with standalone_hlt2_reco.bind(do_mc_checking=True, do_data_monitoring=True), \ check_track_resolution.bind(per_hit_resolutions=True, split_per_type=True): -- GitLab From 06fbae989d992ab8250f121ded0fd8789acb5a7e Mon Sep 17 00:00:00 2001 From: Sebastien Ponce Date: Tue, 10 Jan 2023 17:56:18 +0100 Subject: [PATCH 4/5] Adapted configuration to usage of Histo1DDef in Properties of DigitMonitor --- .../hlt1_reco_allen_calo_efficiency.py | 3 +- .../python/RecoConf/calo_data_monitoring.py | 62 +++++++------------ 2 files changed, 25 insertions(+), 40 deletions(-) diff --git a/Hlt/RecoConf/options/hlt1_reco_allen_calo_efficiency.py b/Hlt/RecoConf/options/hlt1_reco_allen_calo_efficiency.py index f6341993112..bc30af4714c 100644 --- a/Hlt/RecoConf/options/hlt1_reco_allen_calo_efficiency.py +++ b/Hlt/RecoConf/options/hlt1_reco_allen_calo_efficiency.py @@ -27,7 +27,8 @@ def make_reconstruction(): calo = make_calo_reduced() # Build CaloFutureClusterMonitor - data_producers = monitor_calo_clusters(ecal_clusters_allen) + data_producers = monitor_calo_clusters( + ecal_clusters_allen, name="CaloFutureClusterMonitor") # Build CaloClusterEfficiency calo["ecalClusters"] = ecal_clusters_allen # for mc checking diff --git a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py index 438d745cae2..9a891ff4c23 100644 --- a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py +++ b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py @@ -22,15 +22,17 @@ from DDDB.CheckDD4Hep import UseDD4Hep @configurable -def monitor_calo_clusters(clusters, split_clusters=None): +def monitor_calo_clusters(clusters, + split_clusters=None, + name="ClusterMonitorEcalClusters"): nodes = [ CaloFutureClusterECALMonitor( - name="ClusterMonitorEcalClusters", + name=name, Input=clusters, - HistoMultiplicityMax=400, - HistoEnergyMax=50. * GeV, - HistoEtMax=5. * GeV, - HistoSizeMax=30, + HistoMultiplicity=(0., 400., 100), + HistoEnergy=(0. * GeV, 50. * GeV, 100), + HistoEt=(0. * GeV, 5. * GeV, 100), + HistoSize=(0, 30, 25), ), ] if split_clusters: @@ -38,9 +40,9 @@ def monitor_calo_clusters(clusters, split_clusters=None): CaloFutureClusterECALMonitor( name="ClusterMonitorEcalSplitClusters", Input=split_clusters, - HistoMultiplicityMax=50, - HistoEnergyMax=100. * GeV, - HistoEtMax=10. * GeV, + HistoMultiplicity=(0., 50., 100), + HistoEnergy=(0. * GeV, 100. * GeV, 100), + HistoEt=(0. * GeV, 10. * GeV, 100), )) return nodes @@ -64,18 +66,11 @@ def monitor_calo_digits(calo, name="DigitMonitorEcal", Input=calo["digitsEcal"], ODINLocation=make_odin(), - HistoMultiplicityMax=HistoMultiplicityMaxEcal, - HistoMultiplicityBin=HistoMultiplicityBinEcal, - HistoEtMax=5. * GeV, - HistoAdcMin=histoAdcMin, - HistoAdcMax=histoAdcMax, - HistoAdcBin=histoAdcBin, - HistoXMin=-3900.8, - HistoXMax=3900.8, - HistoXBin=64, - HistoYMin=-3169.4, - HistoYMax=3169.4, - HistoYBin=52, + HistoMultiplicity=(0., HistoMultiplicityMaxEcal, HistoMultiplicityBinEcal), + HistoEt=(0. * GeV, 5. * GeV, 100), + HistoAdc=(histoAdcMin, histoAdcMax, histoAdcBin), + HistoX=(-3900.8, 3900.8, 64), + HistoY=(-3169.4, 3169.4, 52), Calib_BXIDsA=Calib_BXIDsA, Calib_BXIDsB=Calib_BXIDsB, ADCFilter=adcFilterEcal, @@ -85,18 +80,11 @@ def monitor_calo_digits(calo, name="DigitMonitorHcal", Input=calo["digitsHcal"], ODINLocation=make_odin(), - HistoMultiplicityMax=HistoMultiplicityMaxHCal, - HistoMultiplicityBin=HistoMultiplicityBinHcal, - HistoEtMax=5. * GeV, - HistoAdcMin=histoAdcMin, - HistoAdcMax=histoAdcMax, - HistoAdcBin=histoAdcBin, - HistoXMin=-4201.6, - HistoXMax=4201.6, - HistoXBin=32, - HistoYMin=-3413.8, - HistoYMax=3413.8, - HistoYBin=26, + HistoMultiplicity=(0., HistoMultiplicityMaxHcal, HistoMultiplicityBinHcal), + HistoEt=(0. * GeV, 5. * GeV, 100), + HistoAdc=(histoAdcMin, histoAdcMax, histoAdcBin), + HistoX=(-4201.6, 4201.6, 32), + HistoY=(-3413.8, 3413.8, 26), Calib_BXIDsA=Calib_BXIDsA, Calib_BXIDsB=Calib_BXIDsB, ADCFilter=adcFilterHcal, @@ -184,17 +172,13 @@ def monitor_calo_pedestal(calo, Input=calo["digitsEcal"], ODINLocation=make_odin(), ADCFilter=adcFilterEcal, - HistoAdcMin=histoAdcMin, - HistoAdcMax=histoAdcMax, - HistoAdcBin=histoAdcBin, + HistoAdc=(histoAdcMin, histoAdcMax, histoAdcBin), ) hcal_pedestal_moni = CaloFutureHCALPedestal( Input=calo["digitsHcal"], ODINLocation=make_odin(), ADCFilter=adcFilterHcal, - HistoAdcMin=histoAdcMin, - HistoAdcMax=histoAdcMax, - HistoAdcBin=histoAdcBin, + HistoAdc=(histoAdcMin, histoAdcMax, histoAdcBin), ) return [ecal_pedestal_moni, hcal_pedestal_moni] -- GitLab From 06172a25f76483342de5ebcaf2e613899cc179ad Mon Sep 17 00:00:00 2001 From: Sebastien Ponce Date: Wed, 15 May 2024 13:55:20 +0200 Subject: [PATCH 5/5] Adapted to drop of Future keyword in algo names --- .../hlt1_reco_allen_calo_efficiency.py | 4 +-- .../python/RecoConf/calo_data_monitoring.py | 36 ++++++++++--------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Hlt/RecoConf/options/hlt1_reco_allen_calo_efficiency.py b/Hlt/RecoConf/options/hlt1_reco_allen_calo_efficiency.py index bc30af4714c..25eebc91b4f 100644 --- a/Hlt/RecoConf/options/hlt1_reco_allen_calo_efficiency.py +++ b/Hlt/RecoConf/options/hlt1_reco_allen_calo_efficiency.py @@ -26,9 +26,9 @@ def make_reconstruction(): # Get calo digits calo = make_calo_reduced() - # Build CaloFutureClusterMonitor + # Build Calo::ClusterMonitor data_producers = monitor_calo_clusters( - ecal_clusters_allen, name="CaloFutureClusterMonitor") + ecal_clusters_allen, name="CaloClusterMonitor") # Build CaloClusterEfficiency calo["ecalClusters"] = ecal_clusters_allen # for mc checking diff --git a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py index 9a891ff4c23..e71c1e8e080 100644 --- a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py +++ b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py @@ -11,11 +11,11 @@ from GaudiKernel.SystemOfUnits import GeV from PyConf import configurable from PyConf.application import make_odin -from PyConf.Algorithms import ( - CaloChargedPIDsMonitor, CaloFutureClusterECALMonitor, - CaloFutureDigitECALMonitor, CaloFutureDigitHCALMonitor, - CaloFutureECALTimeAlignment, CaloFutureHCALTimeAlignment, CaloTAEData, - CaloFutureECALPedestal, CaloFutureHCALPedestal, CaloFutureLEDECALMonitor, CaloFutureLEDHCALMonitor) +from PyConf.Algorithms import (CaloChargedPIDsMonitor, CaloClusterECALMonitor, + CaloDigitECALMonitor, CaloDigitHCALMonitor, + CaloECALTimeAlignment, CaloHCALTimeAlignment, + CaloTAEData, CaloECALPedestal, CaloHCALPedestal, + CaloLEDECALMonitor, CaloLEDHCALMonitor) from PyConf.Algorithms import CaloFutureRawToDigits from PyConf.application import default_raw_banks from DDDB.CheckDD4Hep import UseDD4Hep @@ -26,7 +26,7 @@ def monitor_calo_clusters(clusters, split_clusters=None, name="ClusterMonitorEcalClusters"): nodes = [ - CaloFutureClusterECALMonitor( + CaloClusterECALMonitor( name=name, Input=clusters, HistoMultiplicity=(0., 400., 100), @@ -37,7 +37,7 @@ def monitor_calo_clusters(clusters, ] if split_clusters: nodes.append( - CaloFutureClusterECALMonitor( + CaloClusterECALMonitor( name="ClusterMonitorEcalSplitClusters", Input=split_clusters, HistoMultiplicity=(0., 50., 100), @@ -62,11 +62,12 @@ def monitor_calo_digits(calo, HistoMultiplicityBinHcal=2000, Calib_BXIDsA=[], Calib_BXIDsB=[]): - ecal_digit_moni = CaloFutureDigitECALMonitor( + ecal_digit_moni = CaloDigitECALMonitor( name="DigitMonitorEcal", Input=calo["digitsEcal"], ODINLocation=make_odin(), - HistoMultiplicity=(0., HistoMultiplicityMaxEcal, HistoMultiplicityBinEcal), + HistoMultiplicity=(0., HistoMultiplicityMaxEcal, + HistoMultiplicityBinEcal), HistoEt=(0. * GeV, 5. * GeV, 100), HistoAdc=(histoAdcMin, histoAdcMax, histoAdcBin), HistoX=(-3900.8, 3900.8, 64), @@ -76,11 +77,12 @@ def monitor_calo_digits(calo, ADCFilter=adcFilterEcal, EnergyFilter=eFilter, EtFilter=etFilter) - hcal_digit_moni = CaloFutureDigitHCALMonitor( + hcal_digit_moni = CaloDigitHCALMonitor( name="DigitMonitorHcal", Input=calo["digitsHcal"], ODINLocation=make_odin(), - HistoMultiplicity=(0., HistoMultiplicityMaxHcal, HistoMultiplicityBinHcal), + HistoMultiplicity=(0., HistoMultiplicityMaxHcal, + HistoMultiplicityBinHcal), HistoEt=(0. * GeV, 5. * GeV, 100), HistoAdc=(histoAdcMin, histoAdcMax, histoAdcBin), HistoX=(-4201.6, 4201.6, 32), @@ -109,7 +111,7 @@ def monitor_calo_led(calo): DetectorLocation=ecalpath, DecodePinData=True) - ecal_led_moni = CaloFutureLEDECALMonitor( + ecal_led_moni = CaloLEDECALMonitor( name="LEDMonitorEcal", InputODIN=make_odin(), Input=adc_alg_ecal.OutputDigitData, @@ -126,7 +128,7 @@ def monitor_calo_led(calo): DetectorLocation=hcalpath, DecodePinData=True) - hcal_led_moni = CaloFutureLEDHCALMonitor( + hcal_led_moni = CaloLEDHCALMonitor( name="LEDMonitorHcal", InputODIN=make_odin(), Input=adc_alg_hcal.OutputDigitData, @@ -146,12 +148,12 @@ def monitor_calo_time_alignment(calo, histoAdcMax=4000, taHistoYBin=100, TAE_BXIDs=[1000, 2000]): - ecal_ta_moni = CaloFutureECALTimeAlignment( + ecal_ta_moni = CaloECALTimeAlignment( Input=calo["digitsEcal"], ODINLocation=make_odin(), ADCFilter=adcFilterEcal, TAE_BXIDs=TAE_BXIDs) - hcal_ta_moni = CaloFutureHCALTimeAlignment( + hcal_ta_moni = CaloHCALTimeAlignment( Input=calo["digitsHcal"], ODINLocation=make_odin(), ADCFilter=adcFilterHcal, @@ -168,13 +170,13 @@ def monitor_calo_pedestal(calo, histoAdcMin=-100.5, histoAdcMax=100.5, histoAdcBin=201): - ecal_pedestal_moni = CaloFutureECALPedestal( + ecal_pedestal_moni = CaloECALPedestal( Input=calo["digitsEcal"], ODINLocation=make_odin(), ADCFilter=adcFilterEcal, HistoAdc=(histoAdcMin, histoAdcMax, histoAdcBin), ) - hcal_pedestal_moni = CaloFutureHCALPedestal( + hcal_pedestal_moni = CaloHCALPedestal( Input=calo["digitsHcal"], ODINLocation=make_odin(), ADCFilter=adcFilterHcal, -- GitLab