Skip to content

Commit 4e5eac5

Browse files
cmsbuildcmsbuild
authored
Merge pull request #48329 from denizsun/hcal-data-cert-dqm-issue48243
[HCAL-DQM] Resolve fatal error introduced in PR #48211 (see issue #48243)
2 parents 30983ab + 050e3b8 commit 4e5eac5

File tree

1 file changed

+21
-29
lines changed

1 file changed

+21
-29
lines changed

‎DQM/HcalTasks/plugins/DigiTask.cc‎

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -391,24 +391,12 @@ DigiTask::DigiTask(edm::ParameterSet const& ps)
391391
new hcaldqm::quantity::DetectorQuantity(hcaldqm::quantity::fiphi),
392392
new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_TS200),
393393
0);
394-
_cTimingCutvsieta_Subdet.initialize(_name,
395-
"TimingCutvsieta",
396-
hcaldqm::hashfunctions::fSubdet,
397-
new hcaldqm::quantity::DetectorQuantity(hcaldqm::quantity::fieta),
398-
new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_TS200),
399-
0);
400394
_cOccupancyCutvsiphi_SubdetPM.initialize(_name,
401395
"OccupancyCutvsiphi",
402396
hcaldqm::hashfunctions::fSubdetPM,
403397
new hcaldqm::quantity::DetectorQuantity(hcaldqm::quantity::fiphi),
404398
new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN),
405399
0);
406-
_cOccupancyCutvsieta_Subdet.initialize(_name,
407-
"OccupancyCutvsieta",
408-
hcaldqm::hashfunctions::fSubdet,
409-
new hcaldqm::quantity::DetectorQuantity(hcaldqm::quantity::fieta),
410-
new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN),
411-
0);
412400
_cOccupancyCutvsiphivsLS_SubdetPM.initialize(_name,
413401
"OccupancyCutvsiphivsLS",
414402
hcaldqm::hashfunctions::fSubdetPM,
@@ -469,7 +457,18 @@ DigiTask::DigiTask(edm::ParameterSet const& ps)
469457
new hcaldqm::quantity::DetectorQuantity(hcaldqm::quantity::fiphi),
470458
new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN),
471459
0);
472-
460+
_cTimingCutvsieta_Subdet.initialize(_name,
461+
"TimingCutvsieta",
462+
hcaldqm::hashfunctions::fSubdet,
463+
new hcaldqm::quantity::DetectorQuantity(hcaldqm::quantity::fieta),
464+
new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_TS200),
465+
0);
466+
_cOccupancyCutvsieta_Subdet.initialize(_name,
467+
"OccupancyCutvsieta",
468+
hcaldqm::hashfunctions::fSubdet,
469+
new hcaldqm::quantity::DetectorQuantity(hcaldqm::quantity::fieta),
470+
new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN),
471+
0);
473472
// _cOccupancyCutvsSlotvsLS_HFPM.initialize(_name,
474473
// "OccupancyCutvsSlotvsLS", hcaldqm::hashfunctions::fSubdetPM,
475474
// new hcaldqm::quantity::LumiSection(_maxLS),
@@ -750,12 +749,10 @@ DigiTask::DigiTask(edm::ParameterSet const& ps)
750749

