From b682632641f79d98ee102cd8d776280bbcee6daa Mon Sep 17 00:00:00 2001
From: Moritz Backes <moritz.backes@cern.ch>
Date: Fri, 18 Nov 2016 16:02:06 +0100
Subject: [PATCH] 'change default configForRun2 to 2017'
(TriggerJobOpts-00-05-32)
* Introducing run2Config flag (to switch between 2016-MC16a and
2017-MC16b/c conditions) - switching default to 2017
* TriggerJobOpts-00-05-32
2016-11-18 Moritz Backes
* Introducing run2Config flag (to switch between 2016-MC16a and
2017-MC16b/c conditions) - fix to previous tag
* TriggerJobOpts-00-05-31
2016-11-18 Moritz Backes
* Introducing run2Config flag (to switch between 2016-MC16a and
2017-MC16b/c conditions)
* TriggerJobOpts-00-05-30
2016-11-09 Nils Ruthmann
* Introducing *_pp_v7 menus (ATR-15426)
* TriggerJobOpts-00-05-29
Former-commit-id: b47b87fded17037b855aa0cf0b0bbc3776aae7d1
---
.../TriggerJobOpts/python/TriggerFlags.py | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
index 46dd67d3ad2..126e36d22ed 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
@@ -414,6 +414,18 @@ class configForStartup(JobProperty):
_flags.append(configForStartup)
+class run2Config(JobProperty):
+ """ A flag to specify 2016 or 2017 (tunes, etc) running conditions """
+ statusOn=True
+ allowedType=['string']
+ StoredValue = '2017'
+ allowedValues = [
+ '2016',
+ '2017',
+ ]
+
+_flags.append(run2Config)
+
class dataTakingConditions(JobProperty):
""" A flag that describes the conditions of the Trigger at data taking, and determines which part of it will be processed in reconstruction."""
statusOn=True
@@ -1060,6 +1072,7 @@ class triggerMenuSetup(JobProperty):
'MC_HI_v4', 'MC_HI_v4_tight_mc_prescale',
'MC_pp_v6','Physics_pp_v6','MC_pp_v6_no_prescale', 'MC_pp_v6_tight_mc_prescale', 'MC_pp_v6_tightperf_mc_prescale', 'MC_pp_v6_loose_mc_prescale','Physics_pp_v6_tight_physics_prescale',
+ 'MC_pp_v7','Physics_pp_v7','MC_pp_v7_no_prescale', 'MC_pp_v7_tight_mc_prescale', 'MC_pp_v7_tightperf_mc_prescale', 'MC_pp_v7_loose_mc_prescale','Physics_pp_v7_tight_physics_prescale',
]
_default_menu='MC_pp_v6_tight_mc_prescale'
--
GitLab