Merge branch 'master' into tpsupdatePR

Author: zhenbinwu

Alignment/APEEstimation/interface/TrackerSectorStruct.h

@@ -40,7 +40,7 @@ class TrackerSectorStruct {
           PProbXVsVar(nullptr),
           PSigmaXHitVsVar(nullptr),
           PSigmaXTrkVsVar(nullptr),
-          PSigmaXVsVar(nullptr){};
+          PSigmaXVsVar(nullptr) {}
 
     inline void fillCorrHists(const TString,
                               const TrackStruct::HitParameterStruct &hitParameterStruct,

Alignment/APEEstimation/plugins/ApeEstimator.cc

@@ -128,8 +128,8 @@ class ApeEstimator : public edm::one::EDAnalyzer<> {
 
 private:
   struct PositionAndError2 {
-    PositionAndError2() : posX(-999.F), posY(-999.F), errX2(-999.F), errY2(-999.F){};
-    PositionAndError2(float x, float y, float eX, float eY) : posX(x), posY(y), errX2(eX), errY2(eY){};
+    PositionAndError2() : posX(-999.F), posY(-999.F), errX2(-999.F), errY2(-999.F) {}
+    PositionAndError2(float x, float y, float eX, float eY) : posX(x), posY(y), errX2(eX), errY2(eY) {}
     float posX;
     float posY;
     float errX2;

Alignment/APEEstimation/plugins/BuildFile.xml

@@ -1,6 +1,7 @@
 <library file="*.cc" name="ApeEstimatorApeEstimatorPlugins">
   <use name="Alignment/APEEstimation" source_only="1"/>
   <use name="CommonTools/UtilAlgos"/>
+  <use name="CondFormats/Alignment"/>
   <use name="DataFormats/TrackingRecHit"/>
   <use name="DataFormats/TrackerRecHit2D"/>
   <use name="DataFormats/TrackReco"/>

Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h

@@ -17,7 +17,7 @@ class CocoaMaterialElementary {
 public:
   //---------- Constructors / Destructor
   CocoaMaterialElementary(ALIstring name, float density, ALIstring symbol, float A, ALIint Z);
-  ~CocoaMaterialElementary(){};
+  ~CocoaMaterialElementary() {}
 
   ALIstring getName() const { return theName; }
   float getDensity() const { return theDensity; }

Alignment/CocoaDDLObjects/interface/CocoaSolidShape.h

@@ -17,7 +17,7 @@ class CocoaSolidShape {
 public:
   //---------- Constructors / Destructor
   CocoaSolidShape(ALIstring type);
-  virtual ~CocoaSolidShape(){};
+  virtual ~CocoaSolidShape() {}
 
   ALIstring getType() const { return theType; }
 

Alignment/CocoaDDLObjects/interface/CocoaSolidShapeBox.h

@@ -14,7 +14,7 @@ class CocoaSolidShapeBox : public CocoaSolidShape {
 public:
   //---------- Constructors / Destructor
   CocoaSolidShapeBox(ALIstring type, ALIfloat xdim, ALIfloat ydim, ALIfloat zdim);
-  ~CocoaSolidShapeBox() override{};
+  ~CocoaSolidShapeBox() override {}
 
   ALIfloat getXHalfLength() const { return theXHalfLength; }
   ALIfloat getYHalfLength() const { return theYHalfLength; }

Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h

@@ -20,7 +20,7 @@ class CocoaSolidShapeTubs : public CocoaSolidShape {
                       ALIfloat pDz,
                       ALIfloat pSPhi = 0. * CLHEP::deg,
                       ALIfloat pDPhi = 360. * CLHEP::deg);
-  ~CocoaSolidShapeTubs() override{};
+  ~CocoaSolidShapeTubs() override {}
   ALIfloat getInnerRadius() const { return theInnerRadius; }
   ALIfloat getOuterRadius() const { return theOuterRadius; }
   ALIfloat getZHalfLength() const { return theZHalfLength; }

Alignment/CocoaDaq/interface/CocoaDaqReader.h

@@ -7,11 +7,11 @@ class OpticalAlignMeasurementInfo;
 
 class CocoaDaqReader {
 public:
-  CocoaDaqReader(){};
+  CocoaDaqReader() {}
   static CocoaDaqReader* GetDaqReader() { return theDaqReader; }
   static void SetDaqReader(CocoaDaqReader* reader);
 
-  virtual ~CocoaDaqReader(){};
+  virtual ~CocoaDaqReader() {}
 
   virtual bool ReadNextEvent() = 0;
   virtual bool ReadEvent(int nev) { return false; };

Alignment/CocoaDaq/interface/CocoaDaqRootEvent.h

@@ -195,7 +195,7 @@ class CocoaDaqRootEvent : public TObject {
 
 public:
   CocoaDaqRootEvent();
-  ~CocoaDaqRootEvent() override{};
+  ~CocoaDaqRootEvent() override {}
   void SetHeader(int run, int evt) { Header->SetRunEvt(run, evt); }
   void DumpIt();
 

Alignment/CocoaFit/interface/Fit.h

@@ -32,8 +32,8 @@ enum FitQuality { FQsmallDistanceToMinimum, FQbigDistanceToMinimum, FQchiSquareW
 class Fit {
 public:
   //----- Constructor / Destructor
-  Fit(){};
-  ~Fit(){};
+  Fit() {}
+  ~Fit() {}
 
   //----- Gets the only instance of this class
   static Fit& getInstance();