Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert to thread-friendly modules in CommonTools #38311

Merged
merged 1 commit into from
Jun 10, 2022
Merged

Convert to thread-friendly modules in CommonTools #38311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CommonTools/CandAlgos/plugins/CandViewRefMerger.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

#include "FWCore/Framework/interface/MakerMacros.h"
#include "DataFormats/Candidate/interface/Candidate.h"
#include "FWCore/Framework/interface/EDProducer.h"
#include "FWCore/Framework/interface/global/EDProducer.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Utilities/interface/transform.h"
#include "DataFormats/Common/interface/Handle.h"

class CandViewRefMerger : public edm::EDProducer {
class CandViewRefMerger : public edm::global::EDProducer<> {
public:
explicit CandViewRefMerger(const edm::ParameterSet& cfg)
: srcTokens_(
Expand All @@ -24,7 +24,7 @@ class CandViewRefMerger : public edm::EDProducer {
}

private:
void produce(edm::Event& evt, const edm::EventSetup&) override {
void produce(edm::StreamID, edm::Event& evt, const edm::EventSetup&) const override {
std::unique_ptr<std::vector<reco::CandidateBaseRef> > out(new std::vector<reco::CandidateBaseRef>);
for (std::vector<edm::EDGetTokenT<reco::CandidateView> >::const_iterator i = srcTokens_.begin();
i != srcTokens_.end();
Expand Down
10 changes: 6 additions & 4 deletions CommonTools/UtilAlgos/interface/AssociationMapOneToOne2Association.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@
#include "DataFormats/Common/interface/AssociationMap.h"
#include "DataFormats/Common/interface/OneToOne.h"
#include "DataFormats/Common/interface/Association.h"
#include "FWCore/Framework/interface/EDProducer.h"
#include "FWCore/Framework/interface/global/EDProducer.h"
#include "FWCore/Utilities/interface/InputTag.h"

template <typename CKey, typename CVal>
class AssociationMapOneToOne2Association : public edm::EDProducer {
class AssociationMapOneToOne2Association : public edm::global::EDProducer<> {
public:
AssociationMapOneToOne2Association(const edm::ParameterSet&);

private:
typedef edm::AssociationMap<edm::OneToOne<CKey, CVal> > am_t;
typedef edm::Association<CVal> as_t;
void produce(edm::Event&, const edm::EventSetup&) override;
void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
edm::EDGetTokenT<am_t> am_;
};

Expand All @@ -38,7 +38,9 @@ AssociationMapOneToOne2Association<CKey, CVal>::AssociationMapOneToOne2Associati
}

template <typename CKey, typename CVal>
void AssociationMapOneToOne2Association<CKey, CVal>::produce(edm::Event& evt, const edm::EventSetup&) {
void AssociationMapOneToOne2Association<CKey, CVal>::produce(edm::StreamID,
edm::Event& evt,
const edm::EventSetup&) const {
using namespace edm;
using namespace std;
Handle<am_t> am;
Expand Down
10 changes: 6 additions & 4 deletions CommonTools/UtilAlgos/interface/AssociationVector2ValueMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@

#include "DataFormats/Common/interface/AssociationVector.h"
#include "DataFormats/Common/interface/ValueMap.h"
#include "FWCore/Framework/interface/EDProducer.h"
#include "FWCore/Framework/interface/global/EDProducer.h"
#include "FWCore/Utilities/interface/InputTag.h"

template <typename KeyRefProd, typename CVal>
class AssociationVector2ValueMap : public edm::EDProducer {
class AssociationVector2ValueMap : public edm::global::EDProducer<> {
public:
AssociationVector2ValueMap(const edm::ParameterSet&);

Expand All @@ -22,7 +22,7 @@ class AssociationVector2ValueMap : public edm::EDProducer {
typedef typename CVal::value_type value_t;
typedef edm::ValueMap<value_t> vm_t;
typedef typename av_t::CKey collection_t;
void produce(edm::Event&, const edm::EventSetup&) override;
void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
edm::EDGetTokenT<av_t> av_;
};

Expand All @@ -39,7 +39,9 @@ AssociationVector2ValueMap<KeyRefProd, CVal>::AssociationVector2ValueMap(const e
}

template <typename KeyRefProd, typename CVal>
void AssociationVector2ValueMap<KeyRefProd, CVal>::produce(edm::Event& evt, const edm::EventSetup&) {
void AssociationVector2ValueMap<KeyRefProd, CVal>::produce(edm::StreamID,
edm::Event& evt,
const edm::EventSetup&) const {
using namespace edm;
using namespace std;
Handle<av_t> av;
Expand Down
4 changes: 2 additions & 2 deletions CommonTools/UtilAlgos/interface/AssociationVectorSelector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
*/

#include "DataFormats/Common/interface/AssociationVector.h"
#include "FWCore/Framework/interface/EDProducer.h"
#include "FWCore/Framework/interface/stream/EDProducer.h"
#include "FWCore/Utilities/interface/InputTag.h"
#include "CommonTools/UtilAlgos/interface/AnySelector.h"

template <typename KeyRefProd, typename CVal, typename KeySelector = AnySelector, typename ValSelector = AnySelector>
class AssociationVectorSelector : public edm::EDProducer {
class AssociationVectorSelector : public edm::stream::EDProducer<> {
public:
AssociationVectorSelector(const edm::ParameterSet&);

Expand Down
5 changes: 3 additions & 2 deletions CommonTools/UtilAlgos/interface/HistoAnalyzer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* - C : Concrete candidate collection type
*
*/
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Utilities/interface/InputTag.h"
Expand All @@ -19,7 +19,7 @@
#include "CommonTools/UtilAlgos/interface/ExpressionHisto.h"

template <typename C>
class HistoAnalyzer : public edm::EDAnalyzer {
class HistoAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResources> {
public:
/// constructor from parameter set
HistoAnalyzer(const edm::ParameterSet&);
Expand Down Expand Up @@ -47,6 +47,7 @@ HistoAnalyzer<C>::HistoAnalyzer(const edm::ParameterSet& par)
usingWeights_(par.exists("weights")),
weightsToken_(
mayConsume<double>(par.template getUntrackedParameter<edm::InputTag>("weights", edm::InputTag("fake")))) {
usesResource(TFileService::kSharedResource);
edm::Service<TFileService> fs;
std::vector<edm::ParameterSet> histograms = par.template getParameter<std::vector<edm::ParameterSet> >("histograms");
std::vector<edm::ParameterSet>::const_iterator it = histograms.begin();
Expand Down
4 changes: 2 additions & 2 deletions CommonTools/UtilAlgos/interface/NtpProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
* - C : Concrete candidate collection type
*
*/
#include "FWCore/Framework/interface/EDProducer.h"
#include "FWCore/Framework/interface/stream/EDProducer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "DataFormats/Provenance/interface/RunLumiEventNumber.h"
#include "FWCore/Utilities/interface/InputTag.h"
#include "CommonTools/Utils/interface/StringObjectFunction.h"

template <typename C>
class NtpProducer : public edm::EDProducer {
class NtpProducer : public edm::stream::EDProducer<> {
public:
/// constructor from parameter set
NtpProducer(const edm::ParameterSet&);
Expand Down