Merge pull request cms-sw#36460 from lecriste/maxSpread

cmsbuild · web-flow · commit b200e08103e1 · 2021-12-15T08:02:27.000+01:00
Introduce flag for particles generation with max energy spread
diff --git a/Configuration/Generator/python/CE_E_Front_120um_cfi.py b/Configuration/Generator/python/CE_E_Front_120um_cfi.py
@@ -4,6 +4,7 @@
     PGunParameters = cms.PSet(PartID = cms.vint32(22),
         EnMin = cms.double(25.),
         EnMax = cms.double(200.),
+        MaxEnSpread = cms.bool(False),
         RMin = cms.double(54.99),
         RMax = cms.double(55.01),
         ZMin = cms.double(320.99),
diff --git a/Configuration/Generator/python/CE_E_Front_200um_cfi.py b/Configuration/Generator/python/CE_E_Front_200um_cfi.py
@@ -4,6 +4,7 @@
     PGunParameters = cms.PSet(PartID = cms.vint32(22),
         EnMin = cms.double(25.),
         EnMax = cms.double(200.),
+        MaxEnSpread = cms.bool(False),
         RMin = cms.double(89.99),
         RMax = cms.double(90.01),
         ZMin = cms.double(320.99),
diff --git a/Configuration/Generator/python/CE_E_Front_300um_cfi.py b/Configuration/Generator/python/CE_E_Front_300um_cfi.py
@@ -4,6 +4,7 @@
     PGunParameters = cms.PSet(PartID = cms.vint32(22),
         EnMin = cms.double(25.),
         EnMax = cms.double(200.),
+        MaxEnSpread = cms.bool(False),
         RMin = cms.double(134.99),
         RMax = cms.double(135.01),
         ZMin = cms.double(320.99),
diff --git a/Configuration/Generator/python/CE_H_Coarse_300um_cfi.py b/Configuration/Generator/python/CE_H_Coarse_300um_cfi.py
@@ -4,6 +4,7 @@
     PGunParameters = cms.PSet(PartID = cms.vint32(22),
         EnMin = cms.double(25.),
         EnMax = cms.double(200.),
+        MaxEnSpread = cms.bool(False),
         RMin = cms.double(79.99),
         RMax = cms.double(80.01),
         ZMin = cms.double(429.99),
diff --git a/Configuration/Generator/python/CE_H_Coarse_Scint_cfi.py b/Configuration/Generator/python/CE_H_Coarse_Scint_cfi.py
@@ -4,6 +4,7 @@
     PGunParameters = cms.PSet(PartID = cms.vint32(22),
         EnMin = cms.double(25.),
         EnMax = cms.double(200.),
+        MaxEnSpread = cms.bool(False),
         RMin = cms.double(179.99),
         RMax = cms.double(180.01),
         ZMin = cms.double(429.99),
diff --git a/Configuration/Generator/python/CE_H_Fine_120um_cfi.py b/Configuration/Generator/python/CE_H_Fine_120um_cfi.py
@@ -4,6 +4,7 @@
     PGunParameters = cms.PSet(PartID = cms.vint32(22),
         EnMin = cms.double(25.),
         EnMax = cms.double(200.),
+        MaxEnSpread = cms.bool(False),
         RMin = cms.double(49.99),
         RMax = cms.double(50.01),
         ZMin = cms.double(362.519),
diff --git a/Configuration/Generator/python/CE_H_Fine_200um_cfi.py b/Configuration/Generator/python/CE_H_Fine_200um_cfi.py
@@ -4,6 +4,7 @@
     PGunParameters = cms.PSet(PartID = cms.vint32(22),
         EnMin = cms.double(25.),
         EnMax = cms.double(200.),
+        MaxEnSpread = cms.bool(False),
         RMin = cms.double(89.99),
         RMax = cms.double(90.01),
         ZMin = cms.double(362.519),
diff --git a/Configuration/Generator/python/CE_H_Fine_300um_cfi.py b/Configuration/Generator/python/CE_H_Fine_300um_cfi.py
@@ -4,6 +4,7 @@
     PGunParameters = cms.PSet(PartID = cms.vint32(22),
         EnMin = cms.double(25.),
         EnMax = cms.double(200.),
+        MaxEnSpread = cms.bool(False),
         RMin = cms.double(134.99),
         RMax = cms.double(135.01),
         ZMin = cms.double(362.519),
diff --git a/Configuration/Generator/python/CloseByParticle_Photon_ERZRanges_cfi.py b/Configuration/Generator/python/CloseByParticle_Photon_ERZRanges_cfi.py
@@ -4,6 +4,7 @@
     PGunParameters = cms.PSet(PartID = cms.vint32(22),
         EnMin = cms.double(25.),
         EnMax = cms.double(200.),
+        MaxEnSpread = cms.bool(False),
         RMin = cms.double(60),
         RMax = cms.double(120),
         ZMin = cms.double(320),
diff --git a/IOMC/ParticleGuns/interface/CloseByParticleGunProducer.h b/IOMC/ParticleGuns/interface/CloseByParticleGunProducer.h
@@ -17,6 +17,7 @@ namespace edm {
     // data members
     double fEnMin, fEnMax, fRMin, fRMax, fZMin, fZMax, fDelta, fPhiMin, fPhiMax;
     int fNParticles;
+    bool fMaxEnSpread = false;
     bool fPointing = false;
     bool fOverlapping = false;
     bool fRandomShoot = false;
diff --git a/IOMC/ParticleGuns/src/CloseByParticleGunProducer.cc b/IOMC/ParticleGuns/src/CloseByParticleGunProducer.cc
@@ -27,6 +27,7 @@ CloseByParticleGunProducer::CloseByParticleGunProducer(const ParameterSet& pset)
 
   fEnMax = pgun_params.getParameter<double>("EnMax");
   fEnMin = pgun_params.getParameter<double>("EnMin");
+  fMaxEnSpread = pgun_params.getParameter<bool>("MaxEnSpread");
   fRMax = pgun_params.getParameter<double>("RMax");
   fRMin = pgun_params.getParameter<double>("RMin");
   fZMax = pgun_params.getParameter<double>("ZMax");
@@ -57,32 +58,30 @@ void CloseByParticleGunProducer::produce(Event& e, const EventSetup& es) {
   }
   fEvt = new HepMC::GenEvent();
 
-  // loop over particles
-  //
   int barcode = 1;
-  int numParticles = fRandomShoot ? CLHEP::RandFlat::shoot(engine, 1, fNParticles) : fNParticles;
-  std::vector<int> particles;
-
-  for (int i = 0; i < numParticles; i++) {
-    int partIdx = CLHEP::RandFlat::shoot(engine, 0, fPartIDs.size());
-    particles.push_back(fPartIDs[partIdx]);
-  }
+  unsigned int numParticles = fRandomShoot ? CLHEP::RandFlat::shoot(engine, 1, fNParticles) : fNParticles;
 
   double phi = CLHEP::RandFlat::shoot(engine, fPhiMin, fPhiMax);
   double fR = CLHEP::RandFlat::shoot(engine, fRMin, fRMax);
   double fZ = CLHEP::RandFlat::shoot(engine, fZMin, fZMax);
   double tmpPhi = phi;
   double tmpR = fR;
 
-  for (unsigned int ip = 0; ip < particles.size(); ++ip) {
+  // Loop over particles
+  for (unsigned int ip = 0; ip < numParticles; ++ip) {
     if (fOverlapping) {
       fR = CLHEP::RandFlat::shoot(engine, tmpR - fDelta, tmpR + fDelta);
       phi = CLHEP::RandFlat::shoot(engine, tmpPhi - fDelta / fR, tmpPhi + fDelta / fR);
     } else
       phi += fDelta / fR;
 
-    double fEn = CLHEP::RandFlat::shoot(engine, fEnMin, fEnMax);
-    int PartID = particles[ip];
+    double fEn;
+    if (numParticles > 1 && fMaxEnSpread)
+      fEn = fEnMin + ip * (fEnMax - fEnMin) / (numParticles - 1);
+    else
+      fEn = CLHEP::RandFlat::shoot(engine, fEnMin, fEnMax);
+
+    int PartID = CLHEP::RandFlat::shoot(engine, 0, fPartIDs.size());
     const HepPDT::ParticleData* PData = fPDGTable->particle(HepPDT::ParticleID(abs(PartID)));
     double mass = PData->mass().value();
     double mom2 = fEn * fEn - mass * mass;
@@ -141,6 +140,4 @@ void CloseByParticleGunProducer::produce(Event& e, const EventSetup& es) {
   if (fVerbosity > 0) {
     LogDebug("CloseByParticleGunProducer") << " CloseByParticleGunProducer : Event Generation Done " << endl;
   }
-
-  particles.clear();
 }
