Merge pull request #17696 from dmitrijus/mwgr2_changes

Online DQM changes for MWGR#2
cms-sw · Mar 18, 2017 · c925f26 · c925f26
2 parents f030dd5 + 630b4ed
commit c925f26
Show file tree

Hide file tree

Showing 13 changed files with 288 additions and 273 deletions.
diff --git a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py
@@ -224,7 +224,7 @@ def _copy(old, new, skip=[]):
           for key in old.parameterNames_():
             if key not in skipSet:
               setattr(new, key, getattr(old, key))
-        _copy(process.pixelTracksTrackingRegions, new, skip=["nSigmaZ", "beamSpot"])
+        _copy(process.pixelTracksTrackingRegions.RegionPSet, new.RegionPSet, skip=["nSigmaZ", "beamSpot"])
         new.RegionPSet.originRadius = 0.4
         # Bit of a hack to replace a module with another, but works
         #

diff --git a/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py
@@ -91,7 +91,7 @@
 process.CSCChannelMapperESProducer.AlgoName=cms.string("CSCChannelMapperPostls1")
 
 process.csc2DRecHits.readBadChannels = cms.bool(False)
-process.csc2DRecHits.CSCUseGasGainCorrection = cms.bool(False)
+process.csc2DRecHits.CSCUseGasGainCorrections = cms.bool(False)
 
 
 """ Pick up upgrade condions data directly from DB tags using ESPrefer's.

diff --git a/DQM/Integration/python/clients/visualization-live-secondInstance_cfg.py b/DQM/Integration/python/clients/visualization-live-secondInstance_cfg.py
@@ -10,7 +10,7 @@
 # this is needed to map the names of the run-types chosen by DQM to the scenarios, ideally we could converge to the same names
 #scenarios = {'pp_run': 'ppEra_Run2_2016','cosmic_run':'cosmicsEra_Run2_2016','hi_run':'HeavyIons'}
 #scenarios = {'pp_run': 'ppEra_Run2_2016','pp_run_stage1': 'ppEra_Run2_2016','cosmic_run':'cosmicsEra_Run2_2016','cosmic_run_stage1':'cosmicsEra_Run2_2016','hi_run':'HeavyIonsEra_Run2_HI'}
-scenarios = {'pp_run': 'ppEra_Run2_2016','cosmic_run':'cosmicsEra_Run2_2016','hi_run':'HeavyIonsEra_Run2_HI'}
+scenarios = {'pp_run': 'ppEra_Run2_2017','cosmic_run':'cosmicsEra_Run2_2017','hi_run':'HeavyIonsEra_Run2_HI'}
 
 if not runType.getRunTypeName() in scenarios.keys():
     msg = "Error getting the scenario out of the 'runkey', no mapping for: %s\n"%runType.getRunTypeName()

diff --git a/DQM/Integration/python/clients/visualization-live_cfg.py b/DQM/Integration/python/clients/visualization-live_cfg.py
@@ -10,7 +10,7 @@
 # this is needed to map the names of the run-types chosen by DQM to the scenarios, ideally we could converge to the same names
 #scenarios = {'pp_run': 'ppEra_Run2_2016','cosmic_run':'cosmicsEra_Run2_2016','hi_run':'HeavyIons'}
 #scenarios = {'pp_run': 'ppEra_Run2_2016','pp_run_stage1': 'ppEra_Run2_2016','cosmic_run':'cosmicsEra_Run2_2016','cosmic_run_stage1':'cosmicsEra_Run2_2016','hi_run':'HeavyIonsEra_Run2_HI'}
-scenarios = {'pp_run': 'ppEra_Run2_2016','cosmic_run':'cosmicsEra_Run2_2016','hi_run':'HeavyIonsEra_Run2_HI'}
+scenarios = {'pp_run': 'ppEra_Run2_2017','cosmic_run':'cosmicsEra_Run2_2017','hi_run':'HeavyIonsEra_Run2_HI'}
 
 if not runType.getRunTypeName() in scenarios.keys():
     msg = "Error getting the scenario out of the 'runkey', no mapping for: %s\n"%runType.getRunTypeName()

diff --git a/DQM/Integration/python/config/FrontierCondition_GT_autoExpress_cfi.py b/DQM/Integration/python/config/FrontierCondition_GT_autoExpress_cfi.py
@@ -1,15 +1,16 @@
 import FWCore.ParameterSet.Config as cms
 from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import * 
-GlobalTag.connect = cms.string("frontier://(proxyurl=http://localhost:3128)(serverurl=http://localhost:8000/FrontierOnProd)(serverurl=http://localhost:8000/FrontierOnProd)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_CONDITIONS")
+
 # Default Express GT: it is the GT that will be used in case we are not able
 # to retrieve the one used at Tier0.
 # It should be kept in synch with Express processing at Tier0.
-GlobalTag.globaltag = cms.string( "80X_dataRun2_Express_v15" )
+GlobalTag.connect = cms.string("frontier://(proxyurl=http://localhost:3128)(serverurl=http://localhost:8000/FrontierProd)(serverurl=http://localhost:8000/FrontierProd)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_CONDITIONS")
+GlobalTag.globaltag = "90X_dataRun2_Express_v2"
 
 # ===== auto -> Automatically get the GT string from current Tier0 configuration via a Tier0Das call.
 #       This needs a valid proxy to access the cern.ch network from the .cms one.
 # 
-auto=True
+auto=False
 
 # The implementation of the class is reused from the condition upload service.
 #TODO: make this class a common utility under Conditions or Config.DP

diff --git a/DQM/Integration/python/config/FrontierCondition_GT_cfi.py b/DQM/Integration/python/config/FrontierCondition_GT_cfi.py
@@ -1,4 +1,3 @@
 import FWCore.ParameterSet.Config as cms
 from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import * 
-GlobalTag.connect = cms.string("frontier://(proxyurl=http://localhost:3128)(serverurl=http://localhost:8000/FrontierOnProd)(serverurl=http://localhost:8000/FrontierOnProd)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_CONDITIONS")
-GlobalTag.globaltag = "80X_dataRun2_HLT_v12"
+GlobalTag.globaltag = "90X_dataRun2_HLT_v1"
diff --git a/DQMServices/StreamerIO/test/BuildFile.xml b/DQMServices/StreamerIO/test/BuildFile.xml
@@ -3,6 +3,7 @@
 <use   name="IOPool/Streamer"/>
 <use   name="EventFilter/Utilities"/>
 <use   name="DQMServices/Core"/>
+<use   name="DQMServices/Components"/>
 <library   file="*.cc" name="DQMServicesStreamerIOTestPlugins">
   <flags   EDM_PLUGIN="1"/>
 </library>
diff --git a/DQMServices/StreamerIO/test/DQMStreamReader_replay.py b/DQMServices/StreamerIO/test/DQMStreamReader_replay.py
diff --git a/DQMServices/StreamerIO/test/DQMStreamReader_replay_cfg.py b/DQMServices/StreamerIO/test/DQMStreamReader_replay_cfg.py
diff --git a/DQMServices/StreamerIO/test/DQMStreamWriter.py b/DQMServices/StreamerIO/test/DQMStreamWriter.py
@@ -42,7 +42,7 @@
 )
 
 # define the PoolOutputModule
-process.poolOutput = cms.OutputModule('DQMStreamerOutputModule',
+process.poolOutput = cms.OutputModule('DQMStreamerOutputModuleTest',
     runInputDir = cms.untracked.string(options.runInputDir),
     streamLabel = cms.untracked.string("_streamA"),
 )