speed likelihood calculation up a bit

2 files changed, 2 insertions, 3 deletions

diff --git a/src/likelihood.c b/src/likelihood.c
index 2b686f8..33bf095 100644
--- a/src/likelihood.c
+++ b/src/likelihood.c
@@ -252,7 +252,7 @@ double get_total_charge_approx(double T0, double *pos, double *dir, muon_energy
     /* Assume the particle is travelling at the speed of light. */
     *t = s/SPEED_OF_LIGHT + l_d2o*n_d2o/SPEED_OF_LIGHT + l_h2o*n_h2o/SPEED_OF_LIGHT;
 
-    return f*exp(-l_d2o/absorption_length_d2o)*exp(-l_h2o/absorption_length_h2o)*n_d2o*x*beta0*prob*(1/sin_theta)*omega*(erf((a+b*(smax-s)+n_d2o*(smax-z)*beta0)/frac) + erf((-a+b*s+n_d2o*z*beta0)/frac))/(b+n_d2o*beta0)/(4*M_PI);
+    return f*exp(-l_d2o/absorption_length_d2o-l_h2o/absorption_length_h2o)*n_d2o*x*beta0*prob*(1/sin_theta)*omega*(erf((a+b*(smax-s)+n_d2o*(smax-z)*beta0)/frac) + erf((-a+b*s+n_d2o*z*beta0)/frac))/(b+n_d2o*beta0)/(4*M_PI);
 }
 
 typedef struct betaRootParams {
diff --git a/src/muon.c b/src/muon.c
index 0ab5cd8..9114dda 100644
--- a/src/muon.c
+++ b/src/muon.c
@@ -303,6 +303,5 @@ double get_expected_charge(double x, double T, double theta0, double *pos, doubl
 
     get_path_length(pos,pmt_pos,AV_RADIUS,&l_d2o,&l_h2o);
 
-    /* FIXME: add angular response and scattering/absorption. */
-    return f*exp(-l_d2o/absorption_length_d2o)*exp(-l_h2o/absorption_length_h2o)*omega*FINE_STRUCTURE_CONSTANT*z*z*(1-(1/(beta*beta*n*n)))*get_probability(beta, cos_theta, theta0);
+    return f*exp(-l_d2o/absorption_length_d2o-l_h2o/absorption_length_h2o)*omega*FINE_STRUCTURE_CONSTANT*z*z*(1-(1/(beta*beta*n*n)))*get_probability(beta, cos_theta, theta0);
 }