Skip to content

Commit b28d61a

Browse files
waredjebwaredjeb
committed
restore original parameter names
1 parent d3c48e7 commit b28d61a

11 files changed

+45
-45
lines changed

‎Configuration/Generator/python/CE_E_Front_120um_cfi.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
Overlapping = cms.bool(False),
1616
RandomShoot = cms.bool(False),
1717
NParticles = cms.int32(1),
18-
EtaMax = cms.double(2.7),
19-
EtaMin = cms.double(1.7),
20-
PhiMax = cms.double(3.14159265359),
21-
PhiMin = cms.double(-3.14159265359),
18+
MaxEta = cms.double(2.7),
19+
MinEta = cms.double(1.7),
20+
MaxPhi = cms.double(3.14159265359),
21+
MinPhi = cms.double(-3.14159265359),
2222

2323
),
2424
Verbosity = cms.untracked.int32(0),

‎Configuration/Generator/python/CE_E_Front_200um_cfi.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
Overlapping = cms.bool(False),
1616
RandomShoot = cms.bool(False),
1717
NParticles = cms.int32(1),
18-
EtaMax = cms.double(2.7),
19-
EtaMin = cms.double(1.7),
20-
PhiMax = cms.double(3.14159265359),
21-
PhiMin = cms.double(-3.14159265359),
18+
MaxEta = cms.double(2.7),
19+
MinEta = cms.double(1.7),
20+
MaxPhi = cms.double(3.14159265359),
21+
MinPhi = cms.double(-3.14159265359),
2222

2323
),
2424
Verbosity = cms.untracked.int32(0),

‎Configuration/Generator/python/CE_E_Front_300um_cfi.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
Overlapping = cms.bool(False),
1616
RandomShoot = cms.bool(False),
1717
NParticles = cms.int32(1),
18-
EtaMax = cms.double(2.7),
19-
EtaMin = cms.double(1.7),
20-
PhiMax = cms.double(3.14159265359),
21-
PhiMin = cms.double(-3.14159265359),
18+
MaxEta = cms.double(2.7),
19+
MinEta = cms.double(1.7),
20+
MaxPhi = cms.double(3.14159265359),
21+
MinPhi = cms.double(-3.14159265359),
2222

2323
),
2424
Verbosity = cms.untracked.int32(0),

‎Configuration/Generator/python/CE_H_Coarse_300um_cfi.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
Overlapping = cms.bool(False),
1616
RandomShoot = cms.bool(False),
1717
NParticles = cms.int32(1),
18-
EtaMax = cms.double(2.7),
19-
EtaMin = cms.double(1.7),
20-
PhiMax = cms.double(3.14159265359),
21-
PhiMin = cms.double(-3.14159265359),
18+
MaxEta = cms.double(2.7),
19+
MinEta = cms.double(1.7),
20+
MaxPhi = cms.double(3.14159265359),
21+
MinPhi = cms.double(-3.14159265359),
2222

2323
),
2424
Verbosity = cms.untracked.int32(0),

‎Configuration/Generator/python/CE_H_Coarse_Scint_cfi.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
Overlapping = cms.bool(False),
1616
RandomShoot = cms.bool(False),
1717
NParticles = cms.int32(1),
18-
EtaMax = cms.double(2.7),
19-
EtaMin = cms.double(1.7),
20-
PhiMax = cms.double(3.14159265359),
21-
PhiMin = cms.double(-3.14159265359),
18+
MaxEta = cms.double(2.7),
19+
MinEta = cms.double(1.7),
20+
MaxPhi = cms.double(3.14159265359),
21+
MinPhi = cms.double(-3.14159265359),
2222

2323
),
2424
Verbosity = cms.untracked.int32(0),

‎Configuration/Generator/python/CE_H_Fine_120um_cfi.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
Overlapping = cms.bool(False),
1616
RandomShoot = cms.bool(False),
1717
NParticles = cms.int32(1),
18-
EtaMax = cms.double(2.7),
19-
EtaMin = cms.double(1.7),
20-
PhiMax = cms.double(3.14159265359),
21-
PhiMin = cms.double(-3.14159265359),
18+
MaxEta = cms.double(2.7),
19+
MinEta = cms.double(1.7),
20+
MaxPhi = cms.double(3.14159265359),
21+
MinPhi = cms.double(-3.14159265359),
2222

2323
),
2424
Verbosity = cms.untracked.int32(0),

‎Configuration/Generator/python/CE_H_Fine_200um_cfi.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
Overlapping = cms.bool(False),
1616
RandomShoot = cms.bool(False),
1717
NParticles = cms.int32(1),
18-
EtaMax = cms.double(2.7),
19-
EtaMin = cms.double(1.7),
20-
PhiMax = cms.double(3.14159265359),
21-
PhiMin = cms.double(-3.14159265359),
18+
MaxEta = cms.double(2.7),
19+
MinEta = cms.double(1.7),
20+
MaxPhi = cms.double(3.14159265359),
21+
MinPhi = cms.double(-3.14159265359),
2222

