Merge pull request #11042 from cms-tsg-storm/75X25nsHLT

75X 25ns HLT round three
cms-sw · Sep 15, 2015 · 1cfbe57 · 1cfbe57
2 parents 72ecc3d + 935ae28
commit 1cfbe57
Show file tree

Hide file tree

Showing 24 changed files with 135,544 additions and 12,616 deletions.
diff --git a/Configuration/HLT/python/autoCondHLT.py b/Configuration/HLT/python/autoCondHLT.py
@@ -2,13 +2,13 @@
 
 l1Menus= {
     'Fake'         : 'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc',
-    'FULL'         : 'L1Menu_Collisions2015_25nsStage1_v4',
-    'GRun'         : 'L1Menu_Collisions2015_25nsStage1_v4',
+    'FULL'         : 'L1Menu_Collisions2015_25nsStage1_v5',
+    'GRun'         : 'L1Menu_Collisions2015_25nsStage1_v5',
     '25ns14e33_v1' : 'L1Menu_Collisions2015_25ns_v2_L1T_Scales_20141121_Imp0_0x1030',
     '25ns14e33_v3' : 'L1Menu_Collisions2015_25nsStage1_v4',
     '25ns14e33_v4' : 'L1Menu_Collisions2015_25nsStage1_v5',
     'HIon'         : 'L1Menu_CollisionsHeavyIons2011_v0_nobsc_notau_centrality_q2_singletrack.v1',
-    'PIon'         : 'L1Menu_Collisions2015_25nsStage1_v4',
+    'PIon'         : 'L1Menu_Collisions2015_25nsStage1_v5',
     '50nsGRun'     : 'L1Menu_Collisions2015_50nsGct_v4',
     '50ns_5e33_v1' : 'L1Menu_Collisions2015_50nsGct_v1_L1T_Scales_20141121_Imp0_0x1030',
     '50ns_5e33_v3' : 'L1Menu_Collisions2015_50nsGct_v4',

diff --git a/HLTrigger/Configuration/python/HLT_25ns14e33_v4_cff.py b/HLTrigger/Configuration/python/HLT_25ns14e33_v4_cff.py