CMSHLT-827 in GRun

cms-sw · May 26, 2016 · 6cdd1bd · 6cdd1bd
1 parent 5f5f015
commit 6cdd1bd
Show file tree

Hide file tree

Showing 14 changed files with 2,354 additions and 1,881 deletions.
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_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py
diff --git a/HLTrigger/Configuration/python/HLT_HIon_cff.py b/HLTrigger/Configuration/python/HLT_HIon_cff.py
@@ -1,11 +1,11 @@
-# /dev/CMSSW_8_0_0/HIon/V102 (CMSSW_8_0_8_HLT1)
+# /dev/CMSSW_8_0_0/HIon/V103 (CMSSW_8_0_8_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_8_0_0/HIon/V102')
+  tableName = cms.string('/dev/CMSSW_8_0_0/HIon/V103')
 )
 
 fragment.HLTPSetInitialStepTrajectoryFilterBase = cms.PSet( 

diff --git a/HLTrigger/Configuration/python/HLT_PIon_cff.py b/HLTrigger/Configuration/python/HLT_PIon_cff.py
@@ -1,11 +1,11 @@
-# /dev/CMSSW_8_0_0/PIon/V102 (CMSSW_8_0_8_HLT1)
+# /dev/CMSSW_8_0_0/PIon/V103 (CMSSW_8_0_8_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_8_0_0/PIon/V102')
+  tableName = cms.string('/dev/CMSSW_8_0_0/PIon/V103')
 )
 
 fragment.HLTPSetInitialStepTrajectoryFilterBase = cms.PSet( 

diff --git a/HLTrigger/Configuration/python/HLT_PRef_cff.py b/HLTrigger/Configuration/python/HLT_PRef_cff.py
@@ -1,11 +1,11 @@
-# /dev/CMSSW_8_0_0/PRef/V102 (CMSSW_8_0_8_HLT1)
+# /dev/CMSSW_8_0_0/PRef/V103 (CMSSW_8_0_8_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_8_0_0/PRef/V102')
+  tableName = cms.string('/dev/CMSSW_8_0_0/PRef/V103')
 )
 
 fragment.HLTPSetInitialStepTrajectoryFilterBase = cms.PSet( 

diff --git a/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py b/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py
@@ -417,6 +417,7 @@
 streamA_datasetMET_selector.triggerConditions = cms.vstring('HLT_CaloMHTNoPU90_PFMET90_PFMHT90_IDTight_BTagCSV_p067_v1', 
     'HLT_CaloMHTNoPU90_PFMET90_PFMHT90_IDTight_v2', 
     'HLT_DiCentralPFJet55_PFMET110_v1', 
+    'HLT_DoubleMu3_PFMET50_v1', 
     'HLT_MET200_v1', 
     'HLT_MET250_v1', 
     'HLT_MET300_v1', 
@@ -501,7 +502,6 @@
     'HLT_DoubleMu28NoFiltersNoVtxDisplaced_v2', 
     'HLT_DoubleMu33NoFiltersNoVtx_v2', 
     'HLT_DoubleMu38NoFiltersNoVtx_v2', 
-    'HLT_DoubleMu3_PFMET50_v1', 
     'HLT_DoubleMu8_Mass8_PFHT250_v1', 
     'HLT_DoubleMu8_Mass8_PFHT300_v4', 
     'HLT_L2DoubleMu23_NoVertex_v2', 
@@ -536,7 +536,8 @@
 streamA_datasetDoubleMuonLowMass_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
 streamA_datasetDoubleMuonLowMass_selector.l1tResults = cms.InputTag('')
 streamA_datasetDoubleMuonLowMass_selector.throw      = cms.bool(False)
-streamA_datasetDoubleMuonLowMass_selector.triggerConditions = cms.vstring('HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v2')
+streamA_datasetDoubleMuonLowMass_selector.triggerConditions = cms.vstring('HLT_DoubleMu3_Trk_Tau3mu_v1', 
+    'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v2')
 
 from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamA_datasetMuOnia_selector
 streamA_datasetMuOnia_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')

diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
@@ -31,6 +31,13 @@ def customiseFor13753(process):
             producer.CleanerPSet.useQuadrupletAlgo = cms.bool(False)
     return process
 
+# Add pixel seed extension (PR #14356)
+def customiseFor14356(process):
+    for name, pset in process.psets_().iteritems():
+        if hasattr(pset, "ComponentType") and pset.ComponentType.value() == "CkfBaseTrajectoryFilter" and not hasattr(pset, "pixelSeedExtension"):
+            pset.pixelSeedExtension = cms.bool(False)
+    return process
+
 #
 # CMSSW version specific customizations
 def customizeHLTforCMSSW(process, menuType="GRun"):
@@ -39,6 +46,7 @@ def customizeHLTforCMSSW(process, menuType="GRun"):
     cmsswVersion = os.environ['CMSSW_VERSION']
 
     if cmsswVersion >= "CMSSW_8_1":
+        process = customiseFor14356(process)
         process = customiseFor13753(process)
 #       process = customiseFor12718(process)
         pass

diff --git a/HLTrigger/Configuration/tables/GRun.txt b/HLTrigger/Configuration/tables/GRun.txt
@@ -726,6 +726,7 @@ MC_DoubleMuNoFiltersNoVtx_v*					# JIRA: CMSHLT-322 (template paths only for MC)
 HLT_IsoTrackHE_v*						# JIRA: CMSHLT-289
 HLT_IsoTrackHB_v*						# JIRA: CMSHLT-289
 
+HLT_DoubleMu3_Trk_Tau3mu_v*					# JIRA: CMSHLT-827
 HLT_DoubleMu3_PFMET50_v*					# JIRA: CMSHLT-832
 HLT_TripleMu_5_3_3_v*						# JIRA: CMSHLT-832
 

diff --git a/HLTrigger/Configuration/tables/online_grun.txt b/HLTrigger/Configuration/tables/online_grun.txt
@@ -726,6 +726,7 @@ DST_DoubleMu3_Mass10_CaloScouting_PFScouting_v*			# JIRA: CMSHLT-604 renamed & c
 HLT_IsoTrackHE_v*						# JIRA: CMSHLT-289
 HLT_IsoTrackHB_v*						# JIRA: CMSHLT-289
 
+HLT_DoubleMu3_Trk_Tau3mu_v*					# JIRA: CMSHLT-827
 HLT_DoubleMu3_PFMET50_v*					# JIRA: CMSHLT-832
 HLT_TripleMu_5_3_3_v*						# JIRA: CMSHLT-832