Code checks.

cms-sw · Apr 23, 2020 · 8c33b88 · 8c33b88
1 parent 42c5c7d
commit 8c33b88
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 30 deletions.
diff --git a/CommonTools/CandAlgos/plugins/CandFwdPtrMerger.cc b/CommonTools/CandAlgos/plugins/CandFwdPtrMerger.cc
@@ -12,12 +12,10 @@
 #include "DataFormats/PatCandidates/interface/PackedGenParticle.h"
 #include "DataFormats/Common/interface/FwdPtr.h"
 
-
 typedef Merger<std::vector<edm::FwdPtr<reco::Candidate>>> CandFwdPtrMerger;
 typedef Merger<std::vector<edm::FwdPtr<pat::PackedCandidate>>> PackedCandidateFwdPtrMerger;
 typedef Merger<std::vector<edm::FwdPtr<pat::PackedGenParticle>>> PackedGenParticleFwdPtrMerger;
 
-
-DEFINE_FWK_MODULE( CandFwdPtrMerger );
-DEFINE_FWK_MODULE( PackedCandidateFwdPtrMerger );
-DEFINE_FWK_MODULE( PackedGenParticleFwdPtrMerger );
+DEFINE_FWK_MODULE(CandFwdPtrMerger);
+DEFINE_FWK_MODULE(PackedCandidateFwdPtrMerger);
+DEFINE_FWK_MODULE(PackedGenParticleFwdPtrMerger);
diff --git a/CommonTools/CandAlgos/plugins/CandPtrMerger.cc b/CommonTools/CandAlgos/plugins/CandPtrMerger.cc
@@ -12,12 +12,10 @@
 #include "DataFormats/PatCandidates/interface/PackedGenParticle.h"
 #include "DataFormats/Common/interface/Ptr.h"
 
-
 typedef SetMerger<std::vector<edm::Ptr<reco::Candidate>>> CandPtrMerger;
 typedef SetMerger<std::vector<edm::Ptr<pat::PackedCandidate>>> PackedCandidatePtrMerger;
 typedef SetMerger<std::vector<edm::Ptr<pat::PackedGenParticle>>> PackedGenParticlePtrMerger;
 
-
-DEFINE_FWK_MODULE( CandPtrMerger );
-DEFINE_FWK_MODULE( PackedCandidatePtrMerger );
-DEFINE_FWK_MODULE( PackedGenParticlePtrMerger );
+DEFINE_FWK_MODULE(CandPtrMerger);
+DEFINE_FWK_MODULE(PackedCandidatePtrMerger);
+DEFINE_FWK_MODULE(PackedGenParticlePtrMerger);
diff --git a/CommonTools/UtilAlgos/interface/SetMerger.h b/CommonTools/UtilAlgos/interface/SetMerger.h
@@ -25,50 +25,51 @@
 #include "DataFormats/Common/interface/CloneTrait.h"
 #include <vector>
 
-template<typename InputCollection,
-	 typename OutputCollection = InputCollection,
-	 typename P = typename edm::clonehelper::CloneTrait<InputCollection>::type>
+template <typename InputCollection,
+          typename OutputCollection = InputCollection,
+          typename P = typename edm::clonehelper::CloneTrait<InputCollection>::type>
 class SetMerger : public edm::global::EDProducer<> {
 public:
-typedef std::set<typename OutputCollection::value_type > set_type;
+  typedef std::set<typename OutputCollection::value_type> set_type;
   /// constructor from parameter set
-  explicit SetMerger( const edm::ParameterSet& );
+  explicit SetMerger(const edm::ParameterSet&);
   /// destructor
   ~SetMerger() override;
 
 private:
   /// process an event
-  void produce( edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
+  void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
   /// vector of strings
   typedef std::vector<edm::EDGetTokenT<InputCollection> > vtoken;
   /// labels of the collections to be merged
   vtoken srcToken_;
 };
 
-template<typename InputCollection, typename OutputCollection, typename P>
-SetMerger<InputCollection, OutputCollection, P>::SetMerger( const edm::ParameterSet& par ) :
-  srcToken_( edm::vector_transform(par.template getParameter<std::vector<edm::InputTag> >( "src" ), [this](edm::InputTag const & tag){return consumes<InputCollection>(tag);} ) ) {
+template <typename InputCollection, typename OutputCollection, typename P>
+SetMerger<InputCollection, OutputCollection, P>::SetMerger(const edm::ParameterSet& par)
+    : srcToken_(edm::vector_transform(par.template getParameter<std::vector<edm::InputTag> >("src"),
+                                      [this](edm::InputTag const& tag) { return consumes<InputCollection>(tag); })) {
   produces<OutputCollection>();
 }
 
-template<typename InputCollection, typename OutputCollection, typename P>
-SetMerger<InputCollection, OutputCollection, P>::~SetMerger() {
-}
+template <typename InputCollection, typename OutputCollection, typename P>
+SetMerger<InputCollection, OutputCollection, P>::~SetMerger() {}
 
-template<typename InputCollection, typename OutputCollection, typename P>
-void SetMerger<InputCollection, OutputCollection, P>::produce( edm::StreamID, edm::Event& evt, const edm::EventSetup&) const {
+template <typename InputCollection, typename OutputCollection, typename P>
+void SetMerger<InputCollection, OutputCollection, P>::produce(edm::StreamID,
+                                                              edm::Event& evt,
+                                                              const edm::EventSetup&) const {
   set_type coll_set;
-  for( typename vtoken::const_iterator s = srcToken_.begin(); s != srcToken_.end(); ++ s ) {
+  for (typename vtoken::const_iterator s = srcToken_.begin(); s != srcToken_.end(); ++s) {
     edm::Handle<InputCollection> h;
-    evt.getByToken( * s, h );
-    for( typename InputCollection::const_iterator c = h->begin(); c != h->end(); ++c ) {
-      coll_set.emplace( P::clone( * c ) );
+    evt.getByToken(*s, h);
+    for (typename InputCollection::const_iterator c = h->begin(); c != h->end(); ++c) {
+      coll_set.emplace(P::clone(*c));
     }
   }
-  std::unique_ptr<OutputCollection> coll( new OutputCollection( coll_set.size() ) );
+  std::unique_ptr<OutputCollection> coll(new OutputCollection(coll_set.size()));
   std::copy(coll_set.begin(), coll_set.end(), coll->begin());
   evt.put(std::move(coll));
 }
 
 #endif
-