Skip to content

Commit e96b92c

Browse files
committed
remove extra check after discussion
1 parent 5e9be3b commit e96b92c

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

EventFilter/HGCalRawToDigi/src/HGCalUnpacker.cc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,8 @@ uint16_t HGCalUnpacker::parseFEDData(unsigned fedId,
151151
const auto econd_payload_length = ((econd_headers[0] >> ECOND_FRAME::PAYLOAD_POS) & ECOND_FRAME::PAYLOAD_MASK);
152152

153153
// sanity check
154-
// econd_payload_length must contain at least 1 word (CRC) otherwise it's corrupted
155154
if (((econd_headers[0] >> ECOND_FRAME::HEADER_POS) & ECOND_FRAME::HEADER_MASK) !=
156-
fedConfig.econds[globalECONDIdx].headerMarker ||
157-
econd_payload_length == 0) {
155+
fedConfig.econds[globalECONDIdx].headerMarker) {
158156
econdPacketInfo.view()[ECONDdenseIdx].exception() = 3;
159157
edm::LogWarning("[HGCalUnpacker]")
160158
<< "Expected a ECON-D header at word " << std::dec << (uint32_t)(ptr - header) << "/0x" << std::hex
@@ -204,7 +202,6 @@ uint16_t HGCalUnpacker::parseFEDData(unsigned fedId,
204202
//quality check for ECON-D (check econd_pkt_status here for error in trailer CRC)
205203
if ((((econd_headers[0] >> ECOND_FRAME::HT_POS) & ECOND_FRAME::HT_MASK) >= 0b10) ||
206204
(((econd_headers[0] >> ECOND_FRAME::EBO_POS) & ECOND_FRAME::EBO_MASK) >= 0b10) ||
207-
(((econd_headers[0] >> ECOND_FRAME::BITM_POS) & 0b1) == 0) ||
208205
(((econd_headers[0] >> ECOND_FRAME::BITM_POS) & 0b1) == 0) || econd_payload_length == 0 ||
209206
econd_pkt_status == backend::ECONDPacketStatus::OfflinePayloadCRCError ||
210207
econd_pkt_status == backend::ECONDPacketStatus::InactiveECOND || headerOnlyMode) {

0 commit comments

Comments
 (0)