Merge pull request #24725 from gartung/MuonAnalysis-MomentumScaleCali…

…bration-strictcxx17 MuonAnalysis/MomentumScaleCalibration: replace auto_ptr removed in strict std=c++17
cms-sw · Oct 1, 2018 · 2b77cc3 · 2b77cc3
2 parents a2c304d + c01cd68
commit 2b77cc3
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 20 deletions.
diff --git a/MuonAnalysis/MomentumScaleCalibration/bin/ZntupleToTreeConverter.cc b/MuonAnalysis/MomentumScaleCalibration/bin/ZntupleToTreeConverter.cc
@@ -32,7 +32,7 @@ lorentzVector fromPtEtaPhiToPxPyPz( const double* ptEtaPhiE )
 
   // lorentzVector corrMu(px,py,pz,E);
   // To fix memory leaks, this is to be substituted with
-  // std::auto_ptr<lorentzVector> corrMu(new lorentzVector(px, py, pz, E));
+  // std::unique_ptr<lorentzVector> corrMu(new lorentzVector(px, py, pz, E));
 
   return lorentzVector(px,py,pz,E);
 }

diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/DBReader.h b/MuonAnalysis/MomentumScaleCalibration/plugins/DBReader.h
@@ -57,7 +57,7 @@ class DBReader : public edm::EDAnalyzer
 
   //  uint32_t printdebug_;
   std::string type_;
-  //std::auto_ptr<BaseFunction> corrector_;
+  //std::unique_ptr<BaseFunction> corrector_;
   boost::shared_ptr<MomentumScaleCorrector> corrector_;
   boost::shared_ptr<ResolutionFunction> resolution_;
   boost::shared_ptr<BackgroundFunction> background_;

diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/DBWriter.h b/MuonAnalysis/MomentumScaleCalibration/plugins/DBWriter.h
@@ -20,5 +20,5 @@ class DBWriter : public edm::EDAnalyzer {
   void analyze(const edm::Event&, const edm::EventSetup&) override;
   void endJob() override {};
 
-  std::auto_ptr<BaseFunction> corrector_;
+  std::unique_ptr<BaseFunction> corrector_;
 };
diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/Histograms.h b/MuonAnalysis/MomentumScaleCalibration/plugins/Histograms.h
@@ -2270,8 +2270,8 @@ class HMassResolutionVSPart : public Histograms
  protected:
   std::map<TString, TH1*> mapHisto_;
   TString nameSuffix_[2];
-  std::auto_ptr<HDelta> muMinus;
-  std::auto_ptr<HDelta> muPlus;
+  std::unique_ptr<HDelta> muMinus;
+  std::unique_ptr<HDelta> muPlus;
 };
 
 #endif
diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/MuScleFit.cc b/MuonAnalysis/MomentumScaleCalibration/plugins/MuScleFit.cc
@@ -309,7 +309,7 @@ class MuScleFit: public edm::EDLooper, MuScleFitBase
   edm::InputTag puInfoSrc_;
   edm::InputTag vertexSrc_;
 
-  std::auto_ptr<MuScleFitMuonSelector> muonSelector_;
+  std::unique_ptr<MuScleFitMuonSelector> muonSelector_;
 };
 
 template<typename T>
