diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compare_hkl.c | 1 | ||||
| -rw-r--r-- | src/dw-hdfsee.c | 2 | ||||
| -rw-r--r-- | src/dw-hdfsee.h | 2 | ||||
| -rw-r--r-- | src/get_hkl.c | 6 | ||||
| -rw-r--r-- | src/hdfsee.c | 8 |
5 files changed, 10 insertions, 9 deletions
diff --git a/src/compare_hkl.c b/src/compare_hkl.c index c3e7a547..f0484ede 100644 --- a/src/compare_hkl.c +++ b/src/compare_hkl.c @@ -464,6 +464,7 @@ static int get_bin(struct shells *s, Reflection *refl, UnitCell *cell) /* Allow for slight rounding errors */ if ( (bin == -1) && (d <= s->rmins[0]) ) bin = 0; + if ( (bin == -1) && (d >= s->rmaxs[s->nshells-1]) ) bin = 0; assert(bin != -1); return bin; diff --git a/src/dw-hdfsee.c b/src/dw-hdfsee.c index ee3b55f0..c4eabaf2 100644 --- a/src/dw-hdfsee.c +++ b/src/dw-hdfsee.c @@ -1778,7 +1778,7 @@ static gint displaywindow_press(GtkWidget *widget, GdkEventButton *event, DisplayWindow *displaywindow_open(const char *filename, const char *peaks, - int boost, int binning, int cmfilter, + double boost, int binning, int cmfilter, int noisefilter, int colscale, const char *element, const char *geometry, int show_rings, double *ring_radii, diff --git a/src/dw-hdfsee.h b/src/dw-hdfsee.h index 6d8c9782..84095a41 100644 --- a/src/dw-hdfsee.h +++ b/src/dw-hdfsee.h @@ -117,7 +117,7 @@ typedef struct { /* Open an image display window showing the given filename, or NULL */ extern DisplayWindow *displaywindow_open(const char *filename, - const char *peaks, int boost, + const char *peaks, double boost, int binning, int cmfilter, int noisefilter, int colscale, const char *element, diff --git a/src/get_hkl.c b/src/get_hkl.c index c879a51a..e69beb51 100644 --- a/src/get_hkl.c +++ b/src/get_hkl.c @@ -254,9 +254,9 @@ static RefList *expand_reflections(RefList *in, const SymOpList *initial, RefList *out; SymOpMask *m; - if ( !is_subgroup(target, initial) ) { - ERROR("%s is not a subgroup of %s!\n", symmetry_name(initial), - symmetry_name(target)); + if ( !is_subgroup(initial, target) ) { + ERROR("%s is not a subgroup of %s!\n", symmetry_name(target), + symmetry_name(initial)); return NULL; } diff --git a/src/hdfsee.c b/src/hdfsee.c index 894b8af9..36472e46 100644 --- a/src/hdfsee.c +++ b/src/hdfsee.c @@ -111,7 +111,7 @@ int main(int argc, char *argv[]) size_t i; int nfiles; char *peaks = NULL; - int boost = 1; + double boost = 1.0; int binning = 2; int config_cmfilter = 0; int config_noisefilter = 0; @@ -161,10 +161,10 @@ int main(int argc, char *argv[]) break; case 'i' : - boost = atoi(optarg); - if ( boost < 1 ) { + boost = atof(optarg); + if ( boost <= 0 ) { ERROR("Intensity boost must be a positive" - " integer.\n"); + " number.\n"); return 1; } break; |