Fixing conflict with master; Clang-format

Author: yulunmiao

EventFilter/HGCalRawToDigi/plugins/HGCalRawToDigi.cc

@@ -115,7 +115,6 @@ void HGCalRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
         continue;
       fedPacketInfo.view()[fedId].FEDUnpackingFlag() =
           callUnpacker(fedId, fed_data, moduleIndexer, config, digis, fedPacketInfo, econdPacketInfo);
-      
     }
   }
   //parallel unpacking calls
@@ -151,8 +150,8 @@ uint16_t HGCalRawToDigi::callUnpacker(unsigned fedId,
                                       hgcaldigi::HGCalDigiHost& digis,
                                       hgcaldigi::HGCalFEDPacketInfoHost& fedPacketInfo,
                                       hgcaldigi::HGCalECONDPacketInfoHost& econdPacketInfo) {
-  uint16_t status =
-      unpacker_.parseFEDData(fedId, fed_data, moduleIndexer, config, digis, fedPacketInfo, econdPacketInfo, headersOnly_);
+  uint16_t status = unpacker_.parseFEDData(
+      fedId, fed_data, moduleIndexer, config, digis, fedPacketInfo, econdPacketInfo, headersOnly_);
   return status;
 }
 

EventFilter/HGCalRawToDigi/src/HGCalUnpacker.cc

@@ -265,7 +265,6 @@ uint16_t HGCalUnpacker::parseFEDData(unsigned fedId,
       LogDebug("[HGCalUnpacker]") << "fedId = " << fedId << ", captureblockIdx = " << captureblockIdx
                                   << ", econdIdx = " << econdIdx << ", econd_headers = " << std::hex
                                   << std::setfill('0') << std::setw(8) << econd_headers[0] << " " << econd_headers[1]
-                                  << std::dec << ", econd_payload_length = " << econd_payload_length;
                                   << ", econd_payload_length = " << std::dec << econd_payload_length << ", "
                                   << "H/T = 0b"
                                   << std::bitset<2>((econd_headers[0] >> ECOND_FRAME::HT_POS) & ECOND_FRAME::HT_MASK)