diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthClusterMonAlgCfg.py b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthClusterMonAlgCfg.py
index 2736a14aec74ae2d0d5a1fd1cc0efdd32699fae7..e36e202417a2b5b83724f25a3a4c7ee8dd638467 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthClusterMonAlgCfg.py
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthClusterMonAlgCfg.py
@@ -25,23 +25,23 @@ def PixelAthClusterMonAlgCfg(helper, alg, **kwargs):
path = '/Pixel/Status/'
pathLowStat = '/Pixel/LumiBlock/'
- histoGroupName = 'Map_Of_Modules_Status'
- title = 'Modules Status (0=Active+Good 1=Active+Bad 2=Inactive)'
+ histoGroupName = 'MapOfModulesStatus'
+ title = 'Modules Status (0=Active+Good, 1=Active+Bad, 2=Inactive)'
define2DProfHist(helper, alg, histoGroupName, title, path, type='TProfile2D')
- title = 'Modules Status Reset (0=Active+Good 1=Active+Bad 2=Inactive)'
- define2DProfHist(helper, alg, histoGroupName, title, path, type='TProfile2D', zmin=0, zmax=2, opt='kLBNHistoryDepth=2', histname='Map_Of_Modules_Status_Mon')
+ title = 'Modules Status Reset (0=Active+Good, 1=Active+Bad, 2=Inactive)'
+ define2DProfHist(helper, alg, histoGroupName, title, path, type='TProfile2D', zmin=0, zmax=2, opt='kLBNHistoryDepth=2', histname='MapOfModulesStatusMon')
if doLumiBlock:
- title = 'Modules Status (0=Active+Good 1=Active+Bad 2=Inactive)'
- define2DProfHist(helper, alg, histoGroupName, title, pathLowStat, type='TProfile2D', lifecycle='lumiblock', histname='Map_Of_Modules_Status_LB')
+ title = 'Modules Status (0=Active+Good, 1=Active+Bad, 2=Inactive)'
+ define2DProfHist(helper, alg, histoGroupName, title, pathLowStat, type='TProfile2D', lifecycle='lumiblock', histname='MapOfModulesStatusLB')
- histoGroupName = 'BadModules_per_lumi'
+ histoGroupName = 'BadModulesPerLumi'
title = 'Number of bad modules (bad+active) per event per LB'
yaxistext = ';# modules/event'
define1DProfLumiLayers(helper, alg, histoGroupName, title, path, yaxistext, type='TProfile')
- histoGroupName = 'DisabledModules_per_lumi'
+ histoGroupName = 'DisabledModulesPerLumi'
title = 'Number of disabled modules per event per LB'
yaxistext = ';# modules/event'
define1DProfLumiLayers(helper, alg, histoGroupName, title, path, yaxistext, type='TProfile')
@@ -51,19 +51,19 @@ def PixelAthClusterMonAlgCfg(helper, alg, **kwargs):
path = '/Pixel/TrackOnTrack/'
pathLowStat = '/Pixel/LumiBlockOnTrack/'
- histoGroupName = 'TSOS_Measurement'
+ histoGroupName = 'TSOSMeasurement'
title = 'TSOS of type Measurement'
define2DProfHist(helper, alg, histoGroupName, title, path, type='TH2F')
- histoGroupName = 'TSOS_Hole'
+ histoGroupName = 'TSOSHole'
title = 'TSOS of type Hole'
define2DProfHist(helper, alg, histoGroupName, title, path, type='TH2F')
- histoGroupName = 'TSOS_Outlier'
+ histoGroupName = 'TSOSOutlier'
title = 'TSOS of type Outlier'
define2DProfHist(helper, alg, histoGroupName, title, path, type='TH2F')
- histoGroupName = 'HitEff_all'
+ histoGroupName = 'HitEffAll'
title = 'hit efficiency'
yaxistext = ';hit efficiency'
define1DProfLumiLayers(helper, alg, histoGroupName, title, path, yaxistext, type='TProfile')
@@ -79,45 +79,45 @@ def PixelAthClusterMonAlgCfg(helper, alg, **kwargs):
trackGroup = helper.addGroup(alg, 'Track')
varName = 'res_phi'
title = fullDressTitle('Pixel Residual LocX(phi)', False, ';Residual LocX(phi)',';# measurements on track')
- varName += ';Track_res_phi'
+ varName += ';TrackResPhi'
trackGroup.defineHistogram(varName,
type='TH1F', path=path, title=title,
xbins=100, xmin=-0.1, xmax=0.1)
varName = 'res_eta'
title = fullDressTitle('Pixel Residual LocY(eta)', False, ';Residual LocY(eta)',';# measurements on track')
- varName += ';Track_res_eta'
+ varName += ';TrackResEta'
trackGroup.defineHistogram(varName,
type='TH1F', path=path, title=title,
xbins=100, xmin=-0.3, xmax=0.3)
varName = 'pull_phi'
title = fullDressTitle('Pixel Pull LocX(phi)', False, ';Pull LocX(phi)',';# measurements on track')
- varName += ';Track_pulls_phi'
+ varName += ';TrackPullsPhi'
trackGroup.defineHistogram(varName,
type='TH1F', path=path, title=title,
xbins=100, xmin=-1.2, xmax=1.2)
varName = 'pull_eta'
title = fullDressTitle('Pixel Pull LocY(eta)', False, ';Pull LocY(eta)',';# measurements on track')
- varName += ';Track_pulls_eta'
+ varName += ';TrackPullsEta'
trackGroup.defineHistogram(varName,
type='TH1F', path=path, title=title,
xbins=100, xmin=-2.0, xmax=2.0)
varName = 'fit_chi2byndf'
title = fullDressTitle('chi2/ndf of track', False, ';#chi^{2}/DoF',';# of tracks')
- varName += ';Track_chi2byndf'
+ varName += ';TrackChi2byNDF'
trackGroup.defineHistogram(varName,
type='TH1F', path=path, title=title,
xbins=50, xmin=-0., xmax=10.0)
varName = 'pixclusmontool_lb,ntrks_per_event'
title = fullDressTitle('Number of tracks per event per LB', False, ';lumi block', ';tracks/event')
- varName += ';tracksPerEvt_per_lumi'
+ varName += ';tracksPerEvtPerLumi'
trackGroup.defineHistogram(varName,
type='TProfile', path=path, title=title,
xbins=lumibinsx, xmin=-0.5, xmax=-0.5+lumibinsx)
varName = 'pixclusmontool_lb,npixhits_per_track'
title = fullDressTitle('Number of pixhits per track per LB', False, ';lumi block', ';number of hits')
- varName += ';NPixhits_per_track_lumi'
+ varName += ';NPixHitsPerTrackPerLumi'
trackGroup.defineHistogram(varName,
type='TH2F', path=path, title=title, weight='npixhits_per_track_wgt',
xbins=lumibinsx, xmin=-0.5, xmax=-0.5+lumibinsx,
@@ -126,17 +126,17 @@ def PixelAthClusterMonAlgCfg(helper, alg, **kwargs):
if doOnline:
varName = 'pixclusmontool_lb,npixhits_per_track'
title = fullDressTitle('Number of pixhits per track per LB for last 100LB', False, ';lumi block', ';number of hits')
- varName += ';NPixhits_per_track_lumi_last100LB'
+ varName += ';NPixHitsPerTrackPerLumiLast100LB'
trackGroup.defineHistogram(varName,
type='TH2F', path=path, title=title, weight='npixhits_per_track_wgt',
xbins=lumibinsx, xmin=-0.5, xmax=-0.5+lumibinsx,
ybins=10, ymin=-0.5, ymax=9.5, opt='kLBNHistoryDepth=100')
- histoGroupName = 'HolesRatio_5min'
+ histoGroupName = 'HolesRatio5min'
title = 'Holes per track reset every 5 min'
define2DProfHist(helper, alg, 'HolesRatio', title, path, type='TProfile2D', zmin=0, zmax=1.1, opt='kLBNHistoryDepth=5', histname=histoGroupName)
- histoGroupName = 'MissHitsRatio_5min'
+ histoGroupName = 'MissHitsRatio5min'
title = 'Hole+Outlier per track reset every 5 min'
define2DProfHist(helper, alg, 'MissHitsRatio', title, path, type='TProfile2D', zmin=0, zmax=1.1, opt='kLBNHistoryDepth=5', histname=histoGroupName)
@@ -153,28 +153,28 @@ def PixelAthClusterMonAlgCfg(helper, alg, **kwargs):
for ontrack in True,False:
pathGroup = addOnTrackToPath(pathTiming, ontrack)
varName = 'Cluster_LVL1A_lvl1a'
- title = fullDressTitle('Cluster Level 1 Accept', ontrack, ';LVL1A',';# clusters/event')
- varName += ';'+ addOnTrackTxt('Cluster_LVL1A', ontrack)
+ title = fullDressTitle('Cluster Level 1 Accept', ontrack, ';LVL1A',';# clusters')
+ varName += ';'+ addOnTrackTxt('ClusterLVL1A', ontrack)
clusterGroup[ontrack].defineHistogram(varName,
type='TH1F', path=pathGroup, title=title,
xbins=14, xmin=-1.5, xmax=12.5)
- histoGroupName = addOnTrackTxt('Cluster_LVL1A_Mod', ontrack)
+ histoGroupName = addOnTrackTxt('ClusterLVL1AMod', ontrack)
title = addOnTrackTxt('Average cluster Level 1 Accept', ontrack, True)
define2DProfHist(helper, alg, histoGroupName, title, pathGroup, type='TProfile2D')
- histoGroupName = addOnTrackTxt('Cluster_LVL1A_SizeCut', ontrack)
+ histoGroupName = addOnTrackTxt('ClusterLVL1ASizeCut', ontrack)
title = addOnTrackTxt('Average Size>1 Cluster Level 1 Accept', ontrack, True)
define2DProfHist(helper, alg, histoGroupName, title, pathGroup, type='TProfile2D')
varName = 'Cluster_LVL1A_lvl1a' # re-using same variable
- histoGroupName = addOnTrackTxt('Cluster_LVL1A_ToTCut', ontrack)
+ histoGroupName = addOnTrackTxt('ClusterLVL1AToTCut', ontrack)
xaxistext = ';LVL1A'
yaxistext = ';# clusters/event'
for idx, layer in enumerate(layers):
groupname = histoGroupName + '_{0}'.format(layer)
title = addOnTrackTxt('Cluster Level 1 Accept with ToT > {0}'.format(totcuts[idx]), ontrack, True)
- fulltitle = title + ' {0}'.format(layer) + runtext + xaxistext + yaxistext
+ fulltitle = title + ', {0}'.format(layer) + runtext + xaxistext + yaxistext
layerGroup = helper.addGroup(alg, groupname)
fullvarstring = varName + ';' + groupname
layerGroup.defineHistogram(fullvarstring,
@@ -186,22 +186,22 @@ def PixelAthClusterMonAlgCfg(helper, alg, **kwargs):
###
if ontrack:
pathGroup = addOnTrackToPath(path, ontrack)
- var1Name = addOnTrackTxt('Cluster_Size', ontrack) + '_em'
- var2Name = addOnTrackTxt('Cluster_Size', ontrack) + '_clsize'
- histoGroupName = addOnTrackTxt('Cluster_groupsize_vs_eta', ontrack)
+ var1Name = addOnTrackTxt('ClusterSize', ontrack) + '_em'
+ var2Name = addOnTrackTxt('ClusterSize', ontrack) + '_clsize'
+ histoGroupName = addOnTrackTxt('ClusterGroupsizeVsEta', ontrack)
xaxistext = ';Module eta index'
yaxistext = ';# pixels/cluster'
title = addOnTrackTxt('Number of pixels per cluster vs eta', ontrack, True)
for idx, layer in enumerate(layers):
groupname = histoGroupName + '_{0}'.format(layer)
- fulltitle = title + ' {0}'.format(layer) + runtext + xaxistext + yaxistext
+ fulltitle = title + ', {0}'.format(layer) + runtext + xaxistext + yaxistext
layerGroup = helper.addGroup(alg, groupname)
fullvarstring = var1Name + ',' + var2Name + ';' + groupname
layerGroup.defineHistogram(fullvarstring,
type='TProfile', path=pathGroup, title=fulltitle,
xbins=xbinsem[idx], xmin=xminsem[idx], xmax=xminsem[idx]+xbinsem[idx])
- histoGroupName = addOnTrackTxt('Cluster_Size_Map', ontrack)
+ histoGroupName = addOnTrackTxt('ClusterSizeMap', ontrack)
title = addOnTrackTxt('Average cluster size map', ontrack, True)
define2DProfHist(helper, alg, histoGroupName, title, pathGroup, type='TProfile2D')
@@ -212,13 +212,13 @@ def PixelAthClusterMonAlgCfg(helper, alg, **kwargs):
pathGroup = addOnTrackToPath(path, ontrack)
varName = 'pixclusmontool_lb,ncls_per_event'
- title = fullDressTitle('Average number of pixel clusters per event per LB', ontrack, ';lumi block', ';clusters/event')
- varName += ';'+ addOnTrackTxt('Clusters_per_lumi', ontrack)
+ title = fullDressTitle('Average number of pixel clusters per event per LB', ontrack, ';lumi block', ';# clusters/event')
+ varName += ';'+ addOnTrackTxt('ClustersPerLumi', ontrack)
clusterGroup[ontrack].defineHistogram(varName,
type='TProfile', path=pathGroup, title=title,
xbins=lumibinsx, xmin=-0.5, xmax=-0.5+lumibinsx)
- histoGroupName = addOnTrackTxt('Clusters_per_lumi', ontrack)
+ histoGroupName = addOnTrackTxt('ClustersPerLumi', ontrack)
title = addOnTrackTxt('Average number of pixel clusters per event per LB', ontrack, True)
yaxistext = ';# clusters/event'
define1DProfLumiLayers(helper, alg, histoGroupName, title, pathGroup, yaxistext, type='TProfile')
@@ -226,19 +226,19 @@ def PixelAthClusterMonAlgCfg(helper, alg, **kwargs):
if ontrack:
varName = 'pixclusmontool_lb,cls_frac_ontrack'
title = fullDressTitle('Fraction pixel clusters on track per event per LB', False, ';lumi block', ';fraction clusters/event')
- varName += ';ClustersOnOffTrack_per_lumi'
+ varName += ';ClustersOnOffTrackPerLumi'
clusterGroup[ontrack].defineHistogram(varName,
type='TProfile', path=pathGroup, title=title,
xbins=lumibinsx, xmin=-0.5, xmax=-0.5+lumibinsx)
- histoGroupName = 'num_clusters_per_track_per_lumi'
+ histoGroupName = 'NumClustersPerTrackPerLumi'
title = addOnTrackTxt('Number of pixel clusters per track per event', ontrack, True)
yaxistext = ';avg #clusters/track/event'
define1DProfLumiLayers(helper, alg, histoGroupName, title, pathGroup, yaxistext, type='TProfile')
if doOnline:
- histoGroupName = addOnTrackTxt('ClusterMap_Mon', ontrack)
+ histoGroupName = addOnTrackTxt('ClusterMapMon', ontrack)
title = addOnTrackTxt('Cluster map for monitoring', ontrack, True)
define2DProfHist(helper, alg, histoGroupName, title, pathGroup, type='TH2D', zmin=0, zmax=1e4, opt='kLBNHistoryDepth=2') #FIXME zmax value w/ high stat
@@ -248,24 +248,24 @@ def PixelAthClusterMonAlgCfg(helper, alg, **kwargs):
###
pathGroup = addOnTrackToPath(path, ontrack)
- histoGroupName = addOnTrackTxt('Cluster_Occupancy', ontrack)
+ histoGroupName = addOnTrackTxt('ClusterOccupancy', ontrack)
title = addOnTrackTxt('Cluster occupancy', ontrack, True)
define2DProfHist(helper, alg, histoGroupName, title, pathGroup, type='TH2D')
- histoGroupName = addOnTrackTxt('Clus_Occ_SizeCut', ontrack)
+ histoGroupName = addOnTrackTxt('ClusOccSizeCut', ontrack)
title = addOnTrackTxt('Size>1 Cluster occupancy', ontrack, True)
define2DProfHist(helper, alg, histoGroupName, title, pathGroup, type='TH2D')
if ontrack:
- histoGroupName = addOnTrackTxt('Cluster_Occupancy_PP0', ontrack)
+ histoGroupName = addOnTrackTxt('ClusterOccupancyPP0', ontrack)
title = addOnTrackTxt('Average per module(FE) cluster occupancy reset every 5 min', ontrack, True)
definePP0Histos(helper, alg, histoGroupName, title, pathGroup, opt='kLBNHistoryDepth=5')
if doLumiBlock:
pathGroup = addOnTrackToPath(pathLowStat, ontrack)
- histoGroupName = addOnTrackTxt('Cluster_Occupancy_LB', ontrack)
- title = addOnTrackTxt('Cluster occupancy lowStat', ontrack, True)
- define2DProfHist(helper, alg, addOnTrackTxt('Cluster_Occupancy', ontrack), title, pathGroup, type='TH2D', lifecycle='lowStat', histname=histoGroupName)
+ histoGroupName = addOnTrackTxt('ClusterOccupancyLB', ontrack)
+ title = addOnTrackTxt('Cluster Occupancy', ontrack, True)
+ define2DProfHist(helper, alg, addOnTrackTxt('ClusterOccupancy', ontrack), title, pathGroup, type='TH2D', lifecycle='lowStat', histname=histoGroupName)
###
@@ -274,16 +274,16 @@ def PixelAthClusterMonAlgCfg(helper, alg, **kwargs):
###
if ontrack:
pathGroup = addOnTrackToPath(path, ontrack)
- histoGroupName = addOnTrackTxt('Cluster_ToTxCosAlpha', ontrack)
+ histoGroupName = addOnTrackTxt('ClusterToTxCosAlpha', ontrack)
title = addOnTrackTxt('Cluster ToTxCosAlpha', ontrack, True)
define1DLayers(helper, alg, histoGroupName, title, pathGroup, ';ToT [BC]', ';# clusters', xbins=[300], xmins=[-0.5])
if (not doOnline):
- histoGroupName = addOnTrackTxt('Cluster_QxCosAlpha', ontrack)
+ histoGroupName = addOnTrackTxt('ClusterQxCosAlpha', ontrack)
title = addOnTrackTxt('Cluster Q normalized', ontrack, True)
define1DLayers(helper, alg, histoGroupName, title, pathGroup, ';Charge [e]', ';# clusters', xbins=[70], xmins=[-0.5], binsizes=[3000.])
else:
title = addOnTrackTxt('Zoomed Cluster ToTxCosAlpha per LB', ontrack, True)
- defineMapVsLumiLayers(helper, alg, histoGroupName, title, pathGroup, ';lumi block', ';ToT [BC]', ybins=ztotbinsy, ymins=ztotminsy, histname='Zoomed_Cluster_ToTxCosAlpha_per_lumi')
+ defineMapVsLumiLayers(helper, alg, histoGroupName, title, pathGroup, ';lumi block', ';ToT [BC]', ybins=ztotbinsy, ymins=ztotminsy, histname='ZoomedClusterToTxCosAlphaPerLumi')
###
### end cluster ToT and charge
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthErrorMonAlgCfg.py b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthErrorMonAlgCfg.py
index 4533d2756024db169bedb16515e06c121cd5995d..76f0437bde7633a3517506fa305ee25fb52760d7 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthErrorMonAlgCfg.py
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthErrorMonAlgCfg.py
@@ -29,19 +29,19 @@ def PixelAthErrorMonAlgCfg(helper, alg, **kwargs):
errorGroup = helper.addGroup(alg, 'Error')
- histoGroupName = 'errors_per_lumi'
+ histoGroupName = 'ErrorsPerLumi'
title = 'Average Total Errors'
yaxistext = ';# errors/event'
define1DProfLumiLayers(helper, alg, histoGroupName, title, path, yaxistext, type='TProfile')
- histoGroupName = 'ErrorState_per_lumi'
+ histoGroupName = 'ErrorStatePerLumi'
title = 'Average Errors by Error States'
ylabels = [[i[1] for i in ErrStateLabelsFEI3]]*len(layers)
defineMapVsLumiLayers(helper, alg, histoGroupName, title, path, ';lumi block', ';error state', ybins=errbbinsy, ymins=errbminsy, binsizes=errbbsizy, ylabels=ylabels, type='TProfile2D', onlylayers=fei3layers)
ylabels = [[i[1] for i in ErrStateLabelsFEI4]]*len(layers)
defineMapVsLumiLayers(helper, alg, histoGroupName, title, path, ';lumi block', ';error state', ybins=errbbinsy, ymins=errbminsy, binsizes=errbbsizy, ylabels=ylabels, type='TProfile2D', onlylayers=fei4layers)
- histoGroupName = 'ErrorCatRODMod_per_lumi'
+ histoGroupName = 'ErrorCatRODModPerLumi'
title = 'Average Errors by Error Types'
ylabels = [[i[1] for i in ErrCatRODModLabels]]*len(layers)
defineMapVsLumiLayers(helper, alg, histoGroupName, title, path, ';lumi block', ';error type', ybins=errtbinsy, ymins=errbminsy, binsizes=errbbsizy, ylabels=ylabels, type='TProfile2D')
@@ -69,50 +69,50 @@ def PixelAthErrorMonAlgCfg(helper, alg, **kwargs):
title = "Average "+ErrCatLabels[i][1]+" per Module"
define1DProfLumiLayers(helper, alg, histoGroupName, title, path, yaxistext, type='TProfile')
- histoGroupName = "femcc_errorwords"
+ histoGroupName = "FEMCCErrorwords"
title = "Average FE/MCC Error Words"
define2DProfHist(helper, alg, histoGroupName, title, path, type='TProfile2D', onlylayers=fei3layers)
if doLumiBlock:
- histoGroupName = "Errors_LB"
+ histoGroupName = "ErrorsLB"
title = "Errors"
define2DProfHist(helper, alg, histoGroupName, title, pathLowStat, type='TH2F', doWeight=True, lifecycle='lowStat')
- histoGroupName = "Errors_ModSync_LB"
+ histoGroupName = "ErrorsModSyncLB"
title = "Errors_ModSync"
define2DProfHist(helper, alg, histoGroupName, title, pathLowStat, type='TH2F', lifecycle='lowStat')
- histoGroupName = "Errors_RODSync_LB"
+ histoGroupName = "ErrorsRODSyncLB"
title = "Errors_RODSync"
define2DProfHist(helper, alg, histoGroupName, title, pathLowStat, type='TH2F', lifecycle='lowStat')
for state in ErrStateLabelsFEI3:
- histoGroupName = state[0]+"_Map"
- title = state[1]+" per event per LB"
+ histoGroupName = state[0]+"Map"
+ title = state[1]+" Errors per event per LB"
define2DProfHist(helper, alg, histoGroupName, title, pathExpert, type='TH2F', doWeight=True)
- histoGroupName = state[0]+"_per_lumi"
- title = 'Average '+state[1]
- yaxistext = ';# errors/event'
+ histoGroupName = state[0]+"PerLumi"
+ title = 'Average '+state[1]+" Errors per event per LB"
+ yaxistext = ';# errors/module/event'
define1DProfLumiLayers(helper, alg, histoGroupName, title, pathExpert, yaxistext, type='TProfile', onlylayers=fei3layers)
for state in ErrStateLabelsFEI4:
- histoGroupName = state[0]+"_Map"
- title = state[1]+" per event per LB"
+ histoGroupName = state[0]+"Map"
+ title = state[1]+" Errors per event per LB"
define2DProfHist(helper, alg, histoGroupName, title, pathExpert, type='TH2F', doWeight=True)
- histoGroupName = state[0]+"_per_lumi"
- title = 'Average '+state[1]
- yaxistext = ';# errors/event'
+ histoGroupName = state[0]+"PerLumi"
+ title = 'Average '+state[1]+" Errors per event per LB"
+ yaxistext = ';# errors/module/event'
define1DProfLumiLayers(helper, alg, histoGroupName, title, pathExpert, yaxistext, type='TProfile', onlylayers=fei4layers)
varName = 'ServiceRecord_val'
- title = fullDressTitle('IBL ServiceRecord Unweighted', False, ';SR',';# errors/event')
- varName += ';ServiceRecord_Unweighted_IBL'
+ title = fullDressTitle('IBL ServiceRecord Unweighted', False, ';SR',';# errors')
+ varName += ';ServiceRecordUnweighted_IBL'
errorGroup.defineHistogram(varName,
type='TH1F', path=pathExpert, title=title,
xbins=32, xmin=-0.5, xmax=31.5)
varName = 'ServiceRecord_val'
- title = fullDressTitle('IBL ServiceRecord Weighted with Payload', False, ';SR',';# errors/event')
- varName += ';ServiceRecord_Weighted_IBL'
+ title = fullDressTitle('IBL ServiceRecord Weighted with Payload', False, ';SR',';# errors')
+ varName += ';ServiceRecordWeighted_IBL'
errorGroup.defineHistogram(varName, weight='ServiceRecord_wgt',
type='TH1F', path=pathExpert, title=title,
xbins=32, xmin=-0.5, xmax=31.5)
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthHitMonAlgCfg.py b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthHitMonAlgCfg.py
index 50ada6a7aca435744c58ec382f90832fac296204..cfa7f401ddbf19609a3881c35728326f76ef8cd3 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthHitMonAlgCfg.py
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthHitMonAlgCfg.py
@@ -32,29 +32,29 @@ def PixelAthHitMonAlgCfg(helper, alg, **kwargs):
hitGroup = helper.addGroup(alg, 'Hit')
varName = 'pixhitsmontool_lb,nhits_per_event'
- title = fullDressTitle('Average number of pixel hits per event per LB', ontrack, ';lumi block', ';hits/event')
- varName += ';'+ addOnTrackTxt('Hits_per_lumi', ontrack)
+ title = fullDressTitle('Average number of pixel hits per event per LB', ontrack, ';lumi block', ';# hits/event')
+ varName += ';'+ addOnTrackTxt('HitsPerLumi', ontrack)
hitGroup.defineHistogram(varName,
type='TProfile', path=pathGroup, title=title,
xbins=lumibinsx, xmin=-0.5, xmax=-0.5+lumibinsx)
- histoGroupName = addOnTrackTxt('Hits_per_lumi', ontrack)
+ histoGroupName = addOnTrackTxt('HitsPerLumi', ontrack)
title = addOnTrackTxt('Average number of pixel hits per event per LB', ontrack, True)
yaxistext = ';# hits/event'
define1DProfLumiLayers(helper, alg, histoGroupName, title, pathGroup, yaxistext, type='TProfile')
- histoGroupName = addOnTrackTxt('AvgOcc_active_per_lumi', ontrack)
+ histoGroupName = addOnTrackTxt('AvgOccActivePerLumi', ontrack)
title = addOnTrackTxt('Average pixel occupancy for active modules per event per LB', ontrack, True)
yaxistext = ';# hits/pixel/event'
define1DProfLumiLayers(helper, alg, histoGroupName, title, pathGroup, yaxistext, type='TProfile')
- histoGroupName = addOnTrackTxt('AvgOcc_good_per_lumi', ontrack)
+ histoGroupName = addOnTrackTxt('AvgOccGoodPerLumi', ontrack)
title = addOnTrackTxt('Average pixel occupancy for good modules per event per LB', ontrack, True)
yaxistext = ';# hits/pixel/event'
define1DProfLumiLayers(helper, alg, histoGroupName, title, pathGroup, yaxistext, type='TProfile')
if doOnline:
- histoGroupName = addOnTrackTxt('AvgOcc_ratio_toIBL_per_lumi', ontrack)
+ histoGroupName = addOnTrackTxt('AvgOccRatioToIBLPerLumi', ontrack)
title = addOnTrackTxt('Relative to IBL pixel occupancy per event per LB', ontrack, True)
yaxistext = ';occ. ratio to IBL'
define1DProfLumiLayers(helper, alg, histoGroupName, title, pathGroup, yaxistext, type='TProfile')
@@ -63,11 +63,11 @@ def PixelAthHitMonAlgCfg(helper, alg, **kwargs):
title = 'hit map'
define2DProfHist(helper, alg, histoGroupName, title, path, type='TH2F')
if doLumiBlock:
- define2DProfHist(helper, alg, histoGroupName, title, pathLowStat, type='TH2F', lifecycle='lowStat', histname='HitMap_LB')
+ define2DProfHist(helper, alg, histoGroupName, title, pathLowStat, type='TH2F', lifecycle='lowStat', histname='HitMapLB')
- histoname = 'AvgOcc_per_BCID'
+ histoname = 'AvgOccPerBCID'
for layer in layers:
- title = 'Average pixel occupancy per BCID {0}'.format(layer) + runtext + ';BCID;# hits/pixel/event'
+ title = 'Average pixel occupancy per BCID, {0}'.format(layer) + runtext + ';BCID;# hits/pixel/event'
layerGroup = getLayerGroup(helper, alg, layer)
fullvarstr = 'pixhitsmontool_bcid'
fullvarstr+= ',{0}_{1}'.format(histoname, 'val')
@@ -76,11 +76,11 @@ def PixelAthHitMonAlgCfg(helper, alg, **kwargs):
type='TProfile', path=pathGroup, title=title,
xbins=bcidbinsx, xmin=-0.5, xmax=-0.5+bcidbinsx)
- histoGroupName = 'Hit_Occupancy_PP0'
+ histoGroupName = 'HitOccupancyPP0'
title = 'Average per module(FE) hit occupancy reset every 5 min'
definePP0Histos(helper, alg, histoGroupName, title, path=pathGroup, opt='kLBNHistoryDepth=5')
- histoGroupName ='Occupancy_per_pixel_event'
+ histoGroupName ='OccupancyPerPixelEvent'
title = '#hits / pixel / event'
define2DProfHist(helper, alg, histoGroupName, title, path=pathGroup, type='TProfile2D', zmin=0, zmax=1.0, opt='kLBNHistoryDepth=2')
@@ -90,22 +90,22 @@ def PixelAthHitMonAlgCfg(helper, alg, **kwargs):
pathTiming = '/Pixel/Timing'
varName = 'Hit_LVL1A_pixel'
title = fullDressTitle('Hit Level 1 Accept', False, ';Level 1 Accept',';# hits')
- varName += ';Hit_LVL1A'
+ varName += ';HitLVL1A'
hitGroup.defineHistogram(varName,
type='TH1F', path=pathTiming, title=title,
xbins=14, xmin=-1.5, xmax=12.5)
varName = 'Hit_LVL1A_layer'
for layer in layers:
- histoname = 'Hit_LVL1A_{0}'.format(layer)
- title = 'Hit Level 1 Accept {0}'.format(layer) + runtext + ';Level 1 Accept;# hits'
+ histoname = 'HitLVL1A_{0}'.format(layer)
+ title = 'Hit Level 1 Accept, {0}'.format(layer) + runtext + ';Level 1 Accept;# hits'
layerGroup = getLayerGroup(helper, alg, layer)
fullvarstr = varName + ';' + histoname
layerGroup.defineHistogram(fullvarstr,
type='TH1F', path=pathTiming, title=title,
xbins=14, xmin=-1.5, xmax=12.5)
if doLumiBlock:
- histonameLB = 'Hit_LVL1A_LB_{0}'.format(layer)
- titleLB = 'Hit Level 1 Accept lowstat {0}'.format(layer) + runtext + ';Level 1 Accept;# hits'
+ histonameLB = 'HitLVL1ALB_{0}'.format(layer)
+ titleLB = 'Hit Level 1 Accept lowstat, {0}'.format(layer) + runtext + ';Level 1 Accept;# hits'
fullvarstrLB = varName + ';' + histonameLB
layerGroup.defineHistogram(fullvarstrLB,
type='TH1F', path=pathLowStat, title=titleLB,
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthMonitoringBase.py b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthMonitoringBase.py
index b55e4994056249cfb3171274f8b26028f41f65df..398c9669edbd2b467f268e7d19d6688bc5b5e2d7 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthMonitoringBase.py
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthMonitoringBase.py
@@ -8,14 +8,14 @@
'''
# hack to deal with global variables in this module
# check if we are in "old-" or "new-style" configuration
-from AthenaConfiguration.AllConfigFlags import ConfigFlags
-from RecExConfig.AutoConfiguration import GetRunNumber
-if ConfigFlags.DQ.isReallyOldStyle:
- runtext = ''
- if GetRunNumber() is not None:
- runtext = ' (Run %d)' % GetRunNumber()
-else:
- runtext = ' (Run %d)' % ConfigFlags.Input.RunNumber[0]
+#from AthenaConfiguration.AllConfigFlags import ConfigFlags
+#from RecExConfig.AutoConfiguration import GetRunNumber
+#if ConfigFlags.DQ.isReallyOldStyle:
+runtext = ''
+# if GetRunNumber() is not None:
+# runtext = ' (Run %d)' % GetRunNumber()
+#else:
+# runtext = ' (Run %d)' % ConfigFlags.Input.RunNumber[0]
NumLayersDisk = 3
@@ -149,69 +149,69 @@ PP0LabelX = [PP0sEC, PP0sEC, StavesL0, StavesL1, StavesL2, StavesIBL, StavesIBL]
#Errors
ErrStateLabelsFEI3 = [
- ("ROD_Timeout", "ROD Formatter Timeout"),
- ("ROD_Sync_BCID_errors", "ROD BCID Sync"),
- ("ROD_Sync_LVL1ID_errors", "ROD LVL1ID Sync"),
- ("Optical_Errors", "Preamble/Header"),
- ("Mod_Sync_LVL1ID_errors", "FE/MCC LVL1ID Sync"),
- ("Mod_Sync_BCID2_errors", "FE/MCC BCID2 Sync"),
- ("Mod_Sync_BCID1_errors", "FE/MCC BCID1 Sync"),
- ("Mod_Trunc_EoE_Overflow_errors", "FE/MCC EoE Overflow Trunc"),
- ("Mod_Trunc_Hit_Overflow_errors", "FE/MCC Hit Overflow Trunc"),
- ("FE_Warning", "FE Warning"),
- ("SEU_Hit_Parity", "SEU Hit Parity"),
- ("SEU_Register_Parity", "SEU Register Parity"),
- ("SEU_Hamming", "SEU Hamming Code"),
- ("Mod_Trunc_EOC_errors", "FE/MCC EoC Trunc"),
- ("ROD_Trailer_Bit_errors", "ROD Trailer Bit"),
- ("ROD_Trunc_HT_Limit_errors", "ROD H/T Limit Trunc"),
- ("ROD_Trunc_ROD_OF_errors", "ROD Overflow Trunc")
+ ("RODTimeout", "ROD Formatter Timeout"),
+ ("RODSyncBCIDErrors", "ROD BCID Sync"),
+ ("RODSyncLVL1IDErrors", "ROD LVL1ID Sync"),
+ ("OpticalErrors", "Preamble/Header"),
+ ("ModSyncLVL1IDErrors", "FE/MCC LVL1ID Sync"),
+ ("ModSyncBCID2Errors", "FE/MCC BCID2 Sync"),
+ ("ModSyncBCID1Errors", "FE/MCC BCID1 Sync"),
+ ("ModTruncEoEOverflowErrors", "FE/MCC EoE Overflow Trunc"),
+ ("ModTruncHitOverflowErrors", "FE/MCC Hit Overflow Trunc"),
+ ("FEWarning", "FE Warning"),
+ ("SEUHitParity", "SEU Hit Parity"),
+ ("SEURegisterParity", "SEU Register Parity"),
+ ("SEUHamming", "SEU Hamming Code"),
+ ("ModTruncEOCErrors", "FE/MCC EoC Trunc"),
+ ("RODTrailerBitErrors", "ROD Trailer Bit"),
+ ("RODTruncHTLimitErrors", "ROD H/T Limit Trunc"),
+ ("RODTruncRODOFErrors", "ROD Overflow Trunc")
]
ErrStateLabelsFEI4 = [
- ("ROD_Timeout_errors", "ROD Timeout"),
- ("ROD_BCID_errors", "ROD BCID synchronization"),
- ("ROD_LVL1ID_errors", "ROD LVL1ID synchronization"),
- ("ROD_Preamble_errors", "ROD Preamble"),
- ("ROD_Trailer_errors", "ROD Trailer"),
- ("ROD_Row-Column_errors", "ROD row-column"),
- ("ROD_Masked_link", "ROD Masked link"),
- ("ROD_Limit_errors", "ROD Header Trailer limit"),
- ("SR0_BCID_counter_errors", "SR0 BCID counter"),
- ("SR1_Hamming_code_0_errors", "SR1 Hamming code in word 0"),
- ("SR2_Hamming_code_1_errors", "SR2 Hamming code in word 1"),
- ("SR3_Hamming_code_2_errors", "SR3 Hamming code in word 2"),
- ("SR4_L1_in_counter_errors", "SR4 L1 in counter"),
- ("SR5_L1_request_counter_errors", "SR5 L1 request counter"),
- ("SR6_L1_register_errors", "SR6 L1 register"),
- ("SR7_L1_Trigger_ID_errors", "SR7 L1 trigger ID"),
- ("SR8_FE_readout_process_errors", "SR8 FE readout process"),
- ("SR15_Skippped_trig_count_errors", "SR15 Skipped trigger counter"),
- ("SR16_Truncated_event_flag_errors", "SR16 Truncated event"),
- ("SR24_Triple_redundant_errors_CNFGMEM", "SR24 Triple redundant CNFGMEM"),
- ("SR25_Write_reg_data_errors", "SR25 Write register data"),
- ("SR26_Address_errors", "SR26 Address"),
- ("SR27_Other_CMD_decoder_errors", "SR27 CMD decoder"),
- ("SR28_CMD_decoder_bitflip_errors", "SR28 CMD decoder bit flip"),
- ("SR29_Triple_redundant_errors_CMD", "SR29 Triple redundant CMD"),
- ("SR30_Data_bus_address_errors", "SR30 Data bus address"),
- ("SR31_Triple_redundant_errors_EFUSE", "SR31 Triple redundant EFUSE")
+ ("RODTimeoutErrors", "ROD Timeout"),
+ ("RODBCIDErrors", "ROD BCID synchronization"),
+ ("RODLVL1IDErrors", "ROD LVL1ID synchronization"),
+ ("RODPreambleErrors", "ROD Preamble"),
+ ("RODTrailerErrors", "ROD Trailer"),
+ ("RODRowColumnErrors", "ROD row-column"),
+ ("RODMaskedLink", "ROD Masked link"),
+ ("RODLimitErrors", "ROD Header Trailer limit"),
+ ("SR0BCIDCounterErrors", "SR0 BCID counter"),
+ ("SR1HammingCode0Errors", "SR1 Hamming code in word 0"),
+ ("SR2HammingCode1Errors", "SR2 Hamming code in word 1"),
+ ("SR3HammingCode2Errors", "SR3 Hamming code in word 2"),
+ ("SR4L1InCounterErrors", "SR4 L1 in counter"),
+ ("SR5L1RequestCounterErrors", "SR5 L1 request counter"),
+ ("SR6L1RegisterErrors", "SR6 L1 register"),
+ ("SR7L1TriggerIDErrors", "SR7 L1 trigger ID"),
+ ("SR8FEReadoutProcessErrors", "SR8 FE readout process"),
+ ("SR15SkipppedTrigCountErrors", "SR15 Skipped trigger counter"),
+ ("SR16TruncatedEventFlagErrors", "SR16 Truncated event"),
+ ("SR24TripleRedundantErrorsCNFGMEM", "SR24 Triple redundant CNFGMEM"),
+ ("SR25WriteRegDataErrors", "SR25 Write register data"),
+ ("SR26AddressErrors", "SR26 Address"),
+ ("SR27OtherCMDDecoderErrors", "SR27 CMD decoder"),
+ ("SR28CMDDecoderBitflipErrors", "SR28 CMD decoder bit flip"),
+ ("SR29TripleRedundantErrorsCMD", "SR29 Triple redundant CMD"),
+ ("SR30DataBusAddressErrors", "SR30 Data bus address"),
+ ("SR31TripleRedundantErrorsEFUSE", "SR31 Triple redundant EFUSE")
]
ErrCatRODModLabels = [
- ("SyncErrors_Mod", "FE/MCC Sync Errors"),
- ("SyncErrors_ROD", "ROD Sync Errors"),
- ("TruncErrors_Mod", "FE/MCC Trunc Errors"),
- ("TruncErrors_ROD", "ROD Trunc Errors"),
- ("OpticalErrors_RODMod", "Preamble/Header Errors"),
- ("SEUErrors_RODMod", "SEU Errors"),
- ("TimeoutErrors_RODMod", "Timeout Errors")
+ ("SyncErrorsMod", "FE/MCC Sync Errors"),
+ ("SyncErrorsROD", "ROD Sync Errors"),
+ ("TruncErrorsMod", "FE/MCC Trunc Errors"),
+ ("TruncErrorsROD", "ROD Trunc Errors"),
+ ("OpticalErrorsRODMod", "Preamble/Header Errors"),
+ ("SEUErrorsRODMod", "SEU Errors"),
+ ("TimeoutErrorsRODMod", "Timeout Errors")
]
ErrCatRODModLabelsNorm = [
- "SyncErrors_Mod_Frac_per_event",
- "SyncErrors_ROD_Frac_per_event",
- "TruncErrors_Mod_Frac_per_event",
- "TruncErrors_ROD_Frac_per_event"
+ "SyncErrorsModFracPerEvent",
+ "SyncErrorsRODFracPerEvent",
+ "TruncErrorsModFracPerEvent",
+ "TruncErrorsRODFracPerEvent"
]
ErrCatLabels = [
@@ -223,11 +223,11 @@ ErrCatLabels = [
]
ErrCatLabelsNorm = [
- "SyncErrorsFrac_per_event",
- "TruncationErrorsFrac_per_event",
- "OpticalErrorsFrac_per_event",
- "SEUErrorsFrac_per_event",
- "TimeoutErrorsFrac_per_event"
+ "SyncErrorsFracPerEvent",
+ "TruncationErrorsFracPerEvent",
+ "OpticalErrorsFracPerEvent",
+ "SEUErrorsFracPerEvent",
+ "TimeoutErrorsFracPerEvent"
]
layergroups = {}
@@ -262,7 +262,7 @@ def define2DProfHist(helper, alg, name, title, path, type='TProfile2D', doWeight
for i, layer in enumerate(layers):
if layer not in onlylayers:
continue
- fulltitle = title + ' {0}'.format(layer) + runtext + etatxt[i] + phitext
+ fulltitle = title + ', {0}'.format(layer) + runtext + etatxt[i] + phitext
layerGroup = getLayerGroup(helper, alg, layer)
fullvarstring = '{0}_{1},{0}_{2}'.format(name, 'em', 'pm')
@@ -304,7 +304,7 @@ def definePP0Histos(helper, alg, name, title, path, opt=''):
yatxt += 'FE'
else :
yatxt += 'module'
- fulltitle = title + ' {0}'.format(layer) + runtext + xatxt + yatxt
+ fulltitle = title + ', {0}'.format(layer) + runtext + xatxt + yatxt
groupname = name + '_{0}'.format(layer)
layerGroup = getLayerGroup(helper, alg, layer)
fullvarstring = '{0}_{1},{0}_{2}'.format(name, 'pospp0x', 'val')
@@ -337,7 +337,7 @@ def define1DProfLumiLayers(helper, alg, name, title, path, yaxistext, type='TPro
for layer in layers:
if layer not in onlylayers:
continue
- fulltitle = title + ' {0}'.format(layer) + runtext + lumitext + yaxistext
+ fulltitle = title + ', {0}'.format(layer) + runtext + lumitext + yaxistext
layerGroup = getLayerGroup(helper, alg, layer)
fullvarstring = '{0}_{1}'.format(name,'lb')
if 'Profile' in type: fullvarstring += ',{0}_{1}'.format(name, 'val')
@@ -368,7 +368,7 @@ def defineMapVsLumiLayers(helper, alg, name, title, path, xaxistext, yaxistext,
for idx,layer in enumerate(layers):
if layer not in onlylayers:
continue
- fulltitle = title + ' {0}'.format(layer) + runtext + lumitext + yaxistext
+ fulltitle = title + ', {0}'.format(layer) + runtext + lumitext + yaxistext
layerGroup = getLayerGroup(helper, alg, layer)
fullvarstring = '{0}_{1}'.format(name,'lb')
if 'Profile' in type: fullvarstring += ',{0}_{1}'.format(name, 'cat')
@@ -408,7 +408,7 @@ def define1DLayers(helper, alg, name, title, path, xaxistext, yaxistext, xbins,
for idx,layer in enumerate(layers):
if layer not in onlylayers:
continue
- fulltitle = title + ' {0}'.format(layer) + runtext + xaxistext + yaxistext
+ fulltitle = title + ', {0}'.format(layer) + runtext + xaxistext + yaxistext
layerGroup = getLayerGroup(helper, alg, layer)
fullvarstring = '{0}_{1}'.format(name,'val')
fullvarstring += ';' + histname + '_{0}'.format(layer)
@@ -426,7 +426,7 @@ def addOnTrackTxt(name, ontrack, wSpace=False):
if wSpace:
name += ' OnTrack'
else:
- name += '_OnTrack'
+ name += 'OnTrack'
return name
def addOnTrackToPath(name, ontrack):
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx
index 349928bf1ec5d6c7954e756b89bfc9a1864e0551..d7015683e82e1f816a584e84078232a955fad682 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx
@@ -59,7 +59,7 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
int etaMod(-99);
bool copyFEval(false);
AccumulatorArrays clusPerEventArray = { {{0}}, {{0}}, {{0}}, {{0}}, {{0}}, {{0}} };
- VecAccumulator2DMap Map_Of_Modules_Status("Map_Of_Modules_Status", true);
+ VecAccumulator2DMap Map_Of_Modules_Status("MapOfModulesStatus", true);
for (auto idIt = m_pixelid->wafer_begin(); idIt!=m_pixelid->wafer_end(); ++idIt) {
Identifier waferID = *idIt;
@@ -105,8 +105,8 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
} // end of pixelid wafer loop
fill2DProfLayerAccum( Map_Of_Modules_Status );
- fill1DProfLumiLayers("BadModules_per_lumi", lb, nBadMod);
- fill1DProfLumiLayers("DisabledModules_per_lumi", lb, nDisabledMod);
+ fill1DProfLumiLayers("BadModulesPerLumi", lb, nBadMod);
+ fill1DProfLumiLayers("DisabledModulesPerLumi", lb, nDisabledMod);
//*******************************************************************************
//*************************** End of filling Status Histograms ******************
@@ -120,9 +120,9 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
ATH_MSG_DEBUG("Filling Track Monitoring Histograms");
- VecAccumulator2DMap TSOS_Outlier("TSOS_Outlier", true);
- VecAccumulator2DMap TSOS_Hole("TSOS_Hole", true);
- VecAccumulator2DMap TSOS_Measurement("TSOS_Measurement", true);
+ VecAccumulator2DMap TSOS_Outlier("TSOSOutlier", true);
+ VecAccumulator2DMap TSOS_Hole("TSOSHole", true);
+ VecAccumulator2DMap TSOS_Measurement("TSOSMeasurement", true);
VecAccumulator2DMap HolesRatio("HolesRatio", true);
VecAccumulator2DMap MissHitsRatio("MissHitsRatio", true);
auto trackGroup = getGroup("Track");
@@ -191,8 +191,8 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
float nOutlier = 0.;
float nHole = 0.;
- auto effval = Monitored::Scalar<float>( "HitEff_all_val", 0. );
- auto efflb = Monitored::Scalar<float>( "HitEff_all_lb", lb );
+ auto effval = Monitored::Scalar<float>( "HitEffAll_val", 0. );
+ auto efflb = Monitored::Scalar<float>( "HitEffAll_lb", lb );
if ((*trackStateOnSurfaceIterator)->type(Trk::TrackStateOnSurface::Outlier)) {
nOutlier = 1.0;
if (!m_doOnline) TSOS_Outlier.add(pixlayer, surfaceID, m_pixelid, 1.0);
@@ -309,17 +309,17 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
auto clToTcosAlphaLB = Monitored::Scalar<float>( "Cluster_ToTxCosAlpha_OnTrack_lb", lb);
- VecAccumulator2DMap Cluster_LVL1A_Mod("Cluster_LVL1A_Mod");
- VecAccumulator2DMap Cluster_LVL1A_SizeCut("Cluster_LVL1A_SizeCut");
- VecAccumulator2DMap Cluster_LVL1A_Mod_OnTrack("Cluster_LVL1A_Mod_OnTrack");
- VecAccumulator2DMap Cluster_LVL1A_SizeCut_OnTrack("Cluster_LVL1A_SizeCut_OnTrack");
- VecAccumulator2DMap ClusterMap_Mon("ClusterMap_Mon");
- VecAccumulator2DMap ClusterMap_Mon_OnTrack("ClusterMap_Mon_OnTrack");
- VecAccumulator2DMap Cluster_Size_Map_OnTrack("Cluster_Size_Map_OnTrack");
- VecAccumulator2DMap Cluster_Occupancy("Cluster_Occupancy");
- VecAccumulator2DMap Cluster_Occupancy_OnTrack("Cluster_Occupancy_OnTrack");
- VecAccumulator2DMap Clus_Occ_SizeCut("Clus_Occ_SizeCut");
- VecAccumulator2DMap Clus_Occ_SizeCut_OnTrack("Clus_Occ_SizeCut_OnTrack");
+ VecAccumulator2DMap Cluster_LVL1A_Mod("ClusterLVL1AMod");
+ VecAccumulator2DMap Cluster_LVL1A_SizeCut("ClusterLVL1ASizeCut");
+ VecAccumulator2DMap Cluster_LVL1A_Mod_OnTrack("ClusterLVL1AModOnTrack");
+ VecAccumulator2DMap Cluster_LVL1A_SizeCut_OnTrack("ClusterLVL1ASizeCutOnTrack");
+ VecAccumulator2DMap ClusterMap_Mon("ClusterMapMon");
+ VecAccumulator2DMap ClusterMap_Mon_OnTrack("ClusterMapMonOnTrack");
+ VecAccumulator2DMap Cluster_Size_Map_OnTrack("ClusterSizeMapOnTrack");
+ VecAccumulator2DMap Cluster_Occupancy("ClusterOccupancy");
+ VecAccumulator2DMap Cluster_Occupancy_OnTrack("ClusterOccupancyOnTrack");
+ VecAccumulator2DMap Clus_Occ_SizeCut("ClusOccSizeCut");
+ VecAccumulator2DMap Clus_Occ_SizeCut_OnTrack("ClusOccSizeCutOnTrack");
auto clusterGroup = getGroup("Cluster");
auto clusterGroup_OnTrack = getGroup("Cluster_OnTrack");
@@ -366,7 +366,7 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
fill( clusterGroup, clLVL1A);
Cluster_LVL1A_Mod.add(pixlayer, clusID, m_pixelid, cluster.LVL1A() + 0.00001);
if (cluster.rdoList().size() > 1) Cluster_LVL1A_SizeCut.add(pixlayer, clusID, m_pixelid, cluster.LVL1A() + 0.00001);
- if (cluster.totalToT() > clusterToTMinCut[pixlayer]) fill( "Cluster_LVL1A_ToTCut_" + pixLayersLabel[pixlayer], clLVL1A);
+ if (cluster.totalToT() > clusterToTMinCut[pixlayer]) fill( "ClusterLVL1AToTCut_" + pixLayersLabel[pixlayer], clLVL1A);
//
// end timing histos
@@ -412,15 +412,15 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
fill( clusterGroup_OnTrack, clLVL1A);
Cluster_LVL1A_Mod_OnTrack.add(pixlayer, clusID, m_pixelid, cluster.LVL1A() + 0.00001);
if (cluster.rdoList().size() > 1) Cluster_LVL1A_SizeCut_OnTrack.add(pixlayer, clusID, m_pixelid, cluster.LVL1A() + 0.00001);
- if (cluster.totalToT() > clusterToTMinCut[pixlayer]) fill( "Cluster_LVL1A_ToTCut_OnTrack_" + pixLayersLabel[pixlayer], clLVL1A);
+ if (cluster.totalToT() > clusterToTMinCut[pixlayer]) fill( "ClusterLVL1AToTCutOnTrack_" + pixLayersLabel[pixlayer], clLVL1A);
//
// end timing histos
// begin cluster sizes
//
- auto clSize = Monitored::Scalar<float>( "Cluster_Size_OnTrack_clsize", cluster.rdoList().size());
- auto etaModule = Monitored::Scalar<float>( "Cluster_Size_OnTrack_em", m_pixelid->eta_module(clusID) );
+ auto clSize = Monitored::Scalar<float>( "ClusterSizeOnTrack_clsize", cluster.rdoList().size());
+ auto etaModule = Monitored::Scalar<float>( "ClusterSizeOnTrack_em", m_pixelid->eta_module(clusID) );
if ( abs(m_pixelid->barrel_ec(clusID))!=0 ) etaModule = m_pixelid->layer_disk(clusID) + 1;
- fill( "Cluster_groupsize_vs_eta_OnTrack_" + pixLayersLabel[pixlayer], etaModule, clSize );
+ fill( "ClusterGroupsizeVsEtaOnTrack_" + pixLayersLabel[pixlayer], etaModule, clSize );
Cluster_Size_Map_OnTrack.add(pixlayer, clusID, m_pixelid, cluster.rdoList().size());
//
// end cluster sizes
@@ -437,10 +437,10 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
// end cluster occupancy
// begin cluster ToT and charge
//
- auto clToTcosAlpha = Monitored::Scalar<float>( "Cluster_ToTxCosAlpha_OnTrack_val", cluster.totalToT() * cosalpha );
+ auto clToTcosAlpha = Monitored::Scalar<float>( "ClusterToTxCosAlphaOnTrack_val", cluster.totalToT() * cosalpha );
fill( pixLayersLabel[pixlayer], clToTcosAlpha);
if (!m_doOnline) {
- auto clQcosAlpha = Monitored::Scalar<float>( "Cluster_QxCosAlpha_OnTrack_val", cluster.totalCharge() * cosalpha);
+ auto clQcosAlpha = Monitored::Scalar<float>( "ClusterQxCosAlphaOnTrack_val", cluster.totalCharge() * cosalpha);
fill( pixLayersLabel[pixlayer], clQcosAlpha);
} else {
fill( pixLayersLabel[pixlayer], clToTcosAlphaLB, clToTcosAlpha);
@@ -477,14 +477,14 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
fill( clusterGroup_OnTrack, lbval, clsFracOnTrack);
}
- fill1DProfLumiLayers( "Clusters_per_lumi", lb, nclusters_mod);
- fill1DProfLumiLayers( "Clusters_per_lumi_OnTrack", lb, nclusters_ontrack_mod);
+ fill1DProfLumiLayers( "ClustersPerLumi", lb, nclusters_mod);
+ fill1DProfLumiLayers( "ClustersPerLumiOnTrack", lb, nclusters_ontrack_mod);
- fillFromArrays( "Cluster_Occupancy_PP0_OnTrack", clusPerEventArray);
+ fillFromArrays( "ClusterOccupancyPP0OnTrack", clusPerEventArray);
if (ntracksPerEvent>0) {
for (unsigned int ii=0; ii<PixLayers::COUNT; ii++) nclusters_ontrack_mod[ii]/= ntracksPerEvent; // keep as in Run 1,2
- fill1DProfLumiLayers( "num_clusters_per_track_per_lumi", lb, nclusters_ontrack_mod);
+ fill1DProfLumiLayers( "NumClustersPerTrackPerLumi", lb, nclusters_ontrack_mod);
}
//
// end cluster rate
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.cxx
index 0ad4962b00f1a9524389d94e5649ce9577b6b8ec..3bb258cad486ec102fb19c44a59dc6644299779c 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.cxx
@@ -42,20 +42,20 @@ StatusCode PixelAthErrorMonAlg::fillHistograms( const EventContext& ctx ) const
std::vector<VecAccumulator2DMap> error_maps_per_state;
error_maps_per_state.reserve(kNumErrorStatesFEI3 + kNumErrorStatesFEI4);
for (const auto& state : error_names_stateFEI3) {
- error_maps_per_state.emplace_back(state + std::string("_Map"));
+ error_maps_per_state.emplace_back( state + std::string("Map"), true );
}
for (const auto& state : error_names_stateFEI4) {
- error_maps_per_state.emplace_back(state + std::string("_Map"));
+ error_maps_per_state.emplace_back( state + std::string("Map"), true );
}
std::vector<VecAccumulator2DMap> error_maps_per_cat_rodmod;
// only first four rodmod histos are unique, others are covered by
// the overall, rod/mod-agnostic categories below
for (unsigned int cat = 0; cat < ErrorCategoryRODMOD::kTruncROD+1; ++cat) {
- error_maps_per_cat_rodmod.emplace_back(error_names_cat_rodmod[cat]);
+ error_maps_per_cat_rodmod.emplace_back( error_names_cat_rodmod[cat], true );
}
std::vector<VecAccumulator2DMap> error_maps_per_cat;
for (unsigned int cat = 0; cat < ErrorCategory::COUNT; ++cat) {
- error_maps_per_cat.emplace_back(error_names_cat[cat]);
+ error_maps_per_cat.emplace_back( error_names_cat[cat], true );
}
// containers to keep IBL service records info
@@ -74,10 +74,10 @@ StatusCode PixelAthErrorMonAlg::fillHistograms( const EventContext& ctx ) const
float num_errormodules_per_cat_rodmod[ErrorCategoryRODMOD::COUNT][PixLayers::COUNT] = {{0}};
// Generate femcc_errwords and per LB maps, all _per module_, including IBL.
- VecAccumulator2DMap femcc_errwords_maps("femcc_errorwords", true);
- VecAccumulator2DMap all_errors_maps("Errors_LB", true);
- VecAccumulator2DMap modsync_errors_maps("Errors_ModSync_LB", true);
- VecAccumulator2DMap rodsync_errors_maps("Errors_RODSync_LB", true);
+ VecAccumulator2DMap femcc_errwords_maps("FEMCCErrorwords", true);
+ VecAccumulator2DMap all_errors_maps("ErrorsLB", true);
+ VecAccumulator2DMap modsync_errors_maps("ErrorsModSyncLB", true);
+ VecAccumulator2DMap rodsync_errors_maps("ErrorsRODSyncLB", true);
//====================================================================================
// This is an example how to read the Error informaiton.
@@ -276,10 +276,10 @@ StatusCode PixelAthErrorMonAlg::fillHistograms( const EventContext& ctx ) const
for (unsigned int state = 0; state < kNumErrorStatesFEI3+kNumErrorStatesFEI4; state++) {
if ( state < kNumErrorStatesFEI3 ) {
fill2DProfLayerAccum(error_maps_per_state[state]);
- fill1DProfLumiLayers(error_names_stateFEI3[state] + std::string("_per_lumi"), lb, num_errors_per_state[state], PixLayers::NFEI3LAYERS);
+ fill1DProfLumiLayers(error_names_stateFEI3[state] + std::string("PerLumi"), lb, num_errors_per_state[state], PixLayers::NFEI3LAYERS);
} else {
fill2DProfLayerAccum(error_maps_per_state[state]);
- fill1DProfLumiLayers(error_names_stateFEI4[state-kNumErrorStatesFEI3] + std::string("_per_lumi"), lb, num_errors_per_state[state-kNumErrorStatesFEI3], PixLayers::COUNT - PixLayers::NFEI3LAYERS);
+ fill1DProfLumiLayers(error_names_stateFEI4[state-kNumErrorStatesFEI3] + std::string("PerLumi"), lb, num_errors_per_state[state-kNumErrorStatesFEI3], PixLayers::COUNT - PixLayers::NFEI3LAYERS);
}
}
// Fill the accumulated maps
@@ -297,15 +297,15 @@ StatusCode PixelAthErrorMonAlg::fillHistograms( const EventContext& ctx ) const
}
}
// Fill the luminosity error profiles for all layers.
- fill1DProfLumiLayers("errors_per_lumi", lb, num_errors);
+ fill1DProfLumiLayers("ErrorsPerLumi", lb, num_errors);
auto vals = Monitored::Collection( "ServiceRecord_val", flagged_ibl_error_bits );
auto wgts = Monitored::Collection( "ServiceRecord_wgt", weights_of_flagged_ibl_error_bits );
fill( errorGroup, vals, wgts);
// Fill 2D luminosity error profiles per error bit and cat split by ROD/MOD for all layers.
- fill2DProfLumiLayers("ErrorState_per_lumi", lb, num_errors_per_state, numErrorStatesLayer);
- fill2DProfLumiLayers("ErrorCatRODMod_per_lumi", lb, num_errormodules_per_cat_rodmod, numErrorCatRODModsLayer);
+ fill2DProfLumiLayers("ErrorStatePerLumi", lb, num_errors_per_state, numErrorStatesLayer);
+ fill2DProfLumiLayers("ErrorCatRODModPerLumi", lb, num_errormodules_per_cat_rodmod, numErrorCatRODModsLayer);
// Fill 1D luminosity error profiles for error catergory for all layers.
for (unsigned int cat = 0; cat < error_names_cat_rodmod_norm.size(); ++cat) {
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.h b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.h
index b0332d5b3aaac31cc32d2c6b92173f0b3b3f7ae5..dfbdcc492348d4e01e7c4d1ed0b7eb0e37556c2b 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.h
@@ -27,70 +27,70 @@ static const int kNumErrorStatesFEI4{27};
// error states = enumerators of PixelByteStreamErrors and FEI4 SR's we care about
//
static constexpr std::array<const char*, kNumErrorStatesFEI3> error_names_stateFEI3 {
- "ROD_Timeout",
- "ROD_Sync_BCID_errors",
- "ROD_Sync_LVL1ID_errors",
- "Optical_Errors",
- "Mod_Sync_LVL1ID_errors",
- "Mod_Sync_BCID2_errors",
- "Mod_Sync_BCID1_errors",
- "Mod_Trunc_EoE_Overflow_errors",
- "Mod_Trunc_Hit_Overflow_errors",
- "FE_Warning",
- "SEU_Hit_Parity",
- "SEU_Register_Parity",
- "SEU_Hamming",
- "Mod_Trunc_EOC_errors",
- "ROD_Trailer_Bit_errors",
- "ROD_Trunc_HT_Limit_errors",
- "ROD_Trunc_ROD_OF_errors"
+ "RODTimeout",
+ "RODSyncBCIDErrors",
+ "RODSyncLVL1IDErrors",
+ "OpticalErrors",
+ "ModSyncLVL1IDErrors",
+ "ModSyncBCID2Errors",
+ "ModSyncBCID1Errors",
+ "ModTruncEoEOverflowErrors",
+ "ModTruncHitOverflowErrors",
+ "FEWarning",
+ "SEUHitParity",
+ "SEURegisterParity",
+ "SEUHamming",
+ "ModTruncEOCErrors",
+ "RODTrailerBitErrors",
+ "RODTruncHTLimitErrors",
+ "RODTruncRODOFErrors"
};
static constexpr std::array<const char*, kNumErrorStatesFEI4> error_names_stateFEI4 {
- "ROD_Timeout_errors",
- "ROD_BCID_errors",
- "ROD_LVL1ID_errors",
- "ROD_Preamble_errors",
- "ROD_Trailer_errors",
- "ROD_Row-Column_errors",
- "ROD_Masked_link",
- "ROD_Limit_errors",
- "SR0_BCID_counter_errors",
- "SR1_Hamming_code_0_errors",
- "SR2_Hamming_code_1_errors",
- "SR3_Hamming_code_2_errors",
- "SR4_L1_in_counter_errors",
- "SR5_L1_request_counter_errors",
- "SR6_L1_register_errors",
- "SR7_L1_Trigger_ID_errors",
- "SR8_FE_readout_process_errors",
- "SR15_Skippped_trig_count_errors",
- "SR16_Truncated_event_flag_errors",
- "SR24_Triple_redundant_errors_CNFGMEM",
- "SR25_Write_reg_data_errors",
- "SR26_Address_errors",
- "SR27_Other_CMD_decoder_errors",
- "SR28_CMD_decoder_bitflip_errors",
- "SR29_Triple_redundant_errors_CMD",
- "SR30_Data_bus_address_errors",
- "SR31_Triple_redundant_errors_EFUSE"
+ "RODTimeoutErrors",
+ "RODBCIDErrors",
+ "RODLVL1IDErrors",
+ "RODPreambleErrors",
+ "RODTrailerErrors",
+ "RODRowColumnErrors",
+ "RODMaskedLink",
+ "RODLimitErrors",
+ "SR0BCIDCounterErrors",
+ "SR1HammingCode0Errors",
+ "SR2HammingCode1Errors",
+ "SR3HammingCode2Errors",
+ "SR4L1InCounterErrors",
+ "SR5L1RequestCounterErrors",
+ "SR6L1RegisterErrors",
+ "SR7L1TriggerIDErrors",
+ "SR8FEReadoutProcessErrors",
+ "SR15SkipppedTrigCountErrors",
+ "SR16TruncatedEventFlagErrors",
+ "SR24TripleRedundantErrorsCNFGMEM",
+ "SR25WriteRegDataErrors",
+ "SR26AddressErrors",
+ "SR27OtherCMDDecoderErrors",
+ "SR28CMDDecoderBitflipErrors",
+ "SR29TripleRedundantErrorsCMD",
+ "SR30DataBusAddressErrors",
+ "SR31TripleRedundantErrorsEFUSE"
};
static constexpr std::array<const char*, ErrorCategoryRODMOD::COUNT> error_names_cat_rodmod {
- "SyncErrors_Mod",
- "SyncErrors_ROD",
- "TruncErrors_Mod",
- "TruncErrors_ROD",
- "OpticalErrors_RODMod",
- "SEUErrors_RODMod",
- "TimeoutErrors_RODMod"
+ "SyncErrorsMod",
+ "SyncErrorsROD",
+ "TruncErrorsMod",
+ "TruncErrorsROD",
+ "OpticalErrorsRODMod",
+ "SEUErrorsRODMod",
+ "TimeoutErrorsRODMod"
};
static constexpr std::array<const char*, 4> error_names_cat_rodmod_norm {
- "SyncErrors_Mod_Frac_per_event",
- "SyncErrors_ROD_Frac_per_event",
- "TruncErrors_Mod_Frac_per_event",
- "TruncErrors_ROD_Frac_per_event"
+ "SyncErrorsModFracPerEvent",
+ "SyncErrorsRODFracPerEvent",
+ "TruncErrorsModFracPerEvent",
+ "TruncErrorsRODFracPerEvent"
};
static constexpr std::array<const char*, ErrorCategory::COUNT> error_names_cat {
@@ -102,11 +102,11 @@ static constexpr std::array<const char*, ErrorCategory::COUNT> error_names_cat {
};
static constexpr std::array<const char*, ErrorCategory::COUNT> error_names_cat_norm {
- "SyncErrorsFrac_per_event",
- "TruncationErrorsFrac_per_event",
- "OpticalErrorsFrac_per_event",
- "SEUErrorsFrac_per_event",
- "TimeoutErrorsFrac_per_event"
+ "SyncErrorsFracPerEvent",
+ "TruncationErrorsFracPerEvent",
+ "OpticalErrorsFracPerEvent",
+ "SEUErrorsFracPerEvent",
+ "TimeoutErrorsFracPerEvent"
};
static const int numErrorStatesLayer[PixLayers::COUNT] = {
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx
index ba6a3eaa6e881ba333d6a2ee4f05bb19028a0520..810662d94a34a50c544b839cc7fb9ac70b14e154 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx
@@ -197,24 +197,24 @@ StatusCode PixelAthHitMonAlg::fillHistograms( const EventContext& ctx ) const {
auto nhitsval = Monitored::Scalar<int>( "nhits_per_event", nhits );
fill( hitGroup, lbval, nhitsval );
- fill1DProfLumiLayers( "Hits_per_lumi", lb, nhits_layer );
+ fill1DProfLumiLayers( "HitsPerLumi", lb, nhits_layer );
- fillFromArrays( "Hit_Occupancy_PP0", hitsPerEventArray, "Occupancy_per_pixel_event");
+ fillFromArrays( "HitOccupancyPP0", hitsPerEventArray, "OccupancyPerPixelEvent");
for (int i = 0; i < PixLayers::COUNT; i++) {
if (nGoodChannels_layer[i]>0) avgocc_good_layer[i] = nhits_layer[i] / nGoodChannels_layer[i];
- auto val = Monitored::Scalar<float>( "AvgOcc_per_BCID_val", avgocc_good_layer[i]);
+ auto val = Monitored::Scalar<float>( "AvgOccPerBCID_val", avgocc_good_layer[i]);
fill( pixLayersLabel[i], bcidval, val );
if (nActiveChannels_layer[i]>0) avgocc_active_layer[i] = nhits_layer[i] / nActiveChannels_layer[i];
}
- fill1DProfLumiLayers( "AvgOcc_active_per_lumi", lb, avgocc_active_layer );
- fill1DProfLumiLayers( "AvgOcc_good_per_lumi", lb, avgocc_good_layer );
+ fill1DProfLumiLayers( "AvgOccActivePerLumi", lb, avgocc_active_layer );
+ fill1DProfLumiLayers( "AvgOccGoodPerLumi", lb, avgocc_good_layer );
if (m_doOnline && avgocc_good_layer[PixLayers::kIBL]>0) {
for (int i = 0; i < PixLayers::COUNT; i++) {
avgocc_ratio_toIBL_layer[i] = avgocc_good_layer[i] / avgocc_good_layer[PixLayers::kIBL];
}
- fill1DProfLumiLayers( "AvgOcc_ratio_toIBL_per_lumi", lb, avgocc_ratio_toIBL_layer );
+ fill1DProfLumiLayers( "AvgOccRatioToIBLPerLumi", lb, avgocc_ratio_toIBL_layer );
}
//*******************************************************************************
//************************** End of filling Hit Histograms **********************