aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src/mosflm.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2012-08-29 16:32:20 +0200
committerThomas White <taw@physics.org>2012-10-02 15:02:12 +0200
commit2f5af19403e4e13e36d61e85a9dcf77d8c0d82cd (patch)
tree609336d9376e987b24348b9b77349e91b73a22de /libcrystfel/src/mosflm.c
parentcf1ed4e4fb4004e89f2e307931a1de4c024e13de (diff)
Don't send cell parameters to MOSFLM
Diffstat (limited to 'libcrystfel/src/mosflm.c')
-rw-r--r--libcrystfel/src/mosflm.c29
1 files changed, 7 insertions, 22 deletions
diff --git a/libcrystfel/src/mosflm.c b/libcrystfel/src/mosflm.c
index d5356bab..63166919 100644
--- a/libcrystfel/src/mosflm.c
+++ b/libcrystfel/src/mosflm.c
@@ -340,7 +340,6 @@ static void mosflm_send_next(struct image *image, struct mosflm_data *mosflm)
{
char tmp[256];
double wavelength;
- double a, b, c, alpha, beta, gamma;
switch ( mosflm->step ) {
@@ -352,20 +351,6 @@ static void mosflm_send_next(struct image *image, struct mosflm_data *mosflm)
case 2 :
if ( mosflm->target_cell != NULL ) {
- cell_get_parameters(mosflm->target_cell, &a, &b, &c,
- &alpha, &beta, &gamma);
- snprintf(tmp, 255,
- "CELL %6.2f %6.2f %6.2f %6.2f %6.2f %6.2f\n",
- a*1e10, b*1e10, c*1e10,
- rad2deg(alpha), rad2deg(beta), rad2deg(gamma));
- mosflm_sendline(tmp, mosflm);
- } else {
- mosflm_sendline("# Do nothing\n", mosflm);
- }
- break;
-
- case 3 :
- if ( mosflm->target_cell != NULL ) {
const char *symm;
symm = spacegroup_for_lattice(mosflm->target_cell);
snprintf(tmp, 255, "SYMM %s\n", symm);
@@ -375,31 +360,31 @@ static void mosflm_send_next(struct image *image, struct mosflm_data *mosflm)
}
break;
- case 4 :
+ case 3 :
mosflm_sendline("DISTANCE 67.8\n", mosflm);
break;
- case 5 :
+ case 4 :
mosflm_sendline("BEAM 0.0 0.0\n", mosflm);
break;
- case 6 :
+ case 5 :
wavelength = image->lambda*1e10;
snprintf(tmp, 255, "WAVELENGTH %10.5f\n", wavelength);
mosflm_sendline(tmp, mosflm);
break;
- case 7 :
+ case 6 :
snprintf(tmp, 255, "NEWMAT %s\n", mosflm->newmatfile);
mosflm_sendline(tmp, mosflm);
break;
- case 8 :
+ case 7 :
snprintf(tmp, 255, "IMAGE %s phi 0 0\n", mosflm->imagefile);
mosflm_sendline(tmp, mosflm);
break;
- case 9 :
+ case 8 :
snprintf(tmp, 255, "AUTOINDEX DPS FILE %s"
" IMAGE 1 MAXCELL 1000 REFINE\n",
mosflm->sptfile);
@@ -411,7 +396,7 @@ static void mosflm_send_next(struct image *image, struct mosflm_data *mosflm)
mosflm_sendline(tmp, mosflm);
break;
- case 10 :
+ case 9 :
mosflm_sendline("GO\n", mosflm);
mosflm->finished_ok = 1;
break;