diff options
| author | Thomas White <taw@physics.org> | 2010-05-26 13:52:48 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2010-05-26 13:52:48 +0200 |
| commit | 8d4aae9cbf11cd36cafa791f40804c586fc10b86 (patch) | |
| tree | 2b0eb8612877694f3b96f63da203f5e4a788dd42 | |
| parent | dae25fb8f6de78c51334546184574b98ca4635b0 (diff) | |
process_hkl: Output gas detector values with scaling factors
| -rw-r--r-- | src/hdf5-file.c | 2 | ||||
| -rw-r--r-- | src/likelihood.c | 4 | ||||
| -rw-r--r-- | src/likelihood.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/hdf5-file.c b/src/hdf5-file.c index d6d646ed..a344656f 100644 --- a/src/hdf5-file.c +++ b/src/hdf5-file.c @@ -218,6 +218,8 @@ static double get_f0(struct hdfile *f) H5Dclose(dh); if ( r < 0 ) return -1.0; + STATUS("%f\n", f0); + return f0; } diff --git a/src/likelihood.c b/src/likelihood.c index e8c62010..1089e396 100644 --- a/src/likelihood.c +++ b/src/likelihood.c @@ -26,13 +26,13 @@ void detwin_intensities(const double *model, double *new_pattern, void scale_intensities(const double *model, double *new_pattern, const unsigned int *model_counts, - unsigned int *new_counts) + unsigned int *new_counts, double f0) { double s; unsigned int i; s = stat_scale_intensity(model, model_counts, new_pattern, new_counts); - printf("%f\n", s); + printf("%f %f\n", s, f0); /* NaN -> abort */ if ( isnan(s) ) return; diff --git a/src/likelihood.h b/src/likelihood.h index 9a773829..860640b5 100644 --- a/src/likelihood.h +++ b/src/likelihood.h @@ -23,7 +23,7 @@ extern void detwin_intensities(const double *model, double *new_pattern, extern void scale_intensities(const double *model, double *new_pattern, const unsigned int *model_counts, - unsigned int *new_counts); + unsigned int *new_counts, double f0); #endif /* LIKELIHOOD_H */ |