star-schiff

commit f9779154e61e1bbaccb6eab4158c1802c1573e49
parent 9899bb031bd2ec30d32691d48f6d4e2715b534fe
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Fri, 23 Oct 2015 10:58:20 +0200

Rename the SSCHIFF_AVERAGE_PROJECTIVE_AREA enum

Rename in SSCHIFF_AVERAGE_PROJECTED_AREA. The previous name was actually
a mistake.

Diffstat:
M
src/sschiff.h
 | 
2
+-
M
src/sschiff_estimator.c
 | 
2
+-
M
src/test_sschiff_estimator_sphere.c
 | 
2
+-

3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/sschiff.h b/src/sschiff.h
@@ -61,7 +61,7 @@ enum sschiff_data {
   SSCHIFF_EXTINCTION_CROSS_SECTION,
   SSCHIFF_ABSORPTION_CROSS_SECTION,
   SSCHIFF_SCATTERING_CROSS_SECTION,
-  SSCHIFF_AVERAGE_PROJECTIVE_AREA,
+  SSCHIFF_AVERAGE_PROJECTED_AREA,
   SSCHIFF_DATA_COUNT__
 };
 
diff --git a/src/sschiff_estimator.c b/src/sschiff_estimator.c
@@ -362,7 +362,7 @@ accum_monte_carlo_weight
         accums[iwlen].weights[SSCHIFF_SCATTERING_CROSS_SECTION] += w_scattering;
 
         /* Average projected area */
-        accums[iwlen].weights[SSCHIFF_AVERAGE_PROJECTIVE_AREA] += rcp_pdf;
+        accums[iwlen].weights[SSCHIFF_AVERAGE_PROJECTED_AREA] += rcp_pdf;
       }
     }
   } while(res != RES_OK && nfailures < MAX_FAILURES);
diff --git a/src/test_sschiff_estimator_sphere.c b/src/test_sschiff_estimator_sphere.c
@@ -302,7 +302,7 @@ check_schiff_estimation
     /*s = log(sampler_ctx->sigma);
     r = sampler_ctx->mean_radius * exp(2.5 * s * s);
     r = PI * r * r * 1.e-12 */ /* Meter^2 to micron^2*/;
-    val = state.values + SSCHIFF_AVERAGE_PROJECTIVE_AREA;
+    val = state.values + SSCHIFF_AVERAGE_PROJECTED_AREA;
     printf("  Averavege projected area = %12.6g +/- %12.7g\n", val->E, val->SE);
 
     CHECK(sschiff_estimator_ref_put(estimator), RES_OK);