cms-sw · davidlange6 · May 15, 2014 · May 14, 2014 · May 14, 2014 · May 14, 2014
diff --git a/RecoVertex/AdaptiveVertexFit/interface/AdaptiveVertexFitter.h b/RecoVertex/AdaptiveVertexFit/interface/AdaptiveVertexFitter.h
@@ -213,7 +213,6 @@ class AdaptiveVertexFitter : public VertexFitter<5> {
   VertexTrackCompatibilityEstimator<5> * theComp;
   const AbstractLTSFactory<5> * theLinTrkFactory;
   bool gsfIntermediarySmoothing_;
-  mutable int mctr_;
 };
 
 #endif
diff --git a/RecoVertex/BeamSpotProducer/interface/BeamFitter.h b/RecoVertex/BeamSpotProducer/interface/BeamFitter.h
@@ -140,7 +140,7 @@ class BeamFitter {
   reco::BeamSpot fbeamspot;
   reco::BeamSpot fbeamWidthFit;
   std::map< int, reco::BeamSpot> fbspotPVMap;
-  BSFitter *fmyalgo;
+  //  BSFitter *fmyalgo;
   std::ofstream fasciiFile;
   std::ofstream fasciiDIP;
 
@@ -205,8 +205,8 @@ class BeamFitter {
   int fnTECLayerMeas;
   int fnPXBLayerMeas;
   int fnPXFLayerMeas;
-  double fd0phi_chi2;
-  double fd0phi_d0;
+  //  double fd0phi_chi2;
+  //  double fd0phi_d0;
   double fcov[7][7];
   double fvx;
   double fvy;

diff --git a/RecoVertex/BeamSpotProducer/interface/BeamSpotAnalyzer.h b/RecoVertex/BeamSpotProducer/interface/BeamSpotAnalyzer.h
@@ -40,7 +40,7 @@ class BeamSpotAnalyzer : public edm::EDAnalyzer {
   int    ftotalevents;
   int fitNLumi_;
   int resetFitNLumi_;
-  int countEvt_;       //counter
+  // int countEvt_;       //counter
   int countLumi_;      //counter
   int Org_resetFitNLumi_;
   int previousLumi_;
@@ -53,7 +53,7 @@ class BeamSpotAnalyzer : public edm::EDAnalyzer {
   bool write2DB_;
   bool runbeamwidthfit_;
   bool runallfitters_;
-  double inputBeamWidth_;
+  //  double inputBeamWidth_;
 
   BeamFitter * theBeamFitter;
 };

diff --git a/RecoVertex/BeamSpotProducer/interface/PVFitter.h b/RecoVertex/BeamSpotProducer/interface/PVFitter.h
@@ -145,7 +145,7 @@ class PVFitter {
   bool debug_;
   bool do3DFit_;
   edm::EDGetTokenT<reco::VertexCollection> vertexToken_;
-  bool writeTxt_;
+  // bool writeTxt_;
   std::string outputTxt_;
 
   unsigned int maxNrVertices_;
@@ -159,8 +159,8 @@ class PVFitter {
   double errorScale_;
   double sigmaCut_;         
 
-  int frun;
-  int flumi;
+  //  int frun;
+  //  int flumi;
   std::time_t freftime[2];
 
   TH2F* hPVx; TH2F* hPVy; 
@@ -174,19 +174,19 @@ class PVFitter {
 
   //beam fit results
   //TTree* ftreeFit_;
-  int frunFit;
+  //  int frunFit;
   int fbeginLumiOfFit;
   int fendLumiOfFit;
-  char fbeginTimeOfFit[32];
-  char fendTimeOfFit[32];
+  //  char fbeginTimeOfFit[32];
+  //  char fendTimeOfFit[32];
   double fwidthX;
   double fwidthY;
   double fwidthZ;
   double fwidthXerr;
   double fwidthYerr;
   double fwidthZerr;
 
-  double fx;
+  /*  double fx;
   double fy;
   double fz;
   double fsigmaZ;
@@ -197,7 +197,7 @@ class PVFitter {
   double fzErr;
   double fsigmaZErr;
   double fdxdzErr;
-  double fdydzErr;
+  double fdydzErr;*/
 
   std::vector<BeamSpotFitPVData> pvStore_; //< cache for PV data
   std::map< int, std::vector<BeamSpotFitPVData> > bxMap_; // store PV data as a function of bunch crossings

diff --git a/RecoVertex/GhostTrackFitter/src/AnnealingGhostTrackFitter.cc b/RecoVertex/GhostTrackFitter/src/AnnealingGhostTrackFitter.cc
@@ -9,10 +9,6 @@
 
 using namespace reco;
 
-namespace {
-	static inline double sqr(double arg) { return arg * arg; }
-}
-
 AnnealingGhostTrackFitter::AnnealingGhostTrackFitter()
 {
 	annealing.reset(new GeometricAnnealing(3.0, 64.0, 0.25));

diff --git a/RecoVertex/GhostTrackFitter/src/GhostTrackPrediction.cc b/RecoVertex/GhostTrackFitter/src/GhostTrackPrediction.cc
@@ -17,8 +17,9 @@
 using namespace reco;
 
 namespace {
+#ifndef __clang__
   inline double sqr(double arg) { return arg * arg; }
-
+#endif  
   typedef ROOT::Math::SMatrix<double, 3, 4> Matrix34;
   typedef ROOT::Math::SMatrix<double, 4, 5> Matrix45;
   typedef ROOT::Math::SMatrix<double, 5, 4> Matrix54;

diff --git a/RecoVertex/GhostTrackFitter/src/KalmanGhostTrackUpdater.cc b/RecoVertex/GhostTrackFitter/src/KalmanGhostTrackUpdater.cc
@@ -17,8 +17,9 @@
 using namespace reco;
 
 namespace {
+#ifndef __clang__
 	static inline double sqr(double arg) { return arg * arg; }
-
+#endif
 	using namespace ROOT::Math;
 
 	typedef SVector<double, 4> Vector4;

diff --git a/RecoVertex/GhostTrackFitter/src/VertexGhostTrackState.cc b/RecoVertex/GhostTrackFitter/src/VertexGhostTrackState.cc
@@ -13,8 +13,9 @@
 using namespace reco;
 
 namespace {
+#ifndef __clang__
 	static inline double sqr(double arg) { return arg * arg; }
-
+#endif
 	using namespace ROOT::Math;
 
 	typedef SVector<double, 3> Vector3;

diff --git a/RecoVertex/KinematicFitPrimitives/interface/KinematicPerigeeConversions.h b/RecoVertex/KinematicFitPrimitives/interface/KinematicPerigeeConversions.h
@@ -1,5 +1,5 @@
 #ifndef KinematicPerigeeConversions_H
-#define KinematicPerigeeConversions_h
+#define KinematicPerigeeConversions_H
 
 #include "RecoVertex/KinematicFitPrimitives/interface/KinematicParameters.h"
 #include "RecoVertex/KinematicFitPrimitives/interface/KinematicState.h"

diff --git a/RecoVertex/LinearizationPointFinders/src/CrossingPtBasedLinearizationPointFinder.cc b/RecoVertex/LinearizationPointFinders/src/CrossingPtBasedLinearizationPointFinder.cc
@@ -34,6 +34,7 @@ inline GlobalPoint operator / ( const GlobalPoint & a, const double b )
     return GlobalPoint ( a.x() / b, a.y() / b, a.z() / b );
 }
 
+#ifndef __clang__
 inline GlobalPoint operator * ( const GlobalPoint & a, const double b )
 {
     return GlobalPoint ( a.x() * b, a.y() * b, a.z() * b );
@@ -43,6 +44,7 @@ inline GlobalPoint operator * ( const double b , const GlobalPoint & a )
 {
     return GlobalPoint ( a.x() * b, a.y() * b, a.z() * b );
 }
+#endif
 
 inline unsigned int sum ( unsigned int nr )
 {

diff --git a/RecoVertex/MultiVertexFit/src/LinTrackCache.cc b/RecoVertex/MultiVertexFit/src/LinTrackCache.cc
@@ -5,13 +5,6 @@ using namespace std;
 
 namespace
 {
-  inline int verbose()
-  {
-    static const int ret = 0; /* SimpleConfigurable<int>
-      (0, "LinTrackCache:Debug").value(); */
-    return ret;
-  }
-
   float maxRelinDistance()
   {
     // maximum distance before relinearizing

diff --git a/RecoVertex/MultiVertexFit/src/MultiVertexBSeeder.cc b/RecoVertex/MultiVertexFit/src/MultiVertexBSeeder.cc
@@ -31,23 +31,21 @@ namespace {
     return ret;
   }
 
-  inline int verbose()
-  {
-    return 0;
-  }
-
+#ifndef __clang__
   inline GlobalPoint & operator += ( GlobalPoint & a, const GlobalPoint & b )
   {
     a = GlobalPoint ( a.x() + b.x(), a.y() + b.y(), a.z() + b.z() );
     return a;
   }
+#endif
 
   inline GlobalPoint & operator /= ( GlobalPoint & a, float b )
   {
     a = GlobalPoint ( a.x() / b, a.y() / b, a.z() / b );
     return a;
   }
 
+#ifndef __clang__
   inline bool element ( const reco::TransientTrack & rt, const TransientVertex & rv )
   {
     const vector < reco::TransientTrack > trks = rv.originalTracks();
@@ -57,6 +55,7 @@ namespace {
     };
     return false;
   }
+#endif
 
   GlobalPoint toPoint ( const GlobalVector & v )
   {
@@ -151,13 +150,15 @@ namespace {
     return pts;
   }
 
+#ifndef __clang__
   inline GlobalPoint computePos ( const GlobalTrajectoryParameters & jet,
       double s )
   {
     GlobalPoint ret = jet.position();
     ret += s * jet.momentum();
     return ret;
   }
+#endif
 
   TransientVertex pseudoVertexFit ( const Cluster1D < reco::TransientTrack > & src,
       bool ascending=false, bool kalmanfit=false )

diff --git a/RecoVertex/MultiVertexFit/src/MultiVertexFitter.cc b/RecoVertex/MultiVertexFit/src/MultiVertexFitter.cc
@@ -652,7 +652,7 @@ void MultiVertexFitter::printSeeds() const
 
 void MultiVertexFitter::lostVertexClaimer()
 {
-  if ( !theReviveBelow < 0. ) return;
+  if ( !(theReviveBelow < 0.) ) return;
   // this experimental method is used to get almost lost vertices
   // back into the play by upweighting vertices with very low total weights
 

diff --git a/RecoVertex/MultiVertexFit/src/MultiVertexReconstructor.cc b/RecoVertex/MultiVertexFit/src/MultiVertexReconstructor.cc
@@ -10,12 +10,14 @@ namespace {
     return 0;
   }
 
+#ifndef __clang__
   inline void remove ( vector < TransientVertex > & vtces,
                 const vector < reco::TransientTrack > & trks )
   {
     cout << "[MultiVertexReconstructor] fixme remove not yet implemented" << endl;
     // remove trks from vtces
   }
+#endif
 
   vector < vector < TrackAndWeight > > recover (
       const vector < TransientVertex > & vtces, const vector < reco::TransientTrack > & trks )

diff --git a/RecoVertex/PrimaryVertexProducer/interface/PrimaryVertexProducerAlgorithm.h b/RecoVertex/PrimaryVertexProducer/interface/PrimaryVertexProducerAlgorithm.h
@@ -82,6 +82,7 @@ class PrimaryVertexProducerAlgorithm : public VertexReconstructor {
   edm::InputTag trackLabel;
   edm::InputTag beamSpotLabel;
 private:
+  using VertexReconstructor::vertices;
   // ----------member data ---------------------------
   TrackFilterForPVFindingBase* theTrackFilter; 
   TrackClusterizerInZ* theTrackClusterizer;

diff --git a/RecoVertex/TertiaryTracksVertexFinder/interface/AddTvTrack.h b/RecoVertex/TertiaryTracksVertexFinder/interface/AddTvTrack.h
@@ -60,11 +60,11 @@ class AddTvTrack  {
   // Set parameters
   inline void setPrimaryVertices(std::vector<TransientVertex> & 
 				 ThePrimaryVertices) { 
-    thePrimaryVertices = thePrimaryVertices; // TYPO ?!?!?!?!?!?!?!
+    thePrimaryVertices = &ThePrimaryVertices;
   }
   inline void setSecondaryVertices(std::vector<TransientVertex> & 
 				   TheSecondaryVertices) { 
-    theSecondaryVertices = theSecondaryVertices; // TYPO ?!?!?!?!?!?
+    theSecondaryVertices = &TheSecondaryVertices;
   }
   inline void setMaxSigOnDistTrackToB(double maxSigOnDistTrackToB) { 
     MaxSigOnDistTrackToB  = maxSigOnDistTrackToB; 

diff --git a/RecoVertex/TrimmedKalmanVertexFinder/interface/ConfigurableTrimmedVertexFinder.h b/RecoVertex/TrimmedKalmanVertexFinder/interface/ConfigurableTrimmedVertexFinder.h
@@ -61,7 +61,7 @@ class ConfigurableTrimmedVertexFinder : public VertexReconstructor {
   std::vector<TransientVertex> 
     vertices( const std::vector<reco::TransientTrack> & tracks,
 	      std::vector<reco::TransientTrack>& unused,
-        const reco::BeamSpot & spot, bool use_spot ) const;
+        const reco::BeamSpot & spot, bool use_spot) const;
 
   /** Access to parameters
    */
@@ -115,6 +115,8 @@ class ConfigurableTrimmedVertexFinder : public VertexReconstructor {
 
 private:
 
+  using VertexReconstructor::vertices;
+
   // separate tracks passing the filter
   //  void separateTracks(std::vector<TransientTrack>& filtered, 
   //		      std::vector<TransientTrack>& unused) const;

diff --git a/RecoVertex/TrimmedKalmanVertexFinder/interface/KalmanTrimmedVertexFinder.h b/RecoVertex/TrimmedKalmanVertexFinder/interface/KalmanTrimmedVertexFinder.h
@@ -86,6 +86,7 @@ class KalmanTrimmedVertexFinder
 private:
 
   ConfigurableTrimmedVertexFinder * theFinder;
+  using VertexReconstructor::vertices;
 
 };
 

diff --git a/RecoVertex/V0Producer/interface/V0Fitter.h b/RecoVertex/V0Producer/interface/V0Fitter.h
@@ -77,7 +77,7 @@ class V0Fitter {
   const MagneticField* magField;
 
   bool useRefTrax;
-  bool storeRefTrax;
+  //  bool storeRefTrax;
   bool doKshorts;
   bool doLambdas;
 
@@ -90,7 +90,7 @@ class V0Fitter {
   int tkNhitsCut;
   double rVtxCut;
   double vtxSigCut;
-  double vtxSigCut3D;
+  //  double vtxSigCut3D;
   double collinCut;
   double kShortMassCut;
   double lambdaMassCut;

diff --git a/RecoVertex/V0Producer/test/V0Analyzer.cc b/RecoVertex/V0Producer/test/V0Analyzer.cc
@@ -129,7 +129,7 @@ class V0Analyzer : public edm::EDAnalyzer {
   TH1D* rVtxHisto1;
   TH1D* vtxSigHisto1;
   TH1D* rVtxHisto2;
-  TH1D* simRHisto;
+  //  TH1D* simRHisto;
   TH1D* vtxSigHisto2;
 
   TH1D* rErrorHisto;