Fix online74

DQM/DTMonitorModule/python/dt_dqm_sourceclient_common_cff.py

@@ -33,7 +33,6 @@
 dtunpacker.readOutParameters.rosParameters.performDataIntegrityMonitor = True
 dtunpacker.readOutParameters.debug = False
 dtunpacker.readOutParameters.rosParameters.debug = False
-dtunpacker.fedbyType = False
 dtunpacker.inputLabel = 'rawDataCollector'
 
 from RecoLocalMuon.Configuration.RecoLocalMuon_cff import *

DQM/Integration/python/test/FrontierCondition_GT_cfi.py

@@ -1,5 +1,5 @@
 import FWCore.ParameterSet.Config as cms
 from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import * 
 GlobalTag.connect = "frontier://(proxyurl=http://localhost:3128)(serverurl=http://localhost:8000/FrontierOnProd)(serverurl=http://localhost:8000/FrontierOnProd)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_CONDITIONS"
-GlobalTag.globaltag = "GR_H_V45"
+GlobalTag.globaltag = "GR_H_V58"
 es_prefer_GlobalTag = cms.ESPrefer('PoolDBESSource','GlobalTag')

DQM/Integration/python/test/fedtest_dqm_sourceclient-live_cfg.py

@@ -67,9 +67,6 @@
 process.l1tfed.FEDDirName=cms.untracked.string("L1T/FEDIntegrity_SM")
 
 # Pixel DQM sequences
-process.load("Geometry.TrackerSimData.trackerSimGeometryXML_cfi")
-process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi")
-process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi")
 process.load("Configuration.StandardSequences.MagneticField_cff")
 # Pixel RawToDigi conversion
 process.load("EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi")

DQM/Integration/python/test/hlt_dqm_sourceclient-live_cfg.py

@@ -27,8 +27,6 @@
 # Condition for lxplus
 #process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") 
 
-process.load("DQM.HLTEvF.HLTMonitor_cff")
-process.load("DQM.HLTEvF.HLTMonitorClient_cff")
 # added for hlt scalars
 process.load("DQM.TrigXMonitor.HLTSeedL1LogicScalers_cfi")
 # added for hlt scalars

DQM/SiStripMonitorClient/python/SiStripSourceConfigP5_cff.py

@@ -38,7 +38,6 @@
 # SiStripMonitorCluster ####
 import DQM.SiStripMonitorCluster.SiStripMonitorCluster_cfi
 SiStripMonitorClusterReal = DQM.SiStripMonitorCluster.SiStripMonitorCluster_cfi.SiStripMonitorCluster.clone()
-SiStripMonitorClusterReal.OutputMEsInRootFile = False
 SiStripMonitorClusterReal.SelectAllDetectors = True
 SiStripMonitorClusterReal.TProfTotalNumberOfClusters.subdetswitchon = True
 SiStripMonitorClusterReal.TProfClustersApvCycle.subdetswitchon = True

RecoTauTag/Configuration/python/loadRecoTauTagMVAsFromPrepDB_cfi.py

@@ -1,14 +1,14 @@
 '''Helper procedure that loads mva inputs from database'''
 from CondCore.DBCommon.CondDBSetup_cfi import *
 
-loadRecoTauTagMVAsFromPrepDB = cms.ESSource("PoolDBESSource",
-    CondDBSetup,
-    DumpStat = cms.untracked.bool(False),
-    toGet = cms.VPSet(),                                             
-    #  connect = cms.string("frontier://FrontierPrep/CMS_COND_PHYSICSTOOLS") # prep database
-    connect = cms.string('frontier://FrontierProd/CMS_COND_PAT_000') # prod database
-    #'sqlite_file:/afs/cern.ch/user/j/jez/public/tauID/RecoTauTag_MVAs_2014Oct22.db')
-)
+#loadRecoTauTagMVAsFromPrepDB = cms.ESSource("PoolDBESSource",
+#    CondDBSetup,
+#    DumpStat = cms.untracked.bool(False),
+#    toGet = cms.VPSet(),                                             
+#    #  connect = cms.string("frontier://FrontierPrep/CMS_COND_PHYSICSTOOLS") # prep database
+#    connect = cms.string('frontier://FrontierProd/CMS_COND_PAT_000') # prod database
+#    #'sqlite_file:/afs/cern.ch/user/j/jez/public/tauID/RecoTauTag_MVAs_2014Oct22.db')
+#)
 
 # register tau ID (= isolation) discriminator MVA
 tauIdDiscrMVA_trainings = {
@@ -58,29 +58,29 @@
     'tauIdMVAnewDMwLT'  : "mvaOutput_normalization_newDMwLT"    
 }
 tauIdDiscrMVA_version = "v1"
