From a14d8e090d33097ed2cf6772335121b19b2fd314 Mon Sep 17 00:00:00 2001 From: Jean-Francois Marchand Date: Wed, 30 Mar 2022 15:47:18 +0200 Subject: [PATCH 01/10] Include LED monitoring --- .../python/RecoConf/calo_data_monitoring.py | 195 +++++++++++++++++- 1 file changed, 191 insertions(+), 4 deletions(-) diff --git a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py index f002f62bab2..55bbfaf5e57 100644 --- a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py +++ b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py @@ -11,10 +11,12 @@ 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) - +from PyConf.Algorithms import (CaloFutureClusterMonitor, + CaloFutureDigitMonitor, CaloFutureTimeAlignment, + CaloTAEData, CaloFuturePedestal, CaloFutureLEDMonitor) +from PyConf.Tools import CaloHisto +from PyConf.application import default_raw_event +from PyConf.Algorithms import CaloFutureRawToDigits @configurable def monitor_calo_clusters(calo, split_clusters=True): @@ -101,6 +103,191 @@ def monitor_calo_digits(calo, return ecal_digit_moni, hcal_digit_moni +@configurable +def monitor_calo_led(calo, + adcFilterEcal=-100, + adcFilterHcal=-100, + HistoMultiplicityMaxEcal=6000, + HistoMultiplicityMaxHCal=4000, + spectrum=False): + + # ====================== Detailed histos (distribution per channel) + # produce signal histos + ecalCalibSignal = CaloHisto( + name="Signal", + Name="LED", + Histo=False, + Ranges={0: [75., 3840., 100]}, + PercentRate=6) + + # produce pedestal histos + ecalCalibPedestal = CaloHisto( + name="Pedestal", + Histo=True, + Ranges={0: [-15.5, 20.5, 36]}, + PercentRate=50) + + # produce full dynamics histos + ecalCalibAll = CaloHisto( + name="All", Histo=True, Ranges={0: [-256., 3840, 256]}, PercentRate=5) + + # produce PMT/PIN histos + ecalCalibRatio = CaloHisto( + name="Ratio", Histo=True, Ranges={0: [0., 20, 200]}, PercentRate=6) + + # ====================== Summary histos : moments and profile versus channel + # produce summary for signal + ecalCalibSumSignal = CaloHisto( + name="SumSignal", + Name="LED", + Histo=False, + Profile=True, + Order=0, # produce moments up to order 2 + Windows={0: [75., 3840.]}, # ADC window + ) + + # produce summary for Pedestal + ecalCalibSumPedestal = CaloHisto( + name="SumPedestal", + Histo=False, + Profile=True, + Windows={0: [-15., 20.]}, # ADC window + ) + + # produce summary for Ratio + ecalCalibSumRatio = CaloHisto( + name="SumRatio", + Histo=False, + Profile=True, + Windows={0: [75, 3840.]}, # ADC window + #SplitLeds = True + ) + + # produce summary for Desertic region + ecalCalibSumAll = CaloHisto( + name="SumAll", + Histo=False, + Profile=True, + Name="Desert", + Order=0, # produce moments up to order 2 + Windows={0: [-15, 20., 100, 3840]}, # ADC windows + InvertWindow=True) + + rawEventEcal = default_raw_event(["EcalPacked"]) + adc_alg_ecal = CaloFutureRawToDigits( + name='FutureEcalZSup', + RawEventLocation=rawEventEcal, + DetectorLocation='/dd/Structure/LHCb/DownstreamRegion/Ecal', + DecodePinData=True) + + ecal_led_moni = CaloFutureLEDMonitor( + name="LEDMonitorEcal", + InputODIN=make_odin(), + Input=adc_alg_ecal.OutputDigitData, + HistoMultiplicityMax=HistoMultiplicityMaxEcal, + HistoEtMax=5. * GeV, + HistoSizeMax=30, + ADCFilter=adcFilterEcal, + HistoSignal=ecalCalibSignal, + HistoPedestal=ecalCalibPedestal, + HistoRatio=ecalCalibRatio, + HistoAll=ecalCalibAll, + HistoSumSignal=ecalCalibSumSignal, + HistoSumPedestal=ecalCalibSumPedestal, + HistoSumRatio=ecalCalibSumRatio, + HistoSumAll=ecalCalibSumAll, + Spectrum=spectrum) + + # ====================== Detailed histos (distribution per channel) + # produce signal histos + hcalCalibSignal = CaloHisto( + name="Signal", + Name="LED", + Histo=False, + Ranges={0: [75., 3840., 100]}, + PercentRate=6) + + # produce pedestal histos + hcalCalibPedestal = CaloHisto( + name="Pedestal", + Histo=True, + Ranges={0: [-15.5, 20.5, 36]}, + PercentRate=50) + + # produce full dynamics histos + hcalCalibAll = CaloHisto( + name="All", Histo=True, Ranges={0: [-256., 3840, 256]}, PercentRate=5) + + # produce PMT/PIN histos + hcalCalibRatio = CaloHisto( + name="Ratio", Histo=True, Ranges={0: [0., 20, 200]}, PercentRate=6) + + # ====================== Summary histos : moments and profile versus channel + # produce summary for signal + hcalCalibSumSignal = CaloHisto( + name="SumSignal", + Name="LED", + Histo=False, + Profile=True, + Order=0, # produce moments up to order 2 + Windows={0: [75., 3840.]}, # ADC window + ) + + # produce summary for Pedestal + hcalCalibSumPedestal = CaloHisto( + name="SumPedestal", + Histo=False, + Profile=True, + Windows={0: [-15., 20.]}, # ADC window + ) + + # produce summary for Ratio + hcalCalibSumRatio = CaloHisto( + name="SumRatio", + Histo=False, + Profile=True, + Windows={0: [75, 3840.]}, # ADC window + #SplitLeds = true + ) + + # produce summary for Desertic region + hcalCalibSumAll = CaloHisto( + name="SumAll", + Histo=False, + Profile=True, + Name="Desert", + Order=0, # produce moments up to order 2 + Windows={0: [-15, 20., 100, 3840]}, # ADC windows + InvertWindow=True) + + rawEventHcal = default_raw_event(["HcalPacked"]) + adc_alg_hcal = CaloFutureRawToDigits( + name='FutureHcalZSup', + RawEventLocation=rawEventHcal, + DetectorLocation='/dd/Structure/LHCb/DownstreamRegion/Hcal', + DecodePinData=True) + + hcal_led_moni = CaloFutureLEDMonitor( + name="LEDMonitorHcal", + InputODIN=make_odin(), + Input=adc_alg_hcal.OutputDigitData, + HistoMultiplicityMax=HistoMultiplicityMaxHCal, + HistoEtMax=5. * GeV, + HistoSizeMax=30, + ADCFilter=adcFilterHcal, + HistoSignal=hcalCalibSignal, + HistoPedestal=hcalCalibPedestal, + HistoRatio=hcalCalibRatio, + HistoAll=hcalCalibAll, + HistoSumSignal=hcalCalibSumSignal, + HistoSumPedestal=hcalCalibSumPedestal, + HistoSumRatio=hcalCalibSumRatio, + HistoSumAll=hcalCalibSumAll, + Spectrum=spectrum) + + return ecal_led_moni, hcal_led_moni + + @configurable def monitor_calo_time_alignment(calo, adcFilterEcal=-100, -- GitLab From 8bec00696ccfcf3e40a1a8666de795a494f2e20f Mon Sep 17 00:00:00 2001 From: Jean-Francois Marchand Date: Mon, 9 May 2022 14:27:20 +0200 Subject: [PATCH 02/10] Adapt calo_data_monitoring --- .../python/RecoConf/calo_data_monitoring.py | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py index 55bbfaf5e57..8729daa469e 100644 --- a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py +++ b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py @@ -117,23 +117,20 @@ def monitor_calo_led(calo, name="Signal", Name="LED", Histo=False, - Ranges={0: [75., 3840., 100]}, + Ranges=[75., 3840., 100], PercentRate=6) # produce pedestal histos ecalCalibPedestal = CaloHisto( - name="Pedestal", - Histo=True, - Ranges={0: [-15.5, 20.5, 36]}, - PercentRate=50) + name="Pedestal", Histo=True, Ranges=[-15.5, 20.5, 36], PercentRate=50) # produce full dynamics histos ecalCalibAll = CaloHisto( - name="All", Histo=True, Ranges={0: [-256., 3840, 256]}, PercentRate=5) + name="All", Histo=True, Ranges=[-256., 3840, 256], PercentRate=5) # produce PMT/PIN histos ecalCalibRatio = CaloHisto( - name="Ratio", Histo=True, Ranges={0: [0., 20, 200]}, PercentRate=6) + name="Ratio", Histo=True, Ranges=[0., 20, 200], PercentRate=6) # ====================== Summary histos : moments and profile versus channel # produce summary for signal @@ -143,7 +140,7 @@ def monitor_calo_led(calo, Histo=False, Profile=True, Order=0, # produce moments up to order 2 - Windows={0: [75., 3840.]}, # ADC window + Windows=[75., 3840.], # ADC window ) # produce summary for Pedestal @@ -151,7 +148,7 @@ def monitor_calo_led(calo, name="SumPedestal", Histo=False, Profile=True, - Windows={0: [-15., 20.]}, # ADC window + Windows=[-15., 20.], # ADC window ) # produce summary for Ratio @@ -159,7 +156,7 @@ def monitor_calo_led(calo, name="SumRatio", Histo=False, Profile=True, - Windows={0: [75, 3840.]}, # ADC window + Windows=[75, 3840.], # ADC window #SplitLeds = True ) @@ -170,7 +167,7 @@ def monitor_calo_led(calo, Profile=True, Name="Desert", Order=0, # produce moments up to order 2 - Windows={0: [-15, 20., 100, 3840]}, # ADC windows + Windows=[-15, 20., 100, 3840], # ADC windows InvertWindow=True) rawEventEcal = default_raw_event(["EcalPacked"]) @@ -187,6 +184,10 @@ def monitor_calo_led(calo, HistoMultiplicityMax=HistoMultiplicityMaxEcal, HistoEtMax=5. * GeV, HistoSizeMax=30, + ADCThreshold=30, # ADC threshold for a PIN to be declared as fired + CheckNCell= + 5, # Number of Cells to be looked for a LED to be declared as fired + PedestalRate=64, # Accept rate (%) ADCFilter=adcFilterEcal, HistoSignal=ecalCalibSignal, HistoPedestal=ecalCalibPedestal, @@ -204,23 +205,20 @@ def monitor_calo_led(calo, name="Signal", Name="LED", Histo=False, - Ranges={0: [75., 3840., 100]}, + Ranges=[75., 3840., 100], PercentRate=6) # produce pedestal histos hcalCalibPedestal = CaloHisto( - name="Pedestal", - Histo=True, - Ranges={0: [-15.5, 20.5, 36]}, - PercentRate=50) + name="Pedestal", Histo=True, Ranges=[-15.5, 20.5, 36], PercentRate=50) # produce full dynamics histos hcalCalibAll = CaloHisto( - name="All", Histo=True, Ranges={0: [-256., 3840, 256]}, PercentRate=5) + name="All", Histo=True, Ranges=[-256., 3840, 256], PercentRate=5) # produce PMT/PIN histos hcalCalibRatio = CaloHisto( - name="Ratio", Histo=True, Ranges={0: [0., 20, 200]}, PercentRate=6) + name="Ratio", Histo=True, Ranges=[0., 20, 200], PercentRate=6) # ====================== Summary histos : moments and profile versus channel # produce summary for signal @@ -230,7 +228,7 @@ def monitor_calo_led(calo, Histo=False, Profile=True, Order=0, # produce moments up to order 2 - Windows={0: [75., 3840.]}, # ADC window + Windows=[75., 3840.], # ADC window ) # produce summary for Pedestal @@ -238,7 +236,7 @@ def monitor_calo_led(calo, name="SumPedestal", Histo=False, Profile=True, - Windows={0: [-15., 20.]}, # ADC window + Windows=[-15., 20.], # ADC window ) # produce summary for Ratio @@ -246,7 +244,7 @@ def monitor_calo_led(calo, name="SumRatio", Histo=False, Profile=True, - Windows={0: [75, 3840.]}, # ADC window + Windows=[75, 3840.], # ADC window #SplitLeds = true ) @@ -257,7 +255,7 @@ def monitor_calo_led(calo, Profile=True, Name="Desert", Order=0, # produce moments up to order 2 - Windows={0: [-15, 20., 100, 3840]}, # ADC windows + Windows=[-15, 20., 100, 3840], # ADC windows InvertWindow=True) rawEventHcal = default_raw_event(["HcalPacked"]) @@ -274,6 +272,10 @@ def monitor_calo_led(calo, HistoMultiplicityMax=HistoMultiplicityMaxHCal, HistoEtMax=5. * GeV, HistoSizeMax=30, + ADCThreshold=30, # ADC threshold for a PIN to be declared as fired + CheckNCell= + 5, # Number of Cells to be looked for a LED to be declared as fired + PedestalRate=64, # Accept rate (%) ADCFilter=adcFilterHcal, HistoSignal=hcalCalibSignal, HistoPedestal=hcalCalibPedestal, -- GitLab From 72169b933ccefe3a12b8984a28ce768af327db50 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Tue, 19 Jul 2022 13:48:11 +0000 Subject: [PATCH 03/10] Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/23383999 --- Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py index 8729daa469e..6850e1c3166 100644 --- a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py +++ b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py @@ -11,13 +11,14 @@ from GaudiKernel.SystemOfUnits import GeV from PyConf import configurable from PyConf.application import make_odin -from PyConf.Algorithms import (CaloFutureClusterMonitor, - CaloFutureDigitMonitor, CaloFutureTimeAlignment, - CaloTAEData, CaloFuturePedestal, CaloFutureLEDMonitor) +from PyConf.Algorithms import ( + CaloFutureClusterMonitor, CaloFutureDigitMonitor, CaloFutureTimeAlignment, + CaloTAEData, CaloFuturePedestal, CaloFutureLEDMonitor) from PyConf.Tools import CaloHisto from PyConf.application import default_raw_event from PyConf.Algorithms import CaloFutureRawToDigits + @configurable def monitor_calo_clusters(calo, split_clusters=True): nodes = (CaloFutureClusterMonitor( -- GitLab From 076d5bef27119909b2fa6bd9c30dbe065816d66b Mon Sep 17 00:00:00 2001 From: Jean-Francois Marchand Date: Thu, 6 Oct 2022 21:06:06 +0200 Subject: [PATCH 04/10] Adapted configuration for updated version of LED monitoring code --- .../python/RecoConf/calo_data_monitoring.py | 150 +----------------- 1 file changed, 4 insertions(+), 146 deletions(-) diff --git a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py index 6850e1c3166..8e6325d3b0e 100644 --- a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py +++ b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py @@ -112,65 +112,6 @@ def monitor_calo_led(calo, HistoMultiplicityMaxHCal=4000, spectrum=False): - # ====================== Detailed histos (distribution per channel) - # produce signal histos - ecalCalibSignal = CaloHisto( - name="Signal", - Name="LED", - Histo=False, - Ranges=[75., 3840., 100], - PercentRate=6) - - # produce pedestal histos - ecalCalibPedestal = CaloHisto( - name="Pedestal", Histo=True, Ranges=[-15.5, 20.5, 36], PercentRate=50) - - # produce full dynamics histos - ecalCalibAll = CaloHisto( - name="All", Histo=True, Ranges=[-256., 3840, 256], PercentRate=5) - - # produce PMT/PIN histos - ecalCalibRatio = CaloHisto( - name="Ratio", Histo=True, Ranges=[0., 20, 200], PercentRate=6) - - # ====================== Summary histos : moments and profile versus channel - # produce summary for signal - ecalCalibSumSignal = CaloHisto( - name="SumSignal", - Name="LED", - Histo=False, - Profile=True, - Order=0, # produce moments up to order 2 - Windows=[75., 3840.], # ADC window - ) - - # produce summary for Pedestal - ecalCalibSumPedestal = CaloHisto( - name="SumPedestal", - Histo=False, - Profile=True, - Windows=[-15., 20.], # ADC window - ) - - # produce summary for Ratio - ecalCalibSumRatio = CaloHisto( - name="SumRatio", - Histo=False, - Profile=True, - Windows=[75, 3840.], # ADC window - #SplitLeds = True - ) - - # produce summary for Desertic region - ecalCalibSumAll = CaloHisto( - name="SumAll", - Histo=False, - Profile=True, - Name="Desert", - Order=0, # produce moments up to order 2 - Windows=[-15, 20., 100, 3840], # ADC windows - InvertWindow=True) - rawEventEcal = default_raw_event(["EcalPacked"]) adc_alg_ecal = CaloFutureRawToDigits( name='FutureEcalZSup', @@ -182,82 +123,11 @@ def monitor_calo_led(calo, name="LEDMonitorEcal", InputODIN=make_odin(), Input=adc_alg_ecal.OutputDigitData, - HistoMultiplicityMax=HistoMultiplicityMaxEcal, - HistoEtMax=5. * GeV, - HistoSizeMax=30, - ADCThreshold=30, # ADC threshold for a PIN to be declared as fired CheckNCell= 5, # Number of Cells to be looked for a LED to be declared as fired PedestalRate=64, # Accept rate (%) - ADCFilter=adcFilterEcal, - HistoSignal=ecalCalibSignal, - HistoPedestal=ecalCalibPedestal, - HistoRatio=ecalCalibRatio, - HistoAll=ecalCalibAll, - HistoSumSignal=ecalCalibSumSignal, - HistoSumPedestal=ecalCalibSumPedestal, - HistoSumRatio=ecalCalibSumRatio, - HistoSumAll=ecalCalibSumAll, - Spectrum=spectrum) - - # ====================== Detailed histos (distribution per channel) - # produce signal histos - hcalCalibSignal = CaloHisto( - name="Signal", - Name="LED", - Histo=False, - Ranges=[75., 3840., 100], - PercentRate=6) - - # produce pedestal histos - hcalCalibPedestal = CaloHisto( - name="Pedestal", Histo=True, Ranges=[-15.5, 20.5, 36], PercentRate=50) - - # produce full dynamics histos - hcalCalibAll = CaloHisto( - name="All", Histo=True, Ranges=[-256., 3840, 256], PercentRate=5) - - # produce PMT/PIN histos - hcalCalibRatio = CaloHisto( - name="Ratio", Histo=True, Ranges=[0., 20, 200], PercentRate=6) - - # ====================== Summary histos : moments and profile versus channel - # produce summary for signal - hcalCalibSumSignal = CaloHisto( - name="SumSignal", - Name="LED", - Histo=False, - Profile=True, - Order=0, # produce moments up to order 2 - Windows=[75., 3840.], # ADC window - ) - - # produce summary for Pedestal - hcalCalibSumPedestal = CaloHisto( - name="SumPedestal", - Histo=False, - Profile=True, - Windows=[-15., 20.], # ADC window - ) - - # produce summary for Ratio - hcalCalibSumRatio = CaloHisto( - name="SumRatio", - Histo=False, - Profile=True, - Windows=[75, 3840.], # ADC window - #SplitLeds = true - ) - - # produce summary for Desertic region - hcalCalibSumAll = CaloHisto( - name="SumAll", - Histo=False, - Profile=True, - Name="Desert", - Order=0, # produce moments up to order 2 - Windows=[-15, 20., 100, 3840], # ADC windows - InvertWindow=True) + ADCThreshold=30, # ADC threshold for a PIN to be declared as fired + Profile=True) rawEventHcal = default_raw_event(["HcalPacked"]) adc_alg_hcal = CaloFutureRawToDigits( @@ -270,23 +140,11 @@ def monitor_calo_led(calo, name="LEDMonitorHcal", InputODIN=make_odin(), Input=adc_alg_hcal.OutputDigitData, - HistoMultiplicityMax=HistoMultiplicityMaxHCal, - HistoEtMax=5. * GeV, - HistoSizeMax=30, - ADCThreshold=30, # ADC threshold for a PIN to be declared as fired CheckNCell= 5, # Number of Cells to be looked for a LED to be declared as fired PedestalRate=64, # Accept rate (%) - ADCFilter=adcFilterHcal, - HistoSignal=hcalCalibSignal, - HistoPedestal=hcalCalibPedestal, - HistoRatio=hcalCalibRatio, - HistoAll=hcalCalibAll, - HistoSumSignal=hcalCalibSumSignal, - HistoSumPedestal=hcalCalibSumPedestal, - HistoSumRatio=hcalCalibSumRatio, - HistoSumAll=hcalCalibSumAll, - Spectrum=spectrum) + ADCThreshold=30, # ADC threshold for a PIN to be declared as fired + Profile=True) return ecal_led_moni, hcal_led_moni -- GitLab From 2956e337207c38af974097a413935deaf6b12f04 Mon Sep 17 00:00:00 2001 From: Jean-Francois Marchand Date: Thu, 6 Oct 2022 21:08:44 +0200 Subject: [PATCH 05/10] Fix import --- Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py index 8e6325d3b0e..56f4eb1a8da 100644 --- a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py +++ b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py @@ -14,7 +14,6 @@ from PyConf.application import make_odin from PyConf.Algorithms import ( CaloFutureClusterMonitor, CaloFutureDigitMonitor, CaloFutureTimeAlignment, CaloTAEData, CaloFuturePedestal, CaloFutureLEDMonitor) -from PyConf.Tools import CaloHisto from PyConf.application import default_raw_event from PyConf.Algorithms import CaloFutureRawToDigits -- GitLab From 2c00a50494e26b51711ff63a9955afa6c67ab6e6 Mon Sep 17 00:00:00 2001 From: Jean-Francois Marchand Date: Fri, 21 Oct 2022 15:25:08 +0200 Subject: [PATCH 06/10] Update calo rawbank type --- Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py index 56f4eb1a8da..2552e9488c7 100644 --- a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py +++ b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py @@ -111,7 +111,7 @@ def monitor_calo_led(calo, HistoMultiplicityMaxHCal=4000, spectrum=False): - rawEventEcal = default_raw_event(["EcalPacked"]) + rawEventEcal = default_raw_event(["Calo"]) adc_alg_ecal = CaloFutureRawToDigits( name='FutureEcalZSup', RawEventLocation=rawEventEcal, @@ -128,7 +128,7 @@ def monitor_calo_led(calo, ADCThreshold=30, # ADC threshold for a PIN to be declared as fired Profile=True) - rawEventHcal = default_raw_event(["HcalPacked"]) + rawEventHcal = default_raw_event(["Calo"]) adc_alg_hcal = CaloFutureRawToDigits( name='FutureHcalZSup', RawEventLocation=rawEventHcal, -- GitLab From b5c32961ab7833230305c5f8a64517f0a1edad02 Mon Sep 17 00:00:00 2001 From: Jean-Francois Marchand Date: Fri, 21 Oct 2022 15:55:50 +0200 Subject: [PATCH 07/10] Fix monitor_calo_led properties --- Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py index 2552e9488c7..9891e0c22b2 100644 --- a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py +++ b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py @@ -104,14 +104,8 @@ def monitor_calo_digits(calo, @configurable -def monitor_calo_led(calo, - adcFilterEcal=-100, - adcFilterHcal=-100, - HistoMultiplicityMaxEcal=6000, - HistoMultiplicityMaxHCal=4000, - spectrum=False): - - rawEventEcal = default_raw_event(["Calo"]) +def monitor_calo_led(calo, rawEventEcal, rawEventHcal): + adc_alg_ecal = CaloFutureRawToDigits( name='FutureEcalZSup', RawEventLocation=rawEventEcal, @@ -128,7 +122,6 @@ def monitor_calo_led(calo, ADCThreshold=30, # ADC threshold for a PIN to be declared as fired Profile=True) - rawEventHcal = default_raw_event(["Calo"]) adc_alg_hcal = CaloFutureRawToDigits( name='FutureHcalZSup', RawEventLocation=rawEventHcal, -- GitLab From c79f0743b0f4c2f85e28f7f1202ff6fdbacbac0a Mon Sep 17 00:00:00 2001 From: Jean-Francois Marchand Date: Fri, 21 Oct 2022 16:00:17 +0200 Subject: [PATCH 08/10] Fix import --- Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py index 9891e0c22b2..b61cc191b1f 100644 --- a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py +++ b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py @@ -14,7 +14,6 @@ from PyConf.application import make_odin from PyConf.Algorithms import ( CaloFutureClusterMonitor, CaloFutureDigitMonitor, CaloFutureTimeAlignment, CaloTAEData, CaloFuturePedestal, CaloFutureLEDMonitor) -from PyConf.application import default_raw_event from PyConf.Algorithms import CaloFutureRawToDigits -- GitLab From a7a6cce97ee000a0f937831e882cb127ac9fd732 Mon Sep 17 00:00:00 2001 From: Jean-Francois Marchand Date: Fri, 23 Jun 2023 09:46:52 +0200 Subject: [PATCH 09/10] Fix python imports --- Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py index b61cc191b1f..3bfb342cefb 100644 --- a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py +++ b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py @@ -12,8 +12,9 @@ from GaudiKernel.SystemOfUnits import GeV from PyConf import configurable from PyConf.application import make_odin from PyConf.Algorithms import ( - CaloFutureClusterMonitor, CaloFutureDigitMonitor, CaloFutureTimeAlignment, - CaloTAEData, CaloFuturePedestal, CaloFutureLEDMonitor) + CaloChargedPIDsMonitor, CaloFutureClusterMonitor, CaloFutureDigitMonitor, + CaloFutureTimeAlignment, CaloTAEData, CaloFuturePedestal, + CaloFutureLEDMonitor) from PyConf.Algorithms import CaloFutureRawToDigits -- GitLab From 18a700bc2cf84372825c299960d2c60d4e903e80 Mon Sep 17 00:00:00 2001 From: Jean-Francois Marchand Date: Mon, 23 Oct 2023 12:11:49 +0200 Subject: [PATCH 10/10] Fix RawEventLocation and DetectorLocation --- .../python/RecoConf/calo_data_monitoring.py | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py index 3bfb342cefb..31ab1e43168 100644 --- a/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py +++ b/Hlt/RecoConf/python/RecoConf/calo_data_monitoring.py @@ -16,6 +16,8 @@ from PyConf.Algorithms import ( CaloFutureTimeAlignment, CaloTAEData, CaloFuturePedestal, CaloFutureLEDMonitor) from PyConf.Algorithms import CaloFutureRawToDigits +from PyConf.application import default_raw_banks +from DDDB.CheckDD4Hep import UseDD4Hep @configurable @@ -104,12 +106,19 @@ def monitor_calo_digits(calo, @configurable -def monitor_calo_led(calo, rawEventEcal, rawEventHcal): +def monitor_calo_led(calo): + + ecalpath = '/world/DownstreamRegion/Ecal:DetElement-Info-IOV' if UseDD4Hep else '/dd/Structure/LHCb/DownstreamRegion/Ecal' + hcalpath = '/world/DownstreamRegion/Hcal:DetElement-Info-IOV' if UseDD4Hep else '/dd/Structure/LHCb/DownstreamRegion/Hcal' + + rawEventCalo = default_raw_banks("Calo") + rawEventCaloError = default_raw_banks("CaloError") adc_alg_ecal = CaloFutureRawToDigits( - name='FutureEcalZSup', - RawEventLocation=rawEventEcal, - DetectorLocation='/dd/Structure/LHCb/DownstreamRegion/Ecal', + name='FutureEcalZSup_withPinDiodes', + RawBanks=rawEventCalo, + ErrorRawBanks=rawEventCaloError, + DetectorLocation=ecalpath, DecodePinData=True) ecal_led_moni = CaloFutureLEDMonitor( @@ -123,9 +132,10 @@ def monitor_calo_led(calo, rawEventEcal, rawEventHcal): Profile=True) adc_alg_hcal = CaloFutureRawToDigits( - name='FutureHcalZSup', - RawEventLocation=rawEventHcal, - DetectorLocation='/dd/Structure/LHCb/DownstreamRegion/Hcal', + name='FutureHcalZSup_withPinDiodes', + RawBanks=rawEventCalo, + ErrorRawBanks=rawEventCaloError, + DetectorLocation=hcalpath, DecodePinData=True) hcal_led_moni = CaloFutureLEDMonitor( -- GitLab