Skip to content

Commit

Permalink
Merge pull request #23832 from wddgit/gcc8CompilerWarnings2
Browse files Browse the repository at this point in the history 
Fix GCC8 compiler warnings, A real bug
  • Loading branch information
@cmsbuild
cmsbuild committed Jul 20, 2018
2 parents 67f69c8 + 4c8b35d commit e9ef1ce
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 37 deletions.
35 changes: 17 additions & 18 deletions EventFilter/L1TXRawToDigi/plugins/UCTCTP7RawData.h
View file
Expand Up @@ -3,7 +3,6 @@

#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/MessageLogger/interface/MessageDrop.h"
using namespace edm;

class UCTCTP7RawData {
public:
Expand All @@ -13,7 +12,7 @@ class UCTCTP7RawData {
UCTCTP7RawData(const uint32_t *d) : myDataPtr(d) {
if(myDataPtr != nullptr) {
if(sof() != 0xA110CA7E) {
LogError("UCTCTP7RawData") << "Failed to see 0xA110CA7E at start - but continuing" << std::endl;
edm::LogError("UCTCTP7RawData") << "Failed to see 0xA110CA7E at start - but continuing" << std::endl;
}
}
}
Expand All @@ -34,11 +33,11 @@ class UCTCTP7RawData {
uint32_t index = 0xDEADBEEF;
if(cType == EBEE || cType == HBHE) {
if(iPhi > 3) {
LogError("UCTCTP7RawData") << "Incorrect iPhi; iPhi = " << iPhi << "; should be in [0,3]" << std::endl;
edm::LogError("UCTCTP7RawData") << "Incorrect iPhi; iPhi = " << iPhi << "; should be in [0,3]" << std::endl;
return 0xDEADBEEF;
}
if(cEta < 1 || cEta > 28) {
LogError("UCTCTP7RawData") << "Incorrect caloEta; cEta = " << cEta << "; should be in [1-28]" << std::endl;
edm::LogError("UCTCTP7RawData") << "Incorrect caloEta; cEta = " << cEta << "; should be in [1-28]" << std::endl;
return 0xDEADBEEF;
}
// ECAL/HB+HE fragment size is 3 32-bit words
Expand Down Expand Up @@ -68,11 +67,11 @@ class UCTCTP7RawData {
}
else if(cType == HF) {
if(iPhi > 1) {
LogError("UCTCTP7RawData") << "HF iPhi should be 0 or 1 (for a , b) - invalid iPhi = " << iPhi << std::endl;
edm::LogError("UCTCTP7RawData") << "HF iPhi should be 0 or 1 (for a , b) - invalid iPhi = " << iPhi << std::endl;
return 0xDEADBEEF;
}
if(cEta < 30 || cEta > 41) {
LogError("UCTCTP7RawData") << "HF cEta should be between 30 and 41 - invalid cEta = " << cEta << std::endl;
edm::LogError("UCTCTP7RawData") << "HF cEta should be between 30 and 41 - invalid cEta = " << cEta << std::endl;
return 0xDEADBEEF;
}
if(negativeEta) {
Expand All @@ -99,7 +98,7 @@ class UCTCTP7RawData {
}
}
else {
LogError("UCTCTP7RawData") << "Unknown CaloType " << cType << std::endl;
edm::LogError("UCTCTP7RawData") << "Unknown CaloType " << cType << std::endl;
return 0xDEADBEEF;
}
return index;
Expand Down Expand Up @@ -263,9 +262,9 @@ class UCTCTP7RawData {

void print() {
using namespace std;
LogError("UCTCTP7RawData") << "CTP7 Payload Header:" << endl;
LogError("UCTCTP7RawData") << "No BX per L1A = " << dec << nBXPerL1A() << endl;
LogError("UCTCTP7RawData") << "Calo BX ID = " << dec << caloLinkBXID() << endl;
edm::LogError("UCTCTP7RawData") << "CTP7 Payload Header:" << endl;
edm::LogError("UCTCTP7RawData") << "No BX per L1A = " << dec << nBXPerL1A() << endl;
edm::LogError("UCTCTP7RawData") << "Calo BX ID = " << dec << caloLinkBXID() << endl;
CaloType cType = EBEE;
bool negativeEta = false;
bool first = true;
Expand All @@ -277,9 +276,9 @@ class UCTCTP7RawData {
for(uint32_t iPhi = 0; iPhi < 4; iPhi++) {
if(getLinkStatus(cType, negativeEta, cEta, iPhi) != 0 ||
getET(cType, negativeEta, cEta, iPhi) != 0) {
if(first) LogError("UCTCTP7RawData") << "EcalET FG LinkStatus" << endl;
if(first) edm::LogError("UCTCTP7RawData") << "EcalET FG LinkStatus" << endl;
first = false;
LogError("UCTCTP7RawData") << dec << setfill(' ') << setw(6) << getET(cType, negativeEta, cEta, iPhi) << " "
edm::LogError("UCTCTP7RawData") << dec << setfill(' ') << setw(6) << getET(cType, negativeEta, cEta, iPhi) << " "
<< getFB(cType, negativeEta, cEta, iPhi) << " "
<< showbase << internal << setfill('0') << setw(10) << hex << getLinkStatus(cType, negativeEta, cEta, iPhi)
<< " (" << dec << getIndex(cType, negativeEta, cEta, iPhi) << ", " << negativeEta << ", " << cEta << ", " << iPhi << ")"
Expand All @@ -293,9 +292,9 @@ class UCTCTP7RawData {
for(uint32_t iPhi = 0; iPhi < 4; iPhi++) {
if(getLinkStatus(cType, negativeEta, cEta, iPhi) != 0 ||
getET(cType, negativeEta, cEta, iPhi) != 0) {
if(first) LogError("UCTCTP7RawData") << "HcalET Feature LinkStatus" << endl;
if(first) edm::LogError("UCTCTP7RawData") << "HcalET Feature LinkStatus" << endl;
first = false;
LogError("UCTCTP7RawData") << dec << setfill(' ') << setw(6) << getET(cType, negativeEta, cEta, iPhi) << " "
edm::LogError("UCTCTP7RawData") << dec << setfill(' ') << setw(6) << getET(cType, negativeEta, cEta, iPhi) << " "
<< getFB(cType, negativeEta, cEta, iPhi) << " "
<< showbase << internal << setfill('0') << setw(10) << hex << getLinkStatus(cType, negativeEta, cEta, iPhi)
<< " (" << dec << getIndex(cType, negativeEta, cEta, iPhi) << ", " << negativeEta << ", " << cEta << ", " << iPhi << ")"
Expand All @@ -310,9 +309,9 @@ class UCTCTP7RawData {
if(iPhi == 1 && cEta == 40) cEta = 41;
if(getLinkStatus(cType, negativeEta, cEta, iPhi) != 0 ||
getET(cType, negativeEta, cEta, iPhi) != 0) {
if(first) LogError("UCTCTP7RawData") << "HF-ET Feature LinkStatus" << endl;
if(first) edm::LogError("UCTCTP7RawData") << "HF-ET Feature LinkStatus" << endl;
first = false;
LogError("UCTCTP7RawData") << dec << setfill(' ') << setw(6) << getET(cType, negativeEta, cEta, iPhi) << " "
edm::LogError("UCTCTP7RawData") << dec << setfill(' ') << setw(6) << getET(cType, negativeEta, cEta, iPhi) << " "
<< dec << setfill(' ') << setw(2) << getHFFeatureBits(negativeEta, cEta, iPhi) << " "
<< showbase << internal << setfill('0') << setw(10) << hex << getLinkStatus(cType, negativeEta, cEta, iPhi)
<< " (" << dec << getIndex(cType, negativeEta, cEta, iPhi) << ", " << negativeEta << ", " << cEta << ", " << iPhi << ")"
Expand All @@ -322,9 +321,9 @@ class UCTCTP7RawData {
}
first = true;
for(uint32_t region = 0; region < 7; region++) {
if(first) LogError("UCTCTP7RawData") << "Region ET EGVeto TauVeto HitLocation" << endl;
if(first) edm::LogError("UCTCTP7RawData") << "Region ET EGVeto TauVeto HitLocation" << endl;
first = false;
LogError("UCTCTP7RawData") << dec << setfill(' ') << setw(6) << region
edm::LogError("UCTCTP7RawData") << dec << setfill(' ') << setw(6) << region
<< " " << hex << showbase << internal << setfill('0') << setw(6) << getRegionET(negativeEta, region) << dec
<< " " << getRegionEGVeto(negativeEta, region)
<< " " << getRegionTauVeto(negativeEta, region)
Expand Down
37 changes: 18 additions & 19 deletions EventFilter/L1TXRawToDigi/plugins/UCTDAQRawData.h
View file
Expand Up @@ -7,15 +7,14 @@

#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/MessageLogger/interface/MessageDrop.h"
using namespace edm;

class UCTDAQRawData {
public:

UCTDAQRawData(const uint64_t *d) : myDataPtr(d) {
if(d != nullptr) {
if((d[0] & 0x5000000000000000) != 0x5000000000000000) {
LogError("UCTDAQRawData") << "CDF Header does not seem to be correct"
edm::LogError("UCTDAQRawData") << "CDF Header does not seem to be correct"
<< std::showbase << std::internal
<< std::setfill('0') << std::setw(10)
<< std::hex
Expand Down Expand Up @@ -49,87 +48,87 @@ class UCTDAQRawData {
if(amc < nAMCs()) {
return myDataPtr[2+amc] & 0x000000000000FFFF;
}
LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch board ID for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
edm::LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch board ID for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
return 0xDEADBEEF;
}

uint32_t amcNo(uint32_t amc = 0) {
if(amc < nAMCs()) {
return ((myDataPtr[2+amc] & 0x00000000000F0000) >> 16);
}
LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch amc no for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
edm::LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch amc no for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
return 0xDEADBEEF;
}

uint32_t amcBlkNo(uint32_t amc = 0) {
if(amc < nAMCs()) {
return ((myDataPtr[2+amc] & 0x000000000FF00000) >> 20);
}
LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch amc block no for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
edm::LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch amc block no for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
return 0xDEADBEEF;
}

uint32_t amcSize(uint32_t amc = 0) {
if(amc < nAMCs()) {
return ((myDataPtr[2+amc] & 0x00FFFFFF00000000) >> 32);
}
LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch amc size for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
edm::LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch amc size for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
return 0xDEADBEEF;
}

bool crcError(uint32_t amc = 0) {
if(amc < nAMCs()) {
return ((myDataPtr[2+amc] & 0x0100000000000000) != 0);
}
LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch crcError-bit for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
edm::LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch crcError-bit for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
return false;
}

bool isValid(uint32_t amc = 0) {
if(amc < nAMCs()) {
return ((myDataPtr[2+amc] & 0x0200000000000000) != 0);
}
LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch isValid-bit for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
edm::LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch isValid-bit for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
return false;
}

bool isPresent(uint32_t amc = 0) {
if(amc < nAMCs()) {
return ((myDataPtr[2+amc] & 0x0400000000000000) != 0);
}
LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch isPresent-bit for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
edm::LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch isPresent-bit for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
return false;
}

bool isEnabled(uint32_t amc = 0) {
if(amc < nAMCs()) {
return ((myDataPtr[2+amc] & 0x0800000000000000) != 0);
}
LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch isEnabled-bit for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
edm::LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch isEnabled-bit for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
return false;
}

bool isSegmented(uint32_t amc = 0) {
if(amc < nAMCs()) {
return ((myDataPtr[2+amc] & 0x1000000000000000) != 0);
}
LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch isSegmented-bit for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
edm::LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch isSegmented-bit for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
return false;
}

bool more(uint32_t amc = 0) {
if(amc < nAMCs()) {
return ((myDataPtr[2+amc] & 0x2000000000000000) != 0);
}
LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch more-bit for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
edm::LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch more-bit for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
return false;
}

bool lengthError(uint32_t amc = 0) {
if(amc < nAMCs()) {
return ((myDataPtr[2+amc] & 0x4000000000000000) != 0);
}
LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch length error bit for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
edm::LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch length error bit for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
return false;
}

Expand All @@ -142,7 +141,7 @@ class UCTDAQRawData {
}
return (uint32_t *) &myDataPtr[skip];
}
LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch payload location for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
edm::LogError("UCTDAQRawData") << "UCTDAQRawData: Failed to fetch payload location for AMC = " << amc << "; Max AMC = " << nAMCs() << std::endl;
return nullptr;
}

Expand Down Expand Up @@ -182,7 +181,7 @@ class UCTDAQRawData {
skip++;
const uint64_t *data = &myDataPtr[skip];
if((data[0] & 0xF000000000000000) != 0xA000000000000000) {
LogError("UCTDAQRawData") << "CDF Trailer seems to be wrong : "
edm::LogError("UCTDAQRawData") << "CDF Trailer seems to be wrong : "
<< std::showbase << std::internal
<< std::setfill('0') << std::setw(10)
<< std::hex
Expand All @@ -194,12 +193,12 @@ class UCTDAQRawData {

bool crcModified() {
const uint64_t *data = cdfTrailerPtr();
return ((data[0] & 0x0000000000000004) == 1);
return ((data[0] & 0x0000000000000004) != 0);
}

bool isLastTrailerWord() {
const uint64_t *data = cdfTrailerPtr();
return ((data[0] & 0x0000000000000008) == 1);
return ((data[0] & 0x0000000000000008) != 0);
}

uint32_t ttsBits() {
Expand All @@ -214,12 +213,12 @@ class UCTDAQRawData {

bool isWrongFEDID() {
const uint64_t *data = cdfTrailerPtr();
return ((data[0] & 0x0000000000004000) == 1);
return ((data[0] & 0x0000000000004000) != 0);
}

bool isSLinkErrorDetectedByFRL() {
const uint64_t *data = cdfTrailerPtr();
return ((data[0] & 0x0000000000008000) == 1);
return ((data[0] & 0x0000000000008000) != 0);
}

uint32_t crc16() {
Expand Down

0 comments on commit e9ef1ce

Please sign in to comment.