Merge pull request #1 from cms-sw/master

update fork

.clang-tidy

@@ -0,0 +1,42 @@
+---
+Checks: -*,
+  ,boost-use-to-string,
+  ,misc-string-compare,
+  ,misc-uniqueptr-reset-release,
+  ,modernize-deprecated-headers,
+  ,modernize-make-shared,
+  ,modernize-use-bool-literals,
+  ,modernize-use-equals-delete,
+  ,modernize-use-nullptr,
+  ,modernize-use-override,
+  ,performance-unnecessary-copy-initialization,
+  ,readability-container-size-empty,
+  ,readability-redundant-string-cstr,
+  ,readability-static-definition-in-anonymous-namespace,
+  ,readability-uniqueptr-delete-release
+WarningsAsErrors: ''
+HeaderFilterRegex: ''
+AnalyzeTemporaryDtors: false
+CheckOptions:    
+  - key:             google-readability-braces-around-statements.ShortStatementLines
+    value:           '1'
+  - key:             google-readability-function-size.StatementThreshold
+    value:           '800'
+  - key:             google-readability-namespace-comments.ShortNamespaceLines
+    value:           '10'
+  - key:             google-readability-namespace-comments.SpacesBeforeComments
+    value:           '2'
+  - key:             modernize-loop-convert.MaxCopySize
+    value:           '16'
+  - key:             modernize-loop-convert.MinConfidence
+    value:           reasonable
+  - key:             modernize-loop-convert.NamingStyle
+    value:           CamelCase
+  - key:             modernize-pass-by-value.IncludeStyle
+    value:           llvm
+  - key:             modernize-replace-auto-ptr.IncludeStyle
+    value:           llvm
+  - key:             modernize-use-nullptr.NullMacros
+    value:           'NULL'
+...
+

Alignment/APEEstimation/interface/EventVariables.h

@@ -1,6 +1,7 @@
 #ifndef Alignment_APEEstimation_EventVariables_h
 #define Alignment_APEEstimation_EventVariables_h
 
