Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Pixel MergedDeadROCOccupancy Maps to TkMap script and FPix panel bug patch (backport to 10_1_X of #23339) #23367

Merged
merged 1 commit into from Jun 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions DQM/SiStripMonitorClient/bin/moduleOccupancyPlots.cc
Expand Up @@ -112,6 +112,7 @@ int main(int argc, char *argv[]) {
th_summary->AddBinContent(i, hist->GetBinContent(i));
TotalDigis += hist->GetBinContent(i);
}
hist->SetLineColor(2);
if (imagePrint) printPlot(hist,prefix,postfix);
hist->Write();
} else {
Expand Down
7 changes: 6 additions & 1 deletion DQM/SiStripMonitorClient/data/index_template_TKMap.html
Expand Up @@ -40,6 +40,10 @@ <H1>Analysis of run RunNumber </H1>
<LI><A href="NumberValidHits.png">SiStrip Number of Valid hits per module</a>
<LI><A href="StoNCorrOnTrack.png">SiStrip Mean value for S/N for on-track cluster corrected for the angle</a>
<LI><A href="ChargePerCMfromTrack.png">SiStrip Mean value for Cluster Charge per cm from Track</a>
<LI><A href="ClusterWidthOnTrack.png"> Average cluster width on-track</a>
<LI><A href="ClusterWidthOffTrack.png"> Average cluster width off-track</a>
<LI><A href="NoiseOnTrack.png"> Average cluster noise on-track</a>
<LI><A href="NoiseOffTrack.png"> Average cluster noise off-track</a>
<LI><A href="ResidualsMean.png">SiStrip Residuals Mean</a>
<LI><A href="ResidualsRMS.png">SiStrip Residuals RMS</a>
<LI><A href="MergedBadComponentsTkMap.png">SiStrip Merged Bad components (PCL + FED Err + Cabling) TkMap</a>
Expand Down Expand Up @@ -75,7 +79,8 @@ <H1>Analysis of run RunNumber </H1>
<LI><A href="PixZeroOccROCs_runRunNumber.txt">Pixel dead ROCS</a>
<LI><A href="inefficientDPixelColumns.txt">Pixel List of Inefficient Double Columns</a>
<LI><A href="noisyPixelColumns.txt">Pixel List of Noisy Double Columns</a>
<LI> Dead ROC Maps</a> (<A href="PXBarrel_Layer1_coded.png"> Dead ROC Map Bpix L1</a>,<A href="PXBarrel_Layer2_coded.png"> Dead ROC Map Bpix L2</a>,<A href="PXBarrel_Layer3_coded.png"> Dead ROC Map Bpix L3</a>,<A href="PXBarrel_Layer4_coded.png"> Dead ROC Map Bpix L4</a>,<A href="PXForward_Ring1_coded.png"> Dead ROC Map Fpix R1</a>,<A href="PXForward_Ring2_coded.png"> Dead ROC Map Fpix R2</a>,)
<LI> Dead ROC Maps</a> (<A href="PXBarrel_Layer1_coded.png"> Dead ROC Map Bpix L1</a>,<A href="PXBarrel_Layer2_coded.png"> Dead ROC Map Bpix L2</a>,<A href="PXBarrel_Layer3_coded.png"> Dead ROC Map Bpix L3</a>,<A href="PXBarrel_Layer4_coded.png"> Dead ROC Map Bpix L4</a>,<A href="PXForward_Ring1_coded.png"> Dead ROC Map Fpix R1</a>,<A href="PXForward_Ring2_coded.png"> Dead ROC Map Fpix R2</a>)
<LI> Merged Dead ROC and Occupancy Maps</a> (<A href="MergedOccupancyDeadROC_BPix_Layer1_TBM.png"> Map Bpix L1</a>,<A href="MergedOccupancyDeadROC_BPix_Layer2_TBM.png"> Map Bpix L2</a>,<A href="MergedOccupancyDeadROC_BPix_Layer3_TBM.png"> Map Bpix L3</a>,<A href="MergedOccupancyDeadROC_BPix_Layer4_TBM.png"> Map Bpix L4</a>,<A href="MergedOccupancyDeadROC_FPix_Ring1_TBM.png"> Map Fpix R1</a>,<A href="MergedOccupancyDeadROC_FPix_Ring2_TBM.png"> Map Fpix R2</a>)
<LI><A href="DeadROC_Diff.txt"> Dead ROC during the run list</a> (<A href="DeadROC_offline.txt"> Dead ROC list at Beginging of the Run</a>,<A href="DeadROC_online.txt"> Dead ROC list at End of the Run</a>)

<!-- <LI><A href="Certification_run_RunNumber.png">Certification per LS - plot</a>
Expand Down
33 changes: 19 additions & 14 deletions DQM/SiStripMonitorClient/data/index_template_TKMap_cosmics.html
Expand Up @@ -24,22 +24,26 @@ <H1>Analysis of run RunNumber </H1>
<HEAD>
<subtitle><b>SiStrip</b> </title>
</HEAD>
<LI><A href="QTestAlarm.png">SiStrp Modules which are BAD from quality tests</a> (<A href="QTestAlarm_fed.png">FED view</a>, <A href="fedmap.html">interactive</a>) (<A href="QTestAlarm_psu.png">SiStrp PSU view</a>, <A href="psumap.html">interactive</a>)
<LI><A href="QualityTest_runRunNumber.txt">SiStrp List of Modules which are BAD from quality tests</a>
(<A href="QualityTestOBSOLETE_runRunNumber.txt">SiStrp obsolete version</a>)
<LI><A href="QTestAlarm.png">SiStrip Modules which are BAD from quality tests</a> (<A href="QTestAlarm_fed.png">FED view</a>, <A href="fedmap.html">interactive</a>) (<A href="QTestAlarm_psu.png">SiStrip PSU view</a>, <A href="psumap.html">interactive</a>)
<LI><A href="QualityTest_runRunNumber.txt">SiStrip List of Modules which are BAD from quality tests</a>
(<A href="QualityTestOBSOLETE_runRunNumber.txt">SiStrip obsolete version</a>)
<!-- <LI><A href="ModuleDifference_RunNumber.txt">Difference in the list of bad modules compared with previous run - text</a> -->
<LI><A href="FractionOfBadChannels.png">SiStrp FED errors per modules</a>
<LI><A href="NumberOfDigi.png">SiStrp Mean Number of digis per module</a>
<LI><A href="NumberOfCluster.png">SiStrp Mean Number of clusters per module</a>
<LI><A href="NApvShots.png">SiStrp Number of APV shots per module</a>
<LI><A href="FractionOfBadChannels.png">SiStrip FED errors per modules</a>
<LI><A href="NumberOfDigi.png">SiStrip Mean Number of digis per module</a>
<LI><A href="NumberOfCluster.png">SiStrip Mean Number of clusters per module</a>
<LI><A href="NApvShots.png">SiStrip Number of APV shots per module</a>
<!-- <LI><A href="MedianChargeApvShots.png">Median charge for Apv Shots per module</a> -->
<LI><A href="NumberOfOnTrackCluster.png">SiStrp Number of clusters on-track per module</a>
<LI><A href="NumberOfOfffTrackCluster.png">SiStrp Number of clusters off-track per module</a> (<A href="NumberOfOfffTrackCluster_autoscale.png">automatic scale</a>)
<LI><A href="NumberInactiveHits.png">SiStrp Number of Inactive hits per module</a>
<LI><A href="NumberMissingHits.png">SiStrp Number of Missing hits per module</a>
<LI><A href="NumberValidHits.png">SiStrp Number of Valid hits per module</a>
<LI><A href="StoNCorrOnTrack.png">SiStrp Mean value for S/N for on-track cluster corrected for the angle</a>
<LI><A href="ChargePerCMfromTrack.png">SiStrp Mean value for Cluster Charge per cm from Track</a>
<LI><A href="NumberOfOnTrackCluster.png">SiStrip Number of clusters on-track per module</a>
<LI><A href="NumberOfOfffTrackCluster.png">SiStrip Number of clusters off-track per module</a> (<A href="NumberOfOfffTrackCluster_autoscale.png">automatic scale</a>)
<LI><A href="NumberInactiveHits.png">SiStrip Number of Inactive hits per module</a>
<LI><A href="NumberMissingHits.png">SiStrip Number of Missing hits per module</a>
<LI><A href="NumberValidHits.png">SiStrip Number of Valid hits per module</a>
<LI><A href="StoNCorrOnTrack.png">SiStrip Mean value for S/N for on-track cluster corrected for the angle</a>
<LI><A href="ChargePerCMfromTrack.png">SiStrip Mean value for Cluster Charge per cm from Track</a>
<LI><A href="ClusterWidthOnTrack.png"> Average cluster width on-track</a>
<LI><A href="ClusterWidthOffTrack.png"> Average cluster width off-track</a>
<LI><A href="NoiseOnTrack.png"> Average cluster noise on-track</a>
<LI><A href="NoiseOffTrack.png"> Average cluster noise off-track</a>
<LI><A href="ResidualsMean.png">SiStrip Residuals Mean</a>
<LI><A href="ResidualsRMS.png">SiStrip Residuals RMS</a>
<LI><A href="MergedBadComponentsTkMap.png">SiStrip Merged Bad components (PCL + FED Err + Cabling) TkMap</a>
Expand Down Expand Up @@ -73,6 +77,7 @@ <H1>Analysis of run RunNumber </H1>
<LI><A href="inefficientDPixelColumns.txt">Pixel List of Inefficient Double Columns</a>
<LI><A href="noisyPixelColumns.txt">Pixel List of Noisy Double Columns</a>
<LI> Dead ROC Maps</a> (<A href="PXBarrel_Layer1_coded.png"> Dead ROC Map Bpix L1</a>,<A href="PXBarrel_Layer2_coded.png"> Dead ROC Map Bpix L2</a>,<A href="PXBarrel_Layer3_coded.png"> Dead ROC Map Bpix L3</a>,<A href="PXBarrel_Layer4_coded.png"> Dead ROC Map Bpix L4</a>,<A href="PXForward_Ring1_coded.png"> Dead ROC Map Fpix R1</a>,<A href="PXForward_Ring2_coded.png"> Dead ROC Map Fpix R2</a>)
<LI> Merged Dead ROC and Occupancy Maps</a> (<A href="MergedOccupancyDeadROC_BPix_Layer1_TBM.png"> Map Bpix L1</a>,<A href="MergedOccupancyDeadROC_BPix_Layer2_TBM.png"> Map Bpix L2</a>,<A href="MergedOccupancyDeadROC_BPix_Layer3_TBM.png"> Map Bpix L3</a>,<A href="MergedOccupancyDeadROC_BPix_Layer4_TBM.png"> Map Bpix L4</a>,<A href="MergedOccupancyDeadROC_FPix_Ring1_TBM.png"> Map Fpix R1</a>,<A href="MergedOccupancyDeadROC_FPix_Ring2_TBM.png"> Map Fpix R2</a>)
<LI><A href="DeadROC_Diff.txt"> Dead ROC during the run list</a> (<A href="DeadROC_offline.txt"> Dead ROC list at Beginging of the Run</a>,<A href="DeadROC_online.txt"> Dead ROC list at End of the Run</a>)


Expand Down
4 changes: 2 additions & 2 deletions DQM/SiStripMonitorClient/scripts/DeadROC_duringRun.py
Expand Up @@ -168,8 +168,8 @@ def FPIX_list(inputFile):

pnl=0

if ((j-1)%4==0 or (j-1)%4==1): pnl=1
if ((j-1)%4==2 or (j-1)%4==3): pnl=2
if ((j-1)%4==0 or (j-1)%4==1): pnl=2
if ((j-1)%4==2 or (j-1)%4==3): pnl=1

if (disk < 0 and bld <0):

Expand Down