Merge pull request #15826 from wmtan/UseUniquePtrInRecoJetAndRecoMET

Use unique_ptr, not auto_ptr in RecoJet and RecoMET
cms-sw · Sep 16, 2016 · 12077f8 · 12077f8
2 parents 851461b + f3a8737
commit 12077f8
Show file tree

Hide file tree

Showing 82 changed files with 233 additions and 267 deletions.
diff --git a/RecoJets/FFTJetProducers/plugins/FFTJetCorrectionProducer.cc b/RecoJets/FFTJetProducers/plugins/FFTJetCorrectionProducer.cc
@@ -228,7 +228,7 @@ void FFTJetCorrectionProducer::applyCorrections(edm::Event& iEvent,
 
     // Create the output collection
     const unsigned nJets = jets->size();
-    std::auto_ptr<MyCollection> coll(new MyCollection());
+    auto coll = std::make_unique<MyCollection>();
     coll->reserve(nJets);
 
     // Cycle over jets and apply the corrector sequences
@@ -340,18 +340,18 @@ void FFTJetCorrectionProducer::applyCorrections(edm::Event& iEvent,
     // Create the uncertainty sequence
     if (writeUncertainties)
     {
-        std::auto_ptr<std::vector<float> > unc(new std::vector<float>());
+        auto unc = std::make_unique<std::vector<float>>();
         unc->reserve(nJets);
         for (unsigned ijet=0; ijet<nJets; ++ijet)
         {
             MyJet& j((*coll)[ijet]);
             unc->push_back(j.pileup());
             j.setPileup(0.f);
         }
-        iEvent.put(unc, outputLabel);
+        iEvent.put(std::move(unc), outputLabel);
     }
 
-    iEvent.put(coll, outputLabel);
+    iEvent.put(std::move(coll), outputLabel);
     ++eventCount;
 }
 

diff --git a/RecoJets/FFTJetProducers/plugins/FFTJetEFlowSmoother.cc b/RecoJets/FFTJetProducers/plugins/FFTJetEFlowSmoother.cc
@@ -225,11 +225,11 @@ void FFTJetEFlowSmoother::produce(
     const double bin0edge = g.phiBin0Edge();
 
     // We will fill the following histo
-    std::auto_ptr<TH3F> pTable(
-        new TH3F("FFTJetEFlowSmoother", "FFTJetEFlowSmoother",
+    auto pTable = std::make_unique<TH3F>(
+                 "FFTJetEFlowSmoother", "FFTJetEFlowSmoother",
                  nScales+1U, -1.5, nScales-0.5,
                  nEta, g.etaMin(), g.etaMax(),
-                 nPhi, bin0edge, bin0edge+2.0*M_PI));
+                 nPhi, bin0edge, bin0edge+2.0*M_PI);
     TH3F* h = pTable.get();
     h->SetDirectory(0);
     h->GetXaxis()->SetTitle("Scale");
@@ -264,7 +264,7 @@ void FFTJetEFlowSmoother::produce(
         }
     }
 
-    iEvent.put(pTable, outputLabel);
+    iEvent.put(std::move(pTable), outputLabel);
 }
 
 

diff --git a/RecoJets/FFTJetProducers/plugins/FFTJetPFPileupCleaner.cc b/RecoJets/FFTJetProducers/plugins/FFTJetPFPileupCleaner.cc
@@ -193,8 +193,7 @@ void FFTJetPFPileupCleaner::produce(
     edm::Event& iEvent, const edm::EventSetup& iSetup)
 {
     // get PFCandidates
-    std::auto_ptr<reco::PFCandidateCollection> 
-        pOutput(new reco::PFCandidateCollection);
+    auto pOutput = std::make_unique<reco::PFCandidateCollection>();
 
     edm::Handle<reco::PFCandidateCollection> pfCandidates;
     iEvent.getByToken(PFCandidatesToken, pfCandidates);
@@ -264,7 +263,7 @@ void FFTJetPFPileupCleaner::produce(
         }
     }
 
-    iEvent.put(pOutput);
+    iEvent.put(std::move(pOutput));
 }
 
 

