fix tracking client in cosmic configuration

cms-sw · Aug 21, 2014 · dfac7f4 · dfac7f4
1 parent 07cd555
commit dfac7f4
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 42 deletions.
diff --git a/DQM/SiStripMonitorClient/python/SiStripClientConfig_Tier0_Cosmic_cff.py b/DQM/SiStripMonitorClient/python/SiStripClientConfig_Tier0_Cosmic_cff.py
@@ -13,21 +13,6 @@
                   LowerCut = cms.double(0.0),
                   UpperCut = cms.double(100.0),
                ),
-    TrackChi2PSet            = cms.PSet(
-           Name     = cms.string("Chi2oNDF_"),
-                  LowerCut = cms.double(0.0),
-                  UpperCut = cms.double(25.0),
-               ),
-    TrackHitPSet            = cms.PSet(
-           Name     = cms.string("NumberOfRecHitsPerTrack_"),
-                  LowerCut = cms.double(3.0),
-                  UpperCut = cms.double(35.0),
-               ),
-    GoodTrackFractionPSet   = cms.PSet(
-           Name     = cms.string("FractionOfGoodTracks_"),
-                  LowerCut = cms.double(-1.),
-                  UpperCut = cms.double(1.),
-               )           
 )
 
 siStripQTester = cms.EDAnalyzer("QualityTester",
@@ -36,14 +21,10 @@
     getQualityTestsFromFile = cms.untracked.bool(True)
 )
 
-from DQM.TrackingMonitor.TrackEfficiencyClient_cfi import *
-TrackEffClient.FolderName = 'Tracking/TrackParameters/TrackEfficiency'
-TrackEffClient.AlgoName   = 'CKFTk'
-
 # Sequence
-SiStripCosmicDQMClient = cms.Sequence(siStripQTester*siStripOfflineAnalyser*TrackEffClient)
+SiStripCosmicDQMClient = cms.Sequence(siStripQTester*siStripOfflineAnalyser)
 #removed modules using TkDetMap
-#SiStripCosmicDQMClient = cms.Sequence(siStripQTester*TrackEffClient)
+#SiStripCosmicDQMClient = cms.Sequence(siStripQTester)
 
 
 # Services needed for TkHistoMap

