diff --git a/DQM/EcalCommon/interface/FEFlags.h b/DQM/EcalCommon/interface/FEFlags.h index 4ded45c7b981a..b88c2d69bf211 100644 --- a/DQM/EcalCommon/interface/FEFlags.h +++ b/DQM/EcalCommon/interface/FEFlags.h @@ -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, diff --git a/DQM/EcalMonitorClient/src/RawDataClient.cc b/DQM/EcalMonitorClient/src/RawDataClient.cc index 65caaa9c34d10..df34d80f294be 100644 --- a/DQM/EcalMonitorClient/src/RawDataClient.cc +++ b/DQM/EcalMonitorClient/src/RawDataClient.cc @@ -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; } diff --git a/DQM/EcalMonitorTasks/python/RawDataTask_cfi.py b/DQM/EcalMonitorTasks/python/RawDataTask_cfi.py index 26dbf239b31f1..25c4fe7e05018 100644 --- a/DQM/EcalMonitorTasks/python/RawDataTask_cfi.py +++ b/DQM/EcalMonitorTasks/python/RawDataTask_cfi.py @@ -37,11 +37,11 @@ "LINKERROR", "BLOCKSIZE", "SUPPRESSED", - "FIFOFULL", + "FORCEDFULLSUPP", "L1ADESYNC", "BXDESYNC", "L1ABXDESYNC", - "FIFOFULLL1ADESYNC", + "FIFOFULL", "HPARITY", "VPARITY", "FORCEDZS" @@ -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'), diff --git a/DQM/EcalMonitorTasks/src/RawDataTask.cc b/DQM/EcalMonitorTasks/src/RawDataTask.cc index 859e9f72233c6..225dbac456508 100644 --- a/DQM/EcalMonitorTasks/src/RawDataTask.cc +++ b/DQM/EcalMonitorTasks/src/RawDataTask.cc @@ -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);