Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed unnecessary const cast from DQM/HcalMonitorTasks #12477

Merged
merged 1 commit into from Nov 26, 2015
Merged

Removed unnecessary const cast from DQM/HcalMonitorTasks #12477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions DQM/HcalMonitorTasks/src/HcalDataIntegrityTask.cc
View file
Open in desktop
Expand Up @@ -186,11 +186,11 @@ void HcalDataIntegrityTask::processEvent(const FEDRawDataCollection& rawraw,
void HcalDataIntegrityTask::unpack(const FEDRawData& raw,
const HcalElectronicsMap& emap){
// get the DCC header
const HcalDCCHeader* dccHeader=(const HcalDCCHeader*)(raw.data());
const HcalDCCHeader* dccHeader=reinterpret_cast<const HcalDCCHeader*>(raw.data());
if(!dccHeader) return;

// get the DCC trailer
unsigned char* trailer_ptr = (unsigned char*) (raw.data()+raw.size()-sizeof(uint64_t));
unsigned char const* trailer_ptr = reinterpret_cast<unsigned char const*>(raw.data()+raw.size()-sizeof(uint64_t));
FEDTrailer trailer = FEDTrailer(trailer_ptr);

int dccid=dccHeader->getSourceId();
Expand Down
4 changes: 2 additions & 2 deletions DQM/HcalMonitorTasks/src/HcalEEUSMonitor.cc
View file
Open in desktop
Expand Up @@ -311,11 +311,11 @@ void HcalEEUSMonitor::unpack(const FEDRawData& raw,


// get the DCC header
const HcalDCCHeader* dccHeader=(const HcalDCCHeader*)(raw.data());
const HcalDCCHeader* dccHeader=reinterpret_cast<const HcalDCCHeader*>(raw.data());
if(!dccHeader) return;

// get the DCC trailer
unsigned char* trailer_ptr = (unsigned char*) (raw.data()+raw.size()-sizeof(uint64_t));
const unsigned char* trailer_ptr = reinterpret_cast<const unsigned char*> (raw.data()+raw.size()-sizeof(uint64_t));
FEDTrailer trailer = FEDTrailer(trailer_ptr);

//DCC Event Fragment sizes distribution, in bytes.
Expand Down
10 changes: 5 additions & 5 deletions DQM/HcalMonitorTasks/src/HcalRawDataMonitor.cc
View file
Open in desktop
Expand Up @@ -626,9 +626,9 @@ void HcalRawDataMonitor::processEvent(const FEDRawDataCollection& rawraw,
void HcalRawDataMonitor::unpack(const FEDRawData& raw){

// get the DCC header & trailer (or bail out)
const HcalDCCHeader* dccHeader=(const HcalDCCHeader*)(raw.data());
const HcalDCCHeader* dccHeader= reinterpret_cast<const HcalDCCHeader*>(raw.data());
if(!dccHeader) return;
unsigned char* trailer_ptr = (unsigned char*) (raw.data()+raw.size()-sizeof(uint64_t));
const unsigned char* trailer_ptr = reinterpret_cast<const unsigned char*> (raw.data()+raw.size()-sizeof(uint64_t));
FEDTrailer trailer = FEDTrailer(trailer_ptr);

// FED id declared in the header
Expand All @@ -637,13 +637,13 @@ void HcalRawDataMonitor::unpack(const FEDRawData& raw){
int dcc_=std::max(0,dccid-700);
dcc_ = std::min(dcc_,31);
if(debug_>1) std::cout << "DCC " << dccid << std::endl;
uint64_t* dccfw= (uint64_t*) (raw.data()+(sizeof(uint64_t)*2)); //64-bit DAQ word number 2 (from 0)
const uint64_t* dccfw= reinterpret_cast<const uint64_t*> (raw.data()+(sizeof(uint64_t)*2)); //64-bit DAQ word number 2 (from 0)
int dcc_fw = ( ((*dccfw)>>(6*8))&0x00000000000000FF ); //Shift right 6 bytes, get that low byte.
meDCCVersion_ -> Fill(dccid,dcc_fw);

//Before all else, how much data are we dealing with here?
uint64_t* lastDataWord = (uint64_t*) ( raw.data()+(raw.size())-(1*sizeof(uint64_t)) );
int EvFragLength = (int) (*lastDataWord>>(4*8)) & 0x0000000000FFFFFF ; //Shift right 4 bytes, get low 3 bytes.
const uint64_t* lastDataWord = reinterpret_cast<const uint64_t*> ( raw.data()+(raw.size())-(1*sizeof(uint64_t)) );
int EvFragLength = static_cast<int> (*lastDataWord>>(4*8)) & 0x0000000000FFFFFF ; //Shift right 4 bytes, get low 3 bytes.
meFEDRawDataSizes_->Fill(EvFragLength*8); //# 64-bit DAQ words *8 = # bytes.
meEvFragSize_ ->Fill(dccid, EvFragLength*8); //# 64-bit DAQ words *8 = # bytes.
meEvFragSize2_ ->Fill(dccid, EvFragLength*8); //# 64-bit DAQ words *8 = # bytes.
Expand Down