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

Jump to bottom

Running code-format for hlt-reconstruction #26867

Merged
merged 2 commits into from May 23, 2019
Merged

Running code-format for hlt-reconstruction #26867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a449cf
Clang-tidy
cmsbuild May 22, 2019
1a9f1c7
Clang-Format
cmsbuild May 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
146 changes: 73 additions & 73 deletions RecoMuon/L2MuonIsolationProducer/src/L2MuonIsolationProducer.cc 100755 → 100644
View file
Open in desktop
Expand Up @@ -33,10 +33,9 @@ using namespace reco;
using namespace muonisolation;

/// constructor with config
L2MuonIsolationProducer::L2MuonIsolationProducer(const ParameterSet& par) :
theSACollectionLabel(par.getParameter<edm::InputTag>("StandAloneCollectionLabel"))
{
LogDebug("Muon|RecoMuon|L2MuonIsolationProducer")<<" L2MuonIsolationProducer constructor called";
L2MuonIsolationProducer::L2MuonIsolationProducer(const ParameterSet& par)
: theSACollectionLabel(par.getParameter<edm::InputTag>("StandAloneCollectionLabel")) {
LogDebug("Muon|RecoMuon|L2MuonIsolationProducer") << " L2MuonIsolationProducer constructor called";

theSACollectionToken = consumes<RecoChargedCandidateCollection>(theSACollectionLabel);

Expand All @@ -45,91 +44,93 @@ L2MuonIsolationProducer::L2MuonIsolationProducer(const ParameterSet& par) :
//
edm::ParameterSet extractorPSet = par.getParameter<edm::ParameterSet>("ExtractorPSet");
std::string extractorName = extractorPSet.getParameter<std::string>("ComponentName");
theExtractor = std::unique_ptr<reco::isodeposit::IsoDepositExtractor>{IsoDepositExtractorFactory::get()->create( extractorName, extractorPSet, consumesCollector())};

theExtractor = std::unique_ptr<reco::isodeposit::IsoDepositExtractor>{
IsoDepositExtractorFactory::get()->create(extractorName, extractorPSet, consumesCollector())};

edm::ParameterSet isolatorPSet = par.getParameter<edm::ParameterSet>("IsolatorPSet");
bool haveIsolator = !isolatorPSet.empty();
optOutputDecision = haveIsolator;
if (optOutputDecision){
if (optOutputDecision) {
std::string type = isolatorPSet.getParameter<std::string>("ComponentName");
theDepositIsolator = std::unique_ptr<muonisolation::MuIsoBaseIsolator>{MuonIsolatorFactory::get()->create(type, isolatorPSet, consumesCollector())};
theDepositIsolator = std::unique_ptr<muonisolation::MuIsoBaseIsolator>{
MuonIsolatorFactory::get()->create(type, isolatorPSet, consumesCollector())};
}
if (optOutputDecision) produces<edm::ValueMap<bool> >();
if (optOutputDecision)
produces<edm::ValueMap<bool>>();
produces<reco::IsoDepositMap>();

optOutputIsolatorFloat = par.getParameter<bool>("WriteIsolatorFloat");
if (optOutputIsolatorFloat && haveIsolator){
produces<edm::ValueMap<float> >();
if (optOutputIsolatorFloat && haveIsolator) {
produces<edm::ValueMap<float>>();
}
}

/// destructor
L2MuonIsolationProducer::~L2MuonIsolationProducer(){
LogDebug("Muon|RecoMuon|L2MuonIsolationProducer")<<" L2MuonIsolationProducer destructor called";
L2MuonIsolationProducer::~L2MuonIsolationProducer() {
LogDebug("Muon|RecoMuon|L2MuonIsolationProducer") << " L2MuonIsolationProducer destructor called";
}

/// ParameterSet descriptions
void L2MuonIsolationProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
desc.add<edm::InputTag>("StandAloneCollectionLabel",edm::InputTag("hltL2MuonCandidates"));
desc.add<edm::InputTag>("StandAloneCollectionLabel", edm::InputTag("hltL2MuonCandidates"));
edm::ParameterSetDescription extractorPSet;
{
extractorPSet.add<double>("DR_Veto_H",0.1);
extractorPSet.add<bool>("Vertex_Constraint_Z",false);
extractorPSet.add<double>("Threshold_H",0.5);
extractorPSet.add<std::string>("ComponentName","CaloExtractor");
extractorPSet.add<double>("Threshold_E",0.2);
extractorPSet.add<double>("DR_Max",1.0);
extractorPSet.add<double>("DR_Veto_E",0.07);
extractorPSet.add<double>("Weight_E",1.5);
extractorPSet.add<bool>("Vertex_Constraint_XY",false);
extractorPSet.addUntracked<std::string>("DepositLabel","EcalPlusHcal");
extractorPSet.add<edm::InputTag>("CaloTowerCollectionLabel",edm::InputTag("towerMaker"));
extractorPSet.add<double>("Weight_H",1.0);
extractorPSet.add<double>("DR_Veto_H", 0.1);
extractorPSet.add<bool>("Vertex_Constraint_Z", false);
extractorPSet.add<double>("Threshold_H", 0.5);
extractorPSet.add<std::string>("ComponentName", "CaloExtractor");
extractorPSet.add<double>("Threshold_E", 0.2);
extractorPSet.add<double>("DR_Max", 1.0);
extractorPSet.add<double>("DR_Veto_E", 0.07);
extractorPSet.add<double>("Weight_E", 1.5);
extractorPSet.add<bool>("Vertex_Constraint_XY", false);
extractorPSet.addUntracked<std::string>("DepositLabel", "EcalPlusHcal");
extractorPSet.add<edm::InputTag>("CaloTowerCollectionLabel", edm::InputTag("towerMaker"));
extractorPSet.add<double>("Weight_H", 1.0);
}
desc.add<edm::ParameterSetDescription>("ExtractorPSet",extractorPSet);
desc.add<edm::ParameterSetDescription>("ExtractorPSet", extractorPSet);
edm::ParameterSetDescription isolatorPSet;
{
std::vector<double> temp;
isolatorPSet.add<std::vector<double> >("ConeSizesRel",std::vector<double>(1, 0.3));
isolatorPSet.add<double>("EffAreaSFEndcap",1.0);
isolatorPSet.add<bool>("CutAbsoluteIso",true);
isolatorPSet.add<bool>("AndOrCuts",true);
isolatorPSet.add<edm::InputTag>("RhoSrc",edm::InputTag("hltKT6CaloJetsForMuons","rho"));
isolatorPSet.add<std::vector<double> >("ConeSizes",std::vector<double>(1, 0.3));
isolatorPSet.add<std::string>("ComponentName","CutsIsolatorWithCorrection");
isolatorPSet.add<bool>("ReturnRelativeSum",false);
isolatorPSet.add<double>("RhoScaleBarrel",1.0);
isolatorPSet.add<double>("EffAreaSFBarrel",1.0);
isolatorPSet.add<bool>("CutRelativeIso",false);
isolatorPSet.add<std::vector<double> >("EtaBounds",std::vector<double>(1, 2.411));
isolatorPSet.add<std::vector<double> >("Thresholds",std::vector<double>(1, 9.9999999E7));
isolatorPSet.add<bool>("ReturnAbsoluteSum",true);
isolatorPSet.add<std::vector<double> >("EtaBoundsRel",std::vector<double>(1, 2.411));
isolatorPSet.add<std::vector<double> >("ThresholdsRel",std::vector<double>(1, 9.9999999E7));
isolatorPSet.add<double>("RhoScaleEndcap",1.0);
isolatorPSet.add<double>("RhoMax",9.9999999E7);
isolatorPSet.add<bool>("UseRhoCorrection",true);
isolatorPSet.add<std::vector<double>>("ConeSizesRel", std::vector<double>(1, 0.3));
isolatorPSet.add<double>("EffAreaSFEndcap", 1.0);
isolatorPSet.add<bool>("CutAbsoluteIso", true);
isolatorPSet.add<bool>("AndOrCuts", true);
isolatorPSet.add<edm::InputTag>("RhoSrc", edm::InputTag("hltKT6CaloJetsForMuons", "rho"));
isolatorPSet.add<std::vector<double>>("ConeSizes", std::vector<double>(1, 0.3));
isolatorPSet.add<std::string>("ComponentName", "CutsIsolatorWithCorrection");
isolatorPSet.add<bool>("ReturnRelativeSum", false);
isolatorPSet.add<double>("RhoScaleBarrel", 1.0);
isolatorPSet.add<double>("EffAreaSFBarrel", 1.0);
isolatorPSet.add<bool>("CutRelativeIso", false);
isolatorPSet.add<std::vector<double>>("EtaBounds", std::vector<double>(1, 2.411));
isolatorPSet.add<std::vector<double>>("Thresholds", std::vector<double>(1, 9.9999999E7));
isolatorPSet.add<bool>("ReturnAbsoluteSum", true);
isolatorPSet.add<std::vector<double>>("EtaBoundsRel", std::vector<double>(1, 2.411));
isolatorPSet.add<std::vector<double>>("ThresholdsRel", std::vector<double>(1, 9.9999999E7));
isolatorPSet.add<double>("RhoScaleEndcap", 1.0);
isolatorPSet.add<double>("RhoMax", 9.9999999E7);
isolatorPSet.add<bool>("UseRhoCorrection", true);
}
desc.add<edm::ParameterSetDescription>("IsolatorPSet",isolatorPSet);
desc.add<bool>("WriteIsolatorFloat",false);
desc.add<edm::ParameterSetDescription>("IsolatorPSet", isolatorPSet);
desc.add<bool>("WriteIsolatorFloat", false);
descriptions.add("hltL2MuonIsolations", desc);
}

/// build deposits
void L2MuonIsolationProducer::produce(Event& event, const EventSetup& eventSetup){
void L2MuonIsolationProducer::produce(Event& event, const EventSetup& eventSetup) {
std::string metname = "Muon|RecoMuon|L2MuonIsolationProducer";

LogDebug(metname)<<" L2 Muon Isolation producing...";
LogDebug(metname) << " L2 Muon Isolation producing...";

// Take the SA container
LogDebug(metname)<<" Taking the StandAlone muons: "<<theSACollectionLabel;
LogDebug(metname) << " Taking the StandAlone muons: " << theSACollectionLabel;
Handle<RecoChargedCandidateCollection> muons;
event.getByToken(theSACollectionToken,muons);
event.getByToken(theSACollectionToken, muons);

// Find deposits and load into event
LogDebug(metname)<<" Get energy around";
LogDebug(metname) << " Get energy around";
auto depMap = std::make_unique<reco::IsoDepositMap>();
auto isoMap = std::make_unique<edm::ValueMap<bool>>();
auto isoFloatMap = std::make_unique<edm::ValueMap<float>>();
Expand All @@ -141,48 +142,47 @@ void L2MuonIsolationProducer::produce(Event& event, const EventSetup& eventSetup

// fill track collection to use for vetos calculation
TrackCollection muonTracks;
for (unsigned int i=0; i<nMuons; i++) {
for (unsigned int i = 0; i < nMuons; i++) {
TrackRef tk = (*muons)[i].track();
muonTracks.push_back(*tk);
}

theExtractor->fillVetos(event,eventSetup,muonTracks);
theExtractor->fillVetos(event, eventSetup, muonTracks);

for (unsigned int i=0; i<nMuons; i++) {
for (unsigned int i = 0; i < nMuons; i++) {
TrackRef tk = (*muons)[i].track();

deps[i] = theExtractor->deposit(event, eventSetup, *tk);
deps[i] = theExtractor->deposit(event, eventSetup, *tk);

if (optOutputDecision){
muonisolation::MuIsoBaseIsolator::DepositContainer isoContainer(1,muonisolation::MuIsoBaseIsolator::DepositAndVetos(&deps[i]));
muonisolation::MuIsoBaseIsolator::Result isoResult = theDepositIsolator->result( isoContainer, *tk, &event );
isos[i] = isoResult.valBool;
isoFloats[i] = isoResult.valFloat;
}
if (optOutputDecision) {
muonisolation::MuIsoBaseIsolator::DepositContainer isoContainer(
1, muonisolation::MuIsoBaseIsolator::DepositAndVetos(&deps[i]));
muonisolation::MuIsoBaseIsolator::Result isoResult = theDepositIsolator->result(isoContainer, *tk, &event);
isos[i] = isoResult.valBool;
isoFloats[i] = isoResult.valFloat;
}
}



//!do the business of filling iso map
reco::IsoDepositMap::Filler depFiller(*depMap);
depFiller.insert(muons, deps.begin(), deps.end());
depFiller.fill();
event.put(std::move(depMap));

if (optOutputDecision){
edm::ValueMap<bool> ::Filler isoFiller(*isoMap);
if (optOutputDecision) {
edm::ValueMap<bool>::Filler isoFiller(*isoMap);
isoFiller.insert(muons, isos.begin(), isos.end());
isoFiller.fill();//! annoying -- I will forget it at some point
isoFiller.fill(); //! annoying -- I will forget it at some point
event.put(std::move(isoMap));

if (optOutputIsolatorFloat){
edm::ValueMap<float> ::Filler isoFloatFiller(*isoFloatMap);
if (optOutputIsolatorFloat) {
edm::ValueMap<float>::Filler isoFloatFiller(*isoFloatMap);
isoFloatFiller.insert(muons, isoFloats.begin(), isoFloats.end());
isoFloatFiller.fill();//! annoying -- I will forget it at some point
isoFloatFiller.fill(); //! annoying -- I will forget it at some point
event.put(std::move(isoFloatMap));
}
}

LogDebug(metname) <<" Event loaded"
<<"================================";
LogDebug(metname) << " Event loaded"
<< "================================";
}
16 changes: 6 additions & 10 deletions RecoMuon/L2MuonIsolationProducer/src/L2MuonIsolationProducer.h 100755 → 100644
View file
Open in desktop
Expand Up @@ -20,24 +20,21 @@
#include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h"

class L2MuonIsolationProducer : public edm::stream::EDProducer<> {

public:

public:
/// constructor with config
L2MuonIsolationProducer(const edm::ParameterSet&);

/// destructor
~L2MuonIsolationProducer() override;
~L2MuonIsolationProducer() override;

/// ParameterSet descriptions
static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

/// Produce isolation maps
void produce(edm::Event&, const edm::EventSetup&) override;
// ex virtual void reconstruct();

private:

private:
// Muon track Collection Label
edm::InputTag theSACollectionLabel;
edm::EDGetTokenT<reco::RecoChargedCandidateCollection> theSACollectionToken;
Expand All @@ -51,9 +48,8 @@ class L2MuonIsolationProducer : public edm::stream::EDProducer<> {
// MuIsoExtractor
std::unique_ptr<reco::isodeposit::IsoDepositExtractor> theExtractor;

// muon isolator
// muon isolator
std::unique_ptr<muonisolation::MuIsoBaseIsolator> theDepositIsolator;

};

#endif
1 change: 0 additions & 1 deletion RecoMuon/L2MuonIsolationProducer/src/SealModule.cc 100755 → 100644
View file
Open in desktop
Expand Up @@ -4,5 +4,4 @@

#include "RecoMuon/L2MuonIsolationProducer/src/L2MuonIsolationProducer.h"


DEFINE_FWK_MODULE(L2MuonIsolationProducer);