Merge pull request #20769 from mrodozov/fix-wrngs-calbgmtr-override-m…

…acros Fix compilation warnings in CalibCalorimetry pkg
cms-sw · Oct 7, 2017 · 073022d · 073022d
2 parents a37ee8e + 8569c45
commit 073022d
Show file tree

Hide file tree

Showing 29 changed files with 29 additions and 29 deletions.
diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaGui.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaGui.h
@@ -1125,7 +1125,7 @@ class TEcnaGui : public TGMainFrame {
   void MessageCnaCommandReplyA(const TString&);
   void MessageCnaCommandReplyB(const TString&);
 
-ClassDef(TEcnaGui,1)// Dialog box with GUI + methods for CNA (Correlated Noises Analysis)
+ClassDefOverride(TEcnaGui,1)// Dialog box with GUI + methods for CNA (Correlated Noises Analysis)
 
 };
 

diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaHeader.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaHeader.h
@@ -111,6 +111,6 @@ class TEcnaHeader : public TNamed {
 
   using TNamed::Print;
   void Print();
-  ClassDef(TEcnaHeader,1)  //Header of CNA ROOT file
+  ClassDefOverride(TEcnaHeader,1)  //Header of CNA ROOT file
 };
 #endif
diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaHistos.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaHistos.h
@@ -1340,7 +1340,7 @@ class TEcnaHistos : public TObject {
   Bool_t StatusFileFound();
   Bool_t StatusDataExist();
 
-ClassDef(TEcnaHistos,1)// methods for plots from ECNA (Ecal Correlated Noises Analysis)
+ClassDefOverride(TEcnaHistos,1)// methods for plots from ECNA (Ecal Correlated Noises Analysis)
 
 };
 

diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaNArrayD.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaNArrayD.h
@@ -73,6 +73,6 @@ class TEcnaNArrayD : public TObject {
   Double_t &operator()(Int_t i1,Int_t i2,Int_t i3,Int_t i4);
   Double_t &operator()(Int_t i1,Int_t i2,Int_t i3,Int_t i4,Int_t i5);
   Double_t &operator()(Int_t i1,Int_t i2,Int_t i3,Int_t i4,Int_t i5,Int_t i6);
-  ClassDef(TEcnaNArrayD,1) //ROOT class for multidimensional arrays of Double_t
+  ClassDefOverride(TEcnaNArrayD,1) //ROOT class for multidimensional arrays of Double_t
 };
 #endif
diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaNumbering.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaNumbering.h
@@ -231,6 +231,6 @@ class TEcnaNumbering : public TObject {
 
   Int_t MaxCrysInStinEcna(const Int_t&, const Int_t&, const TString&); // for not connected and incomplete SC's
 
-  ClassDef(TEcnaNumbering,1)  //Channel Numbering for CNA
+  ClassDefOverride(TEcnaNumbering,1)  //Channel Numbering for CNA
 };
 #endif
diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaObject.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaObject.h
@@ -94,7 +94,7 @@ class TEcnaObject : public TObject {
   void    NumberCreateObjectMessage(const TString&, const Long_t&, const Int_t&);
   void    NumberReuseObjectMessage(const TString&, const Long_t&, const Int_t&);
 
-ClassDef(TEcnaObject,1)// Parameter management for CNA (Correlated Noises Analysis)
+ClassDefOverride(TEcnaObject,1)// Parameter management for CNA (Correlated Noises Analysis)
 
 };
 

diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParCout.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParCout.h
@@ -46,7 +46,7 @@ class TEcnaParCout : public TObject {
   void     Init();
   Int_t    GetCodePrint(const TString&);
 
-ClassDef(TEcnaParCout,1)// Parameter management for ECNA (Ecal Correlated Noises Analysis)
+ClassDefOverride(TEcnaParCout,1)// Parameter management for ECNA (Ecal Correlated Noises Analysis)
 };
 
 #endif   //    ZTR_TEcnaParCout
diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParEcal.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParEcal.h
@@ -281,6 +281,6 @@ class TEcnaParEcal : public TNamed {
   Int_t MaxCrysVecoInStin();
   Int_t MaxCrysInStin();
 
-  ClassDef(TEcnaParEcal,1)  //Init of ECAL parameters
+  ClassDefOverride(TEcnaParEcal,1)  //Init of ECAL parameters
 };
 #endif
diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParHistos.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParHistos.h
@@ -189,7 +189,7 @@ class TEcnaParHistos : public TObject {
   TString GetCodeAllXtalsInStinPlot();
   Int_t   GetCodePlotAllXtalsInStin();
 
-ClassDef(TEcnaParHistos,1)// Parameter management for CNA (Correlated Noises Analysis)
+ClassDefOverride(TEcnaParHistos,1)// Parameter management for CNA (Correlated Noises Analysis)
 
 };
 

diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParPaths.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParPaths.h
@@ -102,7 +102,7 @@ class TEcnaParPaths : public TObject {
   TString PathTestScramArch();
 
 
-ClassDef(TEcnaParPaths,1)// Parameter management for ECNA (Ecal Correlated Noises Analysis)
+ClassDefOverride(TEcnaParPaths,1)// Parameter management for ECNA (Ecal Correlated Noises Analysis)
 
 };
 

diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaRead.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaRead.h
@@ -568,7 +568,7 @@ class TEcnaRead: public TObject {
                             // concerning initialisations
   void  PrintAllComments(); // Set flags to authorize printing of all the comments
 
-ClassDef(TEcnaRead,1) // Calculation of correlated noises from data
+ClassDefOverride(TEcnaRead,1) // Calculation of correlated noises from data
 };  
 
 #endif    //  CL_TEcnaRead_H

diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaResultType.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaResultType.h
@@ -52,6 +52,6 @@ class TEcnaResultType : public TObject {
 
   CnaResultTyp GetTypOfEntry(Int_t);
 
-  ClassDef(TEcnaResultType,1) //One leaf of the CNA root file
+  ClassDefOverride(TEcnaResultType,1) //One leaf of the CNA root file
 };
 #endif
diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaRootFile.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaRootFile.h
@@ -62,7 +62,7 @@ class TEcnaRootFile : public TObject {
   Bool_t ReadElement(Int_t);
   Bool_t ReadElement(CnaResultTyp,Int_t);
   Int_t  ReadElementNextEntryNumber(CnaResultTyp,Int_t);
-  ClassDef(TEcnaRootFile,1)  //Root file of CNA
+  ClassDefOverride(TEcnaRootFile,1)  //Root file of CNA
 };
 
 R__EXTERN TEcnaRootFile *gCnaRootFile;

diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaRun.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaRun.h
@@ -669,7 +669,7 @@ class TEcnaRun: public TObject {
                            // concerning initialisations
   void PrintAllComments(); // Set flags to authorize printing of all the comments
 
-ClassDef(TEcnaRun,1) // Calculation of correlated noises from data
+ClassDefOverride(TEcnaRun,1) // Calculation of correlated noises from data
 };  
 
 #endif    //  CL_TEcnaRun_H

diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaWrite.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaWrite.h
@@ -193,7 +193,7 @@ class TEcnaWrite : public TObject {
   void RegisterFileParameters(const TString&, const Int_t&, const Int_t&, const Int_t&,
 			      const Int_t&,  const Int_t&, const Int_t&);
 
-  ClassDef(TEcnaWrite,1)// Writing in file (.ascii, .root) methods for CNA (Correlated Noises Analysis)
+  ClassDefOverride(TEcnaWrite,1)// Writing in file (.ascii, .root) methods for CNA (Correlated Noises Analysis)
     };
 
 #endif   //    ZTR_TEcnaParameter

diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/PulseFitWithFunction.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/PulseFitWithFunction.h
@@ -79,7 +79,7 @@ class PulseFitWithFunction: public TObject
 
 
 
-  ClassDef(PulseFitWithFunction,0)     //!< The processed part of the class is persistant
+  ClassDefOverride(PulseFitWithFunction,0)     //!< The processed part of the class is persistant
 } ;
 
 #endif

diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/PulseFitWithShape.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/PulseFitWithShape.h
@@ -44,7 +44,7 @@ class PulseFitWithShape: public TObject
   int     fNum_samp_after_max  ; // number of samples after  maximum sample
 
 
