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

Clang-tidy checks for IORawData #20813

Merged
merged 2 commits into from Oct 8, 2017
Merged

Clang-tidy checks for IORawData #20813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5349f79
clang check SUSYBSMAnalysis
davidlange6 Oct 7, 2017
23580dd
clang check IORawData
davidlange6 Oct 7, 2017
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
2 changes: 1 addition & 1 deletion IORawData/CaloPatterns/interface/HcalPatternXMLParser.h
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
#include <vector>
#include <map>
#include <memory>
#include <stdint.h>
#include <cstdint>

class HcalPatternXMLParserImpl;

Expand Down
2 changes: 1 addition & 1 deletion IORawData/CaloPatterns/src/HcalFiberPattern.cc
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
static inline int setIf(const std::string& name,const std::map<std::string, std::string>& params) {
std::map<std::string, std::string>::const_iterator j=params.find(name);
if (j==params.end()) throw cms::Exception("InvalidFormat") << "Missing parameter '" << name << "'";
else return strtol(j->second.c_str(),0,0);
else return strtol(j->second.c_str(),nullptr,0);
}

HcalFiberPattern::HcalFiberPattern(const std::map<std::string, std::string>& params, const std::vector<uint32_t>& data) : pattern_(data) {
Expand Down
2 changes: 1 addition & 1 deletion IORawData/CaloPatterns/src/HcalPatternSource.cc
View file
Open in desktop
Expand Up @@ -102,7 +102,7 @@ void HcalPatternSource::loadPatternFile(const std::string& filename) {
std::map<std::string,std::string> params;
std::vector<uint32_t> data;
FILE* f=fopen(filename.c_str(), "r");
if (f==0) return;
if (f==nullptr) return;
else {
char block[4096];
while (!feof(f)) {
Expand Down
2 changes: 1 addition & 1 deletion IORawData/CaloPatterns/src/HcalPatternSource.h
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
class HcalPatternSource : public edm::EDProducer {
public:
HcalPatternSource(const edm::ParameterSet & pset);
virtual void produce(edm::Event& e, const edm::EventSetup& c);
void produce(edm::Event& e, const edm::EventSetup& c) override;
private:
void loadPatterns(const std::string& patspec);
void loadPatternFile(const std::string& filename);
Expand Down
20 changes: 10 additions & 10 deletions IORawData/CaloPatterns/src/HcalPatternXMLParser.cc
View file
Open in desktop
Expand Up @@ -14,10 +14,10 @@ class HcalPatternXMLParserImpl {
};

HcalPatternXMLParser::HcalPatternXMLParser() {
m_parser=0;
m_parser=nullptr;
}
HcalPatternXMLParser::~HcalPatternXMLParser() {
if (m_parser!=0) delete m_parser;
if (m_parser!=nullptr) delete m_parser;
}

/*
Expand Down Expand Up @@ -56,21 +56,21 @@ HcalPatternXMLParser::~HcalPatternXMLParser() {
m_items.clear();
m_parameters.clear();
}
virtual ~ConfigurationDBHandler() {
~ConfigurationDBHandler() override {
XMLString::release(&xc_Parameter);
XMLString::release(&xc_Data);
XMLString::release(&xc_name);
XMLString::release(&xc_type);
XMLString::release(&xc_elements);
XMLString::release(&xc_encoding);
}
virtual void startElement (const XMLCh *const uri, const XMLCh *const localname, const XMLCh *const qname, const Attributes &attrs) override;
virtual void endElement (const XMLCh *const uri, const XMLCh *const localname, const XMLCh *const qname) override;
virtual void characters (const XMLCh *const chars, const XMLSize_t length) override;
virtual void ignorableWhitespace (const XMLCh *const chars, const XMLSize_t length) override;
void startElement (const XMLCh *const uri, const XMLCh *const localname, const XMLCh *const qname, const Attributes &attrs) override;
void endElement (const XMLCh *const uri, const XMLCh *const localname, const XMLCh *const qname) override;
void characters (const XMLCh *const chars, const XMLSize_t length) override;
void ignorableWhitespace (const XMLCh *const chars, const XMLSize_t length) override;
private:
inline bool cvt2String(const XMLCh* val, std::string& ou) {
if (val==0) return false;
if (val==nullptr) return false;
char* tool=XMLString::transcode(val);
ou=tool;
XMLString::release(&tool);
Expand Down Expand Up @@ -151,7 +151,7 @@ void HcalPatternXMLParser::parse(const std::string& xmlDocument, std::map<std::s
ConfigurationDBHandler handler(parameters,items,encoding);

try {
if (m_parser==0) {
if (m_parser==nullptr) {
m_parser=new HcalPatternXMLParserImpl();
m_parser->parser=std::auto_ptr<xercesc::SAX2XMLReader>(xercesc::XMLReaderFactory::createXMLReader());
}
Expand All @@ -175,6 +175,6 @@ void HcalPatternXMLParser::parse(const std::string& xmlDocument, std::map<std::s

data.clear();
for (std::vector<std::string>::const_iterator i=items.begin(); i!=items.end(); i++)
data.push_back(strtol(i->c_str(),0,formatting));
data.push_back(strtol(i->c_str(),nullptr,formatting));

}
4 changes: 2 additions & 2 deletions IORawData/CaloPatterns/src/HtrXmlPattern.cc
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@

HtrXmlPattern::HtrXmlPattern(const edm::ParameterSet& iConfig)
{
m_filled=0;
m_filled=false;
m_fill_by_hand = iConfig.getUntrackedParameter<bool>("fill_by_hand");
m_hand_pattern_number = iConfig.getUntrackedParameter<int> ("hand_pattern_number");
m_sets_to_show = iConfig.getUntrackedParameter<int> ("sets_to_show");
Expand Down Expand Up @@ -54,7 +54,7 @@ void HtrXmlPattern::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe

if (m_fill_by_hand) {
do_hand_fill(readoutMap);
m_filled=1;
m_filled=true;
return;
}

Expand Down
6 changes: 3 additions & 3 deletions IORawData/CaloPatterns/src/HtrXmlPattern.h
View file
Open in desktop
Expand Up @@ -21,11 +21,11 @@
class HtrXmlPattern : public edm::EDAnalyzer {
public:
explicit HtrXmlPattern(const edm::ParameterSet&);
~HtrXmlPattern();
~HtrXmlPattern() override;

private:
virtual void analyze(const edm::Event&, const edm::EventSetup&);
virtual void endJob() ;
void analyze(const edm::Event&, const edm::EventSetup&) override;
void endJob() override ;
virtual void do_hand_fill(const HcalElectronicsMap*);
HtrXmlPatternTool *m_tool;
HtrXmlPatternToolParameters *m_toolparameters;
Expand Down
12 changes: 6 additions & 6 deletions IORawData/CaloPatterns/src/HtrXmlPatternSet.cc
View file
Open in desktop
@@ -1,5 +1,5 @@
#include "HtrXmlPatternSet.h"
#include <math.h>
#include <cmath>
#include <iostream>

ChannelPattern::ChannelPattern() {
Expand Down Expand Up @@ -43,7 +43,7 @@ void ChannelPattern::Fill_by_hand(const HcalElectronicsMap *emap,int pattern_num
iCrate=6 ; dcc9[iCrate]=728; dcc19[iCrate]=729;
iCrate=13; dcc9[iCrate]=730; dcc19[iCrate]=731;

int *dcc=0;
int *dcc=nullptr;
int spigot=-100;
if (m_slot>=2 && m_slot<=8) {
spigot=2*m_slot-m_tb-3;
Expand Down Expand Up @@ -207,7 +207,7 @@ CrateData::CrateData(int crate, int slotsActive[ChannelPattern::NUM_SLOTS]) {
for (int slot=0; slot<ChannelPattern::NUM_SLOTS; slot++) {
for (int tb=0;tb<2;tb++) {
if (slotsActive[slot]) m_slotsDoubled[slot][tb] = new HalfHtrData(crate,slot,tb);
else m_slotsDoubled[slot][tb] = 0;
else m_slotsDoubled[slot][tb] = nullptr;
}
}
}
Expand All @@ -222,13 +222,13 @@ CrateData::~CrateData() {

HalfHtrData* CrateData::getHalfHtrData(int slot, int tb) {
if ( slot>=0 && slot<ChannelPattern::NUM_SLOTS && (tb==0 || tb==1) ) return m_slotsDoubled[slot][tb];
else return 0;
else return nullptr;
}

HtrXmlPatternSet::HtrXmlPatternSet(int cratesActive[ChannelPattern::NUM_CRATES], int slotsActive[ChannelPattern::NUM_SLOTS]) {
for (int crate=0; crate<ChannelPattern::NUM_CRATES; crate++) {
if (cratesActive[crate]) m_crates[crate] = new CrateData(crate,slotsActive);
else m_crates[crate] = 0;
else m_crates[crate] = nullptr;
}
}

Expand All @@ -240,5 +240,5 @@ HtrXmlPatternSet::~HtrXmlPatternSet() {

CrateData* HtrXmlPatternSet::getCrate(int crate) {
if (crate>=0 && crate<ChannelPattern::NUM_CRATES) return m_crates[crate];
else return 0;
else return nullptr;
}
2 changes: 1 addition & 1 deletion IORawData/CaloPatterns/src/HtrXmlPatternSet.h
View file
Open in desktop
Expand Up @@ -38,7 +38,7 @@ class ChannelPattern {
class HalfHtrData {
public:
HalfHtrData(int crate, int slot, int tb);
ChannelPattern* getPattern(int chan) { return (chan>=1 && chan<=24)?(&m_patterns[chan-1]):(0); }
ChannelPattern* getPattern(int chan) { return (chan>=1 && chan<=24)?(&m_patterns[chan-1]):(nullptr); }
int getCrate() const { return m_crate; }
int getSlot() const { return m_slot; }
int getTB() const { return m_tb; }
Expand Down
34 changes: 17 additions & 17 deletions IORawData/CaloPatterns/src/HtrXmlPatternTool.cc
View file
Open in desktop
Expand Up @@ -39,8 +39,8 @@ HtrXmlPatternTool::~HtrXmlPatternTool() {

void HtrXmlPatternTool::Fill(const HcalElectronicsId HEID,HBHEDigiCollection::const_iterator data) {
CrateData* cd=m_patternSet->getCrate(HEID.readoutVMECrateId());
HalfHtrData* hd=0;
ChannelPattern* cp=0;
HalfHtrData* hd=nullptr;
ChannelPattern* cp=nullptr;

if (cd) {
hd=cd->getHalfHtrData(HEID.htrSlot(),HEID.htrTopBottom());
Expand All @@ -64,8 +64,8 @@ void HtrXmlPatternTool::Fill(const HcalElectronicsId HEID,HBHEDigiCollection::co

void HtrXmlPatternTool::Fill(const HcalElectronicsId HEID,HFDigiCollection::const_iterator data) {
CrateData* cd=m_patternSet->getCrate(HEID.readoutVMECrateId());
HalfHtrData* hd=0;
ChannelPattern* cp=0;
HalfHtrData* hd=nullptr;
ChannelPattern* cp=nullptr;

if (cd) {
hd=cd->getHalfHtrData(HEID.htrSlot(),HEID.htrTopBottom());
Expand All @@ -89,8 +89,8 @@ void HtrXmlPatternTool::Fill(const HcalElectronicsId HEID,HFDigiCollection::cons

void HtrXmlPatternTool::Fill(const HcalElectronicsId HEID,HODigiCollection::const_iterator data) {
CrateData* cd=m_patternSet->getCrate(HEID.readoutVMECrateId());
HalfHtrData* hd=0;
ChannelPattern* cp=0;
HalfHtrData* hd=nullptr;
ChannelPattern* cp=nullptr;

if (cd) {
hd=cd->getHalfHtrData(HEID.htrSlot(),HEID.htrTopBottom());
Expand Down Expand Up @@ -118,7 +118,7 @@ void HtrXmlPatternTool::prepareDirs() {

void HtrXmlPatternTool::writeXML() {
std::cout << "Writing XML..." << std::endl;
std::ofstream* of=0;
std::ofstream* of=nullptr;

if (m_params->m_XML_file_mode==1) {
std::string name=m_params->m_output_directory+(m_params->m_file_tag)+"_all.xml";
Expand All @@ -133,7 +133,7 @@ void HtrXmlPatternTool::writeXML() {

for (int crate=0; crate<ChannelPattern::NUM_CRATES; crate++) {
CrateData* cd=m_patternSet->getCrate(crate);
if (cd==0) continue;
if (cd==nullptr) continue;

if (m_params->m_XML_file_mode==2) {
std::string name=m_params->m_output_directory+(m_params->m_file_tag);
Expand All @@ -152,7 +152,7 @@ void HtrXmlPatternTool::writeXML() {
for (int slot=0; slot<ChannelPattern::NUM_SLOTS; slot++) {
for (int tb=0; tb<=1; tb++) {
HalfHtrData* hd=cd->getHalfHtrData(slot,tb);
if (hd==0) continue;
if (hd==nullptr) continue;
for (int fiber=1; fiber<=8; fiber++) {

if (m_params->m_XML_file_mode==3) {
Expand All @@ -171,7 +171,7 @@ void HtrXmlPatternTool::writeXML() {
if (m_params->m_XML_file_mode==3) {
of->close();
delete of;
of=0;
of=nullptr;
}

} //end fiber loop
Expand All @@ -182,7 +182,7 @@ void HtrXmlPatternTool::writeXML() {
(*of) << "</CFGBrickSet>" << std::endl;
of->close();
delete of;
of=0;
of=nullptr;
}

} //end crate loop
Expand All @@ -191,7 +191,7 @@ void HtrXmlPatternTool::writeXML() {
(*of) << "</CFGBrickSet>" << std::endl;
of->close();
delete of;
of=0;
of=nullptr;
}
}

Expand All @@ -208,26 +208,26 @@ void HtrXmlPatternTool::createHists() {

for (int crate=0; crate<ChannelPattern::NUM_CRATES; crate++) {
CrateData* cd=m_patternSet->getCrate(crate);
if (cd==0) continue;
if (cd==nullptr) continue;
for (int slot=0; slot<ChannelPattern::NUM_SLOTS; slot++) {
for (int tb=0; tb<=1; tb++) {
HalfHtrData* hd=cd->getHalfHtrData(slot,tb);
if (hd==0) continue;
if (hd==nullptr) continue;
for (int chan=1; chan<=24; chan++) {
ChannelPattern* cp=hd->getPattern(chan);
char hname[128];
sprintf(hname,"Exact fC Cr%d,%d%s-%d",crate,slot,
((tb==1)?("t"):("b")),chan);
TH1* hp=new TH1F(hname,hname,ChannelPattern::SAMPLES,-0.5,ChannelPattern::SAMPLES-0.5);
hp->SetDirectory(0);
hp->SetDirectory(nullptr);
sprintf(hname,"Quantized fC Cr%d,%d%s-%d",crate,slot,
((tb==1)?("t"):("b")),chan);
TH1* hq=new TH1F(hname,hname,ChannelPattern::SAMPLES,-0.5,ChannelPattern::SAMPLES-0.5);
hp->SetDirectory(0);
hp->SetDirectory(nullptr);
sprintf(hname,"Encoded fC Cr%d,%d%s-%d",crate,slot,
((tb==1)?("t"):("b")),chan);
TH1* ha=new TH1F(hname,hname,ChannelPattern::SAMPLES,-0.5,ChannelPattern::SAMPLES-0.5);
ha->SetDirectory(0);
ha->SetDirectory(nullptr);
for (int i=0; i<ChannelPattern::SAMPLES; i++) {
hp->Fill(i*1.0,(*cp)[i]);
hq->Fill(i*1.0,cp->getQuantized(i));
Expand Down
2 changes: 1 addition & 1 deletion IORawData/CaloPatterns/src/HtrXmlPatternWriter.cc
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ static const char* tabbing(int level) {

HtrXmlPatternWriter::HtrXmlPatternWriter() {
// set the timestamp!
time_t now1=time(0);
time_t now1=time(nullptr);
struct tm* now=localtime(&now1);

char buffer[1024];
Expand Down
6 changes: 3 additions & 3 deletions IORawData/DTCommissioning/plugins/DTDDUFileReader.cc
View file
Open in desktop
Expand Up @@ -94,7 +94,7 @@ int DTDDUFileReader::fillRawData(Event& e,
word = dmaUnpack(dataTag,nread);
if ( nread<=0 ) {
cout<<"[DTDDUFileReader]: ERROR! no more words and failed to get the trailer"<<endl;
delete data; data=0;
delete data; data=nullptr;
return false;
}
}
Expand All @@ -104,7 +104,7 @@ int DTDDUFileReader::fillRawData(Event& e,
dataTag = false;
if ( nread<=0 ) {
cout<<"[DTDDUFileReader]: ERROR! failed to get the trailer"<<endl;
delete data; data=0;
delete data; data=nullptr;
return false;
}
}
Expand Down Expand Up @@ -170,7 +170,7 @@ int DTDDUFileReader::fillRawData(Event& e,

void DTDDUFileReader::produce(Event&e, EventSetup const&es){
edm::Handle<FEDRawDataCollection> rawdata;
FEDRawDataCollection *fedcoll = 0;
FEDRawDataCollection *fedcoll = nullptr;
fillRawData(e,fedcoll);
std::unique_ptr<FEDRawDataCollection> bare_product(fedcoll);
e.put(std::move(bare_product));
Expand Down
4 changes: 2 additions & 2 deletions IORawData/DTCommissioning/plugins/DTDDUFileReader.h
View file
Open in desktop
Expand Up @@ -25,14 +25,14 @@ class DTDDUFileReader : public edm::EDProducer {
DTDDUFileReader(const edm::ParameterSet& pset);

/// Destructor
virtual ~DTDDUFileReader();
~DTDDUFileReader() override;

/// Generate and fill FED raw data for a full event
virtual int fillRawData(edm::Event& e,
// edm::Timestamp& tstamp,
FEDRawDataCollection*& data);

virtual void produce(edm::Event&, edm::EventSetup const&);
void produce(edm::Event&, edm::EventSetup const&) override;

/// check for a 64 bits word to be a DDU header
bool isHeader(uint64_t word, bool dataTag);
Expand Down
6 changes: 3 additions & 3 deletions IORawData/DTCommissioning/plugins/DTNewROS8FileReader.cc
View file
Open in desktop
Expand Up @@ -168,13 +168,13 @@ int DTNewROS8FileReader::fillRawData(Event& e,
if ( i == 1 ){
cout << "[DTNewROS8FileReader]: END OF FILE REACHED. "
<< "No information read for the requested event" << endl;
delete data; data=0;
delete data; data=nullptr;
return false;
}
else {
cout << "[DTNewROS8FileReader]: PROBLEM WITH EVENT INFORMATION ON THE FILE. "
<< "EVENT DATA READING FAILED code= " << i << endl;
delete data; data=0;
delete data; data=nullptr;
return false;
}

Expand All @@ -186,7 +186,7 @@ int DTNewROS8FileReader::fillRawData(Event& e,
void DTNewROS8FileReader::produce(Event&e, EventSetup const&es){

edm::Handle<FEDRawDataCollection> rawdata;
FEDRawDataCollection *fedcoll = 0;
FEDRawDataCollection *fedcoll = nullptr;
fillRawData(e,fedcoll);
std::unique_ptr<FEDRawDataCollection> bare_product(fedcoll);
e.put(std::move(bare_product));
Expand Down
4 changes: 2 additions & 2 deletions IORawData/DTCommissioning/plugins/DTNewROS8FileReader.h
View file
Open in desktop
Expand Up @@ -22,14 +22,14 @@ class DTNewROS8FileReader : public edm::EDProducer {
DTNewROS8FileReader(const edm::ParameterSet& pset);

/// Destructor
virtual ~DTNewROS8FileReader();
~DTNewROS8FileReader() override;

/// Generate and fill FED raw data for a full event
virtual int fillRawData(edm::Event& e,
// edm::Timestamp& tstamp,
FEDRawDataCollection*& data);

virtual void produce(edm::Event&, edm::EventSetup const&);
void produce(edm::Event&, edm::EventSetup const&) override;

virtual bool checkEndOfFile();

Expand Down