Skip to content

Commit

Permalink
fix tracking summary map @online
Browse files Browse the repository at this point in the history
  • Loading branch information
@mtosi
mtosi committed Aug 21, 2014
1 parent dfac7f4 commit 2229f54
Show file tree
Hide file tree
Showing 10 changed files with 199 additions and 76 deletions.
19 changes: 0 additions & 19 deletions DQM/SiStripMonitorClient/python/SiStripClientConfigP5_Cosmic_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,6 @@
SummaryConfigPath = cms.untracked.string("DQM/SiStripMonitorClient/data/sistrip_monitorelement_config.xml"),
PrintFaultyModuleList = cms.untracked.bool(True),
RawDataTag = cms.untracked.InputTag("source"),
TrackRatePSet = cms.PSet(
Name = cms.string("NumberOfTracks_"),
LowerCut = cms.double(1.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),
),
TkmapParameters = cms.PSet(
loadFedCabling = cms.untracked.bool(True),
loadFecCabling = cms.untracked.bool(True),
Expand Down Expand Up @@ -58,10 +43,6 @@
)
# Track Efficiency Client

from DQM.TrackingMonitor.TrackEfficiencyClient_cfi import *
TrackEffClient.FolderName = 'Tracking/TrackParameters/TrackEfficiency'
TrackEffClient.AlgoName = 'CKFTk'

# Services needed for TkHistoMap
TkDetMap = cms.Service("TkDetMap")

42 changes: 42 additions & 0 deletions DQM/TrackingMonitorClient/data/tracking_qualitytest_config.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<TESTSCONFIGURATION>
<QTEST name="XrangeWithin:NumberOfTracks" activate="true">
<TYPE>ContentsXRange</TYPE>
<PARAM name="error">0.85</PARAM>
<PARAM name="warning">0.95</PARAM>
<PARAM name="xmin">0.0</PARAM>
<PARAM name="xmax">600.0</PARAM>
</QTEST>
<QTEST name="XrangeWithin:NumberOfRecHitsPerTrk" activate="true">
<TYPE>ContentsXRange</TYPE>
<PARAM name="error">0.80</PARAM>
<PARAM name="warning">0.90</PARAM>
<PARAM name="xmin">5.0</PARAM>
<PARAM name="xmax">35.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">10.0</PARAM>
</QTEST>
<QTEST name="XrangeWithin:TrackPt" 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">100.0</PARAM>
</QTEST>
<LINK name="*TrackParameters/*/GeneralProperties/NumberOfTracks_GenTk">
<TestName activate="true">XrangeWithin:NumberOfTracks</TestName>
</LINK>
<LINK name="*TrackParameters/*/HitProperties/TrackNumberOfRecHitsPerTrack_GenTk">
<TestName activate="true">XrangeWithin:NumberOfRecHitsPerTrk</TestName>
</LINK>
<LINK name="*TrackParameters/*/GeneralProperties/TrackChi2oNDF_GenTk">
<TestName activate="true">XrangeWithin:Chi2overDoF</TestName>
</LINK>
<LINK name="*TrackParameters/*/GeneralProperties/TrackPt_ImpactPoint_GenTk">
<TestName activate="true">XrangeWithin:TrackPt</TestName>
</LINK>
</TESTCONFIGURATION>
38 changes: 38 additions & 0 deletions DQM/TrackingMonitorClient/data/tracking_qualitytest_config_cosmic.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<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>


<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>
</TESTCONFIGURATION>
43 changes: 43 additions & 0 deletions DQM/TrackingMonitorClient/data/tracking_qualitytest_config_heavyion.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<TESTSCONFIGURATION>
<QTEST name="XrangeWithin:NumberOfTracks" activate="true">
<TYPE>ContentsXRange</TYPE>
<PARAM name="error">0.85</PARAM>
<PARAM name="warning">0.95</PARAM>
<PARAM name="xmin">0.0</PARAM>
<PARAM name="xmax">2000.0</PARAM>
</QTEST>
<QTEST name="XrangeWithin:NumberOfRecHitsPerTrk" activate="true">
<TYPE>ContentsXRange</TYPE>
<PARAM name="error">0.80</PARAM>
<PARAM name="warning">0.90</PARAM>
<PARAM name="xmin">4.0</PARAM>
<PARAM name="xmax">35.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">10.0</PARAM>
</QTEST>
<QTEST name="XrangeWithin:TrackPt" 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">100.0</PARAM>
</QTEST>

