add SLHCUpgradeSimulations.Configuration.postLS1Customs

cms-sw · Jul 13, 2015 · 184c2b6 · 184c2b6
1 parent 164695b
commit 184c2b6
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 43 deletions.
diff --git a/DQM/L1TMonitor/python/L1TCSCTF_cfi.py b/DQM/L1TMonitor/python/L1TCSCTF_cfi.py
@@ -7,7 +7,7 @@
     outputFile = cms.untracked.string(''),
     lctProducer = cms.InputTag("csctfDigis"),
     verbose = cms.untracked.bool(False),
-    gangedME11a = cms.untracked.bool(False), ## Run2: False; Run1: True
+    gangedME11a = cms.untracked.bool(True), ## Run2: False; Run1: True
     trackProducer = cms.InputTag("csctfDigis"),
     mbProducer = cms.InputTag("csctfDigis:DT"),
     DQMStore = cms.untracked.bool(True),
@@ -17,6 +17,5 @@
 #
 # Make changes for running in Run 2
 #
-# This is not working.
-#from Configuration.StandardSequences.Eras import eras
-#eras.run2_common.toModify( l1tCsctf, gangedME11a = False )
+from Configuration.StandardSequences.Eras import eras
+eras.run2_common.toModify( l1tCsctf, gangedME11a = False )
diff --git a/DQM/L1TMonitor/test/l1t_dqm_sourceclient-file_cfg.py b/DQM/L1TMonitor/test/l1t_dqm_sourceclient-file_cfg.py
@@ -20,12 +20,12 @@
 
 # for 'file' choose also the type of the global tag and (edit) the actual global tag
 if l1DqmEnv == 'file' :
-    
+
     globalTagType = 'HLT'
     #globalTagType = 'P'
     #globalTagType = 'E'
     #globalTagType = 'R'
-    
+
     if globalTagType == 'HLT' :
         globalTagValue = 'GR_H_V44'
     elif globalTagType == 'P' :
@@ -44,8 +44,8 @@
 
 # check that a valid choice for environment exists
 
-if not ((l1DqmEnv == 'live') or l1DqmEnv == 'playback' or l1DqmEnv == 'file-P5' or l1DqmEnv == 'file' ) : 
-    print 'No valid input source was chosen. Your value for l1DqmEnv input parameter is:'  
+if not ((l1DqmEnv == 'live') or l1DqmEnv == 'playback' or l1DqmEnv == 'file-P5' or l1DqmEnv == 'file' ) :
+    print 'No valid input source was chosen. Your value for l1DqmEnv input parameter is:'
     print 'l1DqmEnv = ', l1DqmEnv
     print 'Available options: "live", "playback", "file-P5", "file" '
     sys.exit()
@@ -61,16 +61,16 @@
             )
     process.EventStreamHttpReader.consumerName = 'L1T DQM Consumer'
     process.EventStreamHttpReader.maxEventRequestRate = cms.untracked.double(25.0)
- 
+
 elif l1DqmEnv == 'playback' :
     print 'FIXME'
     sys.exit()
-    
-else : 
+
+else :
     # running on a file
     process.load("DQM.L1TMonitor.inputsource_file_cfi")
-    
-      
+
+
 #----------------------------
 # DQM Environment
 #
@@ -92,22 +92,22 @@
 
 elif l1DqmEnv == 'playback' :
     print 'FIXME'
-    
+
 elif l1DqmEnv == 'file-P5' :
     process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
     es_prefer_GlobalTag = cms.ESPrefer('GlobalTag')
     process.GlobalTag.RefreshEachRun = cms.untracked.bool(True)
-    
-else : 
+
+else :
     # running on a file, on lxplus (not on .cms)
     process.load("DQM.L1TMonitor.environment_file_cff")
 
     process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
-    
+
     if globalTagType == 'HLT' :
-         process.GlobalTag.connect = 'frontier://FrontierProd/CMS_COND_31X_GLOBALTAG' 
-         process.GlobalTag.pfnPrefix = cms.untracked.string('frontier://FrontierProd/') 
-                      
+         process.GlobalTag.connect = 'frontier://FrontierProd/CMS_COND_31X_GLOBALTAG'
+         process.GlobalTag.pfnPrefix = cms.untracked.string('frontier://FrontierProd/')
+
     process.GlobalTag.globaltag = globalTagValue+'::All'
     es_prefer_GlobalTag = cms.ESPrefer('GlobalTag')
 
@@ -119,34 +119,34 @@
 # sequences needed for L1 trigger DQM
 #
 
-# standard unpacking sequence 
-process.load("Configuration.StandardSequences.RawToDigi_Data_cff")    
+# standard unpacking sequence
+process.load("Configuration.StandardSequences.RawToDigi_Data_cff")
 
-# L1 Trigger sequences 
+# L1 Trigger sequences
 
 # l1tMonitor and l1tMonitorEndPathSeq
-process.load("DQM.L1TMonitor.L1TMonitor_cff")    
+process.load("DQM.L1TMonitor.L1TMonitor_cff")
 
 # L1 trigger synchronization module - it uses also HltHighLevel filter
-process.load("DQM.L1TMonitor.L1TSync_cff")    
+process.load("DQM.L1TMonitor.L1TSync_cff")
 
 # l1tMonitorClient and l1tMonitorClientEndPathSeq
-process.load("DQM.L1TMonitorClient.L1TMonitorClient_cff")   
+process.load("DQM.L1TMonitorClient.L1TMonitorClient_cff")
 
 # change the DB connections when not at P5 - works on lxplus only...
