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.

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

Updating Puppiproducer to include fillDescriptions (backport 106X) #28137

Merged
merged 1 commit into from
Nov 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CommonTools/PileupAlgos/interface/PuppiAlgo.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@

#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
#include "CommonTools/PileupAlgos/interface/PuppiCandidate.h"
#include <vector>

class PuppiAlgo{
public:
PuppiAlgo(edm::ParameterSet &iConfig);
~PuppiAlgo();
static void fillDescriptionsPuppiAlgo(edm::ParameterSetDescription &desc);
//Computing Mean and RMS
void reset();
void fixAlgoEtaBin(int i_eta );
Expand Down
24 changes: 20 additions & 4 deletions CommonTools/PileupAlgos/plugins/PuppiProducer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -335,11 +335,27 @@ void PuppiProducer::endJob() {
}
// ------------------------------------------------------------------------------------------
void PuppiProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
//The following says we do not know what parameters are allowed so do no validation
// Please change this to state exactly what you do use, even if it is no parameters
edm::ParameterSetDescription desc;
desc.setUnknown();
descriptions.addDefault(desc);
desc.add<bool>("puppiDiagnostics", false);
desc.add<bool>("puppiForLeptons", false);
desc.add<bool>("UseDeltaZCut", true);
desc.add<double>("DeltaZCut", 0.3);
desc.add<double>("PtMaxNeutrals", 200.);
desc.add<bool>("useExistingWeights", false);
desc.add<bool>("useWeightsNoLep", false);
desc.add<bool>("clonePackedCands", false);
desc.add<int>("vtxNdofCut", 4);
desc.add<double>("vtxZCut", 24);
desc.add<edm::InputTag>("candName", edm::InputTag("particleFlow"));
desc.add<edm::InputTag>("vertexName", edm::InputTag("offlinePrimaryVertices"));
desc.add<bool>("applyCHS", true);
desc.add<bool>("invertPuppi", false);
desc.add<bool>("useExp", false);
desc.add<double>("MinPuppiWeight", .01);

PuppiAlgo::fillDescriptionsPuppiAlgo(desc);

descriptions.add("PuppiProducer", desc);
}
//define this as a plug-in
DEFINE_FWK_MODULE(PuppiProducer);
1 change: 1 addition & 0 deletions CommonTools/PileupAlgos/plugins/PuppiProducer.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
#include "DataFormats/PatCandidates/interface/PackedCandidate.h"
#include "CommonTools/PileupAlgos/interface/PuppiContainer.h"
#include "CommonTools/PileupAlgos/interface/PuppiAlgo.h"

// ------------------------------------------------------------------------------------------
class PuppiProducer : public edm::stream::EDProducer<> {
Expand Down
45 changes: 45 additions & 0 deletions CommonTools/PileupAlgos/src/PuppiAlgo.cc
Original file line number Diff line number Diff line change
Expand Up @@ -213,3 +213,48 @@ double PuppiAlgo::compute(std::vector<double> const &iVals,double iChi2) const {
return lPVal;

}
// ------------------------------------------------------------------------------------------
void PuppiAlgo::fillDescriptionsPuppiAlgo(edm::ParameterSetDescription &desc) {
edm::ParameterSetDescription puppialgos;
puppialgos.add<int>("algoId", 5);
puppialgos.add<bool>("useCharged", false);
puppialgos.add<bool>("applyLowPUCorr", false);
puppialgos.add<int>("combOpt", 5);
puppialgos.add<double>("cone", .4);
puppialgos.add<double>("rmsPtMin", .1);
puppialgos.add<double>("rmsScaleFactor", 1.0);
std::vector<edm::ParameterSet> VPSetPuppiAlgos;
edm::ParameterSet puppiset;
puppiset.addParameter<int>("algoId", 5);
puppiset.addParameter<bool>("useCharged", false);
puppiset.addParameter<bool>("applyLowPUCorr", false);
puppiset.addParameter<int>("combOpt", 5);
puppiset.addParameter<double>("cone", .4);
puppiset.addParameter<double>("rmsPtMin", .1);
puppiset.addParameter<double>("rmsScaleFactor", 1.0);
VPSetPuppiAlgos.push_back(puppiset);

edm::ParameterSetDescription algos;
algos.addVPSet("puppiAlgos", puppialgos, VPSetPuppiAlgos);
std::vector<edm::ParameterSet> VPSetAlgos;
edm::ParameterSet algosset;
algos.add<std::vector<double>>("etaMin", {0.});
algos.add<std::vector<double>>("etaMax", {2.5});
algos.add<std::vector<double>>("ptMin", {0.});
algos.add<std::vector<double>>("MinNeutralPt", {0.2});
algos.add<std::vector<double>>("MinNeutralPtSlope", {0.015});
algos.add<std::vector<double>>("RMSEtaSF", {1.0});
algos.add<std::vector<double>>("MedEtaSF", {1.0});
algos.add<double>("EtaMaxExtrap", 2.0);
algosset.addParameter<std::vector<double>>("etaMin", {0.});
algosset.addParameter<std::vector<double>>("etaMax", {2.5});
algosset.addParameter<std::vector<double>>("ptMin", {0.});
algosset.addParameter<std::vector<double>>("MinNeutralPt", {0.2});
algosset.addParameter<std::vector<double>>("MinNeutralPtSlope", {0.015});
algosset.addParameter<std::vector<double>>("RMSEtaSF", {1.0});
algosset.addParameter<std::vector<double>>("MedEtaSF", {1.0});
algosset.addParameter<double>("EtaMaxExtrap", 2.0);
algosset.addParameter<std::vector<edm::ParameterSet>>("puppiAlgos", VPSetPuppiAlgos);
VPSetAlgos.push_back(algosset);
desc.addVPSet("algos", algos, VPSetAlgos);
}