Fix merge conflict

cms-sw · May 13, 2016 · 104f7a3 · 104f7a3
2 parents 8c0a1ce + 119717f
commit 104f7a3
Show file tree

Hide file tree

Showing 48 changed files with 22,438 additions and 33,867 deletions.
diff --git a/Configuration/HLT/python/autoCondHLT.py b/Configuration/HLT/python/autoCondHLT.py
@@ -18,10 +18,10 @@
 l1Menus= {
     'Fake' : ( ','.join( [ 'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc'             , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
     'Fake1': ( ','.join( [ 'L1Menu_Collisions2015_25nsStage1_v5'                     , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
-    'FULL' : ( ','.join( [ 'L1Menu_Collisions2016_v1_xml'                            ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-04-27 15:15:00.000"] ), ),
-    'GRun' : ( ','.join( [ 'L1Menu_Collisions2016_v1_xml'                            ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-04-27 15:15:00.000"] ), ),
+    'FULL' : ( ','.join( [ 'L1Menu_Collisions2016_v2_xml'                            ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-05-12 12:40:00.000"] ), ),
+    'GRun' : ( ','.join( [ 'L1Menu_Collisions2016_v2_xml'                            ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-05-12 12:40:00.000"] ), ),
     'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2015_v5_uGT_xml'               ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-04 15:00:00.000"] ), ),
-    'PIon' : ( ','.join( [ 'L1Menu_Collisions2016_v1_xml'                            ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-04-27 15:15:00.000"] ), ),
+    'PIon' : ( ','.join( [ 'L1Menu_Collisions2016_v2_xml'                            ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-05-12 12:40:00.000"] ), ),
     'PRef' : ( ','.join( [ 'L1Menu_Collisions2015_5TeV_pp_reference_v5_uGT_v2_mc_xml',l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-04 15:00:00.000"] ), ),
 }
 

diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py
diff --git a/HLTrigger/Configuration/python/HLT_Fake1_cff.py b/HLTrigger/Configuration/python/HLT_Fake1_cff.py
@@ -1,11 +1,11 @@
-# /dev/CMSSW_8_0_0/Fake1/V11 (CMSSW_8_0_7)
+# /dev/CMSSW_8_0_0/Fake1/V12 (CMSSW_8_0_7_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_8_0_0/Fake1/V11')
+  tableName = cms.string('/dev/CMSSW_8_0_0/Fake1/V12')
 )
 
 fragment.streams = cms.PSet(  A = cms.vstring( 'InitialPD' ) )

diff --git a/HLTrigger/Configuration/python/HLT_Fake_cff.py b/HLTrigger/Configuration/python/HLT_Fake_cff.py
@@ -1,11 +1,11 @@
-# /dev/CMSSW_8_0_0/Fake/V15 (CMSSW_8_0_7)
+# /dev/CMSSW_8_0_0/Fake/V16 (CMSSW_8_0_7_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_8_0_0/Fake/V15')
+  tableName = cms.string('/dev/CMSSW_8_0_0/Fake/V16')
 )
 
 fragment.streams = cms.PSet(  A = cms.vstring( 'InitialPD' ) )