diff --git a/DQM/TrackingMonitorClient/data/tracking_qualitytest_config_tier0_cosmic.xml b/DQM/TrackingMonitorClient/data/tracking_qualitytest_config_tier0_cosmic.xml
@@ -0,0 +1,47 @@
+<TESTSCONFIGURATION> 
+<QTEST name="MeanWithinExpectedRange:TrkRate" activate="true">
+      <TYPE>MeanWithinExpected</TYPE>
+      <PARAM name="error">0.85</PARAM>
+      <PARAM name="warning">0.95</PARAM>
+      <PARAM name="mean">1.0</PARAM>
+      <PARAM name="useRMS">0</PARAM>
+      <PARAM name="useSigma">0</PARAM>
+      <PARAM name="useRange">1</PARAM>
+      <PARAM name="xmin">0.01</PARAM>
+      <PARAM name="xmax">10.0</PARAM>
+</QTEST>
+<QTEST name="XrangeWithin:NumberOfRecHitsPerTrk" activate="true"> 
+     <TYPE>ContentsXRange</TYPE> 
+     <PARAM name="error">0.85</PARAM> 
+     <PARAM name="warning">0.95</PARAM> 
+     <PARAM name="xmin">5.0</PARAM> 
+     <PARAM name="xmax">100.0</PARAM> 
+</QTEST>
+<QTEST name="XrangeWithin:Chi2overDoF" activate="true"> 
+     <TYPE>ContentsXRange</TYPE> 
+     <PARAM name="error">0.85</PARAM> 
+     <PARAM name="warning">0.95</PARAM> 
+     <PARAM name="xmin">0</PARAM> 
+     <PARAM name="xmax">25.0</PARAM> 
+</QTEST>
+<QTEST name="XrangeWithin:FractionOfGoodTracks" activate="true"> 
+     <TYPE>ContentsXRange</TYPE> 
+     <PARAM name="error">0.85</PARAM> 
+     <PARAM name="warning">0.95</PARAM> 
+     <PARAM name="xmin">-1.1</PARAM> 
+     <PARAM name="xmax">1.1</PARAM> 
+</QTEST>
+
+<LINK name="*TrackParameters/GeneralProperties/NumberOfTracks_CKFTk">
+  <TestName activate="true">MeanWithinExpectedRange:TrkRate</TestName>
+</LINK>
+<LINK name="*TrackParameters/HitProperties/NumberOfRecHitsPerTrack_CKFTk">
+  <TestName activate="true">XrangeWithin:NumberOfRecHitsPerTrk</TestName>
+</LINK>
+<LINK name="*TrackParameters/GeneralProperties/Chi2oNDF_CKFTk">
+  <TestName activate="true">XrangeWithin:Chi2overDoF</TestName>
+</LINK>
+<LINK name="*TrackParameters/GeneralProperties/FractionOfGoodTracks_CKFTk">
+  <TestName activate="true">XrangeWithin:FractionOfGoodTracks</TestName>
+</LINK>
+</TESTCONFIGURATION>
diff --git a/DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_Cosmic_cff.py b/DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_Cosmic_cff.py
@@ -2,27 +2,48 @@
 
 #  TrackingOfflineDQM (for Tier0 Harvesting Step) ####
 trackingOfflineAnalyser = cms.EDAnalyzer("TrackingOfflineDQM",
-    GlobalStatusFilling      = cms.untracked.int32(2),
-    UsedWithEDMtoMEConverter = cms.untracked.bool(True),
-    TrackRatePSet            = cms.PSet(
-        Name     = cms.string("NumberOfTracks_"),
-        LowerCut = cms.double(0.0),
-        UpperCut = cms.double(100.0),
+    GlobalStatusFilling        = cms.untracked.int32(2),
+    UsedWithEDMtoMEConverter   = cms.untracked.bool(True),
+    TopFolderName              = cms.untracked.string("Tracking"),                                     
+    TrackingGlobalQualityPSets = cms.VPSet(
+         cms.PSet(
+             QT         = cms.string("Rate"),
+             dir        = cms.string("TrackParameters/highPurityTracks/pt_1/GeneralProperties"),
+             name       = cms.string("NumberOfGoodTracks_"),
+         ),
+         cms.PSet(
+             QT         = cms.string("Chi2"),
+             dir        = cms.string("TrackParameters/highPurityTracks/pt_1/GeneralProperties"),
+             name       = cms.string("GoodTrackChi2oNDF_"),
+         ),
+         cms.PSet(
+             QT         = cms.string("RecHits"),
+             dir        = cms.string("TrackParameters/highPurityTracks/pt_1/HitProperties"),
+             name       = cms.string("GoodTrackNumberOfRecHitsPerTrack_"),
+         ),
     ),
-    TrackChi2PSet            = cms.PSet(
-        Name     = cms.string("Chi2oNDF_"),
-        LowerCut = cms.double(0.0),
-        UpperCut = cms.double(25.0),
-    ),
-    TrackHitPSet            = cms.PSet(
-        Name     = cms.string("NumberOfRecHitsPerTrack_"),
-        LowerCut = cms.double(3.0),
-        UpperCut = cms.double(35.0),
-    ),
-    GoodTrackFractionPSet   = cms.PSet(
-        Name     = cms.string("FractionOfGoodTracks_"),
-        LowerCut = cms.double(-1.),
-        UpperCut = cms.double(1.),
+    TrackingLSQualityPSets = cms.VPSet(
+         cms.PSet(
+             QT         = cms.string("Rate"),
+             LSdir      = cms.string("TrackParameters/highPurityTracks/pt_1/GeneralProperties/LSanalysis"),
+             LSname     = cms.string("NumberOfGoodTracks_lumiFlag_"),
+             LSlowerCut = cms.double( -1.0 ),
+             LSupperCut = cms.double(  1.0 )    
+         ),
+         cms.PSet(
+             QT         = cms.string("Chi2"),
+             LSdir      = cms.string("TrackParameters/highPurityTracks/pt_1/GeneralProperties/LSanalysis"),
+             LSname     = cms.string("GoodTrackChi2oNDF_lumiFlag_"),
+             LSlowerCut = cms.double(  0.0 ),
+             LSupperCut = cms.double( 25.0 )
+         ),
+         cms.PSet(
+             QT         = cms.string("RecHits"),
+             LSdir      = cms.string("TrackParameters/highPurityTracks/pt_1/GeneralProperties/LSanalysis"),
+             LSname     = cms.string("GoodTrackNumberOfRecHitsPerTrack_lumiFlag_"),
+             LSlowerCut = cms.double(  3.0 ),
+             LSupperCut = cms.double( 35.0 )
+         ),
     )
 )
 

diff --git a/DQMOffline/Configuration/python/DQMOfflineCosmics_SecondStep_cff.py b/DQMOffline/Configuration/python/DQMOfflineCosmics_SecondStep_cff.py
@@ -37,8 +37,10 @@
 from DQMOffline.Trigger.DQMOffline_Trigger_Client_cff import *
 from DQMOffline.Trigger.DQMOffline_HLT_Client_cff import *
 from DQMOffline.JetMET.SusyPostProcessor_cff import *
+from DQM.TrackingMonitorClient.TrackingClientConfig_Tier0_Cosmic_cff import *
 
-DQMOfflineCosmics_SecondStep_PrePOG = cms.Sequence( cosmicMuonQualityTests *
+DQMOfflineCosmics_SecondStep_PrePOG = cms.Sequence( TrackingCosmicDQMClient *
+                                                    cosmicMuonQualityTests *
                                                     photonOfflineDQMClient *
 #                                                    l1TriggerDqmOfflineClient * 
                                                     triggerOfflineDQMClient *