Merge pull request #4524 from cms-sw/CMSSW_7_1_X

Forward port CMSSW_7_1_X into CMSSW_7_2_X
cms-sw · Jul 4, 2014 · 604b084 · 604b084
2 parents 86f84bc + 8e38453
commit 604b084
Show file tree

Hide file tree

Showing 29 changed files with 185 additions and 179 deletions.
diff --git a/DQM/Integration/python/test/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/beam_dqm_sourceclient-live_cfg.py
@@ -6,10 +6,10 @@
 # Common part for PP and H.I Running
 #-----------------------------
 # for live online DQM in P5
-#process.load("DQM.Integration.test.inputsource_cfi")
+process.load("DQM.Integration.test.inputsource_cfi")
 
 # for testing in lxplus
-process.load("DQM.Integration.test.fileinputsource_cfi")
+#process.load("DQM.Integration.test.fileinputsource_cfi")
 
 #--------------------------
 # HLT Filter
@@ -50,9 +50,9 @@
 # Calibration
 #---------------
 # Condition for P5 cluster
-#process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
+process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
 # Condition for lxplus
-process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") 
+#process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") 
 
 # Change Beam Monitor variables
 if process.dqmSaver.producer.value() is "Playback":

diff --git a/DQM/Integration/python/test/beampixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/beampixel_dqm_sourceclient-live_cfg.py
@@ -7,10 +7,10 @@
 # Common for PP and HI running
 #----------------------------
 ### @@@@@@ Comment when running locally @@@@@@ ###
-#process.load("DQM.Integration.test.inputsource_cfi")
+process.load("DQM.Integration.test.inputsource_cfi")
 
 # for testing in lxplus
-process.load("DQM.Integration.test.fileinputsource_cfi")
+#process.load("DQM.Integration.test.fileinputsource_cfi")
 
 #----------------------------
 # HLT Filter
@@ -35,9 +35,9 @@
 # Sub-system Configuration
 #----------------------------
 ### @@@@@@ Comment when running locally @@@@@@ ###
-#process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
+process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
 # Condition for lxplus
-process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") 
+#process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") 
 ### @@@@@@ Comment when running locally @@@@@@ ###
 process.load("FWCore.MessageService.MessageLogger_cfi")
 process.load("Configuration.StandardSequences.Services_cff")

diff --git a/DQM/Integration/python/test/castor_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/castor_dqm_sourceclient-live_cfg.py
@@ -5,10 +5,10 @@
 # Event Source
 #================================+
 # for live online DQM in P5
-#process.load("DQM.Integration.test.inputsource_cfi")
+process.load("DQM.Integration.test.inputsource_cfi")
 
 # for testing in lxplus
-process.load("DQM.Integration.test.fileinputsource_cfi")
+#process.load("DQM.Integration.test.fileinputsource_cfi")
 
 #================================
 # DQM Environment

diff --git a/DQM/Integration/python/test/csc_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/csc_dqm_sourceclient-live_cfg.py
@@ -37,10 +37,10 @@
 # Event Source
 #-----------------------------
 # for live online DQM in P5
-#process.load("DQM.Integration.test.inputsource_cfi")
+process.load("DQM.Integration.test.inputsource_cfi")
 
 # for testing in lxplus
-process.load("DQM.Integration.test.fileinputsource_cfi")
+#process.load("DQM.Integration.test.fileinputsource_cfi")
 
 #----------------------------
 # DQM Environment
@@ -77,10 +77,10 @@
 # Global Tag
 #-------------------------------------------------
 # Condition for P5 cluster
-#process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
+process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
 
 # Condition for lxplus
-process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") 
+#process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") 
 
 #--------------------------
 # Service

diff --git a/DQM/Integration/python/test/dt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/dt_dqm_sourceclient-live_cfg.py
@@ -6,10 +6,10 @@
 #### Event Source
 #----------------------------
 # for live online DQM in P5
-#process.load("DQM.Integration.test.inputsource_cfi")
+process.load("DQM.Integration.test.inputsource_cfi")
 
 # for testing in lxplus
