Skip to content

Commit

Permalink
Merge pull request #13560 from rrabadan/StoN-mod-highest-val-81
Browse files Browse the repository at this point in the history 
StoN in module highest values
  • Loading branch information
@cmsbuild
cmsbuild committed Mar 8, 2016
2 parents 9f34dc0 + 0249733 commit 70c8031
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 7 deletions.
6 changes: 6 additions & 0 deletions DQM/SiStripMonitorClient/data/index_template_TKMap.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ <H1>Analysis of run RunNumber </H1>
<LI><A href="NumberOfOnTrackCluster.png">Number of clusters on-track per module</a>
<LI><A href="NumberOfOfffTrackCluster.png">Number of clusters off-track per module</a> (<A href="NumberOfOfffTrackCluster_autoscale.png">automatic scale</a>)
<LI><A href="StoNCorrOnTrack.png">Mean value for S/N for on-track cluster corrected for the angle</a>
<LI><A href="ClusterCharge.png">Cluster charge per module</a>
<LI><A href="ChargePerCMfromOrigin.png">Cluster charge per cm from origin per module</a>
<LI><A href="ChargePerCMfromTrack.png">Cluster charge per cm from track per module</a>
<LI><A href="NumberValidHits.png">Number of valid hits per module</a>
<LI><A href="NumberMissingHits.png">Number of missing hits per module</a>
<LI><A href="NumberInactiveHits.png">Number of inactive hits per module</a>
<LI><A href="PCLBadComponents.png">Fraction of bad components per module found by the prompt calibration loop</a>
<LI><A href="PCLBadComponents_Run_RunNumber.png">Type of bad components per module found by the prompt calibration loop</a>
<LI><A href="PCLBadComponents.log">List of bad components found by the prompt calibration loop</a>
Expand Down
6 changes: 6 additions & 0 deletions DQM/SiStripMonitorClient/data/index_template_TKMap_cosmics.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ <H1>Analysis of run RunNumber </H1>
<LI><A href="NumberOfOnTrackCluster.png">Number of clusters on-track per module</a>
<LI><A href="NumberOfOfffTrackCluster.png">Number of clusters off-track per module</a> (<A href="NumberOfOfffTrackCluster_autoscale.png">automatic scale</a>)
<LI><A href="StoNCorrOnTrack.png">Mean value for S/N for on-track cluster corrected for the angle</a>
<LI><A href="ClusterCharge.png">Cluster charge per module</a>
<LI><A href="ChargePerCMfromOrigin.png">Cluster charge per cm from origin per module</a>
<LI><A href="ChargePerCMfromTrack.png">Cluster charge per cm from track per module</a>
<LI><A href="NumberValidHits.png">Number of valid hits per module</a>
<LI><A href="NumberMissingHits.png">Number of missing hits per module</a>
<LI><A href="NumberInactiveHits.png">Number of inactive hits per module</a>
<LI><A href="PCLBadComponents.png">Fraction of bad components per module found by the prompt calibration loop</a>
<LI><A href="PCLBadComponents_Run_RunNumber.png">Type of bad components per module found by the prompt calibration loop</a>
<LI><A href="PCLBadComponents.log">List of bad components found by the prompt calibration loop</a>
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorClient/interface/SiStripTrackerMapCreator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class SiStripTrackerMapCreator {
void setTkMapRangeOffline();
uint16_t getDetectorFlagAndComment(DQMStore* dqm_store, uint32_t det_id, const TrackerTopology* tTopo, std::ostringstream& comment);
void printBadModuleList(std::map<unsigned int,std::string>* badmodmap, const edm::EventSetup& eSetup);
void printTopModules(std::vector<std::pair<float,uint32_t> >* topNmodVec, const edm::EventSetup& eSetup);
void printTopModules(std::vector<std::pair<float,uint32_t> >* topNmodVec, const edm::EventSetup& eSetup, std::string& htype);


TrackerMap* trackerMap_;
Expand Down
16 changes: 12 additions & 4 deletions DQM/SiStripMonitorClient/src/SiStripTrackerMapCreator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,11 +410,11 @@ void SiStripTrackerMapCreator::setTkMapFromHistogram(DQMStore* dqm_store, std::s
dqm_store->cd(mechanicalview_dir);
}
dqm_store->cd();
if (topModules) printTopModules(topNmodVec, eSetup);
if (topModules) printTopModules(topNmodVec, eSetup, htype);
delete topNmodVec;
}

void SiStripTrackerMapCreator::printTopModules(std::vector<std::pair<float,uint32_t> >* topNmodVec, const edm::EventSetup& eSetup){
void SiStripTrackerMapCreator::printTopModules(std::vector<std::pair<float,uint32_t> >* topNmodVec, const edm::EventSetup& eSetup, std::string& htype){

//////////////Retrieve tracker topology from geometry
//edm::ESHandle<TrackerTopology> tTopoHandle;
Expand All @@ -426,8 +426,16 @@ void SiStripTrackerMapCreator::printTopModules(std::vector<std::pair<float,uint3

if (topNmodVec->empty()) return;

std::sort(topNmodVec->rbegin(), topNmodVec->rend());
if (topNmodVec->size() > numTopModules) topNmodVec->resize(numTopModules);
if (htype == "StoNCorrOnTrack") {
topModLabel += " less than 10";
std::sort(topNmodVec->begin(), topNmodVec->end());
while ((topNmodVec->back()).first > 10)
topNmodVec->pop_back();
}
else{
std::sort(topNmodVec->rbegin(), topNmodVec->rend());
if (topNmodVec->size() > numTopModules) topNmodVec->resize(numTopModules);
}

edm::LogVerbatim("TopModules") << topModLabel;
edm::LogVerbatim("TopModules") << "------------------------------------------------------";
Expand Down
4 changes: 2 additions & 2 deletions DQM/SiStripMonitorClient/test/SiStripDQM_OfflineTkMap_Template_cfg_DB.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@
cms.PSet(mapName=cms.untracked.string('NumberOfOfffTrackCluster'),TopModules=cms.untracked.bool(True)),
cms.PSet(mapName=cms.untracked.string('NumberOfOfffTrackCluster'),mapSuffix=cms.untracked.string("_autoscale"),mapMax=cms.untracked.double(-1.)),
cms.PSet(mapName=cms.untracked.string('NumberOfOnTrackCluster')),
cms.PSet(mapName=cms.untracked.string('StoNCorrOnTrack')),
cms.PSet(mapName=cms.untracked.string('StoNCorrOnTrack'),TopModules=cms.untracked.bool(True)),
cms.PSet(mapName=cms.untracked.string('NApvShots'),mapMax=cms.untracked.double(-1.),logScale=cms.untracked.bool(True)),
cms.PSet(mapName=cms.untracked.string('NApvShots'),logScale=cms.untracked.bool(True),psuMap=cms.untracked.bool(True),loadLVCabling=cms.untracked.bool(True),TopModules=cms.untracked.bool(True)),
cms.PSet(mapName=cms.untracked.string('NApvShots'),mapMax=cms.untracked.double(-1.),logScale=cms.untracked.bool(True),psuMap=cms.untracked.bool(True),loadLVCabling=cms.untracked.bool(True),TopModules=cms.untracked.bool(True)),
# cms.PSet(mapName=cms.untracked.string('MedianChargeApvShots'),mapMax=cms.untracked.double(-1.)),
# cms.PSet(mapName=cms.untracked.string('ClusterCharge'),mapMax=cms.untracked.double(-1.)),
# cms.PSet(mapName=cms.untracked.string('ChargePerCMfromOrigin')),
Expand Down

0 comments on commit 70c8031

Please sign in to comment.