-if ( l1DqmEnv == 'file' ) : 
+if ( l1DqmEnv == 'file' ) :
     process.l1tSync.oracleDB = cms.string("oracle://cms_orcon_adg/CMS_COND_31X_L1T")
     process.l1tSync.pathCondDB = cms.string("/afs/cern.ch/cms/DB/conddb/ADG")
     #
     process.l1tRate.oracleDB = cms.string("oracle://cms_orcon_adg/CMS_COND_31X_L1T")
     process.l1tRate.pathCondDB = cms.string("/afs/cern.ch/cms/DB/conddb/ADG")
-    
+
 
 #-------------------------------------
 # paths & schedule for L1 Trigger DQM
 #
 
-# TODO define a L1 trigger L1TriggerRawToDigi in the standard sequence 
+# TODO define a L1 trigger L1TriggerRawToDigi in the standard sequence
 # to avoid all these remove
 process.rawToDigiPath = cms.Path(process.RawToDigi)
 #
@@ -180,9 +180,9 @@
       1.20, 1.21, 1.22, 1.23, 1.24, 1.25, 1.26, 1.27
     )
 else :
-    process.l1tMonitorPath = cms.Path(process.l1tMonitorOnline) 
+    process.l1tMonitorPath = cms.Path(process.l1tMonitorOnline)
     process.l1tMonitorClientPath = cms.Path(process.l1tMonitorClient)
-    
+
 # separate L1TSync path due to the use of the HltHighLevel filter
 process.l1tSyncPath = cms.Path(process.l1tSyncHltFilter+process.l1tSync)
 
@@ -229,7 +229,7 @@
 
 #---------------------------------------------
 
-# examples for quick fixes in case of troubles 
+# examples for quick fixes in case of troubles
 #    please do not modify the commented lines
 #
 
@@ -249,13 +249,13 @@
 
 #process.l1tMonitorOnline.remove(process.l1Dttf)
 
-#process.l1tMonitorOnline.remove(process.l1tCsctf) 
+#process.l1tMonitorOnline.remove(process.l1tCsctf)
 
 #process.l1tMonitorOnline.remove(process.l1tRpctf)
 
 #process.l1tMonitorOnline.remove(process.l1tGmt)
 
-#process.l1tMonitorOnline.remove(process.l1tGt) 
+#process.l1tMonitorOnline.remove(process.l1tGt)
 
 #process.l1tMonitorOnline.remove(process.l1ExtraDqmSeq)
 
@@ -275,7 +275,7 @@
 process.schedule.remove(process.l1tSyncPath)
 
 
-# 
+#
 # un-comment next lines in case you use the file for private tests using data from the L1T server
 #
 #process.dqmSaver.dirName = '.'
@@ -287,32 +287,32 @@
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.MessageLogger.debugModules = ['l1tGt']
 process.MessageLogger.categories.append('L1TGT')
-process.MessageLogger.destinations = ['L1TDQM_errors', 
-                                      'L1TDQM_warnings', 
-                                      'L1TDQM_info', 
+process.MessageLogger.destinations = ['L1TDQM_errors',
+                                      'L1TDQM_warnings',
+                                      'L1TDQM_info',
                                       'L1TDQM_debug'
                                       ]
 
-process.MessageLogger.L1TDQM_errors = cms.untracked.PSet( 
+process.MessageLogger.L1TDQM_errors = cms.untracked.PSet(
         threshold = cms.untracked.string('ERROR'),
         ERROR = cms.untracked.PSet( limit = cms.untracked.int32(-1) )
        )
 
-process.MessageLogger.L1TDQM_warnings = cms.untracked.PSet( 
+process.MessageLogger.L1TDQM_warnings = cms.untracked.PSet(
         threshold = cms.untracked.string('WARNING'),
         WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ),
         ERROR = cms.untracked.PSet( limit = cms.untracked.int32(0) )
         )
 
-process.MessageLogger.L1TDQM_info = cms.untracked.PSet( 
+process.MessageLogger.L1TDQM_info = cms.untracked.PSet(
         threshold = cms.untracked.string('INFO'),
         INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ),
         WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ),
         ERROR = cms.untracked.PSet( limit = cms.untracked.int32(0) ),
         L1TGT = cms.untracked.PSet( limit = cms.untracked.int32(-1) )
         )
 
-process.MessageLogger.L1TDQM_debug = cms.untracked.PSet( 
+process.MessageLogger.L1TDQM_debug = cms.untracked.PSet(
         threshold = cms.untracked.string('DEBUG'),
         DEBUG = cms.untracked.PSet( limit = cms.untracked.int32(0) ),
         INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ),
@@ -342,7 +342,7 @@
 process.siStripDigis.ProductLabel = cms.InputTag("rawDataCollector")
 process.bxTiming.FedSource = cms.untracked.InputTag("rawDataCollector")
 process.l1s.fedRawData = cms.InputTag("rawDataCollector")
-    
+
 if (process.runType.getRunType() == process.runType.hi_run):
     process.castorDigis.InputLabel = cms.InputTag("rawDataRepacker")
     process.csctfDigis.producer = cms.InputTag("rawDataRepacker")
@@ -363,3 +363,6 @@
     process.l1s.fedRawData = cms.InputTag("rawDataRepacker")
 
 
+from SLHCUpgradeSimulations.Configuration.postLS1Customs import customise_DQM
+#call to customisation function customise_DQM imported from SLHCUpgradeSimulations.Configuration.postLS1Customs
+process = customise_DQM(process)