751750
if (_ptype == fOnline || _ptype == fOffline) {
752751
_cOccupancyCutvsiphi_SubdetPM.book(ib, _emap, _subsystem);
753-
_cOccupancyCutvsieta_Subdet.book(ib, _emap, _subsystem);
754752
_cOccupancyCutvsLS_Subdet.book(ib, _emap, _subsystem);
755753
_cOccupancyCutvsiphivsLS_SubdetPM.book(ib, _emap, _subsystem);
756754
_cOccupancyCutvsBX_Subdet.book(ib, _emap, _subsystem);
757755
_cTimingCutvsiphi_SubdetPM.book(ib, _emap, _subsystem);
758-
_cTimingCutvsieta_Subdet.book(ib, _emap, _subsystem);
759756
_cOccupancyBadCapidvsLS_Subdet.book(ib, _emap, _subsystem);
760757
_cOccupancyBadCapidvsLS_depth.book(ib, _emap, _subsystem);
761758
_xBadCapid.book(_emap);
@@ -771,7 +768,8 @@ DigiTask::DigiTask(edm::ParameterSet const& ps)
771768
_cOccupancyvsieta_Subdet.book(ib, _emap, _subsystem);
772769
_cSummaryvsLS_FED.book(ib, _emap, _subsystem);
773770
_cSummaryvsLS.book(ib, _subsystem);
774-
771+
_cOccupancyCutvsieta_Subdet.book(ib, _emap, _subsystem);
772+
_cTimingCutvsieta_Subdet.book(ib, _emap, _subsystem);
775773
_xUniHF.book(_emap, _filter_FEDHF);
776774
_xNChs.book(_emap);
777775
_xNChsNominal.book(_emap);
@@ -1087,13 +1085,13 @@ DigiTask::DigiTask(edm::ParameterSet const& ps)
10871085
_cSumQ_depth.fill(did, sumQ);
10881086
_cSumQvsLS_SubdetPM_QIE1011.fill(did, _currentLS, sumQ);
10891087
if (_ptype == fOnline) {
1088+
_cOccupancyCutvsieta_Subdet.fill(did);
1089+
_cTimingCutvsieta_Subdet.fill(did, timing);
10901090
_cSumQvsBX_SubdetPM_QIE1011.fill(did, bx, sumQ);
10911091
}
10921092
if (_ptype == fOnline || _ptype == fOffline) {
10931093
_cTimingCutvsiphi_SubdetPM.fill(did, timing);
1094-
_cTimingCutvsieta_Subdet.fill(did, timing);
10951094
_cOccupancyCutvsiphi_SubdetPM.fill(did);
1096-
_cOccupancyCutvsieta_Subdet.fill(did);
10971095
_cOccupancyCutvsiphivsLS_SubdetPM.fill(did, _currentLS);
10981096
}
10991097
if (_ptype != fOffline) { // hidefed2crate
@@ -1268,12 +1266,12 @@ DigiTask::DigiTask(edm::ParameterSet const& ps)
12681266
}
12691267
if (_ptype == fOnline) {
12701268
_cSumQvsBX_SubdetPM.fill(did, bx, sumQ);
1269+
_cTimingCutvsieta_Subdet.fill(did, timing);
1270+
_cOccupancyCutvsieta_Subdet.fill(did);
12711271
}
12721272
if (_ptype == fOnline || _ptype == fOffline) {
12731273
_cTimingCutvsiphi_SubdetPM.fill(did, timing);
1274-
_cTimingCutvsieta_Subdet.fill(did, timing);
12751274
_cOccupancyCutvsiphi_SubdetPM.fill(did);
1276-
_cOccupancyCutvsieta_Subdet.fill(did);
12771275
_cOccupancyCutvsiphivsLS_SubdetPM.fill(did, _currentLS);
12781276
}
12791277
if (_ptype != fOffline) { // hidefed2crate
@@ -1469,21 +1467,15 @@ DigiTask::DigiTask(edm::ParameterSet const& ps)
14691467
_cTimingCutvsLS_depth.fill(did, _currentLS, timing);
14701468
if (_ptype == fOnline) {
14711469
//if (!_filter_QIE1011.filter(did)) {
1472-
_cSumQvsBX_SubdetPM_QIE1011.fill(did, bx, sumQ);
1473-
//}
1474-
_cTimingCutvsiphi_SubdetPM.fill(did, timing);
14751470
_cTimingCutvsieta_Subdet.fill(did, timing);
1476-
_cOccupancyCutvsiphi_SubdetPM.fill(did);
14771471
_cOccupancyCutvsieta_Subdet.fill(did);
1478-
_cOccupancyCutvsiphivsLS_SubdetPM.fill(did, _currentLS);
1479-
// _cOccupancyCutvsSlotvsLS_HFPM.fill(did, _currentLS);
1472+
_cSumQvsBX_SubdetPM_QIE1011.fill(did, bx, sumQ);
1473+
//}
14801474
_xUniHF.get(eid)++;
14811475
}
14821476
if (_ptype == fOnline || _ptype == fOffline) {
14831477
_cTimingCutvsiphi_SubdetPM.fill(did, timing);
1484-
_cTimingCutvsieta_Subdet.fill(did, timing);
14851478
_cOccupancyCutvsiphi_SubdetPM.fill(did);
1486-
_cOccupancyCutvsieta_Subdet.fill(did);
14871479
_cOccupancyCutvsiphivsLS_SubdetPM.fill(did, _currentLS);
14881480
}
14891481
if (_ptype != fOffline) { // hidefed2crate
@@ -1552,7 +1544,7 @@ std::shared_ptr<hcaldqm::Cache> DigiTask::globalBeginLuminosityBlock(edm::Lumino
15521544
if (_ptype == fOffline || _ptype == fOnline) {
15531545
HcalDetId did_HB(hcaldqm::hashfunctions::hash_Subdet(HcalDetId(HcalBarrel, 1, 1, 1)));
15541546
HcalDetId did_HE(hcaldqm::hashfunctions::hash_Subdet(HcalDetId(HcalEndcap, 16, 1, 1)));
1555-
HcalDetId did_HF(hcaldqm::hashfunctions::hash_Subdet(HcalDetId(HcalForward, 29, 1, 1)));
1547+
HcalDetId did_HF(hcaldqm::hashfunctions::hash_Subdet(HcalDetId(HcalForward, 30, 1, 1)));
15561548
HcalDetId did_HO(hcaldqm::hashfunctions::hash_Subdet(HcalDetId(HcalOuter, 1, 1, 1)));
15571549
_cAveragedSumQvsLS_Subdet_QIE1011.fill(did_HB, _currentLS, (_HBSumMeanofSumQForEachEvent / _evsPerLS));
15581550
_cAveragedSumQvsLS_Subdet_QIE1011.fill(did_HE, _currentLS, (_HESumMeanofSumQForEachEvent / _evsPerLS));

0 commit comments

Comments
 (0)