schiff

commit 9c838243d24be5951ca4223d0088db365bc2d90b
parent 096dd4482775ec2698a415909ccf0e79523941c9
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 16 Mar 2016 17:43:17 +0100

Update default value and reduce help doc

Diffstat:
M
src/schiff.c
 | 
2
+-
M
src/schiff_args.c
 | 
27
++++++---------------------
M
src/schiff_args.h
 | 
2
+-

3 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/src/schiff.c b/src/schiff.c
@@ -197,7 +197,7 @@ run_integration
         (estimator, iwlen, iangle, &cdf));
 
       fprintf(stream, "%g %g %g %g %g %g %g\n",
-        args->wavelengths[iwlen], angles[iangle], cdf.E, cdf.SE, pf.E, pf.SE, n);
+        args->wavelengths[iwlen], angles[iangle], pf.E, pf.SE, cdf.E, cdf.SE, n);
 
       res = sschiff_estimator_inverse_cumulative_phase_function
         (estimator, iwlen, thetas, args->nangles_inv);
diff --git a/src/schiff_args.c b/src/schiff_args.c
@@ -54,30 +54,18 @@ print_help(const char* binary)
 {
   printf(
 "Usage: %s [OPTIONS] [FILE]\n"
-"Estimate the radiative properties of soft particles with an \"Approximation\n"
+"Estimate the radiative properties of micro organisms with an \"Approximation\n"
 "Method for Short Wavelength or High Energy Scattering\" (L. Schiff, 1956).\n"
 "Assume a small contrast on the relative refractive index of the particles.\n\n",
     binary);
   printf(
-"FILE lists the per wavelength optical properties of the soft particles. Each\n"
-"line must be formatted as \"W Nr Kr Ne\" where \"W\" is the wavelength in\n"
-"vacuum expressed in micron, \"Nr\" and \"Kr\" are the real and imaginary parts,\n"
-"respectively, of the relative refractive index, and \"Ne\" the refractive index\n"
-"of the medium. With no FILE, read optical properties from standard input.\n\n");
-  printf(
-"The estimated results are written to OUTPUT or to standard output whether the\n"
-"\"-o\" option is defined or not, respectively. The line format of the outputed\n"
-"results is \"W E E' A A' S S' P P'\" with \"W\" the wavelength in vacuum\n"
-"(expressed in micron), \"E\", \"A\" and \"S\" the estimation of the extinction,\n"
-"absorption and scattering cross section, respectively, and \"P\" the estimated\n"
-"average projected area. The \"E'\", \"A'\", \"S'\" and \"P'\" values are the\n"
-"standard error of the aforementioned estimations.\n\n");
-  printf(
-"Options:\n\n");
-  printf(
 "  -a ANGLES     number of phase function scattering angles. Default is %u.\n",
     SCHIFF_ARGS_NULL.nangles);
   printf(
+"  -A ANGLES     number of computed inverse cumulative phase function values.\n"
+"                Default is %u.\n",
+    SCHIFF_ARGS_NULL.nangles_inv);
+  printf(
 "  -d DIRS       number of sampled directions for each geometry.\n"
 "                Default is %u.\n",
     SCHIFF_ARGS_NULL.ndirs);
@@ -87,10 +75,7 @@ print_help(const char* binary)
     SCHIFF_ARGS_NULL.nrealisations);
   printf(
 "  -G NUM        sampled `NUM' geometries with respect to the defined\n"
-"                distribution, dump their data and exit. The data are written to\n"
-"                OUTPUT or the standard output whether the `-o' option is\n"
-"                defined or not, respectively. The outputted data followed the\n"
-"                Alias Wavefront obj file format.\n");
+"                distribution, dump their data and exit.\n");
   printf(
 "  -h            display this help and exit.\n");
   printf(
diff --git a/src/schiff_args.h b/src/schiff_args.h
@@ -62,7 +62,7 @@ static const struct schiff_args SCHIFF_ARGS_NULL = {
   NULL, /* List of Schiff geometries */
   NULL, /* Schiff geometry random variates */
   0, /* # Dumped geometries */
-  1000, /* # Sampled geometries */
+  10000, /* # Sampled geometries */
   100, /* # Sampled directions per geometry */
   1000, /* # Scattering angles */
   2000, /* # angles in the inv cumulative phase function */