-process.load("DQM.Integration.test.fileinputsource_cfi")
+#process.load("DQM.Integration.test.fileinputsource_cfi")
 
 #----------------------------
 #### DQM Environment
@@ -31,9 +31,9 @@
 process.load("Configuration.StandardSequences.Geometry_cff")
 process.load("DQM.DTMonitorModule.dt_dqm_sourceclient_common_cff")
 #---- for P5 (online) DB access
-#process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
+process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
 #---- for offline DB
-process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") 
+#process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") 
 
 
 # message logger

diff --git a/DQM/Integration/python/test/ecal_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/ecal_dqm_sourceclient-live_cfg.py
@@ -73,11 +73,9 @@
 )
 
 # Condition for P5 cluster
-#process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
+process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
 # Condition for lxplus
-process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
-from Configuration.AlCa.GlobalTag import GlobalTag
-process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:com10', '')
+#process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") 
 
 process.GlobalTag.toGet = cms.VPSet(
     cms.PSet(
@@ -157,6 +155,8 @@
 
 process.load("DQM.Integration.test.inputsource_cfi")
 
+# for testing in lxplus
+#process.load("DQM.Integration.test.fileinputsource_cfi")
 
 ### CUSTOMIZATIONS ###
 
@@ -190,13 +190,6 @@
 process.dqmEnv.subSystemFolder = cms.untracked.string("Ecal")
 process.dqmSaver.convention = "Online"
 
- ## Source ##
-# for live online DQM in P5
-#process.load("DQM.Integration.test.inputsource_cfi")
-
-# for testing in lxplus
-process.load("DQM.Integration.test.fileinputsource_cfi")
-
  ## Run type specific ##
 
 if process.runType.getRunType() == process.runType.pp_run :

diff --git a/DQM/Integration/python/test/environment_cfi.py b/DQM/Integration/python/test/environment_cfi.py
@@ -17,36 +17,7 @@
 dqmSaver.referenceHandling = 'all'
 dqmSaver.dirName = '/home/dqmprolocal/output'
 dqmSaver.producer = 'DQM'
-dqmSaver.saveByTime = 1
 dqmSaver.saveByLumiSection = -1
-dqmSaver.saveByMinute = 8
 dqmSaver.saveByRun = 1
 dqmSaver.saveAtJobEnd = False
 
-#RunType, and Runkey selection from RCMS
-import sys
-from FWCore.ParameterSet.VarParsing import VarParsing
-from dqmPythonTypes import *
-
-runParameters = VarParsing ('analysis')
-runParameters.register ('runtype',
-  'pp_run',
-  VarParsing.multiplicity.singleton,
-  VarParsing.varType.string,
-  "Type of Run in CMS")
-
-runParameters.register ('runkey',
-  'pp_run',
-  VarParsing.multiplicity.singleton,
-  VarParsing.varType.string,
-  "Run Keys of CMS")
-
-# Fix to allow scram to compile
-#if len(sys.argv) > 1:
-#  runParameters.parseArguments()
-
-runType = RunType(['pp_run','cosmic_run','hi_run','hpu_run'])
-if not runParameters.runkey.strip():
-  runParameters.runkey = 'pp_run'
-
-runType.setRunType(runParameters.runkey.strip())
diff --git a/DQM/Integration/python/test/es_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/es_dqm_sourceclient-live_cfg.py
@@ -7,15 +7,15 @@
 process.load("FWCore.Modules.preScaler_cfi")
 
 # for live online DQM in P5
-#process.load("DQM.Integration.test.inputsource_cfi")
+process.load("DQM.Integration.test.inputsource_cfi")
 
 # for testing in lxplus
-process.load("DQM.Integration.test.fileinputsource_cfi")
+#process.load("DQM.Integration.test.fileinputsource_cfi")
 
 # Condition for P5 cluster
-#process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
+process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
 # Condition for lxplus
-process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") 
+#process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") 
 
 process.load("EventFilter.ESRawToDigi.esRawToDigi_cfi")
 #process.ecalPreshowerDigis = EventFilter.ESRawToDigi.esRawToDigi_cfi.esRawToDigi.clone()

diff --git a/DQM/Integration/python/test/fed_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/fed_dqm_sourceclient-live_cfg.py
@@ -8,10 +8,10 @@
 
 
 # for live online DQM in P5
-#process.load("DQM.Integration.test.inputsource_cfi")
+process.load("DQM.Integration.test.inputsource_cfi")
 
 # for testing in lxplus
-process.load("DQM.Integration.test.fileinputsource_cfi")
+#process.load("DQM.Integration.test.fileinputsource_cfi")
 
 #process.load("DQMServices.Core.DQM_cfg")
 process.load("DQMServices.Components.DQMEnvironment_cfi")

diff --git a/DQM/Integration/python/test/fedtest_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/fedtest_dqm_sourceclient-live_cfg.py
@@ -6,10 +6,10 @@
 #### Event Source
 #----------------------------
 # for live online DQM in P5
-#process.load("DQM.Integration.test.inputsource_cfi")
+process.load("DQM.Integration.test.inputsource_cfi")
 
 # for testing in lxplus
-process.load("DQM.Integration.test.fileinputsource_cfi")
+#process.load("DQM.Integration.test.fileinputsource_cfi")
 
 #----------------------------
 #### DQM Environment

diff --git a/DQM/Integration/python/test/fileinputsource_cfi.py b/DQM/Integration/python/test/fileinputsource_cfi.py
@@ -8,3 +8,34 @@
 maxEvents = cms.untracked.PSet(
     input = cms.untracked.int32(-1)
 )
+
+# Parameters for runType
+import FWCore.ParameterSet.VarParsing as VarParsing
+import sys
+from dqmPythonTypes import *
+
+options = VarParsing.VarParsing('analysis')
+
+options.register('runtype',
+         'cosmic_run',
+        VarParsing.VarParsing.multiplicity.singleton,
+        VarParsing.VarParsing.varType.string,
+          "Type of Run in CMS")
+
+options.register ('runkey',
+          'cosmic_run',
+          VarParsing.VarParsing.multiplicity.singleton,
+          VarParsing.VarParsing.varType.string,
+          "Run Keys of CMS")
+
+options.parseArguments()
+
+# Fix to allow scram to compile
+#if len(sys.argv) > 1:
+#  options.parseArguments()
+
+runType = RunType(['pp_run','cosmic_run','hi_run','hpu_run'])
+if not options.runkey.strip():
+  options.runkey = 'cosmic_run'
+
+runType.setRunType(options.runkey.strip())
diff --git a/DQM/Integration/python/test/hcal_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/hcal_dqm_sourceclient-live_cfg.py
@@ -40,19 +40,19 @@
 # Event Source
 #-----------------------------
 # for live online DQM in P5
-#process.load("DQM.Integration.test.inputsource_cfi")
+process.load("DQM.Integration.test.inputsource_cfi")
 
 # for testing in lxplus
-process.load("DQM.Integration.test.fileinputsource_cfi")
+#process.load("DQM.Integration.test.fileinputsource_cfi")
 
 #-----------------------------
 # Hcal Conditions: from Global Conditions Tag 
 #-----------------------------
 # DB Condition for online cluster
-#process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
+process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
 
 # DB condition for offline test
-process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") 
+#process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") 
 
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
 

diff --git a/DQM/Integration/python/test/hcaltiming_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/hcaltiming_dqm_sourceclient-live_cfg.py
@@ -37,7 +37,7 @@
 
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 process.GlobalTag.connect = "frontier://(proxyurl=http://localhost:3128)(serverurl=http://frontier1.cms:8000/FrontierOnProd)(serverurl=http://frontier2.cms:8000/FrontierOnProd)(retrieve-ziplevel=0)/CMS_COND_31X_GLOBALTAG"
-process.GlobalTag.globaltag = 'GR09_H_V4::All' # or any other appropriate
+process.GlobalTag.globaltag = 'GR_H_V37' # or any other appropriate
 process.es_prefer_GlobalTag = cms.ESPrefer('PoolDBESSource','GlobalTag')
 
 

diff --git a/DQM/Integration/python/test/hlt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/hlt_dqm_sourceclient-live_cfg.py
@@ -2,12 +2,12 @@
 
 process = cms.Process("DQM")
 # for live online DQM in P5
-#process.load("DQM.Integration.test.inputsource_cfi")
+process.load("DQM.Integration.test.inputsource_cfi")
 # used in the old input source
 #process.DQMEventStreamHttpReader.SelectHLTOutput = cms.untracked.string('hltOutputHLTDQM')
 
 # for testing in lxplus
-process.load("DQM.Integration.test.fileinputsource_cfi")
+#process.load("DQM.Integration.test.fileinputsource_cfi")
 
 process.load("DQMServices.Components.DQMEnvironment_cfi")
 
@@ -23,9 +23,9 @@
 process.TkDetMap = cms.Service("TkDetMap")
 
 #---- for P5 (online) DB access
-#process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
+process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
 # Condition for lxplus
-process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") 
+#process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") 
 
 process.load("DQM.HLTEvF.HLTMonitor_cff")
 process.load("DQM.HLTEvF.HLTMonitorClient_cff")

diff --git a/DQM/Integration/python/test/hltrates_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/hltrates_dqm_sourceclient-live_cfg.py
@@ -8,9 +8,7 @@
 #### leave the following few lines uncommented for online running
 process.load("DQM.Integration.test.inputsource_cfi")
 process.load("DQM.Integration.test.environment_cfi")
-process.DQMEventStreamHttpReader.SelectHLTOutput = cms.untracked.string('hltOutputHLTDQMResults')
-process.DQMEventStreamHttpReader.maxEventRequestRate = cms.untracked.double(1000.0)
-process.DQMEventStreamHttpReader.consumerName = 'HLTTrigerResults'
+#process.DQMEventStreamHttpReader.SelectHLTOutput = cms.untracked.string('hltOutputHLTDQMResults')
 
 #### end first online running section
 
@@ -45,9 +43,7 @@
 
 process.dqmSaver.version = 2
 process.dqmSaver.saveByRun = 1
-process.dqmSaver.saveByMinute = -1
 process.dqmSaver.saveByLumiSection = -1
-process.dqmSaver.saveByTime = -1
 #process.load("Configuration.StandardSequences.GeometryPilot2_cff")
 #process.load("Configuration.StandardSequences.MagneticField_cff")
 #process.GlobalTrackingGeometryESProducer = cms.ESProducer( "GlobalTrackingGeometryESProducer" ) # for muon hlt dqm

diff --git a/DQM/Integration/python/test/hlx_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/hlx_dqm_sourceclient-live_cfg.py
@@ -6,10 +6,10 @@
 
 ## Input source
 # for live online DQM in P5
-#process.load("DQM.Integration.test.inputsource_cfi")
+process.load("DQM.Integration.test.inputsource_cfi")
 
 # for testing in lxplus
-process.load("DQM.Integration.test.fileinputsource_cfi")
+#process.load("DQM.Integration.test.fileinputsource_cfi")
 
 ## HLX configuration
 process.load("DQM.HLXMonitor.hlx_dqm_sourceclient_cfi")

diff --git a/DQM/Integration/python/test/info_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/info_dqm_sourceclient-live_cfg.py
@@ -6,18 +6,17 @@
 #### Event Source
 #----------------------------
 # for live online DQM in P5
-#process.load("DQM.Integration.test.inputsource_cfi")
+process.load("DQM.Integration.test.inputsource_cfi")
 
 # for testing in lxplus
-process.load("DQM.Integration.test.fileinputsource_cfi")
+#process.load("DQM.Integration.test.fileinputsource_cfi")
 
 #----------------------------
 #### DQM Environment
 #----------------------------
 process.load("DQM.Integration.test.environment_cfi")
 process.dqmEnv.subSystemFolder = 'Info'
 process.dqmSaver.saveByRun = 1
-process.dqmSaver.saveByMinute = 4
 process.dqmSaver.dirName = '.'
 #-----------------------------
 process.load("DQMServices.Components.DQMProvInfo_cfi")