Skip to content

add fillDescriptions to several BTV plugins used at HLT #47513

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

Merged
merged 3 commits into from
Mar 7, 2025
Merged

add fillDescriptions to several BTV plugins used at HLT #47513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2972d60
add a fillDescription to BTV modules
SWuchterl Mar 5, 2025
1f8c2b0
add a fillDescription to SoftLepton
SWuchterl Mar 6, 2025
54cc22d
apply code format
SWuchterl Mar 6, 2025
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
81 changes: 43 additions & 38 deletions RecoBTag/Combined/plugins/BTagProbabilityToDiscriminator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,58 +171,63 @@ void BTagProbabilityToDiscriminator::fillDescriptions(edm::ConfigurationDescript
edm::ParameterSetDescription desc;
{
edm::ParameterSetDescription vpsd1;
vpsd1.setAllowAnything(); // Allow any string-to-string mappings
vpsd1.add<std::vector<edm::InputTag>>("denominator", {});
vpsd1.add<std::vector<edm::InputTag>>("numerator",
{
edm::InputTag("pfDeepCSVJetTags", "probb"),
edm::InputTag("pfDeepCSVJetTags", "probbb"),
});
vpsd1.add<std::string>("name", "BvsAll");
std::vector<edm::ParameterSet> temp1;
temp1.reserve(3);
std::vector<edm::ParameterSet> vectorOfDiscriminators;
vectorOfDiscriminators.reserve(3);
{
edm::ParameterSet temp2;
temp2.addParameter<std::vector<edm::InputTag>>("denominator", {});
temp2.addParameter<std::vector<edm::InputTag>>("numerator",
{
edm::InputTag("pfDeepCSVJetTags", "probb"),
edm::InputTag("pfDeepCSVJetTags", "probbb"),
});
temp2.addParameter<std::string>("name", "BvsAll");
temp1.push_back(temp2);
edm::ParameterSet tempDiscriminator;
tempDiscriminator.addParameter<std::vector<edm::InputTag>>("denominator", {});
tempDiscriminator.addParameter<std::vector<edm::InputTag>>("numerator",
{
edm::InputTag("pfDeepCSVJetTags", "probb"),
edm::InputTag("pfDeepCSVJetTags", "probbb"),
});
tempDiscriminator.addParameter<std::string>("name", "BvsAll");
vectorOfDiscriminators.push_back(tempDiscriminator);
}
{
edm::ParameterSet temp2;
temp2.addParameter<std::vector<edm::InputTag>>("denominator",
{
edm::InputTag("pfDeepCSVJetTags", "probc"),
edm::InputTag("pfDeepCSVJetTags", "probb"),
edm::InputTag("pfDeepCSVJetTags", "probbb"),
});
temp2.addParameter<std::vector<edm::InputTag>>("numerator",
{
edm::InputTag("pfDeepCSVJetTags", "probc"),
});
temp2.addParameter<std::string>("name", "CvsB");
temp1.push_back(temp2);
edm::ParameterSet tempDiscriminator;
tempDiscriminator.addParameter<std::vector<edm::InputTag>>("denominator",
{
edm::InputTag("pfDeepCSVJetTags", "probc"),
edm::InputTag("pfDeepCSVJetTags", "probb"),
edm::InputTag("pfDeepCSVJetTags", "probbb"),
});
tempDiscriminator.addParameter<std::vector<edm::InputTag>>("numerator",
{
edm::InputTag("pfDeepCSVJetTags", "probc"),
});
tempDiscriminator.addParameter<std::string>("name", "CvsB");
vectorOfDiscriminators.push_back(tempDiscriminator);
}
{
edm::ParameterSet temp2;
temp2.addParameter<std::vector<edm::InputTag>>("denominator",
{
edm::InputTag("pfDeepCSVJetTags", "probudsg"),
edm::InputTag("pfDeepCSVJetTags", "probc"),
});
temp2.addParameter<std::vector<edm::InputTag>>("numerator",
{
edm::InputTag("pfDeepCSVJetTags", "probc"),
});
temp2.addParameter<std::string>("name", "CvsL");
temp1.push_back(temp2);
edm::ParameterSet tempDiscriminator;
tempDiscriminator.addParameter<std::vector<edm::InputTag>>("denominator",
{
edm::InputTag("pfDeepCSVJetTags", "probudsg"),
edm::InputTag("pfDeepCSVJetTags", "probc"),
});
tempDiscriminator.addParameter<std::vector<edm::InputTag>>("numerator",
{
edm::InputTag("pfDeepCSVJetTags", "probc"),
});
tempDiscriminator.addParameter<std::string>("name", "CvsL");
vectorOfDiscriminators.push_back(tempDiscriminator);
}
desc.addVPSet("discriminators", vpsd1, temp1);
desc.addVPSet("discriminators", vpsd1, vectorOfDiscriminators)
->setComment(
"List of ParameterSets to create new ratio-based neural network discriminants. "
"Each entry is a ParameterSet where 'name' is the new name of the variable, and 'numerator' and "
"'denominator' are vector of InputTags of the pure neural network scores to be used in the calculation.");
}
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}

