Added brick output for testing, debug etc uses. Option in CMake.

Author: jaakkojulin

CMakeLists.txt

@@ -45,6 +45,11 @@ if(JABS_PLUGINS)
     endif()
 endif()
 
+option(BRICK_OUTPUT "Always output debug brick data (will be very verbose)" OFF)
+if(BRICK_OUTPUT)
+    add_compile_options(-DDEBUG_BRICK_OUTPUT)
+endif()
+
 add_subdirectory(gitwatcher)
 
 add_subdirectory(src)

src/brick.c

@@ -51,13 +51,24 @@ void bricks_convolute(gsl_histogram *h, const brick *bricks, size_t last_brick,
                 hi = mi;
             }
         }
-        for(size_t j = lo; j < h->n; j++) {
+#ifdef DEBUG_BRICK_OUTPUT
+        double norm = 0.0;
+#endif
+        for(size_t j = lo; j < h->n - 1; j++) {
             if(h->range[j] > E_cutoff_high) /* Low energy edge of histogram is above cutoff */
                 break; /* Assumes histograms have increasing energy */
             const double E = (h->range[j] + h->range[j + 1]) / 2.0; /* Approximate gaussian at center bin */
             const double w = h->range[j + 1] - h->range[j];
             const double y = (erf_Q((b_low->E - E) / b_low->S_sum) - erf_Q((b_high->E - E) / b_high->S_sum));
-            h->bin[j] += scale * y * w * b_w_inv * b_low->Q;
+            double out = scale * y * w * b_w_inv * b_low->Q;
+            h->bin[j] += out;
+#ifdef DEBUG_BRICK_OUTPUT
+            fprintf(stdout, "BRICK %3zu %4zu %9.3lf %9.3lf %12e %12e %12e %12e %12e %12e\n", i, j, h->range[j] / C_KEV, h->range[j + 1] / C_KEV, out, h->bin[j], scale, y, w * b_w_inv, b_low->Q);
+            norm += y * w * b_w_inv;
+#endif
         }
+#ifdef DEBUG_BRICK_OUTPUT
+        fprintf(stdout, "BRICK #normalization calculated factor %.12lf relative error %.3e\nBRICK\nBRICK\n", norm, (norm-1.0));
+#endif
     }
 }

src/defaults.h

@@ -41,7 +41,7 @@
 #define DES_TABLE_MAX_SIZE (256 * DES_TABLE_INITIAL_ALLOC)
 #define ENERGY_DERIVATIVE_MIN (0.1) /* dE(detected)/dE(incident) is forced to be higher or equal to this. */
 #define ENERGY_DERIVATIVE_MAX (10.0)
-#define BRICK_WIDTH_SIGMAS_DEFAULT (2.0) /* Attempt to make bricks width energy difference equal to this many times the detector resolution and straggling sigmas combined (in quadrature (variances)) */
+#define BRICK_WIDTH_SIGMAS_DEFAULT (C_FWHM) /* Attempt to make bricks width energy difference equal to this many times the detector resolution and straggling sigmas combined (in quadrature (variances)) */
 #define INCIDENT_STOP_STEP_DEFAULT (0.0*C_KEV) /* Zero is automatic */
 #define INCIDENT_STOP_STEP_SIGMAS_DEFAULT (1.0)
 #define INCIDENT_STOP_STEP_MIN_DEFAULT (0.5 * C_KEV) /* Default minimum stopping step. */

src/script_command.c

@@ -2065,7 +2065,7 @@ script_command_status script_test_reference(struct script_session *s, int argc,
             jabs_message(MSG_ERROR, stderr, "Test failed.\n");
             return_value = SCRIPT_COMMAND_FAILURE;
         } else {
-            jabs_message(MSG_ERROR, stderr, "Test passed.\n");
+            jabs_message(MSG_INFO, stderr, "Test passed.\n");
         }
     }
     return return_value;