fix codechecker errors

wiechula · sawenzel · commit 5bd39434d93f · 2017-05-15T15:34:56.000+02:00
diff --git a/Detectors/TPC/calibration/include/TPCCalibration/CalibPedestal.h b/Detectors/TPC/calibration/include/TPCCalibration/CalibPedestal.h
@@ -40,8 +40,8 @@ class CalibPedestal : public CalibRawBase
     /// Update function called once per digit
     ///
     /// \param sector
-    virtual Int_t Update(const Int_t sector, const Int_t row, const Int_t pad,
-                         const Int_t timeBin, const Float_t signal) final;
+    Int_t Update(const Int_t sector, const Int_t row, const Int_t pad,
+                 const Int_t timeBin, const Float_t signal) final;
 
     /// Analyse the buffered adc values and calculate noise and pedestal
     void analyse();
@@ -57,7 +57,7 @@ class CalibPedestal : public CalibRawBase
     const CalPad& getNoise() const { return mNoise; }
 
     /// Dump the relevant data to file
-    virtual void dumpToFile(TString filename) final;
+    void dumpToFile(TString filename) final;
 
 
   //private:
@@ -76,7 +76,7 @@ class CalibPedestal : public CalibRawBase
     vectorType* getVector(ROC roc, bool create=kFALSE);
 
     /// dummy reset
-    virtual void ResetEvent() final {}
+    void ResetEvent() final {}
 };
 
 } // namespace TPC
diff --git a/Detectors/TPC/monitor/include/TPCMonitor/SimpleEventDisplay.h b/Detectors/TPC/monitor/include/TPCMonitor/SimpleEventDisplay.h
@@ -31,8 +31,8 @@ class SimpleEventDisplay : public CalibRawBase
     
     virtual ~SimpleEventDisplay() = default;
 
-    virtual Int_t Update(const Int_t roc, const Int_t row, const Int_t pad,
-                         const Int_t timeBin, const Float_t signal) override;
+    Int_t Update(const Int_t roc, const Int_t row, const Int_t pad,
+                 const Int_t timeBin, const Float_t signal) final;
   
     CalPad* getCalPadMax() {return &mPadMax;}
 
@@ -63,7 +63,7 @@ class SimpleEventDisplay : public CalibRawBase
   
     const Mapper&  mTPCmapper;          //! mapper
   
-    virtual void ResetEvent() override;
+    void ResetEvent() final;
 };
 
 
diff --git a/Detectors/TPC/monitor/src/SimpleEventDisplay.cxx b/Detectors/TPC/monitor/src/SimpleEventDisplay.cxx
@@ -141,9 +141,9 @@ Int_t SimpleEventDisplay::Update(const Int_t roc,
 TH1D* SimpleEventDisplay::MakePadSignals(Int_t roc, Int_t row, Int_t pad)
 {
   // TODO: check
-  //if (roc<0||roc>=(Int_t)mROC->GetNSectors()) return 0x0;
-  //if (row<0||row>=(Int_t)mROC->GetNRows(roc)) return 0x0;
-  //if (pad<0||pad>=(Int_t)mROC->GetNPads(roc,row)) return 0x0;
+  //if (roc<0||roc>=(Int_t)mROC->GetNSectors()) return nullptr;
+  //if (row<0||row>=(Int_t)mROC->GetNRows(roc)) return nullptr;
+  //if (pad<0||pad>=(Int_t)mROC->GetNPads(roc,row)) return nullptr;
   // TODO: possible bug for OROC
   const Int_t channel =  
     mTPCmapper.globalPadNumber(PadPos(row,pad))
@@ -158,11 +158,11 @@ TH1D* SimpleEventDisplay::MakePadSignals(Int_t roc, Int_t row, Int_t pad)
     mLastSelSector=mSelectedSector;
     mSectorLoop=kFALSE;
   }
-  TH1D *h=0x0;
+  TH1D *h=nullptr;
   const Int_t nbins = mLastTimeBin - mFirstTimeBin;
-  if (nbins<=0) return 0x0;
+  if (nbins<=0) return nullptr;
   const Int_t offset = (nbins+2)*(channel+1);
-  Double_t *arrP=0x0;
+  Double_t *arrP=nullptr;
 
   const FECInfo& fecInfo = mTPCmapper.getFECInfo(PadROCPos(roc, row, pad));
 
