diff --git a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTMonitoringRun3ESD_Alg.py b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTMonitoringRun3ESD_Alg.py
index 3f6a89137035a51887e55c081bf7b4d1ae9a26f6..f4f6250c58a85e3d3d2c491edce7b5d784bcaaad 100644
--- a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTMonitoringRun3ESD_Alg.py
+++ b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTMonitoringRun3ESD_Alg.py
@@ -242,6 +242,7 @@ if __name__ == '__main__':
ConfigFlags.Detector.GeometrySCT = True
ConfigFlags.Detector.GeometryTRT = True
ConfigFlags.Detector.GeometryMuon = False
+ ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-RUN2-03"
ConfigFlags.lock()
# Initialize configuration object, add accumulator, merge, and run.
@@ -266,4 +267,4 @@ if __name__ == '__main__':
ServiceMgr.Dump = False
cfg.merge(TRTMonitoringRun3Acc)
- cfg.run(100)
+ cfg.run(200)
diff --git a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTMonitoringRun3RAW_Alg.py b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTMonitoringRun3RAW_Alg.py
index 6690133d2eae7d583475e63f1464ab2f320fdc9e..9a69bb1565bf0f3c2546c36a7c1128d6fb3537a9 100644
--- a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTMonitoringRun3RAW_Alg.py
+++ b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTMonitoringRun3RAW_Alg.py
@@ -154,12 +154,12 @@ def TRTMonitoringRun3RAW_AlgConfig(inputFlags):
rdoLLHLOccGroup.defineHistogram('AvgHLOccMod_side_x,AvgHLOccMod_side_y;hAvgHLOccMod_{0}'.format(regionMarker),type='TProfile',title='Avg. HL Occupancy: {0}s{1};{2};Occupancy'.format(moduleOrWheel[ibe],regionTag,moduleNumAssign[ibe]),path='TRT/{0}/Expert'.format(barrelOrEndcap[ibe]),xbins=moduleNum[ibe],xmin=0,xmax=moduleNum[ibe])
effGroup = helper.addGroup(algTRTMonitoringRun3RAW,'TRTEfficiencyHistograms')
- effGroup.defineHistogram('Efficiency_eta_passed,Efficiency_eta;hefficiency_eta',type='TProfile',title='Efficiency vs #eta;#eta;Efficiency',path='TRT/Efficiency',xbins=50,xmin=-2.8,xmax=2.8)
- effGroup.defineHistogram('Efficiency_phi_passed,Efficiency_phi;hefficiency_phi',type='TProfile',title='Efficiency vs #phi;#phi (deg);Efficiency',path='TRT/Efficiency',xbins=50,xmin=-3.2,xmax=3.2)
- effGroup.defineHistogram('Efficiency_pt_passed,Efficiency_pt;hefficiency_pt',type='TProfile',title='Efficiency vs pT;pT (GeV);Efficiency',path='TRT/Efficiency',xbins=50,xmin=0,xmax=10)
- effGroup.defineHistogram('Efficiency_z0_passed,Efficiency_z0;hefficiency_z0',type='TProfile',title='Efficiency vs z0;z0;Efficiency',path='TRT/Efficiency',xbins=50,xmin=-200,xmax=200)
- effGroup.defineHistogram('EfficiencyBarrel_locR,EfficiencyBarrel_locR_passed;hefficiencyBarrel_locR',type='TProfile',title='Efficiency vs Track-to-Wire Distance for Xenon Straws (Barrel);Track-to-Wire Distance (mm);Efficiency',path='TRT/Efficiency',xbins=50,xmin=-2.5,xmax=2.5)
- effGroup.defineHistogram('EfficiencyBarrel_locR_Ar,EfficiencyBarrel_locR_Ar_passed;hefficiencyBarrel_locR_Ar',type='TProfile',title='Efficiency vs Track-to-Wire Distance for Argon Straws (Barrel);Track-to-Wire Distance (mm);Efficiency',path='TRT/Efficiency',xbins=50,xmin=-2.5,xmax=2.5)
+ effGroup.defineHistogram('Efficiency_eta_passed,Efficiency_eta;hEfficiency_eta',type='TProfile',title='Efficiency vs #eta;#eta;Efficiency',path='TRT/Efficiency',xbins=50,xmin=-2.8,xmax=2.8)
+ effGroup.defineHistogram('Efficiency_phi_passed,Efficiency_phi;hEfficiency_phi',type='TProfile',title='Efficiency vs #phi;#phi (deg);Efficiency',path='TRT/Efficiency',xbins=50,xmin=-3.2,xmax=3.2)
+ effGroup.defineHistogram('Efficiency_pt_passed,Efficiency_pt;hEfficiency_pt',type='TProfile',title='Efficiency vs pT;pT (GeV);Efficiency',path='TRT/Efficiency',xbins=50,xmin=0,xmax=10)
+ effGroup.defineHistogram('Efficiency_z0_passed,Efficiency_z0;hEfficiency_z0',type='TProfile',title='Efficiency vs z0;z0;Efficiency',path='TRT/Efficiency',xbins=50,xmin=-200,xmax=200)
+ effGroup.defineHistogram('EfficiencyBarrel_locR,EfficiencyBarrel_locR_passed;hEfficiencyBarrel_locR',type='TProfile',title='Efficiency vs Track-to-Wire Distance for Xenon Straws (Barrel);Track-to-Wire Distance (mm);Efficiency',path='TRT/Efficiency',xbins=50,xmin=-2.5,xmax=2.5)
+ effGroup.defineHistogram('EfficiencyBarrel_locR_Ar,EfficiencyBarrel_locR_Ar_passed;hEfficiencyBarrel_locR_Ar',type='TProfile',title='Efficiency vs Track-to-Wire Distance for Argon Straws (Barrel);Track-to-Wire Distance (mm);Efficiency',path='TRT/Efficiency',xbins=50,xmin=-2.5,xmax=2.5)
effBarrelGroup = helper.addGroup(algTRTMonitoringRun3RAW,'TRTEfficiencyHistogramsBarrel')
effBarrelGroup.defineHistogram('EfficiencyBarrelMap,EfficiencyBarrelMap_passed;hEfficiencyBarrelMap',type='TProfile',title='Straw Efficiency Map (Barrel);Straw Number;Efficiency',path='TRT/Efficiency',xbins=strawMax[0],xmin=0,xmax=strawMax[0])
effEndcapGroup = helper.addGroup(algTRTMonitoringRun3RAW,'TRTEfficiencyHistogramsEndCap')
@@ -223,8 +223,6 @@ def TRTMonitoringRun3RAW_AlgConfig(inputFlags):
trackGroup.defineHistogram('HitHWonTMapC;unscaled_hHitHWonTMapC',type='TH1F',title='HL Hit(In time Window) on Track: Chips;Chip Number in Stack;Probability',path=oss,xbins=iChipMax[ibe],xmin=0,xmax=iChipMax[ibe])
trackGroup.defineHistogram('HtoLonTMapS,HtoLonTMapS_passed;hHtoLonTMapS',type='TProfile',title='HL/LL Ratio on Track: Straws;Straw Number in Stack;Probability',path=oss,xbins=strawMax[ibe],xmin=0,xmax=strawMax[ibe])
trackGroup.defineHistogram('HtoLWonTMapS,HtoLWonTMapS_passed;hHtoLWonTMapS',type='TProfile',title='HL/LL (In Time Window) Ratio on Track: Straws;Straw Number in Stack;Probability',path=oss,xbins=strawMax[ibe],xmin=0,xmax=strawMax[ibe])
- trackGroup.defineHistogram('HitonTrackVAllS_x,HitonTrackVAllS_y;hHitonTrackVAllS',type='TProfile',title='(Hit on Track) / (Any LL Bit): Straws;Straw Number in Stack;Ratio',path=oss,xbins=strawMax[ibe],xmin=0,xmax=strawMax[ibe])
- trackGroup.defineHistogram('HitonTrackVAllC_x,HitonTrackVAllC_y;hHitonTrackVAllC',type='TProfile',title='(Hit on Track) / (Any LL Bit): Chips;Chip Number in Stack;Ratio',path=oss,xbins=iChipMax[ibe],xmin=0,xmax=iChipMax[ibe])
trackGroup.defineHistogram('HtoLWonTMapC,HtoLWonTMapC_passed;hHtoLWonTMapC',type='TProfile',title='HL/LL(In Time Window) Ratio on Track: Chips;Chip Number in Stack;Probability',path=oss,xbins=iChipMax[ibe],xmin=0,xmax=iChipMax[ibe])
trackGroup.defineHistogram('HtoLonTMapC,HtoLonTMapC_passed;hHtoLonTMapC',type='TProfile',title='HL/LL Ratio on Track: Chips;Chip Number in Stack;Probability',path=oss,xbins=iChipMax[ibe],xmin=0,xmax=iChipMax[ibe])
diff --git a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTPostProcessing.py b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTPostProcessing.py
index 3049cd7a1c271f67fd670a8abe2897e619d0ee68..94c2d45b494b2dda30ab98cd69f185670c9f4231 100644
--- a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTPostProcessing.py
+++ b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTPostProcessing.py
@@ -59,7 +59,7 @@ def hHitOnTrackVsAll(inputs):
if element == 'C':
name = 'C'
titleElement = 'Chips'
- rh = ROOT.TH1F('hHitOnTrackVsAll' + name, '(Hit on Track) / (Any LL Bit): ' + titleElement, 1, 0, 1)
+ rh = ROOT.TH1F('hHitonTrackVsAll' + name, '(Hit on Track) / (Any LL Bit): ' + titleElement, 1, 0, 1)
rh.GetXaxis().SetTitle(titleElement[:-1] + ' Number in Stack')
rh.GetYaxis().SetTitle('Ratio')
for i in range(len(inputs[0][1])):
diff --git a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/share/TRTMonitoringRun3RAW_Alg_jobOptions.py b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/share/TRTMonitoringRun3RAW_Alg_jobOptions.py
index 68ef492e8eced958bfa7bcbb9f1f1aaad5c64481..952354184492fc687c3b9a850c114cd7f244737d 100644
--- a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/share/TRTMonitoringRun3RAW_Alg_jobOptions.py
+++ b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/share/TRTMonitoringRun3RAW_Alg_jobOptions.py
@@ -112,12 +112,12 @@ for ibe in range(2):
rdoLLHLOccGroup.defineHistogram('AvgHLOccMod_side_x,AvgHLOccMod_side_y;hAvgHLOccMod_{0}'.format(regionMarker),type='TProfile',title='Avg. HL Occupancy: {0}s{1};{2};Occupancy'.format(moduleOrWheel[ibe],regionTag,moduleNumAssign[ibe]),path='TRT/{0}/Expert'.format(barrelOrEndcap[ibe]),xbins=moduleNum[ibe],xmin=0,xmax=moduleNum[ibe])
effGroup = helper.addGroup(algTRTMonitoringRun3RAW,'TRTEfficiencyHistograms')
-effGroup.defineHistogram('Efficiency_eta_passed,Efficiency_eta;hefficiency_eta',type='TProfile',title='Efficiency vs #eta;#eta;Efficiency',path='TRT/Efficiency',xbins=50,xmin=-2.8,xmax=2.8)
-effGroup.defineHistogram('Efficiency_phi_passed,Efficiency_phi;hefficiency_phi',type='TProfile',title='Efficiency vs #phi;#phi (deg);Efficiency',path='TRT/Efficiency',xbins=50,xmin=-3.2,xmax=3.2)
-effGroup.defineHistogram('Efficiency_pt_passed,Efficiency_pt;hefficiency_pt',type='TProfile',title='Efficiency vs pT;pT (GeV);Efficiency',path='TRT/Efficiency',xbins=50,xmin=0,xmax=10)
-effGroup.defineHistogram('Efficiency_z0_passed,Efficiency_z0;hefficiency_z0',type='TProfile',title='Efficiency vs z0;z0;Efficiency',path='TRT/Efficiency',xbins=50,xmin=-200,xmax=200)
-effGroup.defineHistogram('EfficiencyBarrel_locR,EfficiencyBarrel_locR_passed;hefficiencyBarrel_locR',type='TProfile',title='Efficiency vs Track-to-Wire Distance for Xenon Straws (Barrel);Track-to-Wire Distance (mm);Efficiency',path='TRT/Efficiency',xbins=50,xmin=-2.5,xmax=2.5)
-effGroup.defineHistogram('EfficiencyBarrel_locR_Ar,EfficiencyBarrel_locR_Ar_passed;hefficiencyBarrel_locR_Ar',type='TProfile',title='Efficiency vs Track-to-Wire Distance for Argon Straws (Barrel);Track-to-Wire Distance (mm);Efficiency',path='TRT/Efficiency',xbins=50,xmin=-2.5,xmax=2.5)
+effGroup.defineHistogram('Efficiency_eta_passed,Efficiency_eta;hEfficiency_eta',type='TProfile',title='Efficiency vs #eta;#eta;Efficiency',path='TRT/Efficiency',xbins=50,xmin=-2.8,xmax=2.8)
+effGroup.defineHistogram('Efficiency_phi_passed,Efficiency_phi;hEfficiency_phi',type='TProfile',title='Efficiency vs #phi;#phi (deg);Efficiency',path='TRT/Efficiency',xbins=50,xmin=-3.2,xmax=3.2)
+effGroup.defineHistogram('Efficiency_pt_passed,Efficiency_pt;hEfficiency_pt',type='TProfile',title='Efficiency vs pT;pT (GeV);Efficiency',path='TRT/Efficiency',xbins=50,xmin=0,xmax=10)
+effGroup.defineHistogram('Efficiency_z0_passed,Efficiency_z0;hEfficiency_z0',type='TProfile',title='Efficiency vs z0;z0;Efficiency',path='TRT/Efficiency',xbins=50,xmin=-200,xmax=200)
+effGroup.defineHistogram('EfficiencyBarrel_locR,EfficiencyBarrel_locR_passed;hEfficiencyBarrel_locR',type='TProfile',title='Efficiency vs Track-to-Wire Distance for Xenon Straws (Barrel);Track-to-Wire Distance (mm);Efficiency',path='TRT/Efficiency',xbins=50,xmin=-2.5,xmax=2.5)
+effGroup.defineHistogram('EfficiencyBarrel_locR_Ar,EfficiencyBarrel_locR_Ar_passed;hEfficiencyBarrel_locR_Ar',type='TProfile',title='Efficiency vs Track-to-Wire Distance for Argon Straws (Barrel);Track-to-Wire Distance (mm);Efficiency',path='TRT/Efficiency',xbins=50,xmin=-2.5,xmax=2.5)
effBarrelGroup = helper.addGroup(algTRTMonitoringRun3RAW,'TRTEfficiencyHistogramsBarrel')
effBarrelGroup.defineHistogram('EfficiencyBarrelMap,EfficiencyBarrelMap_passed;hEfficiencyBarrelMap',type='TProfile',title='Straw Efficiency Map (Barrel);Straw Number;Efficiency',path='TRT/Efficiency',xbins=strawMax[0],xmin=0,xmax=strawMax[0])
effEndcapGroup = helper.addGroup(algTRTMonitoringRun3RAW,'TRTEfficiencyHistogramsEndCap')
@@ -181,8 +181,6 @@ for ibe in range(2):
trackGroup.defineHistogram('HitHWonTMapC;unscaled_hHitHWonTMapC',type='TH1F',title='HL Hit(In time Window) on Track: Chips;Chip Number in Stack;Probability',path=oss,xbins=iChipMax[ibe],xmin=0,xmax=iChipMax[ibe])
trackGroup.defineHistogram('HtoLonTMapS,HtoLonTMapS_passed;hHtoLonTMapS',type='TProfile',title='HL/LL Ratio on Track: Straws;Straw Number in Stack;Probability',path=oss,xbins=strawMax[ibe],xmin=0,xmax=strawMax[ibe])
trackGroup.defineHistogram('HtoLWonTMapS,HtoLWonTMapS_passed;hHtoLWonTMapS',type='TProfile',title='HL/LL (In Time Window) Ratio on Track: Straws;Straw Number in Stack;Probability',path=oss,xbins=strawMax[ibe],xmin=0,xmax=strawMax[ibe])
- trackGroup.defineHistogram('HitonTrackVAllS_x,HitonTrackVAllS_y;hHitonTrackVAllS',type='TProfile',title='(Hit on Track) / (Any LL Bit): Straws;Straw Number in Stack;Ratio',path=oss,xbins=strawMax[ibe],xmin=0,xmax=strawMax[ibe])
- trackGroup.defineHistogram('HitonTrackVAllC_x,HitonTrackVAllC_y;hHitonTrackVAllC',type='TProfile',title='(Hit on Track) / (Any LL Bit): Chips;Chip Number in Stack;Ratio',path=oss,xbins=iChipMax[ibe],xmin=0,xmax=iChipMax[ibe])
trackGroup.defineHistogram('HtoLWonTMapC,HtoLWonTMapC_passed;hHtoLWonTMapC',type='TProfile',title='HL/LL(In Time Window) Ratio on Track: Chips;Chip Number in Stack;Probability',path=oss,xbins=iChipMax[ibe],xmin=0,xmax=iChipMax[ibe])
trackGroup.defineHistogram('HtoLonTMapC,HtoLonTMapC_passed;hHtoLonTMapC',type='TProfile',title='HL/LL Ratio on Track: Chips;Chip Number in Stack;Probability',path=oss,xbins=iChipMax[ibe],xmin=0,xmax=iChipMax[ibe])
diff --git a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/src/TRTMonitoringRun3ESD_Alg.cxx b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/src/TRTMonitoringRun3ESD_Alg.cxx
index ca081b5c53050f63ee16f641796ab413700438e6..40c9befda92eaa078a6c3aeca6020f871f4e6c01 100644
--- a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/src/TRTMonitoringRun3ESD_Alg.cxx
+++ b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/src/TRTMonitoringRun3ESD_Alg.cxx
@@ -1197,71 +1197,66 @@ for (; p_trk != trackCollection.end(); ++p_trk) {
}
}
- if (m_environment != Environment_t::online) {
- if (m_doShift) {
- Summary = 0;
- SummaryWeight = 1.;
+ if (m_doShift) {
+ Summary = 0;
+ SummaryWeight = 1.;
+ fill("SmryHistograms", SummaryWeight, Summary);
+
+ if (m_doTracksMon) {
+ Summary = 1;
+ SummaryWeight = nTotalTracks;
fill("SmryHistograms", SummaryWeight, Summary);
+ Summary = 2;
+ SummaryWeight = nTracksB[0];
+ fill("SmryHistograms", SummaryWeight, Summary);
+ Summary = 3;
+ SummaryWeight = nTracksB[1];
+ fill("SmryHistograms", SummaryWeight, Summary);
+ Summary = 4;
+ SummaryWeight = nTracksEC[0];
+ fill("SmryHistograms", SummaryWeight, Summary);
+ Summary = 5;
+ SummaryWeight = nTracksEC[1];
+ fill("SmryHistograms", SummaryWeight, Summary);
+ Summary = 6;
+ SummaryWeight = nTracksEC_B[0];
+ fill("SmryHistograms", SummaryWeight, Summary);
+ Summary = 7;
+ SummaryWeight = nTracksEC_B[1];
+ fill("SmryHistograms", SummaryWeight, Summary);
+ }
- if (m_doTracksMon) {
- Summary = 1;
- SummaryWeight = nTotalTracks;
- fill("SmryHistograms", SummaryWeight, Summary);
- Summary = 2;
- SummaryWeight = nTracksB[0];
- fill("SmryHistograms", SummaryWeight, Summary);
- Summary = 3;
- SummaryWeight = nTracksB[1];
- fill("SmryHistograms", SummaryWeight, Summary);
- Summary = 4;
- SummaryWeight = nTracksEC[0];
- fill("SmryHistograms", SummaryWeight, Summary);
- Summary = 5;
- SummaryWeight = nTracksEC[1];
- fill("SmryHistograms", SummaryWeight, Summary);
- Summary = 6;
- SummaryWeight = nTracksEC_B[0];
- fill("SmryHistograms", SummaryWeight, Summary);
- Summary = 7;
- SummaryWeight = nTracksEC_B[1];
- fill("SmryHistograms", SummaryWeight, Summary);
- }
+ const unsigned int lumiBlock = eventInfo.lumiBlock();
+ ATH_MSG_VERBOSE("This is lumiblock : " << lumiBlock);
+ int lastLumiBlock = -99; // ToDo - last lumiblock calculation is not correct
+ if ((int)lumiBlock != lastLumiBlock) {
+ lastLumiBlock = lumiBlock;
}
+ float evtLumiBlock = 1.;
+ float lumiBlockScale = (evtLumiBlock > 0) ? (1. / evtLumiBlock) : 0;
- if (m_doShift) {
- const unsigned int lumiBlock = eventInfo.lumiBlock();
- ATH_MSG_VERBOSE("This is lumiblock : " << lumiBlock);
- int lastLumiBlock = -99; // ToDo - last lumiblock calculation is not correct
- if ((int)lumiBlock != lastLumiBlock) {
- lastLumiBlock = lumiBlock;
- }
- float evtLumiBlock = 1.;
- float lumiBlockScale = (evtLumiBlock > 0) ? (1. / evtLumiBlock) : 0;
+ if (m_doTracksMon && evtLumiBlock > 0) {
+ NTrksperLB_x = lastLumiBlock;
+ NTrksperLB_y = (float)nTrksperLB_B * lumiBlockScale;
+ fill("ShiftTRTTrackHistograms0", NTrksperLB_x, NTrksperLB_y);
- if (m_doTracksMon && evtLumiBlock > 0) {
+ for (int iside = 0; iside < 2; iside++) {
NTrksperLB_x = lastLumiBlock;
- NTrksperLB_y = (float)nTrksperLB_B * lumiBlockScale;
- fill("ShiftTRTTrackHistograms0", NTrksperLB_x, NTrksperLB_y);
-
- for (int iside = 0; iside < 2; iside++) {
- NTrksperLB_x = lastLumiBlock;
- NTrksperLB_y = (float)nTrksperLB_E[iside] * lumiBlockScale;
- fill("ShiftTRTTrackHistograms1"+std::to_string(iside), NTrksperLB_x, NTrksperLB_y);
- }
-
- nTrksperLB_B = 0;
+ NTrksperLB_y = (float)nTrksperLB_E[iside] * lumiBlockScale;
+ fill("ShiftTRTTrackHistograms1"+std::to_string(iside), NTrksperLB_x, NTrksperLB_y);
+ }
- for (int iside = 0; iside < 2; iside++) {
- nTrksperLB_E[iside] = 0;
- }
+ nTrksperLB_B = 0;
+ for (int iside = 0; iside < 2; iside++) {
+ nTrksperLB_E[iside] = 0;
}
}
-
- ATH_MSG_DEBUG("end of event and lumi block");
- //number of events in lumiblock counter setted to zero since it is end of the run or the lumiblock
}
+ ATH_MSG_DEBUG("end of event and lumi block");
+ //number of events in lumiblock counter setted to zero since it is end of the run or the lumiblock
+
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/src/TRTMonitoringRun3RAW_Alg.cxx b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/src/TRTMonitoringRun3RAW_Alg.cxx
index 5f0bb2e25353ddf91319cccff3b352adf3cb1b9d..a0242b2f581008f170fa203a63f869c2be5e78df 100644
--- a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/src/TRTMonitoringRun3RAW_Alg.cxx
+++ b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/src/TRTMonitoringRun3RAW_Alg.cxx
@@ -809,78 +809,30 @@ StatusCode TRTMonitoringRun3RAW_Alg::fillTRTRDOs(const TRT_RDO_Container& rdoCon
HLmoduleHits_E[i] = 0;
}
- short int scale_hHitWMap_B_passed[2][s_Straw_max[0]];
- short int scale_hHitWMap_E_passed[2][2][s_Straw_max[1]];
-
- for (int i = 0; i < 2; i++) {
- for (int j = 0; j < s_Straw_max[0]; j++) {
- scale_hHitWMap_B_passed[i][j] = 0;
- }
- }
-
- for (int i = 0; i < 2; i++) {
- for (int j = 0; j < 2; j++) {
- for (int k = 0; k < s_Straw_max[1]; k++) {
- scale_hHitWMap_E_passed[i][j][k] = 0;
- }
- }
- }
-
- short int scale_hHitHWMapS_B_passed[s_numberOfBarrelStacks*2][s_Straw_max[0]];
- short int scale_hHitHWMapC_B_passed[s_numberOfBarrelStacks*2][s_iChip_max[0]];
- short int scale_hHitWMapS_B_passed[s_numberOfBarrelStacks*2][s_Straw_max[0]];
- short int scale_hHitWMapC_B_passed[s_numberOfBarrelStacks*2][s_iChip_max[0]];
- short int scale_hHitAMapS_B_passed[s_numberOfBarrelStacks*2][s_Straw_max[0]];
- short int scale_hHitAMapC_B_passed[s_numberOfBarrelStacks*2][s_iChip_max[0]];
- short int scale_hHitAWMapS_B_passed[s_numberOfBarrelStacks*2][s_Straw_max[0]];
- short int scale_hHitAWMapC_B_passed[s_numberOfBarrelStacks*2][s_iChip_max[0]];
- short int scale_hHitHMapS_B_passed[s_numberOfBarrelStacks*2][s_Straw_max[0]];
- short int scale_hHitHMapC_B_passed[s_numberOfBarrelStacks*2][s_iChip_max[0]];
-
- for (int i = 0; i < s_numberOfBarrelStacks*2; i++) {
- for (int j = 0; j < s_iChip_max[0]; j++) {
- scale_hHitHWMapC_B_passed[i][j] = 0;
- scale_hHitWMapC_B_passed[i][j] = 0;
- scale_hHitAMapC_B_passed[i][j] = 0;
- scale_hHitAWMapC_B_passed[i][j] = 0;
- scale_hHitHMapC_B_passed[i][j] = 0;
- }
- for (int j = 0; j < s_Straw_max[0]; j++) {
- scale_hHitHWMapS_B_passed[i][j] = 0;
- scale_hHitWMapS_B_passed[i][j] = 0;
- scale_hHitAMapS_B_passed[i][j] = 0;
- scale_hHitAWMapS_B_passed[i][j] = 0;
- scale_hHitHMapS_B_passed[i][j] = 0;
- }
- }
-
- short int scale_hHitHWMapS_E_passed[s_numberOfEndCapStacks*2][s_Straw_max[1]];
- short int scale_hHitHWMapC_E_passed[s_numberOfEndCapStacks*2][s_iChip_max[1]];
- short int scale_hHitWMapS_E_passed[s_numberOfEndCapStacks*2][s_Straw_max[1]];
- short int scale_hHitWMapC_E_passed[s_numberOfEndCapStacks*2][s_iChip_max[1]];
- short int scale_hHitAMapS_E_passed[s_numberOfEndCapStacks*2][s_Straw_max[1]];
- short int scale_hHitAMapC_E_passed[s_numberOfEndCapStacks*2][s_iChip_max[1]];
- short int scale_hHitAWMapS_E_passed[s_numberOfEndCapStacks*2][s_Straw_max[1]];
- short int scale_hHitAWMapC_E_passed[s_numberOfEndCapStacks*2][s_iChip_max[1]];
- short int scale_hHitHMapC_E_passed[s_numberOfEndCapStacks*2][s_iChip_max[1]];
- short int scale_hHitHMapS_E_passed[s_numberOfEndCapStacks*2][s_Straw_max[1]];
-
- for (int i = 0; i < s_numberOfEndCapStacks*2; i++) {
- for (int j = 0; j < s_iChip_max[1]; j++) {
- scale_hHitHWMapC_E_passed[i][j] = 0;
- scale_hHitWMapC_E_passed[i][j] = 0;
- scale_hHitAMapC_E_passed[i][j] = 0;
- scale_hHitAWMapC_E_passed[i][j] = 0;
- scale_hHitHMapC_E_passed[i][j] = 0;
- }
- for (int j = 0; j < s_Straw_max[1]; j++) {
- scale_hHitHWMapS_E_passed[i][j] = 0;
- scale_hHitWMapS_E_passed[i][j] = 0;
- scale_hHitAMapS_E_passed[i][j] = 0;
- scale_hHitAWMapS_E_passed[i][j] = 0;
- scale_hHitHMapS_E_passed[i][j] = 0;
- }
- }
+ auto scale_hHitWMap_B_passed = std::make_unique<short int[][s_Straw_max[0]]>(2);
+ auto scale_hHitWMap_E_passed = std::make_unique<short int[][2][s_Straw_max[1]]>(2);
+
+ auto scale_hHitHWMapS_B_passed = std::make_unique<short int[][s_Straw_max[0]]>(s_numberOfBarrelStacks*2);
+ auto scale_hHitHWMapC_B_passed = std::make_unique<short int[][s_iChip_max[0]]>(s_numberOfBarrelStacks*2);
+ auto scale_hHitWMapS_B_passed = std::make_unique<short int[][s_Straw_max[0]]>(s_numberOfBarrelStacks*2);
+ auto scale_hHitWMapC_B_passed = std::make_unique<short int[][s_iChip_max[0]]>(s_numberOfBarrelStacks*2);
+ auto scale_hHitAMapS_B_passed = std::make_unique<short int[][s_Straw_max[0]]>(s_numberOfBarrelStacks*2);
+ auto scale_hHitAMapC_B_passed = std::make_unique<short int[][s_iChip_max[0]]>(s_numberOfBarrelStacks*2);
+ auto scale_hHitAWMapS_B_passed = std::make_unique<short int[][s_Straw_max[0]]>(s_numberOfBarrelStacks*2);
+ auto scale_hHitAWMapC_B_passed = std::make_unique<short int[][s_iChip_max[0]]>(s_numberOfBarrelStacks*2);
+ auto scale_hHitHMapS_B_passed = std::make_unique<short int[][s_Straw_max[0]]>(s_numberOfBarrelStacks*2);
+ auto scale_hHitHMapC_B_passed = std::make_unique<short int[][s_iChip_max[0]]>(s_numberOfBarrelStacks*2);
+
+ auto scale_hHitHWMapS_E_passed = std::make_unique<short int[][s_Straw_max[1]]>(s_numberOfEndCapStacks*2);
+ auto scale_hHitHWMapC_E_passed = std::make_unique<short int[][s_iChip_max[1]]>(s_numberOfEndCapStacks*2);
+ auto scale_hHitWMapS_E_passed = std::make_unique<short int[][s_Straw_max[1]]>(s_numberOfEndCapStacks*2);
+ auto scale_hHitWMapC_E_passed = std::make_unique<short int[][s_iChip_max[1]]>(s_numberOfEndCapStacks*2);
+ auto scale_hHitAMapS_E_passed = std::make_unique<short int[][s_Straw_max[1]]>(s_numberOfEndCapStacks*2);
+ auto scale_hHitAMapC_E_passed = std::make_unique<short int[][s_iChip_max[1]]>(s_numberOfEndCapStacks*2);
+ auto scale_hHitAWMapS_E_passed = std::make_unique<short int[][s_Straw_max[1]]>(s_numberOfEndCapStacks*2);
+ auto scale_hHitAWMapC_E_passed = std::make_unique<short int[][s_iChip_max[1]]>(s_numberOfEndCapStacks*2);
+ auto scale_hHitHMapS_E_passed = std::make_unique<short int[][s_Straw_max[1]]>(s_numberOfEndCapStacks*2);
+ auto scale_hHitHMapC_E_passed = std::make_unique<short int[][s_iChip_max[1]]>(s_numberOfEndCapStacks*2);
int goodid_status = 0;
int prev_bcid = 0;
@@ -2152,8 +2104,6 @@ StatusCode TRTMonitoringRun3RAW_Alg::fillTRTHits(const TrackCollection& trackCol
auto HtoLWonTMapC_passed = Monitored::Scalar<bool>("HtoLWonTMapC_passed", false);
auto HitTronTMapC_x = Monitored::Scalar<float>("HitTronTMapC_x", 0.0);
auto HitTronTMapC_y = Monitored::Scalar<float>("HitTronTMapC_y", 0.0);
- auto HitonTrackVAllS_x = Monitored::Scalar<float>("HitonTrackVAllS_x", 0.0);
- auto HitonTrackVAllS_y = Monitored::Scalar<float>("HitonTrackVAllS_y", 0.0);
auto p_trk = trackCollection.begin();