+#include <vector>
 
 struct TrackStruct{
 

Alignment/APEEstimation/interface/TrackerDetectorStruct.h

@@ -2,30 +2,32 @@
 #define Alignment_APEEstimation_TrackerDetectorStruct_h
 
 
-//#include "TH1.h"
+#include "TH1.h"
+#include "TH2.h"
+#include "TProfile.h"
 
 struct TrackerDetectorStruct{
 
-  TrackerDetectorStruct(): TrkSize(0), TrkSizeGood(0),
-                           HitsSize(0), HitsValid(0), HitsInvalid(0), Hits2D(0),
-			   HitsGood(0), LayersMissed(0),
-			   HitsPixel(0), HitsStrip(0),
-			   Charge(0),
-			   Chi2(0), Ndof(0), NorChi2(0), Prob(0),
-			   Eta(0), EtaErr(0), EtaSig(0), Theta(0),
-			   Phi(0), PhiErr(0), PhiSig(0),
-			   D0Beamspot(0), D0BeamspotErr(0), D0BeamspotSig(0),
-			   Dz(0), DzErr(0), DzSig(0),
-			   P(0), Pt(0), PtErr(0), PtSig(0),
-			   MeanAngle(0),
-			   HitsGoodVsHitsValid(0), MeanAngleVsHits(0),
-			   HitsPixelVsEta(0), HitsPixelVsTheta(0),
-			   HitsStripVsEta(0), HitsStripVsTheta(0),
-			   PtVsEta(0), PtVsTheta(0),
-			   PHitsGoodVsHitsValid(0), PMeanAngleVsHits(0),
-			   PHitsPixelVsEta(0), PHitsPixelVsTheta(0),
-			   PHitsStripVsEta(0), PHitsStripVsTheta(0),
-			   PPtVsEta(0), PPtVsTheta(0){}
+  TrackerDetectorStruct(): TrkSize(nullptr), TrkSizeGood(nullptr),
+                           HitsSize(nullptr), HitsValid(nullptr), HitsInvalid(nullptr), Hits2D(nullptr),
+			   HitsGood(nullptr), LayersMissed(nullptr),
+			   HitsPixel(nullptr), HitsStrip(nullptr),
+			   Charge(nullptr),
+			   Chi2(nullptr), Ndof(nullptr), NorChi2(nullptr), Prob(nullptr),
+			   Eta(nullptr), EtaErr(nullptr), EtaSig(nullptr), Theta(nullptr),
+			   Phi(nullptr), PhiErr(nullptr), PhiSig(nullptr),
+			   D0Beamspot(nullptr), D0BeamspotErr(nullptr), D0BeamspotSig(nullptr),
+			   Dz(nullptr), DzErr(nullptr), DzSig(nullptr),
+			   P(nullptr), Pt(nullptr), PtErr(nullptr), PtSig(nullptr),
+			   MeanAngle(nullptr),
+			   HitsGoodVsHitsValid(nullptr), MeanAngleVsHits(nullptr),
+			   HitsPixelVsEta(nullptr), HitsPixelVsTheta(nullptr),
+			   HitsStripVsEta(nullptr), HitsStripVsTheta(nullptr),
+			   PtVsEta(nullptr), PtVsTheta(nullptr),
+			   PHitsGoodVsHitsValid(nullptr), PMeanAngleVsHits(nullptr),
+			   PHitsPixelVsEta(nullptr), PHitsPixelVsTheta(nullptr),
+			   PHitsStripVsEta(nullptr), PHitsStripVsTheta(nullptr),
+			   PPtVsEta(nullptr), PPtVsTheta(nullptr){}
 
   TH1 *TrkSize, *TrkSizeGood,
       *HitsSize, *HitsValid, *HitsInvalid, *Hits2D,

Alignment/APEEstimation/interface/TrackerSectorStruct.h

@@ -42,11 +42,11 @@ class TrackerSectorStruct{
 
 
   struct CorrelationHists{
-    CorrelationHists():Variable(0),
-                       NorResXVsVar(0), ProbXVsVar(0),
-	               SigmaXHitVsVar(0), SigmaXTrkVsVar(0), SigmaXVsVar(0),
-		       PNorResXVsVar(0), PProbXVsVar(0),
-		       PSigmaXHitVsVar(0), PSigmaXTrkVsVar(0), PSigmaXVsVar(0){};
+    CorrelationHists():Variable(nullptr),
+                       NorResXVsVar(nullptr), ProbXVsVar(nullptr),
+	               SigmaXHitVsVar(nullptr), SigmaXTrkVsVar(nullptr), SigmaXVsVar(nullptr),
+		       PNorResXVsVar(nullptr), PProbXVsVar(nullptr),
+		       PSigmaXHitVsVar(nullptr), PSigmaXTrkVsVar(nullptr), PSigmaXVsVar(nullptr){};
 
     inline void fillCorrHists(const TString, const TrackStruct::HitParameterStruct& hitParameterStruct, double variable);
     inline void fillCorrHistsX(const TrackStruct::HitParameterStruct& hitParameterStruct, double variable);
@@ -126,26 +126,26 @@ class TrackerSectorStruct{
 
 
 
-TrackerSectorStruct::TrackerSectorStruct(): directory_(0),
+TrackerSectorStruct::TrackerSectorStruct(): directory_(nullptr),
                          norResXMax_(999.), sigmaXHitMax_(999.), sigmaXMax_(999.),
-			 name("default"), Name(0),
-			 ResX(0), NorResX(0), XHit(0), XTrk(0),
-			 SigmaX2(0), ProbX(0),
-			 WidthVsPhiSensX(0), WidthVsWidthProjected(0), WidthDiffVsMaxStrip(0), WidthDiffVsSigmaXHit(0),
-			 PhiSensXVsBarycentreX(0),
-			 PWidthVsPhiSensX(0), PWidthVsWidthProjected(0), PWidthDiffVsMaxStrip(0), PWidthDiffVsSigmaXHit(0),
-			 PPhiSensXVsBarycentreX(0),
-			 ResY(0), NorResY(0), YHit(0), YTrk(0),
-			 SigmaY2(0), ProbY(0),
-			 PhiSensYVsBarycentreY(0),
-			 PPhiSensYVsBarycentreY(0),
-			 RawId(0),
-			 EntriesX(0),
-			 MeanX(0), RmsX(0), FitMeanX1(0), ResidualWidthX1(0), CorrectionX1(0),
-			 FitMeanX2(0), ResidualWidthX2(0), CorrectionX2(0),
-			 EntriesY(0),
-			 MeanY(0), RmsY(0), FitMeanY1(0), ResidualWidthY1(0), CorrectionY1(0),
-			 FitMeanY2(0), ResidualWidthY2(0), CorrectionY2(0),
+			 name("default"), Name(nullptr),
+			 ResX(nullptr), NorResX(nullptr), XHit(nullptr), XTrk(nullptr),
+			 SigmaX2(nullptr), ProbX(nullptr),
+			 WidthVsPhiSensX(nullptr), WidthVsWidthProjected(nullptr), WidthDiffVsMaxStrip(nullptr), WidthDiffVsSigmaXHit(nullptr),
+			 PhiSensXVsBarycentreX(nullptr),
+			 PWidthVsPhiSensX(nullptr), PWidthVsWidthProjected(nullptr), PWidthDiffVsMaxStrip(nullptr), PWidthDiffVsSigmaXHit(nullptr),
+			 PPhiSensXVsBarycentreX(nullptr),
+			 ResY(nullptr), NorResY(nullptr), YHit(nullptr), YTrk(nullptr),
+			 SigmaY2(nullptr), ProbY(nullptr),
+			 PhiSensYVsBarycentreY(nullptr),
+			 PPhiSensYVsBarycentreY(nullptr),
+			 RawId(nullptr),
+			 EntriesX(nullptr),
+			 MeanX(nullptr), RmsX(nullptr), FitMeanX1(nullptr), ResidualWidthX1(nullptr), CorrectionX1(nullptr),
+			 FitMeanX2(nullptr), ResidualWidthX2(nullptr), CorrectionX2(nullptr),
+			 EntriesY(nullptr),
+			 MeanY(nullptr), RmsY(nullptr), FitMeanY1(nullptr), ResidualWidthY1(nullptr), CorrectionY1(nullptr),
+			 FitMeanY2(nullptr), ResidualWidthY2(nullptr), CorrectionY2(nullptr),
 			 isPixel(false){}
 
 
@@ -185,7 +185,7 @@ TrackerSectorStruct::bookCorrHists(TString xY,TString varName,TString varTitle,T
     suffix = "_y";
   }
 
-  std::string o(options);
+  const std::string& o(options);
   CorrelationHists correlationHists;
 
   if(!(o.find("n") != std::string::npos || o.find("p") != std::string::npos || o.find("h") != std::string::npos || 
@@ -244,7 +244,7 @@ TrackerSectorStruct::bookCorrHists(TString xY,TString varName,TString labelX,TSt
     xy = "y";
   }
 
-  std::string o(options);
+  const std::string& o(options);
   CorrelationHists correlationHists;
 
   if(!(o.find("n") != std::string::npos || o.find("p") != std::string::npos || o.find("h") != std::string::npos ||