// define this as a plug-in
Expand Down
85 changes: 52 additions & 33 deletions RecoBTag/ImpactParameter/plugins/IPProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,46 +443,65 @@ template <>
inline void IPProducer<reco::TrackRefVector, reco::JTATagInfo, IPProducerHelpers::FromJTA>::fillDescriptions(
edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
desc.add<double>("maximumTransverseImpactParameter", 0.2);
desc.add<int>("minimumNumberOfHits", 8);
desc.add<double>("minimumTransverseMomentum", 1.0);
desc.add<edm::InputTag>("primaryVertex", edm::InputTag("offlinePrimaryVertices"));
desc.add<double>("maximumLongitudinalImpactParameter", 17.0);
desc.add<bool>("computeGhostTrack", true);
desc.add<double>("ghostTrackPriorDeltaR", 0.03);
desc.add<edm::InputTag>("jetTracks", edm::InputTag("ak4JetTracksAssociatorAtVertexPF"));
desc.add<bool>("jetDirectionUsingGhostTrack", false);
desc.add<int>("minimumNumberOfPixelHits", 2);
desc.add<bool>("jetDirectionUsingTracks", false);
desc.add<bool>("computeProbabilities", true);
desc.add<bool>("useTrackQuality", false);
desc.add<double>("maximumChiSquared", 5.0);
descriptions.addDefault(desc);
desc.add<double>("maximumTransverseImpactParameter", 0.2)
->setComment("Set upper threshold for the track transverse impact parameter.");
desc.add<int>("minimumNumberOfHits", 8)->setComment("Set lower threshold for the number of valid hits per track.");
desc.add<double>("minimumTransverseMomentum", 1.0)
->setComment("Set lower threshold for the minimum track transverse momentum.");
desc.add<edm::InputTag>("primaryVertex", edm::InputTag("offlinePrimaryVertices"))
->setComment("InputTag for the primary vertex collection.");
desc.add<double>("maximumLongitudinalImpactParameter", 17.0)
->setComment("Set upper threshold for the track transverse impact parameter.");
desc.add<bool>("computeGhostTrack", true)->setComment("Flag to produce ghost track collection.");
desc.add<double>("ghostTrackPriorDeltaR", 0.03)->setComment("Set cone radius for the ghost track fit.");
desc.add<edm::InputTag>("jetTracks", edm::InputTag("ak4JetTracksAssociatorAtVertexPF"))
->setComment("InputTag for the jet-track association collection.");
desc.add<bool>("jetDirectionUsingGhostTrack", false)
->setComment("Flag to build the jet momentum using ghost tracks.");
desc.add<int>("minimumNumberOfPixelHits", 2)
->setComment("Set lower threshold for the number of valid pixel hits per track.");
desc.add<bool>("jetDirectionUsingTracks", false)
->setComment("Flag to include the track momentum into the jet momentum.");
desc.add<bool>("computeProbabilities", true)
->setComment("Flag to produce output probabilities for the tracks to originate from the PV.");
desc.add<bool>("useTrackQuality", false)->setComment("Flag to use the track quality in the probability calculation.");
desc.add<double>("maximumChiSquared", 5.0)->setComment("Set upper threshold for the track normalized chi2.");
descriptions.addWithDefaultLabel(desc);
}

