diff options
| -rw-r--r-- | libcrystfel/src/fom.c | 12 | ||||
| -rw-r--r-- | libcrystfel/src/fom.h | 1 | ||||
| -rw-r--r-- | src/check_hkl.c | 8 |
3 files changed, 2 insertions, 19 deletions
diff --git a/libcrystfel/src/fom.c b/libcrystfel/src/fom.c index c2de704a..c3ac934e 100644 --- a/libcrystfel/src/fom.c +++ b/libcrystfel/src/fom.c @@ -129,7 +129,6 @@ static struct fom_context *init_fom(enum fom_type fom, int nmax, int nshells) case FOM_RSPLIT : case FOM_RANO : case FOM_MEAN_INTENSITY : - case FOM_STDDEV_INTENSITY : case FOM_SNR : case FOM_REDUNDANCY : fctx->num = malloc(nshells*sizeof(double)); @@ -315,12 +314,6 @@ static int add_to_fom(struct fom_context *fctx, fctx->den[bin] += 1.0; break; - /* FIXME: Delete this FoM? */ - case FOM_STDDEV_INTENSITY : - fctx->num[bin] += 1.0; - fctx->den[bin] += 1.0; - break; - case FOM_COMPLETENESS : /* fctx->cts already incremented, as needed. * Will calculate possible reflections later */ @@ -361,7 +354,6 @@ double fom_overall_value(struct fom_context *fctx) case FOM_REDUNDANCY : case FOM_SNR : case FOM_MEAN_INTENSITY : - case FOM_STDDEV_INTENSITY : overall_num = 0.0; overall_den = 0.0; for ( i=0; i<fctx->nshells; i++ ) { @@ -464,7 +456,6 @@ double fom_overall_value(struct fom_context *fctx) case FOM_REDUNDANCY : case FOM_SNR : case FOM_MEAN_INTENSITY : - case FOM_STDDEV_INTENSITY : return overall_num/overall_den; case FOM_COMPLETENESS : @@ -521,7 +512,6 @@ double fom_shell_value(struct fom_context *fctx, int i) case FOM_REDUNDANCY : case FOM_SNR : case FOM_MEAN_INTENSITY : - case FOM_STDDEV_INTENSITY : return fctx->num[i]/fctx->den[i]; case FOM_R2 : @@ -845,7 +835,6 @@ static int is_anomalous(enum fom_type fom) case FOM_REDUNDANCY: case FOM_SNR: case FOM_MEAN_INTENSITY: - case FOM_STDDEV_INTENSITY: case FOM_COMPLETENESS: return 0; } @@ -877,7 +866,6 @@ static int is_single_list(enum fom_type fom) case FOM_REDUNDANCY: case FOM_SNR: case FOM_MEAN_INTENSITY: - case FOM_STDDEV_INTENSITY: case FOM_COMPLETENESS: return 1; } diff --git a/libcrystfel/src/fom.h b/libcrystfel/src/fom.h index c9c8dbfe..565c9b80 100644 --- a/libcrystfel/src/fom.h +++ b/libcrystfel/src/fom.h @@ -69,7 +69,6 @@ enum fom_type FOM_REDUNDANCY, FOM_SNR, FOM_MEAN_INTENSITY, - FOM_STDDEV_INTENSITY, FOM_COMPLETENESS, }; diff --git a/src/check_hkl.c b/src/check_hkl.c index d95fc51f..545650af 100644 --- a/src/check_hkl.c +++ b/src/check_hkl.c @@ -399,7 +399,6 @@ static void plot_shells(RefList *list, UnitCell *cell, const SymOpList *sym, struct fom_context *red_ctx; struct fom_context *snr_ctx; struct fom_context *mean_ctx; - struct fom_context *stddev_ctx; struct fom_context *compl_ctx; fh = fopen(shell_file, "w"); @@ -427,8 +426,6 @@ static void plot_shells(RefList *list, UnitCell *cell, const SymOpList *sym, FOM_SNR, 0, sym); mean_ctx = fom_calculate(list, NULL, cell, shells, FOM_MEAN_INTENSITY, 0, sym); - stddev_ctx = fom_calculate(list, NULL, cell, shells, - FOM_STDDEV_INTENSITY, 0, sym); compl_ctx = fom_calculate(list, NULL, cell, shells, FOM_COMPLETENESS, 0, sym); @@ -445,7 +442,7 @@ static void plot_shells(RefList *list, UnitCell *cell, const SymOpList *sym, 100.0*fom_overall_value(compl_ctx)); fprintf(fh, "Center 1/nm # refs Possible Compl " - "Meas Red SNR Std dev Mean d(A) " + "Meas Red SNR Mean I d(A) " "Min 1/nm Max 1/nm\n"); for ( i=0; i<nshells; i++ ) { @@ -455,7 +452,7 @@ static void plot_shells(RefList *list, UnitCell *cell, const SymOpList *sym, possible = fom_shell_num_possible(compl_ctx, i); fprintf(fh, "%10.3f %8li %8li %6.2f %10.0f %5.1f" - " %5.2f %10.2f %10.2f %8.2f %10.3f %10.3f\n", + " %5.2f %10.2f %8.2f %10.3f %10.3f\n", fom_shell_centre(shells, i)*1.0e-9, measured, possible, @@ -463,7 +460,6 @@ static void plot_shells(RefList *list, UnitCell *cell, const SymOpList *sym, fom_shell_value(nmeas_ctx, i), fom_shell_value(red_ctx, i), fom_shell_value(snr_ctx, i), - fom_shell_value(stddev_ctx, i), fom_shell_value(mean_ctx, i), (1.0/fom_shell_centre(shells, i))*1e10, shells->rmins[i]*1.0e-9, |