Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DQM/EcalCommon/interface/FEFlags.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ namespace ecaldqm {
LinkError = 5,
BlockSize = 6,
Suppressed = 7,
FIFOFull = 8,
ForcedFullSupp = 8,
L1ADesync = 9,
BXDesync = 10,
L1ABXDesync = 11,
FIFOFullL1ADesync = 12,
FIFOFull = 12,
HParity = 13,
VParity = 14,
ForcedZS = 15,
Expand Down
2 changes: 1 addition & 1 deletion DQM/EcalMonitorClient/src/RawDataClient.cc
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ namespace ecaldqm {
for (unsigned iS(0); iS < nFEFlags; iS++) {
float entries(sFEStatus.getBinContent(getEcalDQMSetupObjects(), id, iS + 1));
towerEntries += entries;
if (entries > 0. && iS != Enabled && iS != Suppressed && iS != FIFOFull && iS != FIFOFullL1ADesync &&
if (entries > 0. && iS != Enabled && iS != Suppressed && iS != ForcedFullSupp && iS != FIFOFull &&
iS != ForcedZS)
towerStatus = doMask ? kMBad : kBad;
}
Expand Down
6 changes: 3 additions & 3 deletions DQM/EcalMonitorTasks/python/RawDataTask_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
"LINKERROR",
"BLOCKSIZE",
"SUPPRESSED",
"FIFOFULL",
"FORCEDFULLSUPP",
"L1ADESYNC",
"BXDESYNC",
"L1ABXDESYNC",
"FIFOFULLL1ADESYNC",
"FIFOFULL",
"HPARITY",
"VPARITY",
"FORCEDZS"
Expand Down Expand Up @@ -284,7 +284,7 @@
otype = cms.untracked.string('Ecal3P'),
btype = cms.untracked.string('SuperCrystal'),
perLumi = cms.untracked.bool(True),
description = cms.untracked.string('FE status error occupancy map for this lumisection. Nominal FE status flags such as ENABLED, SUPPRESSED, FIFOFILL, FIFOFULLL1ADESYNC, and FORCEDZS are NOT included.')
description = cms.untracked.string('FE status error occupancy map for this lumisection. Nominal FE status flags such as ENABLED, SUPPRESSED, FORCEDFULLSUPP, FIFOFULL, and FORCEDZS are NOT included.')
),
FEStatusMEM = cms.untracked.PSet(
path = cms.untracked.string('Ecal/MEM/StatusFlagsTask MEM front-end status bits'),
Expand Down
2 changes: 1 addition & 1 deletion DQM/EcalMonitorTasks/src/RawDataTask.cc
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ namespace ecaldqm {
DetId id(GetElectronicsMap()->dccTowerConstituents(dccId, iFE + 1).at(0));
meFEStatus.fill(getEcalDQMSetupObjects(), id, status);
// Fill FE Status Error Map with error states only
if (status != Enabled && status != Suppressed && status != FIFOFull && status != FIFOFullL1ADesync &&
if (status != Enabled && status != Suppressed && status != ForcedFullSupp && status != FIFOFull &&
status != ForcedZS)
meFEStatusErrMapByLumi.fill(getEcalDQMSetupObjects(), id, status);

Expand Down