2323
),
2424
Verbosity = cms.untracked.int32(0),

‎Configuration/Generator/python/CE_H_Fine_300um_cfi.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
Overlapping = cms.bool(False),
1616
RandomShoot = cms.bool(False),
1717
NParticles = cms.int32(1),
18-
EtaMax = cms.double(2.7),
19-
EtaMin = cms.double(1.7),
20-
PhiMax = cms.double(3.14159265359),
21-
PhiMin = cms.double(-3.14159265359),
18+
MaxEta = cms.double(2.7),
19+
MinEta = cms.double(1.7),
20+
MaxPhi = cms.double(3.14159265359),
21+
MinPhi = cms.double(-3.14159265359),
2222

2323
),
2424
Verbosity = cms.untracked.int32(0),

‎Configuration/Generator/python/CloseByParticle_Photon_ERZRanges_cfi.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
Overlapping = cms.bool(False),
1616
RandomShoot = cms.bool(False),
1717
NParticles = cms.int32(2),
18-
EtaMax = cms.double(2.7),
19-
EtaMin = cms.double(1.7),
20-
PhiMax = cms.double(3.14159265359),
21-
PhiMin = cms.double(-3.14159265359),
18+
MaxEta = cms.double(2.7),
19+
MinEta = cms.double(1.7),
20+
MaxPhi = cms.double(3.14159265359),
21+
MinPhi = cms.double(-3.14159265359),
2222

2323
),
2424
Verbosity = cms.untracked.int32(0),

‎IOMC/ParticleGuns/src/BaseFlatGunProducer.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ BaseFlatGunProducer::BaseFlatGunProducer(const ParameterSet& pset)
4646
// before trying to extract parameters - if it is empty,
4747
// the default values seem to be taken
4848
fPartIDs = pgun_params.getParameter<vector<int> >("PartID");
49-
fMinEta = pgun_params.getParameter<double>("EtaMin");
50-
fMaxEta = pgun_params.getParameter<double>("EtaMax");
51-
fMinPhi = pgun_params.getParameter<double>("PhiMin");
52-
fMaxPhi = pgun_params.getParameter<double>("PhiMax");
49+
fMinEta = pgun_params.getParameter<double>("MinEta");
50+
fMaxEta = pgun_params.getParameter<double>("MaxEta");
51+
fMinPhi = pgun_params.getParameter<double>("MinPhi");
52+
fMaxPhi = pgun_params.getParameter<double>("MaxPhi");
5353

5454
//
5555
//fPDGTablePath = "/afs/cern.ch/sw/lcg/external/clhep/1.9.2.1/slc3_ia32_gcc323/data/HepPDT/" ;

‎IOMC/ParticleGuns/src/CloseByParticleGunProducer.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ CloseByParticleGunProducer::CloseByParticleGunProducer(const ParameterSet& pset)
2828
fEnMin = pgun_params.getParameter<double>("EnMin");
2929
fMaxEnSpread = pgun_params.getParameter<bool>("MaxEnSpread");
3030
if (fControlledByEta) {
31-
fEtaMax = pgun_params.getParameter<double>("EtaMax");
32-
fEtaMin = pgun_params.getParameter<double>("EtaMin");
31+
fEtaMax = pgun_params.getParameter<double>("MaxEta");
32+
fEtaMin = pgun_params.getParameter<double>("MinEta");
3333
if (fEtaMax <= fEtaMin)
34-
LogError("CloseByParticleGunProducer") << " Please fix EtaMin and EtaMax values in the configuration";
34+
LogError("CloseByParticleGunProducer") << " Please fix MinEta and MaxEta values in the configuration";
3535
} else {
3636
fRMax = pgun_params.getParameter<double>("RMax");
3737
fRMin = pgun_params.getParameter<double>("RMin");
@@ -41,8 +41,8 @@ CloseByParticleGunProducer::CloseByParticleGunProducer(const ParameterSet& pset)
4141
fZMax = pgun_params.getParameter<double>("ZMax");
4242
fZMin = pgun_params.getParameter<double>("ZMin");
4343
fDelta = pgun_params.getParameter<double>("Delta");
44-
fPhiMin = pgun_params.getParameter<double>("PhiMin");
45-
fPhiMax = pgun_params.getParameter<double>("PhiMax");
44+
fPhiMin = pgun_params.getParameter<double>("MinPhi");
45+
fPhiMax = pgun_params.getParameter<double>("MaxPhi");
4646
fPointing = pgun_params.getParameter<bool>("Pointing");
4747
fOverlapping = pgun_params.getParameter<bool>("Overlapping");
4848
fRandomShoot = pgun_params.getParameter<bool>("RandomShoot");

0 commit comments

Comments
 (0)