-for training, gbrForestName in tauIdDiscrMVA_trainings.items():
-    loadRecoTauTagMVAsFromPrepDB.toGet.append(
-        cms.PSet(
-            record = cms.string('GBRWrapperRcd'),
-            tag = cms.string("RecoTauTag_%s%s" % (gbrForestName, tauIdDiscrMVA_version)),
-            label = cms.untracked.string("RecoTauTag_%s%s" % (gbrForestName, tauIdDiscrMVA_version))
-        )
-    )
-    for WP in tauIdDiscrMVA_WPs[training].keys():
-        loadRecoTauTagMVAsFromPrepDB.toGet.append(
-            cms.PSet(
-                record = cms.string('PhysicsTGraphPayloadRcd'),
-                tag = cms.string("RecoTauTag_%s%s_WP%s" % (gbrForestName, tauIdDiscrMVA_version, WP)),
-                label = cms.untracked.string("RecoTauTag_%s%s_WP%s" % (gbrForestName, tauIdDiscrMVA_version, WP))
-            )
-        )
-    loadRecoTauTagMVAsFromPrepDB.toGet.append(
-        cms.PSet(
-            record = cms.string('PhysicsTFormulaPayloadRcd'),
-            tag = cms.string("RecoTauTag_%s%s_mvaOutput_normalization" % (gbrForestName, tauIdDiscrMVA_version)),
-            label = cms.untracked.string("RecoTauTag_%s%s_mvaOutput_normalization" % (gbrForestName, tauIdDiscrMVA_version))
-        )
-    )
+#for training, gbrForestName in tauIdDiscrMVA_trainings.items():
+#    loadRecoTauTagMVAsFromPrepDB.toGet.append(
+#        cms.PSet(
+#            record = cms.string('GBRWrapperRcd'),
+#            tag = cms.string("RecoTauTag_%s%s" % (gbrForestName, tauIdDiscrMVA_version)),
+#            label = cms.untracked.string("RecoTauTag_%s%s" % (gbrForestName, tauIdDiscrMVA_version))
+#        )
+#    )
+#    for WP in tauIdDiscrMVA_WPs[training].keys():
+#        loadRecoTauTagMVAsFromPrepDB.toGet.append(
+#            cms.PSet(
+#                record = cms.string('PhysicsTGraphPayloadRcd'),
+#                tag = cms.string("RecoTauTag_%s%s_WP%s" % (gbrForestName, tauIdDiscrMVA_version, WP)),
+#                label = cms.untracked.string("RecoTauTag_%s%s_WP%s" % (gbrForestName, tauIdDiscrMVA_version, WP))
+#            )
+#        )
+#    loadRecoTauTagMVAsFromPrepDB.toGet.append(
+#        cms.PSet(
+#            record = cms.string('PhysicsTFormulaPayloadRcd'),
+#            tag = cms.string("RecoTauTag_%s%s_mvaOutput_normalization" % (gbrForestName, tauIdDiscrMVA_version)),
+#            label = cms.untracked.string("RecoTauTag_%s%s_mvaOutput_normalization" % (gbrForestName, tauIdDiscrMVA_version))
+#        )
+#    )
 
 # register anti-electron discriminator MVA
 antiElectronDiscrMVA_categories = {
@@ -103,46 +103,46 @@
 }
 antiElectronDiscrMVA_WPs = [ "eff99", "eff96", "eff91", "eff85", "eff79" ]
 antiElectronDiscrMVA_version = "v1"