template <>
inline void
IPProducer<std::vector<reco::CandidatePtr>, reco::JetTagInfo, IPProducerHelpers::FromJetAndCands>::fillDescriptions(
edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
desc.add<double>("maximumTransverseImpactParameter", 0.2);
desc.add<int>("minimumNumberOfHits", 8);
desc.add<double>("minimumTransverseMomentum", 1.0);
desc.add<edm::InputTag>("primaryVertex", edm::InputTag("offlinePrimaryVertices"));
desc.add<double>("maximumLongitudinalImpactParameter", 17.0);
desc.add<bool>("computeGhostTrack", true);
desc.add<double>("maxDeltaR", 0.4);
desc.add<edm::InputTag>("candidates", edm::InputTag("particleFlow"));
desc.add<bool>("jetDirectionUsingGhostTrack", false);
desc.add<int>("minimumNumberOfPixelHits", 2);
desc.add<bool>("jetDirectionUsingTracks", false);
desc.add<bool>("computeProbabilities", true);
desc.add<bool>("useTrackQuality", false);
desc.add<edm::InputTag>("jets", edm::InputTag("ak4PFJetsCHS"));
desc.add<double>("ghostTrackPriorDeltaR", 0.03);
desc.add<double>("maximumChiSquared", 5.0);
desc.addOptional<bool>("explicitJTA", false);
descriptions.addDefault(desc);
desc.add<double>("maximumTransverseImpactParameter", 0.2)
->setComment("Set upper threshold for the track transverse impact parameter.");
desc.add<int>("minimumNumberOfHits", 8)->setComment("Set lower threshold for the number of valid hits per track.");
desc.add<double>("minimumTransverseMomentum", 1.0)
->setComment("Set lower threshold for the minimum track transverse momentum.");
desc.add<edm::InputTag>("primaryVertex", edm::InputTag("offlinePrimaryVertices"))
->setComment("InputTag for the primary vertex collection.");
desc.add<double>("maximumLongitudinalImpactParameter", 17.0)
->setComment("Set upper threshold for the track transverse impact parameter.");
desc.add<bool>("computeGhostTrack", true)->setComment("Flag to produce ghost track collection.");
desc.add<double>("maxDeltaR", 0.4)
->setComment("Set upper threshold for the maximum distance between tracks and jets.");
desc.add<edm::InputTag>("candidates", edm::InputTag("particleFlow"))
->setComment("InputTag for the particle flow candidate collection.");
desc.add<bool>("jetDirectionUsingGhostTrack", false)
->setComment("Flag to build the jet momentum using ghost tracks.");
desc.add<int>("minimumNumberOfPixelHits", 2)
->setComment("Set lower threshold for the number of valid pixel hits per track.");
desc.add<bool>("jetDirectionUsingTracks", false)
->setComment("Flag to include the track momentum into the jet momentum.");
desc.add<bool>("computeProbabilities", true)
->setComment("Flag to produce output probabilities for the tracks to originate from the PV.");
desc.add<bool>("useTrackQuality", false)->setComment("Flag to use the track quality in the probability calculation.");
desc.add<edm::InputTag>("jets", edm::InputTag("ak4PFJetsCHS"))->setComment("InputTag for the jet collection.");
desc.add<double>("ghostTrackPriorDeltaR", 0.03)->setComment("Set cone radius for the ghost track fit.");
desc.add<double>("maximumChiSquared", 5.0)->setComment("Set upper threshold for the track normalized chi2.");
desc.addOptional<bool>("explicitJTA", false)->setComment("Flag to explicitly assign jets to tracks.");
descriptions.addWithDefaultLabel(desc);
}

