Merge pull request #258 from JeffersonLab/bugfix-issue-188-phi-phase-…

…space Calculate phase factor on xs based on phi range thrown
JeffersonLab · May 23, 2019 · 4d2d029 · 4d2d029
2 parents b701b2f + 29867ff
commit 4d2d029
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/remollGen12CElastic.cc b/src/remollGen12CElastic.cc
@@ -228,7 +228,7 @@ void remollGen12CElastic::SamplePhysics(remollVertex *vert, remollEvent *evt)
     //    double sigma = sigma_mott*(ef/beamE)*(ffpart1 + ffpart2);
     double sigma = sigma_mott*(ef/beamE);
 
-    double V = 2.0*pi*(cthmin - cthmax)*samp_fact;
+    double V = (fPh_max - fPh_min) * (cthmin - cthmax) * samp_fact;
 
     // Suppress too low angles from being generated
     // If we're in the multiple-scattering regime

diff --git a/src/remollGenMoller.cc b/src/remollGenMoller.cc
@@ -35,7 +35,7 @@ void remollGenMoller::SamplePhysics(remollVertex *vert, remollEvent *evt){
 
   double sigma = alpha*alpha*pow(3.0+cos(thcom)*cos(thcom),2.0)*hbarc*hbarc/pow(sin(thcom),4.0)/(2.0*me*beamE); // units of area
 
-  double V = 2.0*pi*(cos(fThCoM_min) - cos(fThCoM_max));
+  double V = (fPh_max - fPh_min)*(cos(fThCoM_min) - cos(fThCoM_max));
 
   //  Multiply by Z because we have Z electrons
   //  here we must also divide by two because we are double covering

diff --git a/src/remollGenpElastic.cc b/src/remollGenpElastic.cc
@@ -221,7 +221,7 @@ void remollGenpElastic::SamplePhysics(remollVertex *vert, remollEvent *evt){
 
     double sigma = sigma_mott*(ef/beamE)*(ffpart1 + ffpart2);
 
-    double V = 2.0*pi*(cthmin - cthmax)*samp_fact;
+    double V = (fPh_max - fPh_min) * (cthmin - cthmax) * samp_fact;
 
     // Suppress too low angles from being generated
     // If we're in the multiple-scattering regime

diff --git a/src/remollGenpInelastic.cc b/src/remollGenpInelastic.cc
@@ -39,7 +39,7 @@ void remollGenpInelastic::SamplePhysics(remollVertex *vert, remollEvent *evt){
 	//  Effective neutron number...  I don't like it either  SPR 2/14/2013
 	thissigma_n*(vert->GetMaterial()->GetA()*mole/g - vert->GetMaterial()->GetZ());
 
-    double V = 2.0*pi*(cos(fTh_min) - cos(fTh_max))*efmax;
+    double V = (fPh_max - fPh_min) * (cos(fTh_min) - cos(fTh_max)) * efmax;
 
     evt->SetEffCrossSection(sigmatot*V);