Take Kevin's comments

cms-sw · Mar 9, 2020 · 2f5fb2c · 2f5fb2c
1 parent 5fb8530
commit 2f5fb2c
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/IOMC/ParticleGuns/src/BeamMomentumGunProducer.cc b/IOMC/ParticleGuns/src/BeamMomentumGunProducer.cc
@@ -1,5 +1,6 @@
 #include "IOMC/ParticleGuns/interface/BeamMomentumGunProducer.h"
 
+#include "DataFormats/Math/interface/deltaPhi.h"
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h"
 
@@ -13,7 +14,6 @@
 
 #include "TFile.h"
 #include <cmath>
-#include <ostream>
 
 namespace CLHEP {
   class HepRandomEngine;
@@ -125,11 +125,7 @@ namespace edm {
       double newtheta = ptheta + theta;
       if (newtheta > M_PI && newtheta <= 2 * M_PI)
         newtheta = 2 * M_PI - newtheta;
-      double newphi = pphi + phi;
-      if (newphi > M_PI && newphi <= 2 * M_PI)
-        newphi = -(2 * M_PI - newphi);
-      else if (newphi < -M_PI && newphi >= -2 * M_PI)
-        newphi = 2 * M_PI + newphi;
+      double newphi = reco::reduceRange(pphi + phi);
       double px = mom * sin(newtheta) * cos(newphi);
       double py = mom * sin(newtheta) * sin(newphi);
       double pz = mom * cos(newtheta);