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

Add new configuration options to CloseByParticleGun (backport) #45601

Merged
merged 2 commits into from
Aug 8, 2024
+165 −77
Merged

Add new configuration options to CloseByParticleGun (backport) #45601

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
938b266
Add more configuration options (backport)
Jul 30, 2024
c238fb8
Update configurations for matrix commands
Jul 31, 2024
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
12 changes: 8 additions & 4 deletions Configuration/Generator/python/CE_E_Front_120um_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
generator = cms.EDProducer("CloseByParticleGunProducer",
PGunParameters = cms.PSet(PartID = cms.vint32(22),
ControlledByEta = cms.bool(False),
EnMin = cms.double(25.),
EnMax = cms.double(200.),
MaxEnSpread = cms.bool(False),
VarMin = cms.double(25.),
VarMax = cms.double(200.),
MaxVarSpread = cms.bool(False),
FlatPtGeneration = cms.bool(False),
RMin = cms.double(54.99),
RMax = cms.double(55.01),
ZMin = cms.double(320.99),
Expand All @@ -19,7 +20,10 @@
MinEta = cms.double(1.7),
MaxPhi = cms.double(3.14159265359),
MinPhi = cms.double(-3.14159265359),

UseDeltaT = cms.bool(False),
TMin = cms.double(0.),
TMax = cms.double(0.05),
OffsetFirst = cms.double(0.)
),
Verbosity = cms.untracked.int32(0),

Expand Down
12 changes: 8 additions & 4 deletions Configuration/Generator/python/CE_E_Front_200um_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
generator = cms.EDProducer("CloseByParticleGunProducer",
PGunParameters = cms.PSet(PartID = cms.vint32(22),
ControlledByEta = cms.bool(False),
EnMin = cms.double(25.),
EnMax = cms.double(200.),
MaxEnSpread = cms.bool(False),
VarMin = cms.double(25.),
VarMax = cms.double(200.),
MaxVarSpread = cms.bool(False),
FlatPtGeneration = cms.bool(False),
RMin = cms.double(89.99),
RMax = cms.double(90.01),
ZMin = cms.double(320.99),
Expand All @@ -19,7 +20,10 @@
MinEta = cms.double(1.7),
MaxPhi = cms.double(3.14159265359),
MinPhi = cms.double(-3.14159265359),

UseDeltaT = cms.bool(False),
TMin = cms.double(0.),
TMax = cms.double(0.05),
OffsetFirst = cms.double(0.)
),
Verbosity = cms.untracked.int32(0),

Expand Down
12 changes: 8 additions & 4 deletions Configuration/Generator/python/CE_E_Front_300um_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
generator = cms.EDProducer("CloseByParticleGunProducer",
PGunParameters = cms.PSet(PartID = cms.vint32(22),
ControlledByEta = cms.bool(False),
EnMin = cms.double(25.),
EnMax = cms.double(200.),
MaxEnSpread = cms.bool(False),
VarMin = cms.double(25.),
VarMax = cms.double(200.),
MaxVarSpread = cms.bool(False),
FlatPtGeneration = cms.bool(False),
RMin = cms.double(134.99),
RMax = cms.double(135.01),
ZMin = cms.double(320.99),
Expand All @@ -19,7 +20,10 @@
MinEta = cms.double(1.7),
MaxPhi = cms.double(3.14159265359),
MinPhi = cms.double(-3.14159265359),

UseDeltaT = cms.bool(False),
TMin = cms.double(0.),
TMax = cms.double(0.05),
OffsetFirst = cms.double(0.)
),
Verbosity = cms.untracked.int32(0),

Expand Down
12 changes: 8 additions & 4 deletions Configuration/Generator/python/CE_H_Coarse_300um_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
generator = cms.EDProducer("CloseByParticleGunProducer",
PGunParameters = cms.PSet(PartID = cms.vint32(22),
ControlledByEta = cms.bool(False),
EnMin = cms.double(25.),
EnMax = cms.double(200.),
MaxEnSpread = cms.bool(False),
VarMin = cms.double(25.),
VarMax = cms.double(200.),
MaxVarSpread = cms.bool(False),
FlatPtGeneration = cms.bool(False),
RMin = cms.double(79.99),
RMax = cms.double(80.01),
ZMin = cms.double(429.99),
Expand All @@ -19,7 +20,10 @@
MinEta = cms.double(1.7),
MaxPhi = cms.double(3.14159265359),
MinPhi = cms.double(-3.14159265359),

UseDeltaT = cms.bool(False),
TMin = cms.double(0.),
TMax = cms.double(0.05),
OffsetFirst = cms.double(0.)
),
Verbosity = cms.untracked.int32(0),

Expand Down
12 changes: 8 additions & 4 deletions Configuration/Generator/python/CE_H_Coarse_Scint_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
generator = cms.EDProducer("CloseByParticleGunProducer",
PGunParameters = cms.PSet(PartID = cms.vint32(22),
ControlledByEta = cms.bool(False),
EnMin = cms.double(25.),
EnMax = cms.double(200.),
MaxEnSpread = cms.bool(False),
VarMin = cms.double(25.),
VarMax = cms.double(200.),
MaxVarSpread = cms.bool(False),
FlatPtGeneration = cms.bool(False),
RMin = cms.double(179.99),
RMax = cms.double(180.01),
ZMin = cms.double(429.99),
Expand All @@ -19,7 +20,10 @@
MinEta = cms.double(1.7),
MaxPhi = cms.double(3.14159265359),
MinPhi = cms.double(-3.14159265359),

UseDeltaT = cms.bool(False),
TMin = cms.double(0.),
TMax = cms.double(0.05),
OffsetFirst = cms.double(0.)
),
Verbosity = cms.untracked.int32(0),

Expand Down
12 changes: 8 additions & 4 deletions Configuration/Generator/python/CE_H_Fine_120um_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
generator = cms.EDProducer("CloseByParticleGunProducer",
PGunParameters = cms.PSet(PartID = cms.vint32(22),
ControlledByEta = cms.bool(False),
EnMin = cms.double(25.),
EnMax = cms.double(200.),
MaxEnSpread = cms.bool(False),
VarMin = cms.double(25.),
VarMax = cms.double(200.),
MaxVarSpread = cms.bool(False),
FlatPtGeneration = cms.bool(False),
RMin = cms.double(49.99),
RMax = cms.double(50.01),
ZMin = cms.double(362.519),
Expand All @@ -19,7 +20,10 @@
MinEta = cms.double(1.7),
MaxPhi = cms.double(3.14159265359),
MinPhi = cms.double(-3.14159265359),

UseDeltaT = cms.bool(False),
TMin = cms.double(0.),
TMax = cms.double(0.05),
OffsetFirst = cms.double(0.)
),
Verbosity = cms.untracked.int32(0),

Expand Down
12 changes: 8 additions & 4 deletions Configuration/Generator/python/CE_H_Fine_200um_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
generator = cms.EDProducer("CloseByParticleGunProducer",
PGunParameters = cms.PSet(PartID = cms.vint32(22),
ControlledByEta = cms.bool(False),
EnMin = cms.double(25.),
EnMax = cms.double(200.),
MaxEnSpread = cms.bool(False),
VarMin = cms.double(25.),
VarMax = cms.double(200.),
MaxVarSpread = cms.bool(False),
FlatPtGeneration = cms.bool(False),
RMin = cms.double(89.99),
RMax = cms.double(90.01),
ZMin = cms.double(362.519),
Expand All @@ -19,7 +20,10 @@
MinEta = cms.double(1.7),
MaxPhi = cms.double(3.14159265359),
MinPhi = cms.double(-3.14159265359),

UseDeltaT = cms.bool(False),
TMin = cms.double(0.),
TMax = cms.double(0.05),
OffsetFirst = cms.double(0.)
),
Verbosity = cms.untracked.int32(0),

Expand Down
12 changes: 8 additions & 4 deletions Configuration/Generator/python/CE_H_Fine_300um_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
generator = cms.EDProducer("CloseByParticleGunProducer",
PGunParameters = cms.PSet(PartID = cms.vint32(22),
ControlledByEta = cms.bool(False),
EnMin = cms.double(25.),
EnMax = cms.double(200.),
MaxEnSpread = cms.bool(False),
VarMin = cms.double(25.),
VarMax = cms.double(200.),
MaxVarSpread = cms.bool(False),
FlatPtGeneration = cms.bool(False),
RMin = cms.double(134.99),
RMax = cms.double(135.01),
ZMin = cms.double(362.519),
Expand All @@ -19,7 +20,10 @@
MinEta = cms.double(1.7),
MaxPhi = cms.double(3.14159265359),
MinPhi = cms.double(-3.14159265359),

UseDeltaT = cms.bool(False),
TMin = cms.double(0.),
TMax = cms.double(0.05),
OffsetFirst = cms.double(0.)
),
Verbosity = cms.untracked.int32(0),

Expand Down
9 changes: 6 additions & 3 deletions IOMC/ParticleGuns/interface/CloseByParticleGunProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,14 @@ namespace edm {

protected:
// data members
bool fControlledByEta;
double fEnMin, fEnMax, fEtaMin, fEtaMax, fRMin, fRMax, fZMin, fZMax, fDelta, fPhiMin, fPhiMax, fTMin, fTMax,
bool fControlledByEta, fControlledByREta;
double fVarMin, fVarMax, fEtaMin, fEtaMax, fRMin, fRMax, fZMin, fZMax, fDelta, fPhiMin, fPhiMax, fTMin, fTMax,
fOffsetFirst;
double log_fVarMin = 0., log_fVarMax = 0.;
int fNParticles;
bool fMaxEnSpread = false;
bool fLogSpacedVar = false;
bool fMaxVarSpread = false;
bool fFlatPtGeneration = false;
bool fPointing = false;
bool fOverlapping = false;
bool fRandomShoot = false;
Expand Down
Loading