clang check EventFilter

cms-sw · Oct 9, 2017 · e510c05 · e510c05
1 parent a37ee8e
commit e510c05
Show file tree

Hide file tree

Showing 335 changed files with 1,191 additions and 1,191 deletions.
diff --git a/EventFilter/CSCRawToDigi/interface/CSCALCTHeader.h b/EventFilter/CSCRawToDigi/interface/CSCALCTHeader.h
@@ -178,7 +178,7 @@ class CSCALCTHeader {
       default:
 	edm::LogError("CSCALCTHeader|CSCRawToDigi")
           <<"check(): ALCT firmware version is bad/not defined!";
-        return 0;
+        return false;
       }
   }
 

diff --git a/EventFilter/CSCRawToDigi/interface/CSCALCTHeader2007.h b/EventFilter/CSCRawToDigi/interface/CSCALCTHeader2007.h
@@ -10,7 +10,7 @@
 #include <vector>
 #include "DataFormats/CSCDigi/interface/CSCALCTDigi.h"
 #include <boost/dynamic_bitset.hpp>
-#include <string.h>
+#include <cstring>
 
 class CSCDMBHeader;
 

diff --git a/EventFilter/CSCRawToDigi/interface/CSCALCTTrailer.h b/EventFilter/CSCRawToDigi/interface/CSCALCTTrailer.h
@@ -5,7 +5,7 @@
   http://www.phys.ufl.edu/~madorsky/alctv/alct2000_spec.PDF
 */
 
-#include <string.h> // memcpy
+#include <cstring> // memcpy
 #ifndef LOCAL_UNPACK
 #include <atomic>
 #endif
@@ -125,7 +125,7 @@ class CSCALCTTrailer
     default:
       edm::LogError("CSCALCTTrailer|CSCRawToDigi")
 	<<"couldn't check: ALCT firmware version is bad/not defined!";
-      return 0;
+      return false;
     }
   }
 

diff --git a/EventFilter/CSCRawToDigi/interface/CSCAnodeData2006.h b/EventFilter/CSCRawToDigi/interface/CSCAnodeData2006.h
@@ -49,14 +49,14 @@ class CSCAnodeData2006 : public CSCAnodeDataFormat
   /// fill from a real datastream
   CSCAnodeData2006(const CSCALCTHeader &, const unsigned short *buf);
 
-  virtual unsigned short * data() {return theDataFrames;}
+  unsigned short * data() override {return theDataFrames;}
   /// the amount of the input binary buffer read, in 16-bit words
-  virtual unsigned short int sizeInWords() const {return nAFEBs_ * nTimeBins_ * 6 * 2;}
+  unsigned short int sizeInWords() const override {return nAFEBs_ * nTimeBins_ * 6 * 2;}
 
   /// input layer is from 1 to 6
-  virtual std::vector<CSCWireDigi> wireDigis(int layer) const;
+  std::vector<CSCWireDigi> wireDigis(int layer) const override;
 
-  virtual void add(const CSCWireDigi &, int layer);
+  void add(const CSCWireDigi &, int layer) override;
 
   static  void selfTest();
 