#endif
66 changes: 45 additions & 21 deletions RecoBTag/SecondaryVertex/plugins/TemplatedSecondaryVertexProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,8 +1215,10 @@ void TemplatedSecondaryVertexProducer<IPTI, VTX>::matchSubjets(const edm::Handle
template <class IPTI, class VTX>
void TemplatedSecondaryVertexProducer<IPTI, VTX>::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
edm::ParameterSetDescription desc;
desc.add<double>("extSVDeltaRToJet", 0.3);
desc.add<edm::InputTag>("beamSpotTag", edm::InputTag("offlineBeamSpot"));
desc.add<double>("extSVDeltaRToJet", 0.3)
->setComment("Minimum distance between jets and external secondary vertex collection, if provided.");
desc.add<edm::InputTag>("beamSpotTag", edm::InputTag("offlineBeamSpot"))
->setComment("InputTag for the beamspot collection.");
{
edm::ParameterSetDescription vertexReco;
vertexReco.add<double>("primcut", 1.8);
Expand All @@ -1231,15 +1233,21 @@ void TemplatedSecondaryVertexProducer<IPTI, VTX>::fillDescriptions(edm::Configur
edm::ParameterDescription<double>("mergeThreshold", 3.0, true) and
edm::ParameterDescription<std::string>("fitType", "RefitGhostTrackWithVertices", true),
true);
desc.add<edm::ParameterSetDescription>("vertexReco", vertexReco);
desc.add<edm::ParameterSetDescription>("vertexReco", vertexReco)
->setComment("ParameterSet to steer the secondary vertex reconstruction parameters.");
}
{
edm::ParameterSetDescription vertexSelection;
vertexSelection.add<std::string>("sortCriterium", "dist3dError");
desc.add<edm::ParameterSetDescription>("vertexSelection", vertexSelection);
desc.add<edm::ParameterSetDescription>("vertexSelection", vertexSelection)
->setComment("ParameterSet steering the secondary vertex sorting.");
}
desc.add<std::string>("constraint", "BeamSpot");
desc.add<edm::InputTag>("trackIPTagInfos", edm::InputTag("impactParameterTagInfos"));
desc.add<std::string>("constraint", "BeamSpot")
->setComment(
"Option to set any constraint for the SV fit. Options are 'None', 'BeamSpot' (default), "
"'BeamSpot+PVPosition', 'BeamSpotZ+PVErrorScaledXY', 'PVErrorScaled', and 'BeamSpot+PVTracksInFit'.");
desc.add<edm::InputTag>("trackIPTagInfos", edm::InputTag("impactParameterTagInfos"))
->setComment("InputTag for the track impact parameter information collection.");
{
edm::ParameterSetDescription vertexCuts;
vertexCuts.add<double>("distSig3dMax", 99999.9);
Expand All @@ -1261,11 +1269,13 @@ void TemplatedSecondaryVertexProducer<IPTI, VTX>::fillDescriptions(edm::Configur
vertexCuts.add<double>("distVal3dMin", -99999.9);
vertexCuts.add<double>("massMax", 6.5);
vertexCuts.add<double>("distSig3dMin", -99999.9);
desc.add<edm::ParameterSetDescription>("vertexCuts", vertexCuts);
desc.add<edm::ParameterSetDescription>("vertexCuts", vertexCuts)
->setComment("ParameterSet steering the secondary vertex selection.");
}
desc.add<bool>("useExternalSV", false);
desc.add<double>("minimumTrackWeight", 0.5);
desc.add<bool>("usePVError", true);
desc.add<bool>("useExternalSV", false)
->setComment("Flag to consider an external secondary vertex collection as input.");
desc.add<double>("minimumTrackWeight", 0.5)->setComment("Setting a lower threshold for the track weight.");
desc.add<bool>("usePVError", true)->setComment("Flag to consider the error on the PV.");
{
edm::ParameterSetDescription trackSelection;
trackSelection.add<double>("b_pT", 0.3684);
Expand Down Expand Up @@ -1294,21 +1304,35 @@ void TemplatedSecondaryVertexProducer<IPTI, VTX>::fillDescriptions(edm::Configur
trackSelection.add<double>("sip3dSigMax", 99999.9);
trackSelection.add<double>("sip2dSigMin", -99999.9);
trackSelection.add<double>("b_dR", 0.6263);
desc.add<edm::ParameterSetDescription>("trackSelection", trackSelection);
desc.add<edm::ParameterSetDescription>("trackSelection", trackSelection)
->setComment("ParameterSet steering the track selection.");
}
desc.add<std::string>("trackSort", "sip3dSig");
desc.add<edm::InputTag>("extSVCollection", edm::InputTag("secondaryVertices"));
desc.add<std::string>("trackSort", "sip3dSig")->setComment("Set the sorting of the tracks, default is 'sip3dSig'.");
desc.add<edm::InputTag>("extSVCollection", edm::InputTag("secondaryVertices"))
->setComment("InputTag for an (optional) external secondary vertex collection.");
desc.addOptionalNode(edm::ParameterDescription<bool>("useSVClustering", false, true) and
edm::ParameterDescription<std::string>("jetAlgorithm", true) and
edm::ParameterDescription<double>("rParam", true),
true);
desc.addOptional<bool>("useSVMomentum", false);
desc.addOptional<double>("ghostRescaling", 1e-18);
desc.addOptional<double>("relPtTolerance", 1e-03);
desc.addOptional<edm::InputTag>("fatJets");
desc.addOptional<edm::InputTag>("groomedFatJets");
desc.add<edm::InputTag>("weights", edm::InputTag(""));
descriptions.addDefault(desc);
true)
->setComment("Optional ParameterSet to steer any secondary vertex reclustering.");
desc.addOptional<bool>("useSVMomentum", false)
->setComment(
"Flag to consider the secondary vertex momentum instead of the direction only for the ghost clustering.");
desc.addOptional<double>("ghostRescaling", 1e-18)
->setComment("Parameter to scale down the secondary vertex momentum for the ghost clustering.");
desc.addOptional<double>("relPtTolerance", 1e-03)
->setComment("Tolerance for relative difference in transverse momentum for the ghost clustering.");
desc.addOptional<double>("pvErrorScaling", 1.0)
->setComment(
"Scaling of the primary vertex error if 'PVErrorScaled' or 'BeamSpotZ+PVErrorScaledXY' is set for the "
"constraint.");
desc.addOptional<edm::InputTag>("fatJets")->setComment(
"InputTag for any fatjet collection to cluster secondary vertices.");
desc.addOptional<edm::InputTag>("groomedFatJets")
->setComment("InputTag for any groomed fatjet collection to cluster secondary vertices.");
desc.add<edm::InputTag>("weights", edm::InputTag(""))
->setComment("InputTag for any weight collection, e.g., from PUPPI.");
descriptions.addWithDefaultLabel(desc);
}

//define this as a plug-in
Expand Down
Loading