From cdf2b5a53bf28194d0f74948a8a9c1283810c0fe Mon Sep 17 00:00:00 2001 From: Roel Aaij <raaij@nikhef.nl> Date: Mon, 18 Apr 2016 19:42:38 +0200 Subject: [PATCH 1/6] Set PreloadTools = True on all derivatives of DVCommonBase. --- Hlt/HltConf/doc/release.notes | 3 +++ Hlt/HltConf/python/HltConf/Configuration.py | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/Hlt/HltConf/doc/release.notes b/Hlt/HltConf/doc/release.notes index e6301a0c5..3e9c8e373 100755 --- a/Hlt/HltConf/doc/release.notes +++ b/Hlt/HltConf/doc/release.notes @@ -4,6 +4,9 @@ ! Purpose : HLT Configuration ! ----------------------------------------------------------------------------- +! 2016-04-18 - Roel Aaij + - Set PreloadTools = True on all derivatives of DVCommonBase. + !========================= HltConf v13r8 2016-04-11 ========================= ! 2016-04-11 - Rosen Matev diff --git a/Hlt/HltConf/python/HltConf/Configuration.py b/Hlt/HltConf/python/HltConf/Configuration.py index d8e16a80f..b08bbab7a 100755 --- a/Hlt/HltConf/python/HltConf/Configuration.py +++ b/Hlt/HltConf/python/HltConf/Configuration.py @@ -508,6 +508,24 @@ class HltConf(LHCbConfigurableUser): from HltConf.HltMonitoring import HltMonitoringConf HltMonitoringConf().configureHltMonitoring(lines1, lines2) + # Set PreloadTools to True everywhere + def preloadTools(c): + defProps = c.getDefaultProperties() + if 'PreloadTools' in defProps: + if type(defProps['PreloadTools']) == bool: + # DVCommonBase has a bool + c.PreloadTools = True + for p in ['Members', 'Filter0', 'Filter1']: + if not hasattr(c, p): + continue + x = getattr(c, p) + if list is not type(x): + x = [x] + for i in x: + preloadTools(i) + for l in lines1 + lines2: + preloadTools(l.configurable()) + if self.getProp("Verbose") : print Sequence('Hlt') def _safeSet(self, option, newVal): -- GitLab From 12b6ab60c12b1cf32e745639cb5ab764e5ad69ca Mon Sep 17 00:00:00 2001 From: Roel Aaij <raaij@nikhef.nl> Date: Tue, 19 Apr 2016 16:26:46 +0200 Subject: [PATCH 2/6] Change Hlt1MBNoBiasRateLimited rate to 1 kHz for the startup period. Conflicts: Hlt/HltSettings/doc/release.notes --- Hlt/HltSettings/python/HltSettings/Physics_pp_May2016.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Hlt/HltSettings/python/HltSettings/Physics_pp_May2016.py b/Hlt/HltSettings/python/HltSettings/Physics_pp_May2016.py index 48b32fe7c..acc7d531c 100644 --- a/Hlt/HltSettings/python/HltSettings/Physics_pp_May2016.py +++ b/Hlt/HltSettings/python/HltSettings/Physics_pp_May2016.py @@ -308,6 +308,10 @@ class Physics_pp_May2016( object ): , 'Hlt1MBMicroBiasTStation' : 0 , 'Hlt1MBMicroBiasVeloRateLimited' : 0 , 'Hlt1MBMicroBiasTStationRateLimited' : 0 } + , 'Postscale' : { 'Hlt1MBNoBiasRateLimited' : 'RATE(1000)' + , 'Hlt1MBMicroBias.*RateLimited' : 'RATE(500)' + , 'Hlt1CharmCalibrationNoBias' : 'RATE(500)' + , 'Hlt1MBMicroBiasLowMultVelo' : 1.0 } , 'MaxNoBiasRate' : 1000000. } , Hlt1CalibRICHMirrorLinesConf : { 'Prescale' : { 'Hlt1CalibHighPTLowMultTrks' : 0.0001, -- GitLab From ab8351e03c5e243ffbd0e058cfb9354e72e87f78 Mon Sep 17 00:00:00 2001 From: Roel Aaij <roel.aaij@cern.ch> Date: Tue, 19 Apr 2016 16:31:03 +0200 Subject: [PATCH 3/6] Update release.notes to avoid merge conflicts --- Hlt/HltConf/doc/release.notes | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Hlt/HltConf/doc/release.notes b/Hlt/HltConf/doc/release.notes index 170c286df..7f20f26eb 100755 --- a/Hlt/HltConf/doc/release.notes +++ b/Hlt/HltConf/doc/release.notes @@ -4,11 +4,6 @@ ! Purpose : HLT Configuration ! ----------------------------------------------------------------------------- -! 2016-04-19 - Roel Aaij - - Allow routing bit 48 to be set from threshold settings as 'HLT1NOBIAS'. - This is used by the VeloMicroBias settings to ensure the monitoring jobs - get events. - !========================= HltConf v13r9 2016-04-18 ========================= ! 2016-04-18 - Roel Aaij -- GitLab From dca60b768c2d21fb628ceeda5d92d52a6f9862a2 Mon Sep 17 00:00:00 2001 From: Roel Aaij <raaij@nikhef.nl> Date: Tue, 19 Apr 2016 18:38:31 +0200 Subject: [PATCH 4/6] Remove Hlt1MBNoBiasRateLimited from pp_May2016 settings. Set prescale of Hlt2MBNoBias to 0.01 to get 10 Hz for 1 kHz of ODIN NoBias in pp_May2016. --- CMakeLists.txt | 4 ++-- Hlt/Hlt2Lines/python/Hlt2Lines/Technical/Lines.py | 1 + Hlt/HltConf/python/HltConf/HltOutput.py | 2 -- Hlt/HltSettings/python/HltSettings/Hlt1TechnicalLines.py | 1 - Hlt/HltSettings/python/HltSettings/Physics_pp_May2016.py | 7 ++----- .../python/HltSettings/Technical/Technical_pp_May2016.py | 1 + 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4614300c5..73ec299f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,5 +6,5 @@ find_package(GaudiProject) #--------------------------------------------------------------- # Declare project name and version -gaudi_project(Hlt v25r2 - USE Phys v21r3) +gaudi_project(Hlt v25r1 + USE Phys v21r2) diff --git a/Hlt/Hlt2Lines/python/Hlt2Lines/Technical/Lines.py b/Hlt/Hlt2Lines/python/Hlt2Lines/Technical/Lines.py index b881a6d4a..91ddcf505 100644 --- a/Hlt/Hlt2Lines/python/Hlt2Lines/Technical/Lines.py +++ b/Hlt/Hlt2Lines/python/Hlt2Lines/Technical/Lines.py @@ -4,6 +4,7 @@ from Hlt2Lines.Utilities.Hlt2LinesConfigurableUser import Hlt2LinesConfigurableU class TechnicalLines(Hlt2LinesConfigurableUser): __slots__ = {'Prescale' : {'Hlt2PassThrough' : 0.0001, 'Hlt2Forward' : 0.0001, + 'Hlt2MBNoBias' : 0.01, 'Hlt2DebugEvent' : 0.0001}, 'Postscale' : {'Hlt2ErrorEvent' : 'RATE(1)'}, # do not want debug events on lumi-exclusive Hlt1 events... diff --git a/Hlt/HltConf/python/HltConf/HltOutput.py b/Hlt/HltConf/python/HltConf/HltOutput.py index 289772d8c..78eadb690 100644 --- a/Hlt/HltConf/python/HltConf/HltOutput.py +++ b/Hlt/HltConf/python/HltConf/HltOutput.py @@ -317,8 +317,6 @@ class HltOutputConf(LHCbConfigurableUser): , 53 : "HLT_PASS_RE('Hlt1Calib(TrackingKPiDetached|HighPTLowMultTrks)Decision')" # RB 54 RICH mirror alignment , 54 : "HLT_PASS_RE('Hlt1CalibRICH.*Decision')" - # RB 55 NoBias, rate-limited - , 55 : "HLT_PASS('Hlt1MBNoBiasRateLimitedDecision')" # RB 56 Muon alignment , 56 : "HLT_PASS('Hlt1CalibMuonAlignJpsiDecision')" # RB 57 Tell1 Error events diff --git a/Hlt/HltSettings/python/HltSettings/Hlt1TechnicalLines.py b/Hlt/HltSettings/python/HltSettings/Hlt1TechnicalLines.py index c05195522..274b0eddc 100644 --- a/Hlt/HltSettings/python/HltSettings/Hlt1TechnicalLines.py +++ b/Hlt/HltSettings/python/HltSettings/Hlt1TechnicalLines.py @@ -15,7 +15,6 @@ class Hlt1TechnicalLines: 'Hlt1Lumi', 'Hlt1L0Any', 'Hlt1L0AnyNoSPD', 'Hlt1MBNoBias', - 'Hlt1MBNoBiasRateLimited', 'Hlt1ODINTechnical', 'Hlt1Tell1Error', 'Hlt1ErrorEvent', # 'Hlt1Incident' 'Hlt1VeloClosingMicroBias', ] diff --git a/Hlt/HltSettings/python/HltSettings/Physics_pp_May2016.py b/Hlt/HltSettings/python/HltSettings/Physics_pp_May2016.py index acc7d531c..0d08cdca6 100644 --- a/Hlt/HltSettings/python/HltSettings/Physics_pp_May2016.py +++ b/Hlt/HltSettings/python/HltSettings/Physics_pp_May2016.py @@ -307,11 +307,8 @@ class Physics_pp_May2016( object ): , Hlt1MBLinesConf : { 'Prescale' : { 'Hlt1MBMicroBiasVelo' : 0 , 'Hlt1MBMicroBiasTStation' : 0 , 'Hlt1MBMicroBiasVeloRateLimited' : 0 - , 'Hlt1MBMicroBiasTStationRateLimited' : 0 } - , 'Postscale' : { 'Hlt1MBNoBiasRateLimited' : 'RATE(1000)' - , 'Hlt1MBMicroBias.*RateLimited' : 'RATE(500)' - , 'Hlt1CharmCalibrationNoBias' : 'RATE(500)' - , 'Hlt1MBMicroBiasLowMultVelo' : 1.0 } + , 'Hlt1MBMicroBiasTStationRateLimited' : 0 + , 'Hlt1MBNoBias' : 1 } , 'MaxNoBiasRate' : 1000000. } , Hlt1CalibRICHMirrorLinesConf : { 'Prescale' : { 'Hlt1CalibHighPTLowMultTrks' : 0.0001, diff --git a/Hlt/HltSettings/python/HltSettings/Technical/Technical_pp_May2016.py b/Hlt/HltSettings/python/HltSettings/Technical/Technical_pp_May2016.py index dea1b2b46..2a0ef5270 100644 --- a/Hlt/HltSettings/python/HltSettings/Technical/Technical_pp_May2016.py +++ b/Hlt/HltSettings/python/HltSettings/Technical/Technical_pp_May2016.py @@ -43,6 +43,7 @@ class Technical_pp_May2016(object) : from Hlt2Lines.Technical.Lines import TechnicalLines d.update({TechnicalLines : {'Prescale' : {'Hlt2PassThrough' : 0.0001, + 'Hlt2MBNoBias' : 0.01, 'Hlt2Forward' : 0.00001, 'Hlt2DebugEvent' : 0.000001}, 'Postscale' : {'Hlt2ErrorEvent' : 'RATE(0.01)'}, -- GitLab From 82aefe2c0f986388ebf7ada1a11c885816059e76 Mon Sep 17 00:00:00 2001 From: Roel Aaij <roel.aaij@cern.ch> Date: Tue, 19 Apr 2016 19:09:25 +0200 Subject: [PATCH 5/6] Revert mistakenly commited change. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 73ec299f9..4614300c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,5 +6,5 @@ find_package(GaudiProject) #--------------------------------------------------------------- # Declare project name and version -gaudi_project(Hlt v25r1 - USE Phys v21r2) +gaudi_project(Hlt v25r2 + USE Phys v21r3) -- GitLab From e9a9b1990f520212b7ce0cd76c59dfea4eb6677f Mon Sep 17 00:00:00 2001 From: Roel Aaij <raaij@nikhef.nl> Date: Tue, 19 Apr 2016 19:12:46 +0200 Subject: [PATCH 6/6] Align 2016 settings. --- Hlt/HltSettings/python/HltSettings/Physics_pp_Draft2016.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hlt/HltSettings/python/HltSettings/Physics_pp_Draft2016.py b/Hlt/HltSettings/python/HltSettings/Physics_pp_Draft2016.py index 7048753d0..d67c386ee 100644 --- a/Hlt/HltSettings/python/HltSettings/Physics_pp_Draft2016.py +++ b/Hlt/HltSettings/python/HltSettings/Physics_pp_Draft2016.py @@ -311,7 +311,8 @@ class Physics_pp_Draft2016( object ): , Hlt1MBLinesConf : { 'Prescale' : { 'Hlt1MBMicroBiasVelo' : 0 , 'Hlt1MBMicroBiasTStation' : 0 , 'Hlt1MBMicroBiasVeloRateLimited' : 0 - , 'Hlt1MBMicroBiasTStationRateLimited' : 0 } + , 'Hlt1MBMicroBiasTStationRateLimited' : 0 + , 'Hlt1MBNoBias' : 1 } , 'MaxNoBiasRate' : 1000000. } , Hlt1CalibRICHMirrorLinesConf : { 'Prescale' : { 'Hlt1CalibHighPTLowMultTrks' : 0.0001, -- GitLab