diff --git a/EventFilter/CSCRawToDigi/interface/CSCAnodeData2007.h b/EventFilter/CSCRawToDigi/interface/CSCAnodeData2007.h
@@ -39,14 +39,14 @@ class CSCAnodeData2007 : public CSCAnodeDataFormat {
   /// fill from a real datastream
   CSCAnodeData2007(const CSCALCTHeader &, const unsigned short *buf);
 
-  virtual unsigned short * data() {return theDataFrames;}
+  unsigned short * data() override {return theDataFrames;}
   /// the amount of the input binary buffer read, in 16-bit words
-  virtual unsigned short int sizeInWords() const {return sizeInWords2007_;}
+  unsigned short int sizeInWords() const override {return sizeInWords2007_;}
 
   /// input layer is from 1 to 6
-  virtual std::vector<CSCWireDigi> wireDigis(int layer) const;
+  std::vector<CSCWireDigi> wireDigis(int layer) const override;
 
-  virtual void add(const CSCWireDigi &, int layer);
+  void add(const CSCWireDigi &, int layer) override;
 
   static void selfTest();
 

diff --git a/EventFilter/CSCRawToDigi/interface/CSCCFEBTimeSlice.h b/EventFilter/CSCRawToDigi/interface/CSCCFEBTimeSlice.h
@@ -32,7 +32,7 @@ struct CSCCFEBDataWord {
 };
 
 #include <iostream>
-#include <string.h> //for bzero
+#include <cstring> //for bzero
 
 struct CSCCFEBSCAControllerWord {
   /**

diff --git a/EventFilter/CSCRawToDigi/interface/CSCDCCEventData.h b/EventFilter/CSCRawToDigi/interface/CSCDCCEventData.h
@@ -15,7 +15,7 @@ class CSCDCCEventData {
   CSCDCCEventData(int sourceId, int nDDUs, int bx, int l1a);
   /// buf may need to stay pinned in memory as long
   /// as this data is used.  Not sure
-  explicit CSCDCCEventData(unsigned short *buf, CSCDCCExaminer* examiner=NULL);
+  explicit CSCDCCEventData(unsigned short *buf, CSCDCCExaminer* examiner=nullptr);
 
   ~CSCDCCEventData();
 
@@ -51,7 +51,7 @@ class CSCDCCEventData {
 
 
 protected:
-  void unpack_data(unsigned short * buf, CSCDCCExaminer* examiner=NULL);
+  void unpack_data(unsigned short * buf, CSCDCCExaminer* examiner=nullptr);
   CSCDCCHeader theDCCHeader;
   // DDUData is unpacked and stored in this vector
   std::vector<CSCDDUEventData> theDDUData;

diff --git a/EventFilter/CSCRawToDigi/interface/CSCDCCExaminer.h b/EventFilter/CSCRawToDigi/interface/CSCDCCExaminer.h
@@ -176,8 +176,8 @@ class CSCDCCExaminer {
 	const char* payloadName(int num) const { if(num>=0&&num<nPAYLOADS) return sDMBExpectedPayload[num]; else return ""; }
 	const char* statusName (int num) const { if(num>=0&&num<nSTATUSES) return sDMBEventStaus     [num]; else return ""; }
 
-	bool error  (int num) const { if(num>=0&&num<nERRORS)   return fSUM_ERROR  [num]; else return 0; }
-	bool warning(int num) const { if(num>=0&&num<nWARNINGS) return fSUM_WARNING[num]; else return 0; }
+	bool error  (int num) const { if(num>=0&&num<nERRORS)   return fSUM_ERROR  [num]; else return false; }
+	bool warning(int num) const { if(num>=0&&num<nWARNINGS) return fSUM_WARNING[num]; else return false; }
 
 	std::set<CSCIdType> chambersWithError  (int num) const { if(num>=0&&num<nERRORS)   return fCHAMB_ERR[num]; else return std::set<int>(); }
 	std::set<CSCIdType> chambersWithWarning(int num) const { if(num>=0&&num<nWARNINGS) return fCHAMB_WRN[num]; else return std::set<int>(); }

diff --git a/EventFilter/CSCRawToDigi/interface/CSCDCCTrailer.h b/EventFilter/CSCRawToDigi/interface/CSCDCCTrailer.h
@@ -4,7 +4,7 @@
 #define CSCDCCTrailer_h
 
 #include <iostream>
-#include <string.h> // bzero
+#include <cstring> // bzero
 #include "DataFormats/CSCDigi/interface/CSCDCCStatusDigi.h"
 
 

diff --git a/EventFilter/CSCRawToDigi/interface/CSCDCCUnpacker.h b/EventFilter/CSCRawToDigi/interface/CSCDCCUnpacker.h
@@ -20,12 +20,12 @@ class CSCDCCUnpacker: public edm::stream::EDProducer<> {
   CSCDCCUnpacker(const edm::ParameterSet & pset);
 
   /// Destructor
-  virtual ~CSCDCCUnpacker();
+  ~CSCDCCUnpacker() override;
 
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
   /// Produce digis out of raw data
-  void produce(edm::Event & e, const edm::EventSetup& c);
+  void produce(edm::Event & e, const edm::EventSetup& c) override;
 
   /// Visualization of raw data in FED-less events (Robert Harr and Alexander Sakharov)
   void visual_raw(int hl,int id, int run, int event, bool fedshort, bool fDump, short unsigned int* buf) const; 

diff --git a/EventFilter/CSCRawToDigi/interface/CSCDDUEventData.h b/EventFilter/CSCRawToDigi/interface/CSCDDUEventData.h
@@ -23,7 +23,7 @@ class CSCDDUEventData {
 
   // buf may need to stay pinned in memory as long
   // as this data is used.  Not sure
-  explicit CSCDDUEventData(unsigned short *buf, CSCDCCExaminer* examiner=NULL);
+  explicit CSCDDUEventData(unsigned short *buf, CSCDCCExaminer* examiner=nullptr);
 
   ~CSCDDUEventData();
 
@@ -69,7 +69,7 @@ class CSCDDUEventData {
 
   /// a good test routine would be to unpack data, then pack it again.
 protected:
-  void unpack_data(unsigned short * buf, CSCDCCExaminer* examiner=NULL);
+  void unpack_data(unsigned short * buf, CSCDCCExaminer* examiner=nullptr);
   CSCDCCHeader theDCCHeader;
   CSCDDUHeader theDDUHeader;
   // CSCData is unpacked and stored in this vector

diff --git a/EventFilter/CSCRawToDigi/interface/CSCDDUTrailer.h b/EventFilter/CSCRawToDigi/interface/CSCDDUTrailer.h
@@ -2,7 +2,7 @@
 #define CSCDDUTrailer_h
 
 #include <iostream>
-#include <string.h> // bzero
+#include <cstring> // bzero
 #include "DataFormats/CSCDigi/interface/CSCDDUStatusDigi.h"
 
 /** documented at  http://www.physics.ohio-state.edu/~cms/ddu/ddu2.html

diff --git a/EventFilter/CSCRawToDigi/interface/CSCDMBHeader.h b/EventFilter/CSCRawToDigi/interface/CSCDMBHeader.h
@@ -3,7 +3,7 @@
 
 #include <cassert>
 #include <iosfwd>
-#include <string.h> // bzero
+#include <cstring> // bzero
 #include "FWCore/Utilities/interface/Exception.h"
 #include "DataFormats/CSCDigi/interface/CSCDMBStatusDigi.h"
 #include "EventFilter/CSCRawToDigi/interface/CSCVDMBHeaderFormat.h"

diff --git a/EventFilter/CSCRawToDigi/interface/CSCDMBHeader2005.h b/EventFilter/CSCRawToDigi/interface/CSCDMBHeader2005.h
@@ -3,7 +3,7 @@
 
 #include <cassert>
 #include <iosfwd>
-#include <string.h> // bzero
+#include <cstring> // bzero
 #include "DataFormats/CSCDigi/interface/CSCDMBStatusDigi.h"
 #include "EventFilter/CSCRawToDigi/interface/CSCVDMBHeaderFormat.h"
 
@@ -19,39 +19,39 @@ struct CSCDMBHeader2005: public CSCVDMBHeaderFormat  {
       memcpy(this, digi.header(), sizeInWords()*2);
     }
 */
-  virtual bool cfebAvailable(unsigned icfeb);
-
-  virtual void addCFEB(int icfeb);
-  virtual void addNCLCT();  
-  virtual void addNALCT();
-  virtual void setBXN(int bxn);
-  virtual void setL1A(int l1a);
-  virtual void setL1A24(int l1a);
-  virtual void setCrateAddress(int crate, int dmbId);
-  virtual void setdmbID(int newDMBID) {bits.dmb_id = newDMBID;}
-  virtual void setdmbVersion(unsigned int version) {}
-
-  virtual unsigned cfebActive() const {return bits.cfeb_active;} 
-  virtual unsigned crateID() const;
-  virtual unsigned dmbID() const;
-  virtual unsigned bxn() const;
-  virtual unsigned bxn12() const;
-  virtual unsigned l1a() const;
-  virtual unsigned l1a24() const;
-  virtual unsigned cfebAvailable() const;
-  virtual unsigned nalct() const;
-  virtual unsigned nclct() const;
-  virtual unsigned cfebMovlp() const;
-  virtual unsigned dmbCfebSync() const;
-  virtual unsigned activeDavMismatch() const;
-  virtual unsigned format_version() const;
-
-  unsigned sizeInWords() const;
+  bool cfebAvailable(unsigned icfeb) override;
+
+  void addCFEB(int icfeb) override;
+  void addNCLCT() override;  
+  void addNALCT() override;
+  void setBXN(int bxn) override;
+  void setL1A(int l1a) override;
+  void setL1A24(int l1a) override;
+  void setCrateAddress(int crate, int dmbId) override;
+  void setdmbID(int newDMBID) override {bits.dmb_id = newDMBID;}
+  void setdmbVersion(unsigned int version) override {}
+
+  unsigned cfebActive() const override {return bits.cfeb_active;} 
+  unsigned crateID() const override;
+  unsigned dmbID() const override;
+  unsigned bxn() const override;
+  unsigned bxn12() const override;
+  unsigned l1a() const override;
+  unsigned l1a24() const override;
+  unsigned cfebAvailable() const override;
+  unsigned nalct() const override;
+  unsigned nclct() const override;
+  unsigned cfebMovlp() const override;
+  unsigned dmbCfebSync() const override;
+  unsigned activeDavMismatch() const override;
+  unsigned format_version() const override;
+
+  unsigned sizeInWords() const override;
 
-  virtual bool check() const;
+  bool check() const override;
 
-  virtual unsigned short * data() {return (unsigned short *)(&bits);}
-  virtual unsigned short * data() const {return (unsigned short *)(&bits);}
+  unsigned short * data() override {return (unsigned short *)(&bits);}
+  unsigned short * data() const override {return (unsigned short *)(&bits);}
 
 
   //ostream & operator<<(ostream &, const CSCDMBHeader2005 &);

diff --git a/EventFilter/CSCRawToDigi/interface/CSCDMBHeader2013.h b/EventFilter/CSCRawToDigi/interface/CSCDMBHeader2013.h
@@ -37,7 +37,7 @@
 
 #include <cassert>
 #include <iosfwd>
-#include <string.h> // bzero
+#include <cstring> // bzero
 #include "DataFormats/CSCDigi/interface/CSCDMBStatusDigi.h"
 #include "EventFilter/CSCRawToDigi/interface/CSCVDMBHeaderFormat.h"
 
@@ -53,39 +53,39 @@ struct CSCDMBHeader2013: public CSCVDMBHeaderFormat  {
       memcpy(this, digi.header(), sizeInWords()*2);
     }
 */
-  virtual bool cfebAvailable(unsigned icfeb);
-
-  virtual void addCFEB(int icfeb);
-  virtual void addNCLCT();  
-  virtual void addNALCT();
-  virtual void setBXN(int bxn);
-  virtual void setL1A(int l1a);
-  virtual void setL1A24(int l1a);
-  virtual void setCrateAddress(int crate, int dmbId);
-  virtual void setdmbID(int newDMBID) { bits.dmb_id = newDMBID; }
-  virtual void setdmbVersion(unsigned int version) {bits.fmt_version = (version<4) ? version: 0;}
-
-  virtual unsigned cfebActive() const { return bits.cfeb_clct_sent; } 
-  virtual unsigned crateID() const;
-  virtual unsigned dmbID() const;
-  virtual unsigned bxn() const;
-  virtual unsigned bxn12() const;
-  virtual unsigned l1a() const;
-  virtual unsigned l1a24() const;
-  virtual unsigned cfebAvailable() const;
-  virtual unsigned nalct() const;
-  virtual unsigned nclct() const;
-  virtual unsigned cfebMovlp() const;
-  virtual unsigned dmbCfebSync() const;
-  virtual unsigned activeDavMismatch() const;
-  virtual unsigned format_version() const;
-
-  unsigned sizeInWords() const;
+  bool cfebAvailable(unsigned icfeb) override;
+
+  void addCFEB(int icfeb) override;
+  void addNCLCT() override;  
+  void addNALCT() override;
+  void setBXN(int bxn) override;
+  void setL1A(int l1a) override;
+  void setL1A24(int l1a) override;
+  void setCrateAddress(int crate, int dmbId) override;
+  void setdmbID(int newDMBID) override { bits.dmb_id = newDMBID; }
+  void setdmbVersion(unsigned int version) override {bits.fmt_version = (version<4) ? version: 0;}
+
+  unsigned cfebActive() const override { return bits.cfeb_clct_sent; } 
+  unsigned crateID() const override;
+  unsigned dmbID() const override;
+  unsigned bxn() const override;
+  unsigned bxn12() const override;
+  unsigned l1a() const override;
+  unsigned l1a24() const override;
+  unsigned cfebAvailable() const override;
+  unsigned nalct() const override;
+  unsigned nclct() const override;
+  unsigned cfebMovlp() const override;
+  unsigned dmbCfebSync() const override;
+  unsigned activeDavMismatch() const override;
+  unsigned format_version() const override;
+
+  unsigned sizeInWords() const override;
 
-  bool check() const;
+  bool check() const override;
 
-  virtual unsigned short * data() {return (unsigned short *)(&bits);}
-  virtual unsigned short * data() const { return (unsigned short *)(&bits);}
+  unsigned short * data() override {return (unsigned short *)(&bits);}
+  unsigned short * data() const override { return (unsigned short *)(&bits);}
 
 
   //ostream & operator<<(ostream &, const CSCDMBHeader &);

diff --git a/EventFilter/CSCRawToDigi/interface/CSCDMBTrailer.h b/EventFilter/CSCRawToDigi/interface/CSCDMBTrailer.h
@@ -3,7 +3,7 @@
 
 #include <cassert>
 #include <iosfwd>
-#include <string.h> // bzero
+#include <cstring> // bzero
 #include "FWCore/Utilities/interface/Exception.h"
 #include "DataFormats/CSCDigi/interface/CSCDMBStatusDigi.h"
 #include "EventFilter/CSCRawToDigi/interface/CSCVDMBTrailerFormat.h"