diff --git a/RecoJets/FFTJetProducers/plugins/FFTJetPatRecoProducer.cc b/RecoJets/FFTJetProducers/plugins/FFTJetPatRecoProducer.cc
@@ -370,7 +370,7 @@ void FFTJetPatRecoProducer::buildSparseProduct(edm::Event& ev) const
 {
     typedef reco::PattRecoTree<Real,reco::PattRecoPeak<Real> > StoredTree;
 
-    std::auto_ptr<StoredTree> tree(new StoredTree());
+    auto tree = std::make_unique<StoredTree>();
 
     sparsePeakTreeToStorable(sparseTree,
                              sequencer->maxAdaptiveScales(),
@@ -388,7 +388,7 @@ void FFTJetPatRecoProducer::buildSparseProduct(edm::Event& ev) const
                 << std::endl;
     }
 
-    ev.put(tree, outputLabel);
+    ev.put(std::move(tree), outputLabel);
 }
 
 
@@ -397,7 +397,7 @@ void FFTJetPatRecoProducer::buildDenseProduct(edm::Event& ev) const
 {
     typedef reco::PattRecoTree<Real,reco::PattRecoPeak<Real> > StoredTree;
 
-    std::auto_ptr<StoredTree> tree(new StoredTree());
+    auto tree = std::make_unique<StoredTree>();
 
     densePeakTreeToStorable(*clusteringTree,
                             sequencer->maxAdaptiveScales(),
@@ -415,7 +415,7 @@ void FFTJetPatRecoProducer::buildDenseProduct(edm::Event& ev) const
                 << std::endl;
     }
 
-    ev.put(tree, outputLabel);
+    ev.put(std::move(tree), outputLabel);
 }
 
 
