diff options
author | Thomas White <taw@physics.org> | 2019-07-29 14:44:13 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2019-07-29 16:10:45 +0200 |
commit | 9e91eac940a161fec2c6e7505c257c3361b75d2d (patch) | |
tree | 688c936faac681b24eb19b36c3a9399a655e1747 | |
parent | 4ec853ed760c56adee24a19b5b3c81ebe12e8457 (diff) |
Remove old rg_delta stuff
-rw-r--r-- | libcrystfel/src/detector.c | 1 | ||||
-rw-r--r-- | libcrystfel/src/detector.h | 9 | ||||
-rw-r--r-- | libcrystfel/src/stream.c | 22 |
3 files changed, 0 insertions, 32 deletions
diff --git a/libcrystfel/src/detector.c b/libcrystfel/src/detector.c index fd04beaf..d1c8bc75 100644 --- a/libcrystfel/src/detector.c +++ b/libcrystfel/src/detector.c @@ -730,7 +730,6 @@ static struct rigid_group *find_or_add_rg(struct detector *det, rg->name = strdup(name); rg->panels = NULL; rg->n_panels = 0; - rg->have_deltas = 0; return rg; } diff --git a/libcrystfel/src/detector.h b/libcrystfel/src/detector.h index bbdeeaed..cf838726 100644 --- a/libcrystfel/src/detector.h +++ b/libcrystfel/src/detector.h @@ -64,15 +64,6 @@ struct rigid_group char *name; struct panel **panels; int n_panels; - - /* Updates to panel position calculated during integration */ - double d_fsx; - double d_ssx; - double d_cnx; - double d_fsy; - double d_ssy; - double d_cny; - int have_deltas; }; diff --git a/libcrystfel/src/stream.c b/libcrystfel/src/stream.c index 1c2294ea..89270c9a 100644 --- a/libcrystfel/src/stream.c +++ b/libcrystfel/src/stream.c @@ -877,28 +877,6 @@ int write_chunk(Stream *st, struct image *i, struct imagefile *imfile, fprintf(st->fh, "average_camera_length = %f m\n", tclen / i->det->n_panels); - for ( j=0; j<i->det->n_rigid_groups; j++ ) { - - struct rigid_group *rg = i->det->rigid_groups[j]; - - if ( !rg->have_deltas ) continue; - - fprintf(st->fh, "rg_delta_%s_fsx = %f\n", - rg->name, rg->d_fsx); - fprintf(st->fh, "rg_delta_%s_ssx = %f\n", - rg->name, rg->d_ssx); - fprintf(st->fh, "rg_delta_%s_cnx = %f\n", - rg->name, rg->d_cnx); - - fprintf(st->fh, "rg_delta_%s_fsy = %f\n", - rg->name, rg->d_fsy); - fprintf(st->fh, "rg_delta_%s_ssy = %f\n", - rg->name, rg->d_ssy); - fprintf(st->fh, "rg_delta_%s_cny = %f\n", - rg->name, rg->d_cny); - - } - } fprintf(st->fh, "num_peaks = %i\n", image_feature_count(i->features)); |