From 78336844ea5b841a632a85addc44848439a668fc Mon Sep 17 00:00:00 2001 From: David Date: Wed, 17 Nov 2021 11:07:53 +0100 Subject: [PATCH 01/89] round of obsolete file removal --- .../CandAlgos/interface/CandDecaySelector.h | 50 ------------------- .../interface/CompositeCandSelector.h | 34 ------------- .../interface/ObjectShallowCloneSelector.h | 21 -------- .../SingleObjectShallowCloneSelector.h | 34 ------------- .../CandAlgos/plugins/CandViewCombiner.cc | 15 ------ .../plugins/CandViewShallowCloneProducer.cc | 18 ------- .../plugins/CompositeCandAndSelector.cc | 13 ----- .../plugins/DeltaPhiMinCandCombiner.cc | 16 ------ .../plugins/DeltaRMinCandCombiner.cc | 16 ------ .../plugins/NamedCandShallowCloneCombiner.cc | 24 --------- .../NamedCandViewShallowCloneCombiner.cc | 24 --------- .../NamedCandViewShallowClonePtrCombiner.cc | 24 --------- .../PdgIdAndStatusCandDecaySelector.cc | 27 ---------- .../plugins/CompositeDimuonAndSelector.cc | 15 ------ 14 files changed, 331 deletions(-) delete mode 100644 CommonTools/CandAlgos/interface/CandDecaySelector.h delete mode 100644 CommonTools/CandAlgos/interface/CompositeCandSelector.h delete mode 100644 CommonTools/CandAlgos/interface/ObjectShallowCloneSelector.h delete mode 100644 CommonTools/CandAlgos/interface/SingleObjectShallowCloneSelector.h delete mode 100644 CommonTools/CandAlgos/plugins/CandViewCombiner.cc delete mode 100644 CommonTools/CandAlgos/plugins/CandViewShallowCloneProducer.cc delete mode 100644 CommonTools/CandAlgos/plugins/CompositeCandAndSelector.cc delete mode 100644 CommonTools/CandAlgos/plugins/DeltaPhiMinCandCombiner.cc delete mode 100644 CommonTools/CandAlgos/plugins/DeltaRMinCandCombiner.cc delete mode 100644 CommonTools/CandAlgos/plugins/NamedCandShallowCloneCombiner.cc delete mode 100644 CommonTools/CandAlgos/plugins/NamedCandViewShallowCloneCombiner.cc delete mode 100644 CommonTools/CandAlgos/plugins/NamedCandViewShallowClonePtrCombiner.cc delete mode 100644 CommonTools/CandAlgos/plugins/PdgIdAndStatusCandDecaySelector.cc delete mode 100644 CommonTools/RecoAlgos/plugins/CompositeDimuonAndSelector.cc diff --git a/CommonTools/CandAlgos/interface/CandDecaySelector.h b/CommonTools/CandAlgos/interface/CandDecaySelector.h deleted file mode 100644 index 6f134c4be695a..0000000000000 --- a/CommonTools/CandAlgos/interface/CandDecaySelector.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef CandAlgos_CandDecaySelector_h -#define CandAlgos_CandDecaySelector_h -/* \class helper::CandDecayStoreManager - * - * \author: Luca Lista, INFN - * - */ -#include "DataFormats/Candidate/interface/CompositeRefCandidate.h" -#include "CommonTools/UtilAlgos/interface/ObjectSelector.h" - -namespace helper { - class CandDecayStoreManager { - public: - typedef reco::CandidateCollection collection; - CandDecayStoreManager(const edm::Handle&) : selCands_(new reco::CandidateCollection) {} - template - void cloneAndStore(const I& begin, const I& end, edm::Event& evt) { - using namespace reco; - CandidateRefProd cands = evt.getRefBeforePut(); - for (I i = begin; i != end; ++i) - add(cands, **i); - } - edm::OrphanHandle put(edm::Event& evt) { return evt.put(std::move(selCands_)); } - size_t size() const { return selCands_->size(); } - - private: - reco::CandidateRef add(reco::CandidateRefProd cands, const reco::Candidate& c) { - using namespace reco; - using namespace std; - auto cmp = std::make_unique(c); - CompositeRefCandidate* p = cmp.get(); - CandidateRef ref(cands, selCands_->size()); - selCands_->push_back(std::move(cmp)); - size_t n = c.numberOfDaughters(); - for (size_t i = 0; i < n; ++i) - p->addDaughter(add(cands, *c.daughter(i))); - return ref; - } - std::unique_ptr selCands_; - }; - - template - struct StoreManagerTrait { - typedef CandDecayStoreManager type; - typedef ObjectSelectorBase base; - }; - -} // namespace helper - -#endif diff --git a/CommonTools/CandAlgos/interface/CompositeCandSelector.h b/CommonTools/CandAlgos/interface/CompositeCandSelector.h deleted file mode 100644 index 381b7ad354259..0000000000000 --- a/CommonTools/CandAlgos/interface/CompositeCandSelector.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef CommonTools_CandAlgos_CompositeCandSelector_h -#define CommonTools_CandAlgos_CompositeCandSelector_h -#include "FWCore/Framework/interface/ConsumesCollector.h" -#include "CommonTools/UtilAlgos/interface/ParameterAdapter.h" -#include "CommonTools/CandUtils/interface/CompositeCandSelector.h" -#include "CommonTools/UtilAlgos/interface/StringCutObjectSelector.h" - -namespace reco { - namespace modules { - - template - struct ParameterAdapter > { - static CompositeCandSelector make(const edm::ParameterSet& cfg) { - return CompositeCandSelector(modules::make(cfg)); - } - }; - - template