-for category, gbrForestName in antiElectronDiscrMVA_categories.items():
-    loadRecoTauTagMVAsFromPrepDB.toGet.append(
-        cms.PSet(
-            record = cms.string('GBRWrapperRcd'),
-            tag = cms.string("RecoTauTag_antiElectronMVA5%s_%s" % (antiElectronDiscrMVA_version, gbrForestName)),
-            label = cms.untracked.string("RecoTauTag_antiElectronMVA5%s_%s" % (antiElectronDiscrMVA_version, gbrForestName))
-        )
-    )
-    for WP in antiElectronDiscrMVA_WPs:
-        loadRecoTauTagMVAsFromPrepDB.toGet.append(
-            cms.PSet(
-                record = cms.string('PhysicsTGraphPayloadRcd'),
-                tag = cms.string("RecoTauTag_antiElectronMVA5%s_%s_WP%s" % (antiElectronDiscrMVA_version, gbrForestName, WP)),
-                label = cms.untracked.string("RecoTauTag_antiElectronMVA5%s_%s_WP%s" % (antiElectronDiscrMVA_version, gbrForestName, WP))
-            )
-        )
+#for category, gbrForestName in antiElectronDiscrMVA_categories.items():
+#    loadRecoTauTagMVAsFromPrepDB.toGet.append(
+#        cms.PSet(
+#            record = cms.string('GBRWrapperRcd'),
+#            tag = cms.string("RecoTauTag_antiElectronMVA5%s_%s" % (antiElectronDiscrMVA_version, gbrForestName)),
+#            label = cms.untracked.string("RecoTauTag_antiElectronMVA5%s_%s" % (antiElectronDiscrMVA_version, gbrForestName))
+#        )
+#    )
+#    for WP in antiElectronDiscrMVA_WPs:
+#        loadRecoTauTagMVAsFromPrepDB.toGet.append(
+#            cms.PSet(
+#                record = cms.string('PhysicsTGraphPayloadRcd'),
+#                tag = cms.string("RecoTauTag_antiElectronMVA5%s_%s_WP%s" % (antiElectronDiscrMVA_version, gbrForestName, WP)),
+#                label = cms.untracked.string("RecoTauTag_antiElectronMVA5%s_%s_WP%s" % (antiElectronDiscrMVA_version, gbrForestName, WP))
+#            )
+#        )
 
 # register anti-muon discriminator MVA
 antiMuonDiscrMVA_WPs = [ "eff99_5", "eff99_0", "eff98_0" ]
 antiMuonDiscrMVA_version = "v1"
 gbrForestName = "againstMuonMVA"
-loadRecoTauTagMVAsFromPrepDB.toGet.append(
-    cms.PSet(
-        record = cms.string('GBRWrapperRcd'),
-        tag = cms.string("RecoTauTag_%s%s" % (gbrForestName, antiMuonDiscrMVA_version)),
-        label = cms.untracked.string("RecoTauTag_%s%s" % (gbrForestName, antiMuonDiscrMVA_version))
-    )
-)
-for WP in antiMuonDiscrMVA_WPs:
-    loadRecoTauTagMVAsFromPrepDB.toGet.append(
-        cms.PSet(
-            record = cms.string('PhysicsTGraphPayloadRcd'),
-            tag = cms.string("RecoTauTag_%s%s_WP%s" % (gbrForestName, antiMuonDiscrMVA_version, WP)),
-            label = cms.untracked.string("RecoTauTag_%s%s_WP%s" % (gbrForestName, antiMuonDiscrMVA_version, WP))
-        )
-    )
-loadRecoTauTagMVAsFromPrepDB.toGet.append(
-    cms.PSet(
-        record = cms.string('PhysicsTFormulaPayloadRcd'),
-        tag = cms.string("RecoTauTag_%s%s_mvaOutput_normalization" % (gbrForestName, antiMuonDiscrMVA_version)),
-        label = cms.untracked.string("RecoTauTag_%s%s_mvaOutput_normalization" % (gbrForestName, antiMuonDiscrMVA_version))
-    )
-)
+#loadRecoTauTagMVAsFromPrepDB.toGet.append(
+#    cms.PSet(
+#        record = cms.string('GBRWrapperRcd'),
+#        tag = cms.string("RecoTauTag_%s%s" % (gbrForestName, antiMuonDiscrMVA_version)),
+#        label = cms.untracked.string("RecoTauTag_%s%s" % (gbrForestName, antiMuonDiscrMVA_version))
+#    )
+#)
+#for WP in antiMuonDiscrMVA_WPs:
+#    loadRecoTauTagMVAsFromPrepDB.toGet.append(
+#        cms.PSet(
+#            record = cms.string('PhysicsTGraphPayloadRcd'),
+#            tag = cms.string("RecoTauTag_%s%s_WP%s" % (gbrForestName, antiMuonDiscrMVA_version, WP)),
+#            label = cms.untracked.string("RecoTauTag_%s%s_WP%s" % (gbrForestName, antiMuonDiscrMVA_version, WP))
+#        )
+#    )
+#loadRecoTauTagMVAsFromPrepDB.toGet.append(
+#    cms.PSet(
+#        record = cms.string('PhysicsTFormulaPayloadRcd'),
+#        tag = cms.string("RecoTauTag_%s%s_mvaOutput_normalization" % (gbrForestName, antiMuonDiscrMVA_version)),
+#        label = cms.untracked.string("RecoTauTag_%s%s_mvaOutput_normalization" % (gbrForestName, antiMuonDiscrMVA_version))
+#    )
+#)