-  ClassDef(PulseFitWithShape,0)     //!< The processed part of the class is persistant
+  ClassDefOverride(PulseFitWithShape,0)     //!< The processed part of the class is persistant
 
 } ;
 

diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/Shape.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/Shape.h
@@ -23,7 +23,7 @@ class Shape: public TObject
   //! Calling this method fill the shape corresponding to a given channel (tower, crystal and gain) 
   virtual bool fillShapeFor(int tower=0, int crystal=0, int gain=0) = 0 ; 
 
-  ClassDef(Shape,1) // Definition of a general interface to pulse shapes
+  ClassDefOverride(Shape,1) // Definition of a general interface to pulse shapes
 };
 
 #endif
diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/TAPDPulse.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/TAPDPulse.h
@@ -58,7 +58,7 @@ class TAPDPulse: public TObject
   double getPedestal();
   double* getAdcWithoutPedestal();
   void setPresamples(int);
-  ClassDef(TAPDPulse,0)
+  ClassDefOverride(TAPDPulse,0)
 };
 
 #endif
diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/TFParams.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/TFParams.h
@@ -93,6 +93,6 @@ double fitpj(double **, double *,double ** , double noise_val, int debug) ;
  double mixShape( Double_t *, Double_t * ) ;
  double computePulseWidth( int, double, double) ;
 
- ClassDef( TFParams, 0 )
+ ClassDefOverride( TFParams, 0 )
 };
 #endif
diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/TMarkov.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/TMarkov.h
@@ -27,7 +27,7 @@ class TMarkov: public TObject
   double getPeakValue(int i) const { return peak[i]; }
   int getBinMax() const { return imax; }
 
-  ClassDef(TMarkov,0)
+  ClassDefOverride(TMarkov,0)
 };
 
 #endif

diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/TMatacq.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/TMatacq.h
@@ -76,7 +76,7 @@ class TMatacq: public TObject
   double getWidth80() {return width80;}
   double getSlide() {return slidingmean;}
 
-  ClassDef(TMatacq,0)
+  ClassDefOverride(TMatacq,0)
 };
 
 #endif

diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/TMem.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/TMem.h
@@ -29,7 +29,7 @@ class TMem: public TObject
   bool isMemRelevant(int);
   int Mem(int, int);
 
-  ClassDef(TMem,0)
+  ClassDefOverride(TMem,0)
 };
 
 #endif
diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/TMom.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/TMom.h
@@ -61,7 +61,7 @@ class TMom: public TObject
   double getMax();
   std::vector<double> getPeak();
 
-  ClassDef(TMom,0)
+  ClassDefOverride(TMom,0)
 };
 
 #endif
diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/TPNCor.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/TPNCor.h
@@ -28,7 +28,7 @@ class TPNCor: public TObject
   double corParams[iSizeGain][iSizePar];
   int isFileOK;
 
-  ClassDef(TPNCor,0)
+  ClassDefOverride(TPNCor,0)
 
 
 

diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/TPNFit.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/TPNFit.h
@@ -35,7 +35,7 @@ class TPNFit: public TObject
   double getAmpl() {return ampl;}
   double getTimax() {return timeatmax;}
 
-  ClassDef(TPNFit,0)
+  ClassDefOverride(TPNFit,0)
 };
 
 #endif

diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/TPNPulse.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/TPNPulse.h
@@ -40,7 +40,7 @@ class TPNPulse: public TObject
   double getPedestal();
   double* getAdcWithoutPedestal();
   void setPresamples(int);
-  ClassDef(TPNPulse,0)
+  ClassDefOverride(TPNPulse,0)
 };
 
 #endif
diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/TSFit.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/TSFit.h
@@ -86,7 +86,7 @@ public :
 
   double inverms  ( int, double xx[matdim][matdim], double yy[matdim][matdim] );
 
-  ClassDef( TSFit, 0 )
+  ClassDefOverride( TSFit, 0 )
 };
 
 #endif

diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/TShapeAnalysis.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/TShapeAnalysis.h
@@ -75,7 +75,7 @@ class TShapeAnalysis: public TObject
   std::vector<double> getVals(int);
   std::vector<double> getInitVals(int);
 
-  ClassDef(TShapeAnalysis,0)
+  ClassDefOverride(TShapeAnalysis,0)
 };
 
 #endif