Merge pull request #9923 from deguio/fixOnline75x

minor fixes online applications. same as #9623
cms-sw · Jun 29, 2015 · 25ba490 · 25ba490
2 parents da5c13a + de30fe0
commit 25ba490
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 18 deletions.
diff --git a/DQM/DTMonitorModule/python/dt_dqm_sourceclient_common_cff.py b/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 *

diff --git a/DQM/Integration/python/test/beampixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/beampixel_dqm_sourceclient-live_cfg.py
@@ -77,7 +77,7 @@
     #----------------------------
     process.pixelVertexDQM = cms.EDAnalyzer("Vx3DHLTAnalyzer",
                                             vertexCollection   = cms.untracked.InputTag("pixelVertices"),
-                                            pixelHitCollection = cms.untracked.InputTag("siPixelRecHits"),
+                                            pixelHitCollection = cms.untracked.InputTag("siPixelRecHitsPreSplitting"),
                                             debugMode          = cms.bool(True),
                                             nLumiReset         = cms.uint32(2),
                                             dataFromFit        = cms.bool(True),
@@ -99,23 +99,29 @@
        process.pixelVertexDQM.fileName = cms.string("/nfshome0/dqmpro/BeamMonitorDQM/BeamPixelResults.txt")
 
 
-    #----------------------------
-    # Pixel-Tracks Configuration
-    #----------------------------
+    process.load("RecoVertex.PrimaryVertexProducer.OfflinePixel3DPrimaryVertices_cfi")
+    #pixel  track/vertices reco
+    process.load("RecoPixelVertexing.Configuration.RecoPixelVertexing_cff")
     process.pixelVertices.TkFilterParameters.minPt = process.pixelTracks.RegionFactoryPSet.RegionPSet.ptMin
+    process.offlinePrimaryVertices.TrackLabel = cms.InputTag("pixelTracks")
+    #process.dqmBeamMonitor.PVFitter.errorScale = 1.25 #keep checking this with new release expected close to 1.2
 
+    from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import *
+    process.PixelLayerTriplets.BPix.HitProducer = cms.string('siPixelRecHitsPreSplitting')
+    process.PixelLayerTriplets.FPix.HitProducer = cms.string('siPixelRecHitsPreSplitting')
+    from RecoPixelVertexing.PixelTrackFitting.PixelTracks_cff import *
+    process.pixelTracks.OrderedHitsFactoryPSet.GeneratorPSet.SeedComparitorPSet.clusterShapeCacheSrc = cms.InputTag('siPixelClusterShapeCachePreSplitting')
 
     #----------------------------
     # Pixel-Vertices Configuration
     #----------------------------
     process.reconstruction_step = cms.Sequence(process.siPixelDigis*
                                                process.offlineBeamSpot*
-                                               process.siPixelClusters*
-                                               process.siPixelRecHits*
-                                               process.siPixelClusterShapeCache*
-                                               process.PixelLayerTriplets*
-                                               process.pixelTracks*
-                                               process.pixelVertices)
+                                               process.siPixelClustersPreSplitting*
+                                               process.siPixelRecHitsPreSplitting*
+                                               process.siPixelClusterShapeCachePreSplitting*
+                                               process.recopixelvertexing
+                                               )
 
 
     #----------------------------

diff --git a/DQM/Integration/python/test/dt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/dt_dqm_sourceclient-live_cfg.py
@@ -29,6 +29,7 @@
 
 # DT reco and DQM sequences
 process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
+process.load("Configuration/StandardSequences/MagneticField_cff")
 process.load("DQM.DTMonitorModule.dt_dqm_sourceclient_common_cff")
 #---- for P5 (online) DB access
 process.load("DQM.Integration.test.FrontierCondition_GT_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
@@ -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")
@@ -117,7 +114,7 @@
 #-----------------------------
 process.evfDQMPath = cms.Path(#process.physicsEventsFilter+
                               process.cscDQMEvF +
- 			      process.dtunpacker +
+ 			      process.dtunpacker + process.DTDataIntegrityTask +
  			      process.ecalDigis  + process.ecalFEDMonitor + 
 			      process.l1tfed +
  			      process.siPixelDigis + process.SiPixelHLTSource +

diff --git a/DQM/Integration/python/test/hlt_dqm_sourceclient-live_cfg.py b/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

diff --git a/RecoTauTag/Configuration/python/loadRecoTauTagMVAsFromPrepDB_cfi.py b/RecoTauTag/Configuration/python/loadRecoTauTagMVAsFromPrepDB_cfi.py
@@ -7,7 +7,7 @@
     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')
+    #connect = cms.string('sqlite_file:/home/dqmdevlocal/CMSSW_7_4_2_official/src/DQM/Integration/python/test/RecoTauTag_MVAs_2014Jul07.db')
 )
 
 # register tau ID (= isolation) discriminator MVA