Merge pull request #5276 from mtosi/from-CMSSW_7_1_6_patch1_fixTracki…

…ngSummaryMap

DQM: fix tracking summary map

DQM/Integration/python/test/fileinputsource_cfi.py

@@ -3,10 +3,13 @@
 source = cms.Source("PoolSource",
                     fileNames = cms.untracked.vstring(
         "file:/afs/cern.ch/cms/CAF/CMSCOMM/COMM_DQM/DQMTest/MinimumBias__RAW__v1__165633__1CC420EE-B686-E011-A788-0030487CD6E8.root",
+#        "/store/data/Commissioning2014/Cosmics/RAW//v3/000/224/380/00000/E05943D1-1227-E411-BB8E-02163E00F0C4.root"
+#    "/store/data/Commissioning2014/Cosmics/RAW/v3/000/224/380/00000/68FDADE5-1227-E411-8AA6-02163E00A10C.root"
         )
 )
 maxEvents = cms.untracked.PSet(
     input = cms.untracked.int32(-1)
+#    input = cms.untracked.int32(1000)
 )
 
 # Parameters for runType

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

@@ -11,14 +11,21 @@
     destinations = cms.untracked.vstring('cout')
 )
 
+live=True
+# uncomment for running on lxplus
+#live=False
+offlineTesting=not live
+#print "live: "+str(live)+" ==> offlineTesting: "+str(offlineTesting)
+
 #----------------------------
 # Event Source
 #-----------------------------
 # for live online DQM in P5
-process.load("DQM.Integration.test.inputsource_cfi")
-
+if (live):
+    process.load("DQM.Integration.test.inputsource_cfi")
 # for testing in lxplus
-#process.load("DQM.Integration.test.fileinputsource_cfi")
+elif(offlineTesting):
+    process.load("DQM.Integration.test.fileinputsource_cfi")
 
 #----------------------------
 # DQM Environment
@@ -80,9 +87,11 @@
 # Calibration
 #--------------------------
 # Condition for P5 cluster
-process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
+if (live):
+    process.load("DQM.Integration.test.FrontierCondition_GT_cfi")
 # Condition for lxplus
-#process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") 
+elif(offlineTesting):
+    process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") 
 
 #--------------------------------------------
 ## Patch to avoid using Run Info information in reconstruction
@@ -120,10 +129,11 @@
 import RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi
 process.offlineBeamSpot = RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi.onlineBeamSpotProducer.clone()
 
-#--------------------------
-# Strip DQM Source and Client
-#--------------------------
+#------------------------------
+# Strip and Tracking DQM Source
+#------------------------------
 process.load("DQM.SiStripMonitorClient.SiStripSourceConfigP5_cff")
+process.load("DQM.TrackingMonitorSource.TrackingSourceConfigP5_cff")
 process.TrackMon_gentk.doLumiAnalysis = False
 process.TrackMon_ckf.doLumiAnalysis = False
 process.TrackMon_hi.doLumiAnalysis = False
@@ -132,7 +142,7 @@
 #--------------------------
 # Quality Test
 #--------------------------
