diff options
| author | Thomas White <taw@physics.org> | 2012-05-31 13:48:42 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-05-31 13:48:42 +0200 |
| commit | 13770d8553f9696c1c4c0c56703717524c028d86 (patch) | |
| tree | 23c9f11f0407207ad24a8f7a4f6c72d52d0e7822 /libcrystfel/src/mosflm.c | |
| parent | 6ff1bbbd0deeac54175fc862a6e1b53374ae6306 (diff) | |
| parent | b6e0b7972e3dbdace0034d439b992faf3ac8c454 (diff) | |
Merge branch 'master' into tom/speed
Conflicts:
.gitignore
Diffstat (limited to 'libcrystfel/src/mosflm.c')
| -rw-r--r-- | libcrystfel/src/mosflm.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libcrystfel/src/mosflm.c b/libcrystfel/src/mosflm.c index 0032a095..ed118aa4 100644 --- a/libcrystfel/src/mosflm.c +++ b/libcrystfel/src/mosflm.c @@ -283,13 +283,13 @@ static void mosflm_send_next(struct image *image, struct mosflm_data *mosflm) switch ( mosflm->step ) { - case 1 : + case 1 : mosflm_sendline("DETECTOR ROTATION HORIZONTAL" " ANTICLOCKWISE ORIGIN LL FAST HORIZONTAL" " RECTANGULAR\n", mosflm); break; - case 2 : + case 2 : if ( mosflm->target_cell != NULL ) { cell_get_parameters(mosflm->target_cell, &a, &b, &c, &alpha, &beta, &gamma); @@ -303,7 +303,7 @@ static void mosflm_send_next(struct image *image, struct mosflm_data *mosflm) } break; - case 3 : + case 3 : if ( mosflm->target_cell != NULL ) { sg = cell_get_spacegroup(mosflm->target_cell); /* Remove white space from space group */ @@ -321,31 +321,31 @@ static void mosflm_send_next(struct image *image, struct mosflm_data *mosflm) } break; - case 4 : + case 4 : mosflm_sendline("DISTANCE 67.8\n", mosflm); break; - case 5 : + case 5 : mosflm_sendline("BEAM 0.0 0.0\n", mosflm); break; - case 6 : + case 6 : wavelength = image->lambda*1e10; snprintf(tmp, 255, "WAVELENGTH %10.5f\n", wavelength); mosflm_sendline(tmp, mosflm); break; - case 7 : + case 7 : snprintf(tmp, 255, "NEWMAT %s\n", mosflm->newmatfile); mosflm_sendline(tmp, mosflm); break; - case 8 : + case 8 : snprintf(tmp, 255, "IMAGE %s phi 0 0\n", mosflm->imagefile); mosflm_sendline(tmp, mosflm); break; - case 9 : + case 9 : snprintf(tmp, 255, "AUTOINDEX DPS FILE %s" " IMAGE 1 MAXCELL 1000 REFINE\n", mosflm->sptfile); @@ -357,7 +357,7 @@ static void mosflm_send_next(struct image *image, struct mosflm_data *mosflm) mosflm_sendline(tmp, mosflm); break; - case 10 : + case 10 : mosflm_sendline("GO\n", mosflm); mosflm->finished_ok = 1; break; |