<LINK name="*TrackParameters/GeneralProperties/NumberOfTracks_HeavyIonTk">
<TestName activate="true">XrangeWithin:NumberOfTracks</TestName>
</LINK>
<LINK name="*TrackParameters/HitProperties/NumberOfRecHitsPerTrack_HeavyIonTk">
<TestName activate="true">XrangeWithin:NumberOfRecHitsPerTrk</TestName>
</LINK>
<LINK name="*TrackParameters/GeneralProperties/Chi2oNDF_HeavyIonTk">
<TestName activate="true">XrangeWithin:Chi2overDoF</TestName>
</LINK>
<LINK name="*TrackParameters/GeneralProperties/TrackPt_ImpactPoint_HeavyIonTk">
<TestName activate="true">XrangeWithin:TrackPt</TestName>
</LINK>
</TESTCONFIGURATION>
2 changes: 1 addition & 1 deletion DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
TrackingAnalyser::TrackingAnalyser(edm::ParameterSet const& ps) {

// Get TkMap ParameterSet
tkMapPSet_ = ps.getParameter<edm::ParameterSet>("TkmapParameters");
// tkMapPSet_ = ps.getParameter<edm::ParameterSet>("TkmapParameters");

std::string localPath = std::string("DQM/TrackingMonitorClient/test/loader.html");
std::ifstream fin(edm::FileInPath(localPath).fullPath().c_str(), std::ios::in);
Expand Down
68 changes: 41 additions & 27 deletions DQM/TrackingMonitorClient/python/TrackingClientConfigP5_Cosmic_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,54 @@
import FWCore.ParameterSet.Config as cms

from DQM.TrackingMonitorSummary.OnDemandMonitoring_cfi import *
# TrackingMonitorAnalyser ####
TrackingAnalyserCosmic = cms.EDAnalyzer("TrackingAnalyser",
StaticUpdateFrequency = cms.untracked.int32(1),
GlobalStatusFilling = cms.untracked.int32(2),
TkMapCreationFrequency = cms.untracked.int32(3),
SummaryCreationFrequency = cms.untracked.int32(5),
ShiftReportFrequency = cms.untracked.int32(-1),
SummaryConfigPath = cms.untracked.string("DQM/TrackingMonitorClient/data/tracking_monitorelement_config.xml"),
PrintFaultyModuleList = cms.untracked.bool(True),
RawDataTag = cms.untracked.InputTag("source"),
TrackRatePSet = cms.PSet(
Name = cms.string("NumberOfTracks_"),
LowerCut = cms.double(1.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),
),
TkmapParameters = cms.PSet(
loadFedCabling = cms.untracked.bool(True),
loadFecCabling = cms.untracked.bool(True),
loadLVCabling = cms.untracked.bool(True),
loadHVCabling = cms.untracked.bool(True),
trackerdatPath = cms.untracked.string('CommonTools/TrackerMap/data/'),
trackermaptxtPath = cms.untracked.string('DQM/Integration/test/TkMap/')
TopFolderName = cms.untracked.string("Tracking"),
TrackingGlobalQualityPSets = cms.VPSet(
cms.PSet(
QT = cms.string("Rate"),
dir = cms.string("TrackParameters/GeneralProperties"),
name = cms.string("NumberOfTracks_"),
),
cms.PSet(
QT = cms.string("Chi2"),
dir = cms.string("TrackParameters/GeneralProperties"),
name = cms.string("TrackChi2oNDF_"),
),
cms.PSet(
QT = cms.string("RecHits"),
dir = cms.string("TrackParameters/HitProperties"),
name = cms.string("TrackNumberOfRecHitsPerTrack_"),
),
),
TrackingLSQualityPSets = cms.VPSet(
cms.PSet(
QT = cms.string("Rate"),
LSdir = cms.string("TrackParameters/GeneralProperties/LSanalysis"),
LSname = cms.string("NumberOfTracks_lumiFlag_"),
LSlowerCut = cms.double( -1.0 ),
LSupperCut = cms.double( 1.0 )
),
cms.PSet(
QT = cms.string("Chi2"),
LSdir = cms.string("TrackParameters/GeneralProperties/LSanalysis"),
LSname = cms.string("TrackChi2oNDF_lumiFlag_"),
LSlowerCut = cms.double( 0.0 ),
LSupperCut = cms.double( 25.0 )
),
cms.PSet(
QT = cms.string("RecHits"),
LSdir = cms.string("TrackParameters/GeneralProperties/LSanalysis"),
LSname = cms.string("TrackNumberOfRecHitsPerTrack_lumiFlag_"),
LSlowerCut = cms.double( 3.0 ),
LSupperCut = cms.double( 35.0 )
),
)
)

# Track Efficiency Client

from DQM.TrackingMonitor.TrackEfficiencyClient_cfi import *
Expand Down
14 changes: 3 additions & 11 deletions DQM/TrackingMonitorClient/python/TrackingClientConfigP5_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,20 @@
PrintFaultyModuleList = cms.untracked.bool(True),
RawDataTag = cms.untracked.InputTag("source"),
TrackRatePSet = cms.PSet(
Name = cms.string("NumberOfGoodTracks_"),
Name = cms.string("NumberOfTracks_"),
LowerCut = cms.double(1.0),
UpperCut = cms.double(1000.0),
),
TrackChi2PSet = cms.PSet(
Name = cms.string("GoodTrackChi2oNDF_"),
Name = cms.string("TrackChi2oNDF_"),
LowerCut = cms.double(0.0),
UpperCut = cms.double(25.0),
),
TrackHitPSet = cms.PSet(
Name = cms.string("GoodTrackNumberOfRecHitsPerTrack_"),
Name = cms.string("TrackNumberOfRecHitsPerTrack_"),
LowerCut = cms.double(5.0),
UpperCut = cms.double(20.0),
),
TkmapParameters = cms.PSet(
loadFedCabling = cms.untracked.bool(True),
loadFecCabling = cms.untracked.bool(True),
loadLVCabling = cms.untracked.bool(True),
loadHVCabling = cms.untracked.bool(True),
trackerdatPath = cms.untracked.string('CommonTools/TrackerMap/data/'),
trackermaptxtPath = cms.untracked.string('DQM/Integration/test/TkMap/')
)
)
# Track Efficiency Client

Expand Down
24 changes: 12 additions & 12 deletions DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_Cosmic_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,39 @@
TrackingGlobalQualityPSets = cms.VPSet(
cms.PSet(
QT = cms.string("Rate"),
dir = cms.string("TrackParameters/highPurityTracks/pt_1/GeneralProperties"),
name = cms.string("NumberOfGoodTracks_"),
dir = cms.string("TrackParameters/GeneralProperties"),
name = cms.string("NumberOfTracks_"),
),
cms.PSet(
QT = cms.string("Chi2"),
dir = cms.string("TrackParameters/highPurityTracks/pt_1/GeneralProperties"),
name = cms.string("GoodTrackChi2oNDF_"),
dir = cms.string("TrackParameters/GeneralProperties"),
name = cms.string("TrackChi2oNDF_"),
),
cms.PSet(
QT = cms.string("RecHits"),
dir = cms.string("TrackParameters/highPurityTracks/pt_1/HitProperties"),
name = cms.string("GoodTrackNumberOfRecHitsPerTrack_"),
dir = cms.string("TrackParameters/HitProperties"),
name = cms.string("TrackNumberOfRecHitsPerTrack_"),
),
),
TrackingLSQualityPSets = cms.VPSet(
cms.PSet(
QT = cms.string("Rate"),
LSdir = cms.string("TrackParameters/highPurityTracks/pt_1/GeneralProperties/LSanalysis"),
LSname = cms.string("NumberOfGoodTracks_lumiFlag_"),
LSdir = cms.string("TrackParameters/GeneralProperties/LSanalysis"),
LSname = cms.string("NumberOfTracks_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_"),
LSdir = cms.string("TrackParameters/GeneralProperties/LSanalysis"),
LSname = cms.string("TrackChi2oNDF_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_"),
LSdir = cms.string("TrackParameters/GeneralProperties/LSanalysis"),
LSname = cms.string("TrackNumberOfRecHitsPerTrack_lumiFlag_"),
LSlowerCut = cms.double( 3.0 ),
LSupperCut = cms.double( 35.0 )
),
Expand Down
12 changes: 6 additions & 6 deletions DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
cms.PSet(
QT = cms.string("Rate"),
dir = cms.string("TrackParameters/highPurityTracks/pt_1/GeneralProperties"),
name = cms.string("NumberOfGoodTracks_"),
name = cms.string("NumberOfTracks_"),
),
cms.PSet(
QT = cms.string("Chi2"),
dir = cms.string("TrackParameters/highPurityTracks/pt_1/GeneralProperties"),
name = cms.string("GoodTrackChi2oNDF_"),
name = cms.string("TrackChi2oNDF_"),
),
cms.PSet(
QT = cms.string("RecHits"),
dir = cms.string("TrackParameters/highPurityTracks/pt_1/HitProperties"),
name = cms.string("GoodTrackNumberOfRecHitsPerTrack_"),
name = cms.string("TrackNumberOfRecHitsPerTrack_"),
),
cms.PSet(
QT = cms.string("Seed"),
Expand All @@ -31,21 +31,21 @@
cms.PSet(
QT = cms.string("Rate"),
LSdir = cms.string("TrackParameters/highPurityTracks/pt_1/GeneralProperties/LSanalysis"),
LSname = cms.string("NumberOfGoodTracks_lumiFlag_"),
LSname = cms.string("NumberOfTracks_lumiFlag_"),
LSlowerCut = cms.double( 1.0 ),
LSupperCut = cms.double( 1000.0 )
),
cms.PSet(
QT = cms.string("Chi2"),
LSdir = cms.string("TrackParameters/highPurityTracks/pt_1/GeneralProperties/LSanalysis"),
LSname = cms.string("GoodTrackChi2oNDF_lumiFlag_"),
LSname = cms.string("TrackChi2oNDF_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_"),
LSname = cms.string("TrackNumberOfRecHitsPerTrack_lumiFlag_"),
LSlowerCut = cms.double( 5.0 ),
LSupperCut = cms.double( 20.0 )
),
Expand Down
13 changes: 13 additions & 0 deletions DQM/TrackingMonitorClient/test/loader.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<html>
<head>

<title> TrackingAnalyser MAIN</title>

<script type="text/javascript" language="JavaScript">
var url = window.location.href;
var arr = url.split('/urn');
var newurl = arr[0]+ '/temporary/Online.html';
window.location=newurl;
</script>
</head>
</html>

0 comments on commit 2229f54

Please sign in to comment.