-process.qTester = cms.EDAnalyzer("QualityTester",
+process.stripQTester = cms.EDAnalyzer("QualityTester",
     qtList = cms.untracked.FileInPath('DQM/SiStripMonitorClient/data/sistrip_qualitytest_config.xml'),
     prescaleFactor = cms.untracked.int32(3),                               
     getQualityTestsFromFile = cms.untracked.bool(True),
@@ -156,7 +166,8 @@
 
 # Simple filter for event
 process.eventFilter = cms.EDFilter("SimpleEventFilter",
-                   EventsToSkip = cms.untracked.int32(3)
+#                   EventsToSkip = cms.untracked.int32(3)
+                   EventsToSkip = cms.untracked.int32(100)
 )
 
 #--------------------------
@@ -194,7 +205,7 @@
 # Scheduling
 #--------------------------
 process.SiStripSources_LocalReco = cms.Sequence(process.siStripFEDMonitor*process.SiStripMonitorDigi*process.SiStripMonitorClusterReal)
-process.DQMCommon                = cms.Sequence(process.qTester*process.trackingQTester*process.dqmEnv*process.dqmEnvTr*process.dqmSaver)
+process.DQMCommon                = cms.Sequence(process.stripQTester*process.trackingQTester*process.dqmEnv*process.dqmEnvTr*process.dqmSaver)
 process.RecoForDQM_LocalReco     = cms.Sequence(process.siPixelDigis*process.siStripDigis*process.gtDigis*process.trackerlocalreco*process.gtEvmDigis)
 
 #--------------------------
@@ -203,23 +214,26 @@
 process.SiStripMonitorClusterReal.TH1ClusterCharge.moduleswitchon = True
 process.SiStripMonitorDigi.TotalNumberOfDigisFailure.subdetswitchon = cms.bool(False)
 
+### COSMIC RUN SETTING
 if (process.runType.getRunType() == process.runType.cosmic_run):
     # event selection for cosmic data
     # process.DQMStreamerReader.SelectEvents = cms.untracked.PSet(SelectEvents = cms.vstring('HLT_L1*','HLT_*Cosmic*','HLT_ZeroBias*'))
     # Reference run for cosmic
     process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/sistrip_reference_cosmic.root'
-    # Source and Client config for cosmic data
+    # Source config for cosmic data
     process.SiStripSources_TrkReco_cosmic = cms.Sequence(process.SiStripMonitorTrack_ckf*process.TrackMon_ckf)
+    # Client config for cosmic data
+    ### STRIP
     process.load("DQM.SiStripMonitorClient.SiStripClientConfigP5_Cosmic_cff")
     process.SiStripAnalyserCosmic.RawDataTag = cms.untracked.InputTag("rawDataCollector")
     process.SiStripAnalyserCosmic.TkMapCreationFrequency  = -1
     process.SiStripAnalyserCosmic.ShiftReportFrequency = -1
     process.SiStripAnalyserCosmic.StaticUpdateFrequency = 5
     process.SiStripAnalyserCosmic.MonitorSiStripBackPlaneCorrection = cms.bool(False)
     process.SiStripClients           = cms.Sequence(process.SiStripAnalyserCosmic)
-
+    ### TRACKING 
     process.load("DQM.TrackingMonitorClient.TrackingClientConfigP5_Cosmic_cff")
-    process.TrackingAnalyserCosmic.RawDataTag = cms.untracked.InputTag("rawDataCollector")
+    process.TrackingAnalyserCosmic.RawDataTag           = cms.untracked.InputTag("rawDataCollector")
     process.TrackingAnalyserCosmic.ShiftReportFrequency = -1
     process.TrackingAnalyserCosmic.StaticUpdateFrequency = 5
     process.TrackingClient = cms.Sequence( process.TrackingAnalyserCosmic )
@@ -230,28 +244,27 @@
 
     process.RecoForDQM_TrkReco_cosmic = cms.Sequence(process.offlineBeamSpot*process.MeasurementTrackerEvent*process.ctftracksP5)
 
-    process.qTester = cms.EDAnalyzer("QualityTester",
-                                     qtList = cms.untracked.FileInPath('DQM/SiStripMonitorClient/data/sistrip_qualitytest_config_cosmic.xml'),
-                                     prescaleFactor = cms.untracked.int32(2),
-                                     getQualityTestsFromFile = cms.untracked.bool(True),
-                                     qtestOnEndLumi = cms.untracked.bool(True),
-                                     qtestOnEndRun = cms.untracked.bool(True)
-                                     )
+
+    process.stripQTester.qtList = cms.untracked.FileInPath('DQM/SiStripMonitorClient/data/sistrip_qualitytest_config_cosmic.xml')
+    process.stripQTester.prescaleFactor          = cms.untracked.int32(2)
+    process.stripQTester.getQualityTestsFromFile = cms.untracked.bool(True)
+    process.stripQTester.qtestOnEndLumi          = cms.untracked.bool(True)
+    process.stripQTester.qtestOnEndRun           = cms.untracked.bool(True)
 
     process.trackingQTester.qtList                  = cms.untracked.FileInPath('DQM/TrackingMonitorClient/data/tracking_qualitytest_config_cosmic.xml')
-    process.trackingQTester.prescaleFactor          = cms.untracked.int32(2)
+    process.trackingQTester.prescaleFactor          = cms.untracked.int32(1)
     process.trackingQTester.getQualityTestsFromFile = cms.untracked.bool(True)
     process.trackingQTester.qtestOnEndLumi          = cms.untracked.bool(True)
     process.trackingQTester.qtestOnEndRun           = cms.untracked.bool(True)                                                                    
 
 #    process.trackingQTester = cms.EDAnalyzer("QualityTester",
 #                                               qtList = cms.untracked.FileInPath('DQM/TrackingMonitorClient/data/tracking_qualitytest_config_cosmic.xml'),
-#                                               prescaleFactor = cms.untracked.int32(2),
+#                                               prescaleFactor = cms.untracked.int32(1),
 #                                               getQualityTestsFromFile = cms.untracked.bool(True),
 #                                               qtestOnEndLumi = cms.untracked.bool(True),
 #                                               qtestOnEndRun = cms.untracked.bool(True)                                                                    
 #                                            )
-
+#    print "process.trackingQTester: " + str(process.trackingQTester.prescaleFactor) + " " + str(process.trackingQTester.qtList)
 
     process.p = cms.Path(process.scalersRawToDigi*
                          process.APVPhases*
@@ -260,15 +273,16 @@
                          process.RecoForDQM_LocalReco*
                          process.DQMCommon*
                          process.SiStripClients*
-                         process.TrackingClient *
                          process.SiStripSources_LocalReco*
                          process.RecoForDQM_TrkReco_cosmic*
-                         process.SiStripSources_TrkReco_cosmic
+                         process.SiStripSources_TrkReco_cosmic*
+                         process.TrackingClient
                          )
 
 
 
 #else :
+### pp COLLISION SETTING
 if (process.runType.getRunType() == process.runType.pp_run):
     #event selection for pp collisions
 #    process.DQMEventStreamerReader.SelectEvents = cms.untracked.PSet(SelectEvents = cms.vstring('HLT_L1*',
@@ -293,6 +307,8 @@
     process.SiStripMonitorTrack_gentk.TrackProducer    = 'earlyGeneralTracks'
 
     process.SiStripSources_TrkReco   = cms.Sequence(process.SiStripMonitorTrack_gentk*process.MonitorTrackResiduals_gentk*process.TrackMon_gentk)
+    # Client config for cosmic data
+    ### STRIP
     process.load("DQM.SiStripMonitorClient.SiStripClientConfigP5_cff")
     process.SiStripAnalyser.UseGoodTracks  = cms.untracked.bool(True)
     process.SiStripAnalyser.TkMapCreationFrequency  = -1
@@ -303,7 +319,7 @@
     process.SiStripClients           = cms.Sequence(process.SiStripAnalyser)
 
     process.SiStripMonitorDigi.TotalNumberOfDigisFailure.integrateNLumisections = cms.int32(25)
-
+    ### TRACKING 
     process.load("DQM.TrackingMonitorClient.TrackingClientConfigP5_cff")
     process.TrackingAnalyser.ShiftReportFrequency = -1
     process.TrackingAnalyser.StaticUpdateFrequency = 5
@@ -395,12 +411,12 @@
     process.SiStripAnalyser.RawDataTag = cms.untracked.InputTag("rawDataCollector")
     process.SiStripAnalyser.MonitorSiStripBackPlaneCorrection = cms.bool(False)
     process.SiStripClients           = cms.Sequence(process.SiStripAnalyser)
-
-    process.load("DQM.TrackingMonitorClient.TrackingClientConfigP5_HeavyIons_cff")
-    process.TrackingAnalyserHI.ShiftReportFrequency = -1
-    process.TrackingAnalyserHI.StaticUpdateFrequency = 5
-    process.TrackingAnalyserHI.RawDataTag            = cms.untracked.InputTag("rawDataCollector")
-    process.TrackingClient = cms.Sequence( process.TrackingAnalyserHI )
+    ### TRACKING
+    process.load("DQM.TrackingMonitorClient.TrackingClientConfigP5_cff")
+    process.TrackingAnalyser.ShiftReportFrequency = -1
+    process.TrackingAnalyser.StaticUpdateFrequency = 5
+    process.TrackingAnalyser.RawDataTag = cms.untracked.InputTag("rawDataCollector")
+    process.TrackingClient = cms.Sequence( process.TrackingAnalyser )
 
     # Reco for pp collisions
 
@@ -470,7 +486,7 @@
 #--------------------------------------------------
 
 print "Running with run type = ", process.runType.getRunType()
-
+### HEAVY ION SETTING
 if (process.runType.getRunType() == process.runType.hi_run):
     process.castorDigis.InputLabel = cms.InputTag("rawDataRepacker")
     process.csctfDigis.producer = cms.InputTag("rawDataRepacker")
@@ -501,7 +517,7 @@
 #
     process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/sistrip_reference_hi.root'
     # Quality test for HI                                                                                                                  
-    process.qTester = cms.EDAnalyzer("QualityTester",
+    process.stripQTester = cms.EDAnalyzer("QualityTester",
                                      qtList = cms.untracked.FileInPath('DQM/SiStripMonitorClient/data/sistrip_qualitytest_config_heavyion.xml'),
                                      prescaleFactor = cms.untracked.int32(3),
                                      getQualityTestsFromFile = cms.untracked.bool(True),
@@ -527,13 +543,21 @@
     process.load("Configuration.StandardSequences.RawToDigi_Repacked_cff")
     process.SiStripBaselineValidator.srcProcessedRawDigi =  cms.InputTag('siStripVRDigis','VirginRaw')
     process.SiStripSources_TrkReco   = cms.Sequence(process.SiStripMonitorTrack_hi*process.TrackMon_hi)
-# Client for HI
+    # Client for HI
+    ### STRIP
     process.load("DQM.SiStripMonitorClient.SiStripClientConfigP5_HeavyIons_cff")
     process.SiStripAnalyserHI.RawDataTag = cms.untracked.InputTag("rawDataRepacker")
     process.SiStripAnalyserHI.TkMapCreationFrequency  = -1
     process.SiStripAnalyserHI.ShiftReportFrequency = -1
     process.SiStripAnalyserHI.StaticUpdateFrequency = 5
     process.SiStripClients  = cms.Sequence(process.SiStripAnalyserHI)
+    ### TRACKING
+    process.load("DQM.TrackingMonitorClient.TrackingClientConfigP5_HeavyIons_cff")
+    process.TrackingAnalyserHI.ShiftReportFrequency = -1
+    process.TrackingAnalyserHI.StaticUpdateFrequency = 5
+    process.TrackingAnalyserHI.RawDataTag            = cms.untracked.InputTag("rawDataCollector")
+    process.TrackingClient = cms.Sequence( process.TrackingAnalyserHI )
+
     # Reco for HI collisions
     process.load("Configuration.StandardSequences.ReconstructionHeavyIons_cff")
     process.RecoForDQM_LocalReco = cms.Sequence(process.siPixelDigis*process.siStripDigis*process.siStripVRDigis*process.gtDigis*process.trackerlocalreco)
@@ -550,6 +574,7 @@
                          process.RecoForDQM_TrkReco*
                          process.SiStripSources_TrkReco*
                          process.multFilter*
-                         process.SiStripBaselineValidator                         
+                         process.SiStripBaselineValidator*
+                         process.TrackingClients
                          )
 

DQM/SiStripMonitorClient/python/SiStripSourceConfigP5_cff.py

@@ -129,81 +129,6 @@
 #MonitorTrackResiduals_hi.OutputMEsInRootFile    = False
 #MonitorTrackResiduals_hi.Mod_On                 = False
 
-# TrackingMonitor ####
-# Clone for Cosmic Track Finder
-import DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi
-TrackMon_cosmicTk = DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi.TrackerCosmicTrackMon.clone()
-TrackMon_cosmicTk.TrackProducer = 'cosmictrackfinderP5'
-TrackMon_cosmicTk.AlgoName      = 'CosmicTk'
-TrackMon_cosmicTk.FolderName    = 'Tracking/TrackParameters'
-TrackMon_cosmicTk.doSeedParameterHistos = True
-
-# Clone for CKF Tracks
-import DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi
-TrackMon_ckf = DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi.TrackerCosmicTrackMon.clone()
-TrackMon_ckf.TrackProducer      = 'ctfWithMaterialTracksP5'
-TrackMon_ckf.AlgoName           = 'CKFTk'
-TrackMon_ckf.FolderName         = 'Tracking/TrackParameters'
-TrackMon_ckf.doSeedParameterHistos = True
-
-# Clone for Road Search  Tracks
-#import DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi
-#TrackMon_rs = DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi.TrackerCosmicTrackMon.clone()
-#TrackMon_rs.TrackProducer       = 'rsWithMaterialTracksP5'
-#TrackMon_rs.AlgoName            = 'RSTk'
-#TrackMon_rs.FolderName          = 'Tracking/TrackParameters'
-#TrackMon_rs.doSeedParameterHistos = True
-
-# Clone for General Track (for Collision data)
-import DQM.TrackingMonitor.TrackerCollisionTrackingMonitor_cfi
-TrackMon_gentk = DQM.TrackingMonitor.TrackerCollisionTrackingMonitor_cfi.TrackerCollisionTrackMon.clone()
-TrackMon_gentk.FolderName          = 'Tracking/TrackParameters'
-TrackMon_gentk.BSFolderName        = 'Tracking/TrackParameters/BeamSpotParameters'
-# decrease number of histograms
-#TrackMon_gentk.doTrackerSpecific = False
-
-# Clone for Heavy Ion Tracks (for HI Collisions)
-import DQM.TrackingMonitor.TrackerHeavyIonTrackingMonitor_cfi
-TrackMon_hi = DQM.TrackingMonitor.TrackerHeavyIonTrackingMonitor_cfi.TrackerHeavyIonTrackMon.clone()
-TrackMon_hi.FolderName          = 'Tracking/TrackParameters'
-TrackMon_hi.BSFolderName        = 'Tracking/TrackParameters/BeamSpotParameters'
-
-# Tracking Efficiency ####
-# Clone for Cosmic Tracks
-import DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi
-TrackEffMon_cosmicTk = DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi.TrackEffMon.clone()
-TrackEffMon_cosmicTk.TKTrackCollection             = 'cosmictrackfinderP5'
-TrackEffMon_cosmicTk.AlgoName                      = 'CosmicTk'
-TrackEffMon_cosmicTk.FolderName                    = 'Tracking/TrackParameters/TrackEfficiency'
-
-# Clone for CKF Tracks
-import DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi
-TrackEffMon_ckf = DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi.TrackEffMon.clone()
-TrackEffMon_ckf.TKTrackCollection                  = 'ctfWithMaterialTracksP5'
-TrackEffMon_ckf.AlgoName                           = 'CKFTk'
-TrackEffMon_ckf.FolderName                         = 'Tracking/TrackParameters/TrackEfficiency'
-
-# Clone for RS Tracks
-#import DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi
-#TrackEffMon_rs = DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi.TrackEffMon.clone()
-#TrackEffMon_rs.TKTrackCollection                   = 'rsWithMaterialTracksP5'
-#TrackEffMon_rs.AlgoName                            = 'RSTk'
-#TrackEffMon_rs.FolderName                          = 'Tracking/TrackParameters/TrackEfficiency'
-
-# Clone for Beam Halo  Tracks
-import DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi
-TrackEffMon_bhmuon = DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi.TrackEffMon.clone()
-TrackEffMon_bhmuon.TKTrackCollection               = 'ctfWithMaterialTracksBeamHaloMuon'
-TrackEffMon_bhmuon.AlgoName                        = 'BHMuonTk'
-TrackEffMon_bhmuon.FolderName                      = 'Tracking/TrackParameters/TrackEfficiency'
-
-# Clone for Heavy Ion Tracks (for HI Collisions)
-import DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi
-TrackEffMon_hi = DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi.TrackEffMon.clone()
-TrackEffMon_hi.TKTrackCollection                   = 'hiGlobalPrimTracks'
-TrackEffMon_hi.AlgoName                            = 'HeavyIonTk'
-TrackEffMon_hi.FolderName                          = 'Tracking/TrackParameters/TrackEfficiency'
-
 # Services needed for TkHistoMap
 TkDetMap = cms.Service("TkDetMap")
 SiStripDetInfoFileReade = cms.Service("SiStripDetInfoFileReader")

DQM/TrackingMonitorClient/data/tracking_plot_layout.xml

@@ -0,0 +1,10 @@
+<Layouts>
+<layout name="Tracks">
+  <monitorable name="Tracking/TrackParameters/GeneralProperties/NumberOfTracks_GenTk"></monitorable>
+  <monitorable name="Tracking/TrackParameters/HitProperties/NumberOfRecHitsPerTrack_GenTk"></monitorable>
+  <monitorable name="Tracking/TrackParameters/GeneralProperties/TrackPt_GenTk"></monitorable>
+  <monitorable name="Tracking/TrackParameters/GeneralProperties/Chi2oNDF_GenTk"></monitorable>
+  <monitorable name="Tracking/TrackParameters/GeneralProperties/TrackPhi_GenTk"></monitorable>
+  <monitorable name="Tracking/TrackParameters/GeneralProperties/TrackEta_GenTk"></monitorable>
+</layout>
+</Layouts>

DQM/TrackingMonitorClient/data/tracking_qualitytest_config_cosmic.xml

@@ -25,14 +25,13 @@
      <PARAM name="xmax">25.0</PARAM> 
 </QTEST>
 
-
-<LINK name="*TrackParameters/GeneralProperties/NumberOfTracks_CKFTk">
+<LINK name="*TrackParameters/GeneralProperties/NumberOfTracks_CKFTk*">
   <TestName activate="true">MeanWithinExpectedRange:TrkRate</TestName>
 </LINK>
-<LINK name="*TrackParameters/HitProperties/NumberOfRecHitsPerTrack_CKFTk">
+<LINK name="*TrackParameters/HitProperties/NumberOfRecHitsPerTrack_CKFTk*">
   <TestName activate="true">XrangeWithin:NumberOfRecHitsPerTrk</TestName>
 </LINK>
-<LINK name="*TrackParameters/GeneralProperties/Chi2oNDF_CKFTk">
+<LINK name="*TrackParameters/GeneralProperties/Chi2oNDF_CKFTk*">
   <TestName activate="true">XrangeWithin:Chi2overDoF</TestName>
 </LINK>
 </TESTCONFIGURATION>

DQM/TrackingMonitorClient/interface/TrackingQualityChecker.h

@@ -67,6 +67,7 @@ class TrackingQualityChecker {
   MonitorElement* TrackLSSummaryReportGlobal;
 
   edm::ParameterSet pSet_;
+  bool verbose_;
 
   bool bookedTrackingGlobalStatus_;
   bool bookedTrackingLSStatus_;