diff options
| author | Thomas White <taw@physics.org> | 2011-05-16 17:44:39 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:26 +0100 |
| commit | c65ac2bd1d3ba1b69349ba52d0e2a72ee2c2e25d (patch) | |
| tree | 7eb37d1c42ae3deffffcf4a7678e1e3fead68638 /src | |
| parent | a56aafbeae1b6438c84cb433bfb17023581d5527 (diff) | |
Fussiness
Diffstat (limited to 'src')
| -rw-r--r-- | src/indexamajig.c | 6 | ||||
| -rw-r--r-- | src/mosflm.c | 8 | ||||
| -rw-r--r-- | src/peaks.c | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/indexamajig.c b/src/indexamajig.c index 7da8a280..569a41bd 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -264,7 +264,8 @@ static void process_image(void *pp, int cookie) if ( beam != NULL ) { ERROR("Using nominal photon enery of %.2f eV\n", beam->photon_energy); - image.lambda = ph_en_to_lambda(eV_to_J(beam->photon_energy)); + image.lambda = ph_en_to_lambda( + eV_to_J(beam->photon_energy)); } else { ERROR("No wavelength in file, so you need to give " "a beam parameters file with -b.\n"); @@ -313,7 +314,8 @@ static void process_image(void *pp, int cookie) config_verbose, pargs->static_args.ipriv, pargs->static_args.config_insane); - /* No cell at this point? Then we're done. */ + + if ( image.indexed_cell != NULL ) pargs->indexable = 1; /* Measure intensities if requested */ diff --git a/src/mosflm.c b/src/mosflm.c index 9ccbf0d5..088ef52d 100644 --- a/src/mosflm.c +++ b/src/mosflm.c @@ -174,11 +174,11 @@ static void write_spt(struct image *image, const char *filename) { FILE *fh; int i; - double fclen=67.8; /* fake camera length in mm */ - double fpix=0.075; /* fake pixel size in mm */ + double fclen = 67.8; /* fake camera length in mm */ + double fpix = 0.075; /* fake pixel size in mm */ double pix; - double height=100; - double sigma=1; + double height = 100.0; + double sigma = 1.0; int nPeaks = image_feature_count(image->features); struct sptline *sptlines; diff --git a/src/peaks.c b/src/peaks.c index efe50b9b..b838b810 100644 --- a/src/peaks.c +++ b/src/peaks.c @@ -160,7 +160,6 @@ int integrate_peak(struct image *image, int cfs, int css, double noise_mean = 0.0; double noise_meansq = 0.0; - p = find_panel(image->det, cfs, css); if ( p == NULL ) return 1; if ( p->no_index ) return 1; |