Merge pull request #17 from cms-sw/CMSSW_7_1_X

Merge cms-sw CMSSW_7_1_X into my CMSSW_7_1_X
cms-sw · May 2, 2014 · 5824050 · 5824050
2 parents 4799f61 + 6099be8
commit 5824050
Show file tree

Hide file tree

Showing 688 changed files with 29,213 additions and 17,181 deletions.
diff --git a/Alignment/OfflineValidation/plugins/EopTreeWriter.cc b/Alignment/OfflineValidation/plugins/EopTreeWriter.cc
@@ -106,7 +106,8 @@ EopTreeWriter::EopTreeWriter(const edm::ParameterSet& iConfig) :
 
    // TrackAssociator parameters
    edm::ParameterSet parameters = iConfig.getParameter<edm::ParameterSet>("TrackAssociatorParameters");
-   parameters_.loadParameters( parameters );
+   edm::ConsumesCollector iC = consumesCollector();
+   parameters_.loadParameters( parameters, iC );
 
    tree_ = fs_->make<TTree>("EopTree","EopTree");
    treeMemPtr_ = new EopVariables;

diff --git a/Alignment/ReferenceTrajectories/interface/BeamSpotTransientTrackingRecHit.h b/Alignment/ReferenceTrajectories/interface/BeamSpotTransientTrackingRecHit.h
@@ -61,7 +61,6 @@ class BeamSpotTransientTrackingRecHit GCC11_FINAL : public TValidTrackingRecHit
   }
 
   virtual AlgebraicMatrix projectionMatrix() const {
-    if (!isInitialized) initialize();
     return theProjectionMatrix;
   }
 
@@ -83,9 +82,7 @@ class BeamSpotTransientTrackingRecHit GCC11_FINAL : public TValidTrackingRecHit
      return new BeamSpotTransientTrackingRecHit(*this);
    }
 
-   static bool isInitialized;
-   static AlgebraicMatrix theProjectionMatrix;
-   void initialize() const;
+   static const AlgebraicMatrix theProjectionMatrix;
 };
 
 #endif

diff --git a/Alignment/ReferenceTrajectories/src/BeamSpotTransientTrackingRecHit.cc b/Alignment/ReferenceTrajectories/src/BeamSpotTransientTrackingRecHit.cc
@@ -23,13 +23,12 @@ AlgebraicSymMatrix BeamSpotTransientTrackingRecHit::parametersError() const
   return m;
 }
 
-void BeamSpotTransientTrackingRecHit::initialize() const
+
+static AlgebraicMatrix initialize()
 {
-  theProjectionMatrix = AlgebraicMatrix( 1, 5, 0);
-  theProjectionMatrix[0][3] = 1;
-
-  isInitialized = true;
+  AlgebraicMatrix ret( 1, 5, 0);
+  ret[0][3] = 1;
+  return ret;
 }
 
-bool BeamSpotTransientTrackingRecHit::isInitialized(false);
-AlgebraicMatrix BeamSpotTransientTrackingRecHit::theProjectionMatrix;
+const AlgebraicMatrix BeamSpotTransientTrackingRecHit::theProjectionMatrix=initialize();
diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaHeader.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaHeader.h
@@ -109,6 +109,7 @@ class TEcnaHeader : public TNamed {
   void HeaderParameters( const TString&,      const Int_t&, const Int_t&,
 			 const Int_t&, const Int_t&, const Int_t&, const Int_t&, const Int_t&);
 
+  using TNamed::Print;
   void Print();
   ClassDef(TEcnaHeader,1)  //Header of CNA ROOT file
 };

diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaHistos.cc b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaHistos.cc
@@ -8597,7 +8597,7 @@ Int_t TEcnaHistos::GetHistoryRunListParameters(const TString& list_of_run_file_n
   Int_t nb_of_runs_in_list = 0;
 
   //========= immediate return if file name is an empty string
-  if( list_of_run_file_name.Data() == '\0' )
+  if( !strcmp(list_of_run_file_name.Data(), "\0") )
     {
       std::cout << "!TEcnaHistos::GetHistoryRunListParameters(...)> *** ERROR *** =====> "
 	   << " EMPTY STRING for list of run file name." << fTTBELL << std::endl;
@@ -12809,7 +12809,7 @@ void TEcnaHistos::PlotCloneOfCurrentCanvas()
     {
       if( (TCanvasImp*)fCurrentCanvas->GetCanvasImp() != 0 )
 	{
-	  (TCanvas*)fCurrentCanvas->DrawClone();
+	  static_cast<TCanvas*>(fCurrentCanvas)->DrawClone();
 	}
       else
 	{

diff --git a/Calibration/HcalAlCaRecoProducers/src/AlCaIsoTracksProducer.cc b/Calibration/HcalAlCaRecoProducers/src/AlCaIsoTracksProducer.cc
@@ -185,7 +185,8 @@ AlCaIsoTracksProducer::AlCaIsoTracksProducer(const edm::ParameterSet& iConfig)
 // Parameters for track associator   ===========================
 //  
   edm::ParameterSet parameters = iConfig.getParameter<edm::ParameterSet>("TrackAssociatorParameters");
-  parameters_.loadParameters( parameters );
+  edm::ConsumesCollector iC = consumesCollector();
+  parameters_.loadParameters( parameters, iC );
   trackAssociator_.useDefaultPropagator();
 // ===============================================================
 

diff --git a/Calibration/HcalCalibAlgos/plugins/HcalCorrPFCalculation.cc b/Calibration/HcalCalibAlgos/plugins/HcalCorrPFCalculation.cc
@@ -136,7 +136,8 @@ HcalCorrPFCalculation::HcalCorrPFCalculation(edm::ParameterSet const& iConfig) {
   //energyECALmip = iConfig.getParameter<double>("energyECALmip");
 
   edm::ParameterSet parameters = iConfig.getParameter<edm::ParameterSet>("TrackAssociatorParameters");
-  parameters_.loadParameters( parameters );
+  edm::ConsumesCollector iC = consumesCollector();
+  parameters_.loadParameters( parameters, iC );
   trackAssociator_.useDefaultPropagator();
 
   associationConeSize_=iConfig.getParameter<double>("associationConeSize");

diff --git a/Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc b/Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc
@@ -233,7 +233,8 @@ ValidIsoTrkCalib::ValidIsoTrkCalib(const edm::ParameterSet& iConfig)
   maxPNear = iConfig.getParameter<double>("maxPNear");
 
   edm::ParameterSet parameters = iConfig.getParameter<edm::ParameterSet>("TrackAssociatorParameters");
-  parameters_.loadParameters( parameters );
+  edm::ConsumesCollector iC = consumesCollector();
+  parameters_.loadParameters( parameters, iC );
   trackAssociator_.useDefaultPropagator();
 
   // taECALCone_=iConfig.getUntrackedParameter<double>("TrackAssociatorECALCone",0.5);

diff --git a/Calibration/HcalCalibAlgos/src/HcalIsoTrkAnalyzer.cc b/Calibration/HcalCalibAlgos/src/HcalIsoTrkAnalyzer.cc
@@ -202,7 +202,8 @@ HcalIsoTrkAnalyzer::HcalIsoTrkAnalyzer(const edm::ParameterSet& iConfig)
   EcalConeOuter = iConfig.getParameter<double>("EcalConeOuter");
 
   edm::ParameterSet parameters = iConfig.getParameter<edm::ParameterSet>("TrackAssociatorParameters");
-  parameters_.loadParameters( parameters );
+  edm::ConsumesCollector iC = consumesCollector();
+  parameters_.loadParameters( parameters, iC );
   trackAssociator_.useDefaultPropagator();
 
 }

diff --git a/Calibration/IsolatedParticles/plugins/IsolatedTracksCone.cc b/Calibration/IsolatedParticles/plugins/IsolatedTracksCone.cc
@@ -87,7 +87,8 @@ IsolatedTracksCone::IsolatedTracksCone(const edm::ParameterSet& iConfig) {
 
   edm::ParameterSet parameters = 
     iConfig.getParameter<edm::ParameterSet>("TrackAssociatorParameters");
-  parameters_.loadParameters( parameters );
+  edm::ConsumesCollector iC = consumesCollector();
+  parameters_.loadParameters( parameters, iC );
   trackAssociator_ =  new TrackDetectorAssociator();
   trackAssociator_->useDefaultPropagator();
 

diff --git a/Calibration/Tools/interface/MinL3AlgoUnivErr.h b/Calibration/Tools/interface/MinL3AlgoUnivErr.h
@@ -720,7 +720,7 @@ getMeanPartialSolution( IDdet id ) const
     {
       int i = cell->second;
       int   n      = sumPartSolu0[ i ];
-      float meanX  = sumPartSolu1[ i ] / n;
+      meanX  = sumPartSolu1[ i ] / n;
     }
   return meanX;
 

diff --git a/CaloOnlineTools/EcalTools/plugins/EcalCosmicsHists.cc b/CaloOnlineTools/EcalTools/plugins/EcalCosmicsHists.cc
@@ -87,7 +87,8 @@ EcalCosmicsHists::EcalCosmicsHists(const edm::ParameterSet& iConfig) :
 
   // TrackAssociator parameters
   edm::ParameterSet trkParameters = iConfig.getParameter<edm::ParameterSet>("TrackAssociatorParameters");
-  trackParameters_.loadParameters( trkParameters );
+  edm::ConsumesCollector iC = consumesCollector();
+  trackParameters_.loadParameters( trkParameters, iC );
   trackAssociator_.useDefaultPropagator();
 
   string title1 = "Seed Energy for All Feds; Seed Energy (GeV)";

diff --git a/CondCore/CondDB/src/ConnectionPool.cc b/CondCore/CondDB/src/ConnectionPool.cc
@@ -158,7 +158,7 @@ namespace cond {
       if( it == m_dbTypes.end() ){
 	bt = checkBackendType( coralSession, connectionString );
 	if( bt == UNKNOWN_DB && writeCapable) bt = backType;
-	m_dbTypes.insert( std::make_pair( connectionString, bt ) ).first;
+	m_dbTypes.insert( std::make_pair( connectionString, bt ) );
       } else {
 	bt = (BackendType) it->second;
       }

diff --git a/CondFormats/JetMETObjects/src/Utilities.cc → ...rmats/JetMETObjects/interface/Utilities.h b/CondFormats/JetMETObjects/src/Utilities.cc → ...rmats/JetMETObjects/interface/Utilities.h
@@ -1,69 +1,77 @@
-#ifndef UTIL_H
-#define UTIL_H
+#ifndef CondFormats_JetMETObjects_Utilities_h
+#define CondFormats_JetMETObjects_Utilities_h
+
+#ifdef STANDALONE
+#include <stdexcept>
+#else
+#include "FWCore/Utilities/interface/Exception.h"
+#endif
 
 #include <cstdlib>
 #include <sstream>
 #include <string>
 #include <vector>
 #include <cmath>
 
-
+namespace
+{
+  void handleError(const std::string& fClass, const std::string& fMessage)
+  {
 #ifdef STANDALONE
-#include <stdexcept>
+    std::stringstream sserr;
+    sserr<<fClass<<" ERROR: "<<fMessage;
+    throw std::runtime_error(sserr.str());
 #else
-#include "FWCore/Utilities/interface/Exception.h"
+    throw cms::Exception(fClass)<<fMessage;
 #endif
-
-namespace 
-{
-  void handleError(const std::string& fClass, const std::string& fMessage);
+  }
   //----------------------------------------------------------------------
-  float getFloat(const std::string& token) 
+  float getFloat(const std::string& token)
   {
     char* endptr;
     float result = strtod (token.c_str(), &endptr);
-    if (endptr == token.c_str()) 
+    if (endptr == token.c_str())
       {
-        std::stringstream sserr; 
+        std::stringstream sserr;
         sserr<<"can't convert token "<<token<<" to float value";
 	handleError("getFloat",sserr.str());
       }
     return result;
-  } 
+  }
   //----------------------------------------------------------------------
-  unsigned getUnsigned(const std::string& token) 
+  unsigned getUnsigned(const std::string& token)
   {
     char* endptr;
     unsigned result = strtoul (token.c_str(), &endptr, 0);
-    if (endptr == token.c_str()) 
+    if (endptr == token.c_str())
       {
-        std::stringstream sserr; 
+        std::stringstream sserr;
         sserr<<"can't convert token "<<token<<" to unsigned value";
 	handleError("getUnsigned",sserr.str());
       }
     return result;
   }
   //----------------------------------------------------------------------
-  std::string getSection(const std::string& token) 
+  std::string getSection(const std::string& token)
   {
     size_t iFirst = token.find ('[');
     size_t iLast = token.find (']');
     if (iFirst != std::string::npos && iLast != std::string::npos && iFirst < iLast)
-      return std::string (token, iFirst+1, iLast-iFirst-1); 
+      return std::string (token, iFirst+1, iLast-iFirst-1);
     return "";
   }
   //----------------------------------------------------------------------
   std::vector<std::string> getTokens(const std::string& fLine)
   {
     std::vector<std::string> tokens;
     std::string currentToken;
-    for (unsigned ipos = 0; ipos < fLine.length (); ++ipos) 
+    for (unsigned ipos = 0; ipos < fLine.length (); ++ipos)
       {
         char c = fLine[ipos];
         if (c == '#') break; // ignore comments
-        else if (c == ' ') 
+        else if (c == ' ')
           { // flush current token if any
-            if (!currentToken.empty()) 
+            if (!currentToken.empty())
               {
 	        tokens.push_back(currentToken);
 	        currentToken.clear();
@@ -72,30 +80,19 @@ namespace
         else
           currentToken += c;
       }
-    if (!currentToken.empty()) tokens.push_back(currentToken); // flush end 
+    if (!currentToken.empty()) tokens.push_back(currentToken); // flush end
     return tokens;
   }
-  //---------------------------------------------------------------------- 
-  std::string getDefinitions(const std::string& token) 
+  //----------------------------------------------------------------------
+  std::string getDefinitions(const std::string& token)
   {
     size_t iFirst = token.find ('{');
     size_t iLast = token.find ('}');
     if (iFirst != std::string::npos && iLast != std::string::npos && iFirst < iLast)
-      return std::string (token, iFirst+1, iLast-iFirst-1); 
+      return std::string (token, iFirst+1, iLast-iFirst-1);
     return "";
   }
-  //------------------------------------------------------------------------ 
-  void handleError(const std::string& fClass, const std::string& fMessage)
-  {
-#ifdef STANDALONE 
-    std::stringstream sserr;
-    sserr<<fClass<<" ERROR: "<<fMessage;
-    throw std::runtime_error(sserr.str());
-#else
-    throw cms::Exception(fClass)<<fMessage;
-#endif
-  }
-  //------------------------------------------------------------------------ 
+  //------------------------------------------------------------------------
   float quadraticInterpolation(float fZ, const float fX[3], const float fY[3])
   {
     // Quadratic interpolation through the points (x[i],y[i]). First find the parabola that

diff --git a/CondFormats/JetMETObjects/src/FactorizedJetCorrector.cc b/CondFormats/JetMETObjects/src/FactorizedJetCorrector.cc
@@ -1,26 +1,26 @@
-// This is the file "FactorizedJetCorrector.cc". 
+// This is the file "FactorizedJetCorrector.cc".
 // This is the implementation of the class FactorizedJetCorrector.
 // Author: Konstantinos Kousouris, Philipp Schieferdecker
 // Email:  [email protected], [email protected]
 
 #include "CondFormats/JetMETObjects/interface/FactorizedJetCorrector.h"
 #include "CondFormats/JetMETObjects/interface/SimpleJetCorrector.h"
 #include "CondFormats/JetMETObjects/interface/JetCorrectorParameters.h"
-#include "CondFormats/JetMETObjects/src/Utilities.cc"
+#include "CondFormats/JetMETObjects/interface/Utilities.h"
 #include "Math/PtEtaPhiE4D.h"
 #include "Math/Vector3D.h"
 #include "Math/LorentzVector.h"
 #include <vector>
 #include <string>
 #include <sstream>
 
-//------------------------------------------------------------------------ 
+//------------------------------------------------------------------------
 //--- Default FactorizedJetCorrector constructor -------------------------
 //------------------------------------------------------------------------
 FactorizedJetCorrector::FactorizedJetCorrector()
 {
 }
-//------------------------------------------------------------------------ 
+//------------------------------------------------------------------------
 //--- FactorizedJetCorrector constructor ---------------------------------
 //------------------------------------------------------------------------
 FactorizedJetCorrector::FactorizedJetCorrector(const std::string& fLevels, const std::string& fFiles, const std::string& fOptions):
@@ -35,21 +35,21 @@ FactorizedJetCorrector::FactorizedJetCorrector(const std::vector<JetCorrectorPar
 {
 }
 
-//------------------------------------------------------------------------ 
+//------------------------------------------------------------------------
 //--- Returns the correction ---------------------------------------------
 //------------------------------------------------------------------------
 float FactorizedJetCorrector::getCorrection()
 {
   return mCalc.getCorrection(mValues);
 }
-//------------------------------------------------------------------------ 
+//------------------------------------------------------------------------
 //--- Returns the vector of subcorrections, up to a given level ----------
 //------------------------------------------------------------------------
 std::vector<float> FactorizedJetCorrector::getSubCorrections()
 {
   return mCalc.getSubCorrections(mValues);
 }
-//------------------------------------------------------------------------ 
+//------------------------------------------------------------------------
 //--- Setters ------------------------------------------------------------
 //------------------------------------------------------------------------
 void FactorizedJetCorrector::setNPV(int fNPV)