Apply code-checks/format

cms-sw · Aug 27, 2020 · 313863a · 313863a
1 parent c2d8c19
commit 313863a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/GeneratorInterface/RivetInterface/interface/ParticleLevelProducer.h b/GeneratorInterface/RivetInterface/interface/ParticleLevelProducer.h
@@ -43,7 +43,6 @@ class ParticleLevelProducer : public edm::one::EDProducer<edm::one::SharedResour
 
   Rivet::RivetAnalysis* rivetAnalysis_ = nullptr;
   std::unique_ptr<Rivet::AnalysisHandler> analysisHandler_;
-
 };
 
 #endif
diff --git a/GeneratorInterface/RivetInterface/plugins/HTXSRivetProducer.cc b/GeneratorInterface/RivetInterface/plugins/HTXSRivetProducer.cc
@@ -19,6 +19,8 @@
 #include "GeneratorInterface/RivetInterface/src/HiggsTemplateCrossSections.cc"
 #include "SimDataFormats/HTXS/interface/HiggsTemplateCrossSections.h"
 
+#include <memory>
+
 #include <vector>
 #include <cstdio>
 #include <cstring>
@@ -107,7 +109,7 @@ void HTXSRivetProducer::produce(edm::Event& iEvent, const edm::EventSetup&) {
     }
 
     if (!_HTXS || !_HTXS->hasProjection("FS")) {
-      _analysisHandler = std::unique_ptr<Rivet::AnalysisHandler>(new Rivet::AnalysisHandler());
+      _analysisHandler = std::make_unique<Rivet::AnalysisHandler>();
       _HTXS = new Rivet::HiggsTemplateCrossSections();
       _analysisHandler->addAnalysis(_HTXS);
 

diff --git a/GeneratorInterface/RivetInterface/plugins/ParticleLevelProducer.cc b/GeneratorInterface/RivetInterface/plugins/ParticleLevelProducer.cc
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include "GeneratorInterface/RivetInterface/interface/ParticleLevelProducer.h"
 
 #include "FWCore/Framework/interface/Event.h"
@@ -17,8 +19,7 @@ using namespace reco;
 using namespace Rivet;
 
 ParticleLevelProducer::ParticleLevelProducer(const edm::ParameterSet& pset)
-    : srcToken_(consumes<edm::HepMCProduct>(pset.getParameter<edm::InputTag>("src"))),
-      pset_(pset) {
+    : srcToken_(consumes<edm::HepMCProduct>(pset.getParameter<edm::InputTag>("src"))), pset_(pset) {
   usesResource("Rivet");
   genVertex_ = reco::Particle::Point(0, 0, 0);
 
@@ -115,7 +116,7 @@ void ParticleLevelProducer::produce(edm::Event& event, const edm::EventSetup& ev
 
   if (!rivetAnalysis_ || !rivetAnalysis_->hasProjection("FS")) {
     rivetAnalysis_ = new Rivet::RivetAnalysis(pset_);
-    analysisHandler_ = std::unique_ptr<Rivet::AnalysisHandler>(new Rivet::AnalysisHandler());
+    analysisHandler_ = std::make_unique<Rivet::AnalysisHandler>();
 
     analysisHandler_->setIgnoreBeams(true);
     analysisHandler_->addAnalysis(rivetAnalysis_);
-Original file line number
+Diff line change
@@ Expand Up @@
       Rivet::RivetAnalysis* rivetAnalysis_ = nullptr;
       std::unique_ptr<Rivet::AnalysisHandler> analysisHandler_;
     };
     #endif