@@ -783,7 +783,7 @@ edm::EDLooper::Status MuScleFit::duringLoop( const edm::Event & event, const edm
   //event.getByLabel(InputTag(triggerResultsLabel_),triggerResults);
   bool isFired = false;
 
-  if(triggerPath_[0] == "")
+  if(triggerPath_[0].empty())
     isFired = true;
   else if(triggerPath_[0] == "All"){
     isFired =triggerResults->accept();

diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/MuScleFitFilter.cc b/MuonAnalysis/MomentumScaleCalibration/plugins/MuScleFitFilter.cc
@@ -122,7 +122,7 @@ bool MuScleFitFilter::filter(edm::Event& event, const edm::EventSetup& iSetup) {
 
   // Get the RecTrack and the RecMuon collection from the event
   // ----------------------------------------------------------
-  std::auto_ptr<reco::MuonCollection> muons(new reco::MuonCollection());
+  std::unique_ptr<reco::MuonCollection> muons(new reco::MuonCollection());
 
   if (debug) std::cout << "Looking for muons of the right kind" << std::endl;
 

diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/MuScleFitUtils.cc b/MuonAnalysis/MomentumScaleCalibration/plugins/MuScleFitUtils.cc
@@ -462,7 +462,7 @@ lorentzVector MuScleFitUtils::applyScale (const lorentzVector& muon,
 {
   double * p = new double[(int)(parval.size())];
   // Replaced by auto_ptr, which handles delete at the end
-  // std::auto_ptr<double> p(new double[(int)(parval.size())]);
+  // std::unique_ptr<double> p(new double[(int)(parval.size())]);
   // Removed auto_ptr, check massResolution for an explanation.
   int id = 0;
   for (std::vector<double>::const_iterator it=parval.begin(); it!=parval.end(); ++it, ++id) {
@@ -506,7 +506,7 @@ lorentzVector MuScleFitUtils::fromPtEtaPhiToPxPyPz( const double* ptEtaPhiE )
 
   // lorentzVector corrMu(px,py,pz,E);
   // To fix memory leaks, this is to be substituted with
-  // std::auto_ptr<lorentzVector> corrMu(new lorentzVector(px, py, pz, E));
+  // std::unique_ptr<lorentzVector> corrMu(new lorentzVector(px, py, pz, E));
 
   return lorentzVector(px,py,pz,E);
 }
@@ -534,7 +534,7 @@ double MuScleFitUtils::massResolution( const lorentzVector& mu1,
   // not be used with arrays. There are alternatives see
   // e.g.: http://www.gotw.ca/gotw/042.htm. The best
   // alternative seems to be to switch to vector though.
-  // std::auto_ptr<double> p(new double[(int)(parval.size())]);
+  // std::unique_ptr<double> p(new double[(int)(parval.size())]);
 
   double * p = new double[(int)(parval.size())];
   std::vector<double>::const_iterator it = parval.begin();
@@ -711,7 +711,7 @@ double MuScleFitUtils::massProb( const double & mass, const double & resEta, con
   double * p = new double[(int)(parval.size())];
   // Replaced by auto_ptr, which handles delete at the end
   // Removed auto_ptr, check massResolution for an explanation.
-  // std::auto_ptr<double> p(new double[(int)(parval.size())]);
+  // std::unique_ptr<double> p(new double[(int)(parval.size())]);
 
   std::vector<double>::const_iterator it = parval.begin();
   int id = 0;

diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/MuScleFitUtils.h b/MuonAnalysis/MomentumScaleCalibration/plugins/MuScleFitUtils.h
@@ -79,7 +79,7 @@ class MuScleFitUtils {
   static double invDimuonMass( const lorentzVector & mu1, const lorentzVector & mu2 );
   static double massResolution( const lorentzVector & mu1, const lorentzVector & mu2 );
   static double massResolution( const lorentzVector & mu1, const lorentzVector & mu2, const std::vector<double> & parval );
-  static double massResolution( const lorentzVector & mu1, const lorentzVector & mu2, std::auto_ptr<double> parval );
+  static double massResolution( const lorentzVector & mu1, const lorentzVector & mu2, std::unique_ptr<double> parval );
   static double massResolution( const lorentzVector & mu1, const lorentzVector & mu2, double* parval );
   static double massResolution( const lorentzVector& mu1, const lorentzVector& mu2, const ResolutionFunction & resolFunc );
 

diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/TestCorrection.cc b/MuonAnalysis/MomentumScaleCalibration/plugins/TestCorrection.cc
@@ -123,9 +123,9 @@ class TestCorrection : public edm::EDAnalyzer, MuScleFitBase {
 
   int eventCounter_;
 
-  std::auto_ptr<MomentumScaleCorrector> corrector_;
-  std::auto_ptr<ResolutionFunction> resolution_;
-  std::auto_ptr<BackgroundFunction> background_;
+  std::unique_ptr<MomentumScaleCorrector> corrector_;
+  std::unique_ptr<ResolutionFunction> resolution_;
+  std::unique_ptr<BackgroundFunction> background_;
 
   edm::EDGetTokenT<reco::MuonCollection> glbMuonsToken_;
   edm::EDGetTokenT<reco::TrackCollection> saMuonsToken_;

diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/TestCorrection.h b/MuonAnalysis/MomentumScaleCalibration/plugins/TestCorrection.h
@@ -119,9 +119,9 @@ class TestCorrection : public edm::EDAnalyzer, MuScleFitBase {
 
   int eventCounter_;
 
-  std::auto_ptr<MomentumScaleCorrector> corrector_;
-  std::auto_ptr<ResolutionFunction> resolution_;
-  std::auto_ptr<BackgroundFunction> background_;
+  std::unique_ptr<MomentumScaleCorrector> corrector_;
+  std::unique_ptr<ResolutionFunction> resolution_;
+  std::unique_ptr<BackgroundFunction> background_;
 };
 
 #endif // TESTCORRECTION_HH
diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/TestResolution.h b/MuonAnalysis/MomentumScaleCalibration/plugins/TestResolution.h
@@ -91,7 +91,7 @@ class TestResolution : public edm::EDAnalyzer {
 
   int eventCounter_;
 
-  std::auto_ptr<ResolutionFunction> resolutionFunction_;
+  std::unique_ptr<ResolutionFunction> resolutionFunction_;
 };
 
 #endif // TESTRESOLUTION_HH