Merge pull request #2966 from Martin-Grunewald/ToolfAndFrozen

HLTrigger/Configuration -- Frozen menu update for ecal unpacking, tools update for RR, misc. fixes
cms-sw · Mar 24, 2014 · bdcf26c · bdcf26c
2 parents 3d99b5e + bb797d4
commit bdcf26c
Show file tree

Hide file tree

Showing 19 changed files with 1,311 additions and 2,223 deletions.
diff --git a/HLTrigger/Configuration/python/HLT_2013_Famos_cff.py b/HLTrigger/Configuration/python/HLT_2013_Famos_cff.py
diff --git a/HLTrigger/Configuration/python/HLT_2013_cff.py b/HLTrigger/Configuration/python/HLT_2013_cff.py
diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py
@@ -1,10 +1,10 @@
-# /dev/CMSSW_7_1_0/HLT/V21 (CMSSW_7_1_0_pre4_HLT5)
+# /dev/CMSSW_7_1_0/HLT/V23 (CMSSW_7_1_0_pre4_HLT5)
 
 import FWCore.ParameterSet.Config as cms
 
 
 HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_7_1_0/HLT/V21')
+  tableName = cms.string('/dev/CMSSW_7_1_0/HLT/V23')
 )
 
 streams = cms.PSet( 

diff --git a/HLTrigger/Configuration/python/HLT_GRun_Famos_cff.py b/HLTrigger/Configuration/python/HLT_GRun_Famos_cff.py
@@ -1,11 +1,11 @@
-# /dev/CMSSW_7_1_0/GRun/V16 (CMSSW_7_1_0_pre4_HLT5)
+# /dev/CMSSW_7_1_0/GRun/V17 (CMSSW_7_1_0_pre4_HLT5)
 
 import FWCore.ParameterSet.Config as cms
 from FastSimulation.HighLevelTrigger.HLTSetup_cff import *
 
 
 HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_7_1_0/GRun/V16')
+  tableName = cms.string('/dev/CMSSW_7_1_0/GRun/V17')
 )
 
 CSCChannelMapperESSource = cms.ESSource( "EmptyESSource",

diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py
@@ -1,10 +1,10 @@
-# /dev/CMSSW_7_1_0/GRun/V16 (CMSSW_7_1_0_pre4_HLT5)
+# /dev/CMSSW_7_1_0/GRun/V17 (CMSSW_7_1_0_pre4_HLT5)
 
 import FWCore.ParameterSet.Config as cms
 
 
 HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_7_1_0/GRun/V16')
+  tableName = cms.string('/dev/CMSSW_7_1_0/GRun/V17')
 )
 
 streams = cms.PSet( 

diff --git a/HLTrigger/Configuration/python/HLT_HIon_cff.py b/HLTrigger/Configuration/python/HLT_HIon_cff.py
@@ -1,10 +1,10 @@
-# /dev/CMSSW_7_1_0/HIon/V16 (CMSSW_7_1_0_pre4_HLT5)
+# /dev/CMSSW_7_1_0/HIon/V17 (CMSSW_7_1_0_pre4_HLT5)
 
 import FWCore.ParameterSet.Config as cms
 
 
 HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_7_1_0/HIon/V16')
+  tableName = cms.string('/dev/CMSSW_7_1_0/HIon/V17')
 )
 
 streams = cms.PSet( 

diff --git a/HLTrigger/Configuration/python/HLT_PIon_cff.py b/HLTrigger/Configuration/python/HLT_PIon_cff.py
@@ -1,10 +1,10 @@
-# /dev/CMSSW_7_1_0/PIon/V16 (CMSSW_7_1_0_pre4_HLT5)
+# /dev/CMSSW_7_1_0/PIon/V17 (CMSSW_7_1_0_pre4_HLT5)
 
 import FWCore.ParameterSet.Config as cms
 
 
 HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_7_1_0/PIon/V16')
+  tableName = cms.string('/dev/CMSSW_7_1_0/PIon/V17')
 )
 
 streams = cms.PSet( 

diff --git a/HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py b/HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py
@@ -243,6 +243,8 @@
         'keep *_hltSelector4JetsL1FastJet_*_*',
         'keep *_hltSelectorJets20L1FastJet_*_*',
         'keep *_hltSiPixelCluster_*_*',
+        'keep *_hltSiPixelClusters_*_*',
+        'keep *_hltSiStripClusters_*_*',
         'keep *_hltSiStripRawToClustersFacility_*_*',
         'keep *_hltSingleMu15L3Filtered15_*_*',
         'keep *_hltSingleMuIsoL1s14L3IsoFiltered15eta2p1_*_*',
@@ -511,6 +513,8 @@
         'keep *_hltSelector4JetsL1FastJet_*_*',
         'keep *_hltSelectorJets20L1FastJet_*_*',
         'keep *_hltSiPixelCluster_*_*',
+        'keep *_hltSiPixelClusters_*_*',
+        'keep *_hltSiStripClusters_*_*',
         'keep *_hltSiStripRawToClustersFacility_*_*',
         'keep *_hltSingleMu15L3Filtered15_*_*',
         'keep *_hltSingleMuIsoL1s14L3IsoFiltered15eta2p1_*_*',

diff --git a/HLTrigger/Configuration/test/OnData_HLT_2013.py b/HLTrigger/Configuration/test/OnData_HLT_2013.py
diff --git a/HLTrigger/Configuration/test/OnData_HLT_FULL.py b/HLTrigger/Configuration/test/OnData_HLT_FULL.py
@@ -1,11 +1,11 @@
-# /dev/CMSSW_7_1_0/HLT/V21 (CMSSW_7_1_0_pre4_HLT5)
+# /dev/CMSSW_7_1_0/HLT/V23 (CMSSW_7_1_0_pre4_HLT5)
 
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process( "HLTFULL" )
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_7_1_0/HLT/V21')
+  tableName = cms.string('/dev/CMSSW_7_1_0/HLT/V23')
 )
 
 process.streams = cms.PSet( 
@@ -5045,7 +5045,8 @@
       suppressInfo = cms.untracked.vstring(  ),
       suppressWarning = cms.untracked.vstring(  ),
       suppressDebug = cms.untracked.vstring(  ),
-      suppressError = cms.untracked.vstring(  )
+      suppressError = cms.untracked.vstring(  ),
+      ERROR = cms.untracked.PSet(  limit = cms.untracked.int32( 0 ) )
     ),
     cerr_stats = cms.untracked.PSet( 
       threshold = cms.untracked.string( "WARNING" ),
@@ -68013,7 +68014,8 @@
       'keep *_hltPixelTracks_*_*',
       'keep *_hltPixelVertices3DbbPhi_*_*',
       'keep *_hltPixelVertices_*_*',
-      'keep *_hltSiPixelCluster_*_*',
+      'keep *_hltSiPixelClusters_*_*',
+      'keep *_hltSiStripClusters_*_*',
       'keep *_hltSiStripRawToClustersFacility_*_*',
       'keep *_hltTriggerSummaryAOD_*_*',
       'keep *_hltTriggerSummaryRAW_*_*',

diff --git a/HLTrigger/Configuration/test/OnData_HLT_GRun.py b/HLTrigger/Configuration/test/OnData_HLT_GRun.py
@@ -1,11 +1,11 @@
-# /dev/CMSSW_7_1_0/GRun/V16 (CMSSW_7_1_0_pre4_HLT5)
+# /dev/CMSSW_7_1_0/GRun/V17 (CMSSW_7_1_0_pre4_HLT5)
 
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process( "HLTGRun" )
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_7_1_0/GRun/V16')
+  tableName = cms.string('/dev/CMSSW_7_1_0/GRun/V17')
 )
 
 process.streams = cms.PSet( 
@@ -4006,7 +4006,8 @@
       suppressInfo = cms.untracked.vstring(  ),
       suppressWarning = cms.untracked.vstring(  ),
       suppressDebug = cms.untracked.vstring(  ),
-      suppressError = cms.untracked.vstring(  )
+      suppressError = cms.untracked.vstring(  ),
+      ERROR = cms.untracked.PSet(  limit = cms.untracked.int32( 0 ) )
     ),
     cerr_stats = cms.untracked.PSet( 
       threshold = cms.untracked.string( "WARNING" ),
@@ -56434,7 +56435,8 @@
       'keep *_hltPixelTracks_*_*',
       'keep *_hltPixelVertices3DbbPhi_*_*',
       'keep *_hltPixelVertices_*_*',
-      'keep *_hltSiPixelCluster_*_*',
+      'keep *_hltSiPixelClusters_*_*',
+      'keep *_hltSiStripClusters_*_*',
       'keep *_hltSiStripRawToClustersFacility_*_*',
       'keep *_hltTriggerSummaryAOD_*_*',
       'keep *_hltTriggerSummaryRAW_*_*',

diff --git a/HLTrigger/Configuration/test/OnData_HLT_HIon.py b/HLTrigger/Configuration/test/OnData_HLT_HIon.py
@@ -1,11 +1,11 @@
-# /dev/CMSSW_7_1_0/HIon/V16 (CMSSW_7_1_0_pre4_HLT5)
+# /dev/CMSSW_7_1_0/HIon/V17 (CMSSW_7_1_0_pre4_HLT5)
 
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process( "HLTHIon" )
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_7_1_0/HIon/V16')
+  tableName = cms.string('/dev/CMSSW_7_1_0/HIon/V17')
 )
 
 process.streams = cms.PSet( 
@@ -2593,7 +2593,8 @@
       suppressInfo = cms.untracked.vstring(  ),
       suppressWarning = cms.untracked.vstring(  ),
       suppressDebug = cms.untracked.vstring(  ),
-      suppressError = cms.untracked.vstring(  )
+      suppressError = cms.untracked.vstring(  ),
+      ERROR = cms.untracked.PSet(  limit = cms.untracked.int32( 0 ) )
     ),
     cerr_stats = cms.untracked.PSet( 
       threshold = cms.untracked.string( "WARNING" ),
@@ -7877,7 +7878,8 @@
       'keep *_hltPixelTracks_*_*',
       'keep *_hltPixelVertices3DbbPhi_*_*',
       'keep *_hltPixelVertices_*_*',
-      'keep *_hltSiPixelCluster_*_*',
+      'keep *_hltSiPixelClusters_*_*',
+      'keep *_hltSiStripClusters_*_*',
       'keep *_hltSiStripRawToClustersFacility_*_*',
       'keep *_hltTriggerSummaryAOD_*_*',
       'keep *_hltTriggerSummaryRAW_*_*',

diff --git a/HLTrigger/Configuration/test/OnData_HLT_PIon.py b/HLTrigger/Configuration/test/OnData_HLT_PIon.py
@@ -1,11 +1,11 @@
-# /dev/CMSSW_7_1_0/PIon/V16 (CMSSW_7_1_0_pre4_HLT5)
+# /dev/CMSSW_7_1_0/PIon/V17 (CMSSW_7_1_0_pre4_HLT5)
 
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process( "HLTPIon" )
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_7_1_0/PIon/V16')
+  tableName = cms.string('/dev/CMSSW_7_1_0/PIon/V17')
 )
 
 process.streams = cms.PSet( 
@@ -3033,7 +3033,8 @@
       suppressInfo = cms.untracked.vstring(  ),
       suppressWarning = cms.untracked.vstring(  ),
       suppressDebug = cms.untracked.vstring(  ),
-      suppressError = cms.untracked.vstring(  )
+      suppressError = cms.untracked.vstring(  ),
+      ERROR = cms.untracked.PSet(  limit = cms.untracked.int32( 0 ) )
     ),
     cerr_stats = cms.untracked.PSet( 
       threshold = cms.untracked.string( "WARNING" ),