From 30a56e318fc45e98fb0071f701f85f232259680a Mon Sep 17 00:00:00 2001 From: Andrea Date: Tue, 30 Apr 2019 12:34:14 +0200 Subject: [PATCH] Remove dead assignments inside CSCRawToDigi --- .../CSCRawToDigi/src/CSCDCCExaminer.cc | 19 ------------------- .../CSCRawToDigi/src/CSCDDUEventData.cc | 8 -------- EventFilter/CSCRawToDigi/src/CSCTMBData.cc | 5 ----- 3 files changed, 32 deletions(-) diff --git a/EventFilter/CSCRawToDigi/src/CSCDCCExaminer.cc b/EventFilter/CSCRawToDigi/src/CSCDCCExaminer.cc index 72aaae4ddc12a..d29925f165c5d 100644 --- a/EventFilter/CSCRawToDigi/src/CSCDCCExaminer.cc +++ b/EventFilter/CSCRawToDigi/src/CSCDCCExaminer.cc @@ -273,18 +273,14 @@ int32_t CSCDCCExaminer::check(const uint16_t* &buffer, int32_t length) /// Check for presence of data blocks inside TMB data - bool fTMB_Scope_Start = false; bool fTMB_MiniScope_Start = false; bool fTMB_RPC_Start = false; bool fTMB_BlockedCFEBs_Start = false; - bool fTMB_Scope = false; bool fTMB_MiniScope = false; bool fTMB_RPC = false; bool fTMB_BlockedCFEBs = false; - fTMB_Scope = fTMB_Scope && true; // WARNING in 5_0_X - while( length>0 ) { // == Store last 4 read buffers in pipeline-like memory (note that memcpy works quite slower!) @@ -633,12 +629,10 @@ int32_t CSCDCCExaminer::check(const uint16_t* &buffer, int32_t length) uniqueALCT = true; uniqueTMB = true; - fTMB_Scope_Start = false; fTMB_MiniScope_Start = false; fTMB_RPC_Start = false; fTMB_BlockedCFEBs_Start = false; - fTMB_Scope = false; fTMB_MiniScope = false; fTMB_RPC = false; fTMB_BlockedCFEBs = false; @@ -1031,12 +1025,6 @@ int32_t CSCDCCExaminer::check(const uint16_t* &buffer, int32_t length) fTMB_RPC_Start = true; } - // Check for Scope data - if ( fTMB_Header && (scanbuf(buf0,4, 0x6B05)>=0) ) - { - fTMB_Scope_Start = true; - } - // Check for Mini-Scope data if ( fTMB_Header && (scanbuf(buf0,4, 0x6B07)>=0) ) { @@ -1057,13 +1045,6 @@ int32_t CSCDCCExaminer::check(const uint16_t* &buffer, int32_t length) fTMB_RPC = true; } - // Check for end of Scope data - if ( fTMB_Header && fTMB_Scope_Start - && (scanbuf(buf0,4, 0x6E05)>=0) ) - { - fTMB_Scope = true; - } - // Check for end of Mini-Scope data if ( fTMB_Header && fTMB_MiniScope_Start && (scanbuf(buf0,4, 0x6E07)>=0) ) diff --git a/EventFilter/CSCRawToDigi/src/CSCDDUEventData.cc b/EventFilter/CSCRawToDigi/src/CSCDDUEventData.cc index 9ed43bff073fc..61a8af7ff1791 100644 --- a/EventFilter/CSCRawToDigi/src/CSCDDUEventData.cc +++ b/EventFilter/CSCRawToDigi/src/CSCDDUEventData.cc @@ -172,7 +172,6 @@ void CSCDDUEventData::unpack_data(const uint16_t *buf, CSCDCCExaminer* examiner) std::cout << i << " " << std::hex << buf[4*i+3] << " " << buf[4*i+2] << " " << buf[4*i+1] << " " << buf[4*i] << std::endl; } - //std::cout << "DDU Size: " << std::dec << theDDUHeader.sizeInWords() << std::endl; theDDUHeader.setFromBuffer(buf); @@ -196,10 +195,6 @@ void CSCDDUEventData::unpack_data(const uint16_t *buf, CSCDCCExaminer* examiner) { theFormatVersion = 2013; } - - // std::cout << "Format Version: " << theFormatVersion << std::endl; - //std::cout << "sandrik dduID =" << theDDUHeader.source_id() << std::endl; - //int i=-1; // we really don't want to copy CSCEventData's while filling the vec @@ -246,7 +241,6 @@ void CSCDDUEventData::unpack_data(const uint16_t *buf, CSCDCCExaminer* examiner) { LogTrace ("CSCDDUEventData|CSCRawToDigi") << "size of vector of cscData = " << theData.size(); } - // std::cout << std::dec << theDDUTrailer.sizeInWords() << std::endl; // decode ddu tail theDDUTrailer.setFromBuffer(inputBuf+dduBufSize); // memcpy(&theDDUTrailer, dduBlock+(dduBufSize-theDDUTrailer.sizeInWords())*2, theDDUTrailer.sizeInWords()*2); @@ -277,7 +271,6 @@ void CSCDDUEventData::unpack_data(const uint16_t *buf, CSCDCCExaminer* examiner) } theSizeInWords = dduBufSize+12; - buf=inputBuf+dduBufSize; } else { @@ -326,7 +319,6 @@ void CSCDDUEventData::unpack_data(const uint16_t *buf, CSCDCCExaminer* examiner) theSizeInWords = buf - inputBuf; } -//std::cout << "DDUevData Size: " << theSizeInWords << " BUFlast: " << std::hex << inputBuf0[theSizeInWords-4] << //std::endl; /// Pack Trailer 0 (to access TTS) theDDUTrailer0 = inputBuf0[theSizeInWords-4]; } diff --git a/EventFilter/CSCRawToDigi/src/CSCTMBData.cc b/EventFilter/CSCRawToDigi/src/CSCTMBData.cc index b5f6919c9bb10..09f39ef520dd9 100644 --- a/EventFilter/CSCRawToDigi/src/CSCTMBData.cc +++ b/EventFilter/CSCRawToDigi/src/CSCTMBData.cc @@ -166,26 +166,21 @@ int CSCTMBData::UnpackTMB(const uint16_t *buf) { ///determine 2007 or 2006 version unsigned short int firmwareVersion=0; int Ntbins = 0 ; - int NHeaderFrames = 0; //WARNING in 5_0_X int NRPCtbins = 0; // =VB= number of RPC tbins int b0cLine=0;///assumes that buf starts at the tmb data ///this is not true if something is wrong in the data ///before TMB - then we skip the whole event - NHeaderFrames++; NHeaderFrames--; - if (buf[b0cLine]==0xdb0c) { firmwareVersion=2007; Ntbins = buf[b0cLine+19]&0xF8; NRPCtbins = (buf[b0cLine+36]>>5)&0x1F; // =VB= get RPC tbins - NHeaderFrames = buf[b0cLine+5]&0x3F; //WARNING in 5_0_X } else if (buf[b0cLine]==0x6b0c) { firmwareVersion=2006; Ntbins = buf[b0cLine+1]&0x1f ; NRPCtbins = Ntbins; - NHeaderFrames = buf[b0cLine+4]&0x1f; //WARNING in 5_0_X } else { LogTrace("CSCTMBData|CSCRawToDigi") << "+++ Can't find b0C flag";