@@ -460,10 +460,9 @@ void FFTJetPatRecoProducer::produce(
     {
         const fftjet::Grid2d<Real>& g(*energyFlow);
 
-        std::auto_ptr<reco::DiscretizedEnergyFlow> flow(
-            new reco::DiscretizedEnergyFlow(
+        auto flow = std::make_unique<reco::DiscretizedEnergyFlow>(
                 g.data(), g.title(), g.etaMin(), g.etaMax(),
-                g.phiBin0Edge(), g.nEta(), g.nPhi()));
+                g.phiBin0Edge(), g.nEta(), g.nPhi());
 
         if (verifyDataConversion)
         {
@@ -474,7 +473,7 @@ void FFTJetPatRecoProducer::produce(
             assert(g == check);
         }
 
-        iEvent.put(flow, outputLabel);
+        iEvent.put(std::move(flow), outputLabel);
     }
 
     if (storeGridsExternally)

diff --git a/RecoJets/FFTJetProducers/plugins/FFTJetPileupEstimator.cc b/RecoJets/FFTJetProducers/plugins/FFTJetPileupEstimator.cc
@@ -60,10 +60,10 @@ class FFTJetPileupEstimator : public edm::EDProducer
     FFTJetPileupEstimator(const FFTJetPileupEstimator&);
     FFTJetPileupEstimator& operator=(const FFTJetPileupEstimator&);
 
-    std::auto_ptr<reco::FFTJetPileupSummary> calibrateFromConfig(
+    std::unique_ptr<reco::FFTJetPileupSummary> calibrateFromConfig(
         double uncalibrated) const;
 
-    std::auto_ptr<reco::FFTJetPileupSummary> calibrateFromDB(
+    std::unique_ptr<reco::FFTJetPileupSummary> calibrateFromDB(
         double uncalibrated, const edm::EventSetup& iSetup) const;
 
     template<class Ptr>
@@ -171,12 +171,12 @@ void FFTJetPileupEstimator::produce(edm::Event& iEvent,
     // Simple fixed-point pile-up estimate
     const double curve = h.data()[filterNumber*nCdfvalues + fixedCdfvalueBin];
 
-    std::auto_ptr<reco::FFTJetPileupSummary> summary;
+    std::unique_ptr<reco::FFTJetPileupSummary> summary;
     if (loadCalibFromDB)
         summary = calibrateFromDB(curve, iSetup);
     else
         summary = calibrateFromConfig(curve);
-    iEvent.put(summary, outputLabel);
+    iEvent.put(std::move(summary), outputLabel);
 }
 
 
@@ -190,7 +190,7 @@ void FFTJetPileupEstimator::endJob()
 }
 
 
-std::auto_ptr<reco::FFTJetPileupSummary>
+std::unique_ptr<reco::FFTJetPileupSummary>
 FFTJetPileupEstimator::calibrateFromConfig(const double curve) const
 {
     const double pileupRho = ptToDensityFactor*(*calibrationCurve)(curve);
@@ -222,13 +222,11 @@ FFTJetPileupEstimator::calibrateFromConfig(const double curve) const
             }
     }
 
-    return std::auto_ptr<reco::FFTJetPileupSummary>(
-        new reco::FFTJetPileupSummary(curve, pileupRho,
-                                      rhoUncert, uncertaintyCode));
+    return std::make_unique<reco::FFTJetPileupSummary>(curve, pileupRho, rhoUncert, uncertaintyCode);
 }
 
 
-std::auto_ptr<reco::FFTJetPileupSummary>
+std::unique_ptr<reco::FFTJetPileupSummary>
 FFTJetPileupEstimator::calibrateFromDB(
     const double curve, const edm::EventSetup& iSetup) const
 {
@@ -246,9 +244,7 @@ FFTJetPileupEstimator::calibrateFromDB(
     const double rhoUncert = ptToDensityFactor*(*uc)(&curve, 1U);
     const int uncertaintyCode = round((*uz)(&curve, 1U));
 
-    return std::auto_ptr<reco::FFTJetPileupSummary>(
-        new reco::FFTJetPileupSummary(curve, pileupRho,
-                                      rhoUncert, uncertaintyCode));
+    return std::make_unique<reco::FFTJetPileupSummary>(curve, pileupRho, rhoUncert, uncertaintyCode);
 }
 
 

diff --git a/RecoJets/FFTJetProducers/plugins/FFTJetPileupProcessor.cc b/RecoJets/FFTJetProducers/plugins/FFTJetPileupProcessor.cc
@@ -290,15 +290,11 @@ void FFTJetPileupProcessor::produce(
 
     // Convert percentile data into a more convenient storable object
     // and put it into the event record
-    std::auto_ptr<reco::DiscretizedEnergyFlow> pTable(
-        new reco::DiscretizedEnergyFlow(
+    iEvent.put(std::make_unique<reco::DiscretizedEnergyFlow>(
             &percentileData[0], "FFTJetPileupProcessor",
-            -0.5, nScales-0.5, 0.0, nScales, nPercentiles));
-    iEvent.put(pTable, outputLabel);
+            -0.5, nScales-0.5, 0.0, nScales, nPercentiles), outputLabel);
 
-    std::auto_ptr<std::pair<double,double> > etSum(
-        new std::pair<double,double>(densityBeforeMixing, densityAfterMixing));
-    iEvent.put(etSum, outputLabel);
+    iEvent.put(std::make_unique<std::pair<double,double>>(densityBeforeMixing, densityAfterMixing), outputLabel);
 }
 
 

diff --git a/RecoJets/FFTJetProducers/plugins/FFTJetProducer.cc b/RecoJets/FFTJetProducers/plugins/FFTJetProducer.cc
@@ -633,7 +633,7 @@ void FFTJetProducer::writeJets(edm::Event& iEvent,
                    pileupEnergyFlow->phiBinWidth();
 
     // allocate output jet collection
-    std::auto_ptr<OutputCollection> jets(new OutputCollection());
+    auto jets = std::make_unique<OutputCollection>();
     const unsigned nJets = recoJets.size();
     jets->reserve(nJets);
 
@@ -705,7 +705,7 @@ void FFTJetProducer::writeJets(edm::Event& iEvent,
         std::sort(jets->begin(), jets->end(), LocalSortByPt());
 
     // put the collection into the event
-    iEvent.put(jets, outputLabel);
+    iEvent.put(std::move(jets), outputLabel);
 }
 
 
@@ -732,15 +732,13 @@ void FFTJetProducer::saveResults(edm::Event& ev, const edm::EventSetup& iSetup,
     const double maxScale = maxLevel ? sparseTree.getScale(maxLevel) : 0.0;
     const double scaleUsed = usedLevel ? sparseTree.getScale(usedLevel) : 0.0;
 
-    std::auto_ptr<reco::FFTJetProducerSummary> summary(
-        new reco::FFTJetProducerSummary(
+    ev.put(std::make_unique<reco::FFTJetProducerSummary>(
             thresholds, occupancy, unclusE,
             constituents[0], unused,
             minScale, maxScale, scaleUsed,
             nPreclustersFound, iterationsPerformed,
             iterationsPerformed == 1U ||
-            iterationsPerformed <= maxIterations));
-    ev.put(summary, outputLabel);
+            iterationsPerformed <= maxIterations), outputLabel);
 }
 
 

diff --git a/RecoJets/FFTJetProducers/plugins/FFTJetVertexAdder.cc b/RecoJets/FFTJetProducers/plugins/FFTJetVertexAdder.cc
@@ -130,7 +130,7 @@ void FFTJetVertexAdder::produce(
     CLHEP::RandGauss rGauss(rng->getEngine(iEvent.streamID()));
 
     // get PFCandidates
-    std::auto_ptr<reco::VertexCollection> pOutput(new reco::VertexCollection);
+    auto pOutput = std::make_unique<reco::VertexCollection>();
 
     double xmean = fixedX;
     double ymean = fixedY;
@@ -193,7 +193,7 @@ void FFTJetVertexAdder::produce(
             pOutput->push_back(*iv);
     }
 
-    iEvent.put(pOutput, outputLabel);
+    iEvent.put(std::move(pOutput), outputLabel);
 }
 
 

diff --git a/RecoJets/JetAnalyzers/src/JetIdSelector.cc b/RecoJets/JetAnalyzers/src/JetIdSelector.cc
@@ -155,7 +155,7 @@ JetIdSelector<T>::~JetIdSelector(){
 template<typename T>
 void JetIdSelector<T>::produce(edm::Event& iEvent,const edm::EventSetup& iSetup)
 {
-  auto_ptr<JetCollection> selectedJets(new JetCollection);
+  auto selectedJets = std::make_unique<JetCollection>();
   edm::Handle<reco::JetView> jets;  // uncorrected jets!
   iEvent.getByLabel(src_,jets);
 
@@ -241,7 +241,7 @@ void JetIdSelector<T>::produce(edm::Event& iEvent,const edm::EventSetup& iSetup)
 
   nJetsTot_  +=jets->size();
   nJetsPassed_+=selectedJets->size();  
-  iEvent.put(selectedJets);
+  iEvent.put(std::move(selectedJets));
 }
 
 

diff --git a/RecoJets/JetAssociationProducers/src/JetExtender.cc b/RecoJets/JetAssociationProducers/src/JetExtender.cc
@@ -35,8 +35,7 @@ void JetExtender::produce(edm::Event& fEvent, const edm::EventSetup& fSetup) {
   edm::Handle <reco::JetTracksAssociation::Container> j2tCALO_h;
   if (!(mJet2TracksAtCALO.label().empty())) fEvent.getByToken (token_mJet2TracksAtCALO, j2tCALO_h);
 
-  std::auto_ptr<reco::JetExtendedAssociation::Container> 
-    jetExtender (new reco::JetExtendedAssociation::Container (reco::JetRefBaseProd(jets_h)));
+  auto jetExtender = std::make_unique<reco::JetExtendedAssociation::Container>(reco::JetRefBaseProd(jets_h));
 
   // loop over jets (make sure jets in associations are the same as in collection
 
@@ -69,5 +68,5 @@ void JetExtender::produce(edm::Event& fEvent, const edm::EventSetup& fSetup) {
     }
     reco::JetExtendedAssociation::setValue (&*jetExtender, jet, extendedData);
   }
-  fEvent.put (jetExtender);
+  fEvent.put(std::move(jetExtender));
 }
diff --git a/RecoJets/JetAssociationProducers/src/JetSignalVertexCompatibility.cc b/RecoJets/JetAssociationProducers/src/JetSignalVertexCompatibility.cc
@@ -51,8 +51,7 @@ void JetSignalVertexCompatibility::produce(edm::Event &event,
 	edm::Handle<VertexCollection> primaryVertices;
 	event.getByToken(primaryVerticesToken, primaryVertices);
 
-	std::auto_ptr<JetFloatAssociation::Container> result(
-		new JetFloatAssociation::Container(jetTracksAssoc->keyProduct()));
+	auto result = std::make_unique<JetFloatAssociation::Container>(jetTracksAssoc->keyProduct());
 
 	for(JetTracksAssociationCollection::const_iterator iter =
 						jetTracksAssoc->begin();
@@ -70,5 +69,5 @@ void JetSignalVertexCompatibility::produce(edm::Event &event,
 
 	algo.resetEvent(0);
 
-	event.put(result);
+	event.put(std::move(result));
 }
diff --git a/RecoJets/JetAssociationProducers/src/JetTracksAssociatorAtCaloFace.cc b/RecoJets/JetAssociationProducers/src/JetTracksAssociatorAtCaloFace.cc
@@ -56,7 +56,7 @@ void JetTracksAssociatorAtCaloFace::produce(edm::Event& fEvent, const edm::Event
     throw cms::Exception("InvalidInput") << " Jet-track association is only defined for CaloJets.";
   }
 
-  std::auto_ptr<reco::JetTracksAssociation::Container> jetTracks (new reco::JetTracksAssociation::Container (reco::JetRefBaseProd(jets_h)));
+  auto jetTracks = std::make_unique<reco::JetTracksAssociation::Container>(reco::JetRefBaseProd(jets_h));
 
 
   // format inputs
@@ -67,7 +67,7 @@ void JetTracksAssociatorAtCaloFace::produce(edm::Event& fEvent, const edm::Event
 
 
   // store output
-  fEvent.put (jetTracks);
+  fEvent.put(std::move(jetTracks));
 }
 
 
diff --git a/RecoJets/JetAssociationProducers/src/JetTracksAssociatorAtVertex.cc b/RecoJets/JetAssociationProducers/src/JetTracksAssociatorAtVertex.cc
@@ -38,7 +38,7 @@ void JetTracksAssociatorAtVertex::produce(edm::Event& fEvent, const edm::EventSe
   edm::Handle <reco::TrackCollection> tracks_h;
   fEvent.getByToken (mTracks, tracks_h);
 
-  std::auto_ptr<reco::JetTracksAssociation::Container> jetTracks (new reco::JetTracksAssociation::Container (reco::JetRefBaseProd(jets_h)));
+  auto jetTracks = std::make_unique<reco::JetTracksAssociation::Container>(reco::JetRefBaseProd(jets_h));
 
   // format inputs
   std::vector <edm::RefToBase<reco::Jet> > allJets;
@@ -61,5 +61,5 @@ void JetTracksAssociatorAtVertex::produce(edm::Event& fEvent, const edm::EventSe
 
 
   // store output
-  fEvent.put (jetTracks);
+  fEvent.put(std::move(jetTracks));
 }
diff --git a/RecoJets/JetAssociationProducers/src/JetTracksAssociatorExplicit.cc b/RecoJets/JetAssociationProducers/src/JetTracksAssociatorExplicit.cc
@@ -32,7 +32,7 @@ void JetTracksAssociatorExplicit::produce(edm::Event& fEvent, const edm::EventSe
   edm::Handle <reco::TrackCollection> tracks_h;
   fEvent.getByToken (mTracks, tracks_h);
 
-  std::auto_ptr<reco::JetTracksAssociation::Container> jetTracks (new reco::JetTracksAssociation::Container (reco::JetRefBaseProd(jets_h)));
+  auto jetTracks = std::make_unique<reco::JetTracksAssociation::Container>(reco::JetRefBaseProd(jets_h));
 
   // format inputs
   std::vector <edm::RefToBase<reco::Jet> > allJets;
@@ -50,5 +50,5 @@ void JetTracksAssociatorExplicit::produce(edm::Event& fEvent, const edm::EventSe
 
 
   // store output
-  fEvent.put (jetTracks);
+  fEvent.put(std::move(jetTracks));
 }
diff --git a/RecoJets/JetAssociationProducers/src/TrackExtrapolator.cc b/RecoJets/JetAssociationProducers/src/TrackExtrapolator.cc
@@ -50,7 +50,7 @@ TrackExtrapolator::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
   edm::Handle <reco::TrackCollection> tracks_h;
   iEvent.getByToken (tracksSrc_, tracks_h);
 
-  std::auto_ptr< std::vector<reco::TrackExtrapolation> > extrapolations( new std::vector<reco::TrackExtrapolation>() );
+  auto extrapolations = std::make_unique<std::vector<reco::TrackExtrapolation>>();
 
   // Get list of tracks we want to extrapolate
   std::vector <reco::TrackRef> goodTracks;
@@ -79,7 +79,7 @@ TrackExtrapolator::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
 							   vresultMom ) );
     }
   }
-  iEvent.put( extrapolations );
+  iEvent.put(std::move(extrapolations));
 }
 
 // -----------------------------------------------------------------------------