Skip to content

FlatEvtVtxGenerator: do check on R/Phi limits only if UseCylindricalCoords is chosen and other fixes #50946

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
cmsbuild merged 4 commits into from
May 17, 2026
Merged

FlatEvtVtxGenerator: do check on R/Phi limits only if UseCylindricalCoords is chosen and other fixes #50946

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
37671e7
FlatEvtVtxGenerator: do check on R/Phi limits only if fixedR is chosen
mmusich May 15, 2026
8c8532e
Modernize `FlatEvtVtxGenerator` configuration and initialization
mmusich May 15, 2026
6ddcd6a
FlatEvtVtxGenerator: rename FixedR -> UseCylindricalCoords
mmusich May 15, 2026
a4030ea
wrap the optional parameters in FlatEvtVtxGenerator as std::optional
mmusich May 15, 2026
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
50 changes: 30 additions & 20 deletions IOMC/EventVertexGenerators/src/FlatEvtVtxGenerator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,6 @@ FlatEvtVtxGenerator::FlatEvtVtxGenerator(const edm::ParameterSet& p) : BaseEvtVt
fMinT = p.getParameter<double>("MinT") * ns * c_light;
fMaxT = p.getParameter<double>("MaxT") * ns * c_light;

if (fMinX > fMaxX) {
throw cms::Exception("Configuration") << "Error in FlatEvtVtxGenerator: "
<< "MinX is greater than MaxX";
}
if (fMinY > fMaxY) {
throw cms::Exception("Configuration") << "Error in FlatEvtVtxGenerator: "
<< "MinY is greater than MaxY";
}
if (fMinZ > fMaxZ) {
throw cms::Exception("Configuration") << "Error in FlatEvtVtxGenerator: "
<< "MinZ is greater than MaxZ";
Expand All @@ -46,17 +38,35 @@ FlatEvtVtxGenerator::FlatEvtVtxGenerator(const edm::ParameterSet& p) : BaseEvtVt
throw cms::Exception("Configuration") << "Error in FlatEvtVtxGenerator: "
<< "MinT is greater than MaxT";
}
if (fMinR > fMaxR) {
throw cms::Exception("Configuration") << "Error in FlatEvtVtxGenerator: "
<< "MinR is greater than MaxR";
}
if (fMinPhi > fMaxPhi) {
throw cms::Exception("Configuration") << "Error in FlatEvtVtxGenerator: "
<< "MinPhi is greater than MaxPhi";

// configuration dependent checks
if (fFixedR) {
if (fMinR > fMaxR) {
throw cms::Exception("Configuration") << "Error in FlatEvtVtxGenerator: "
<< "MinR is greater than MaxR";
}
if (fMinPhi > fMaxPhi) {
throw cms::Exception("Configuration") << "Error in FlatEvtVtxGenerator: "
<< "MinPhi is greater than MaxPhi";
}

edm::LogVerbatim("FlatEvtVtx") << "FlatEvtVtxGenerator Initialized with r[" << fMinR << ":" << fMaxR << "] cm; phi["
<< fMinPhi << ":" << fMaxPhi << "] rad; z[" << fMinZ << ":" << fMaxZ << "] cm; t["
<< fMinT << ":" << fMaxT << "]";
} else {
if (fMinX > fMaxX) {
throw cms::Exception("Configuration") << "Error in FlatEvtVtxGenerator: "
<< "MinX is greater than MaxX";
}
if (fMinY > fMaxY) {
throw cms::Exception("Configuration") << "Error in FlatEvtVtxGenerator: "
<< "MinY is greater than MaxY";
}

edm::LogVerbatim("FlatEvtVtx") << "FlatEvtVtxGenerator Initialized with x[" << fMinX << ":" << fMaxX << "] cm; y["
<< fMinY << ":" << fMaxY << "] cm; z[" << fMinZ << ":" << fMaxZ << "] cm; t["
<< fMinT << ":" << fMaxT << "]";
}
edm::LogVerbatim("FlatEvtVtx") << "FlatEvtVtxGenerator Initialized with x[" << fMinX << ":" << fMaxX << "] cm; y["
<< fMinY << ":" << fMaxY << "] cm; z[" << fMinZ << ":" << fMaxZ << "] cm; t[" << fMinT
<< ":" << fMaxT << "]";
}

FlatEvtVtxGenerator::~FlatEvtVtxGenerator() {}
Expand Down Expand Up @@ -94,8 +104,8 @@ void FlatEvtVtxGenerator::fillDescriptions(edm::ConfigurationDescriptions& descr
desc.add<bool>("FixedR", false);
desc.add<double>("MinR", 0.0)->setComment("in cm");
desc.add<double>("MaxR", 0.001)->setComment("in cm");
desc.add<double>("MinPhi", -3.14159265359)->setComment("in radians");
desc.add<double>("MaxPhi", 3.14159265359)->setComment("in radians");
desc.add<double>("MinPhi", -M_PI)->setComment("in radians");
Comment thread
mmusich marked this conversation as resolved.
Outdated
desc.add<double>("MaxPhi", M_PI)->setComment("in radians");
desc.add<edm::InputTag>("src");
descriptions.add("FlatEvtVtxGenerator", desc);
}