diff options
author | Thomas White <taw@physics.org> | 2012-06-28 17:23:46 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2012-06-28 17:24:01 +0200 |
commit | 172293570b790ffcde14128404d9c0e294ca1f30 (patch) | |
tree | af63838617e2a0d0919eaf69f175ab5e96783436 /libcrystfel/src/detector.c | |
parent | 51f5ed0461208f813a7c4ab45546516223dd4d5b (diff) |
Remove peak_sep from detector geometry file, use ir_inn instead
Diffstat (limited to 'libcrystfel/src/detector.c')
-rw-r--r-- | libcrystfel/src/detector.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libcrystfel/src/detector.c b/libcrystfel/src/detector.c index b7d809df..f212821d 100644 --- a/libcrystfel/src/detector.c +++ b/libcrystfel/src/detector.c @@ -608,8 +608,6 @@ static int parse_field_for_panel(struct panel *panel, const char *key, panel->res = atof(val); } else if ( strcmp(key, "max_adu") == 0 ) { panel->max_adu = atof(val); - } else if ( strcmp(key, "peak_sep") == 0 ) { - panel->peak_sep = atof(val); } else if ( strcmp(key, "badrow_direction") == 0 ) { panel->badrow = val[0]; /* First character only */ if ( (panel->badrow != 'x') && (panel->badrow != 'y') @@ -687,8 +685,6 @@ static void parse_toplevel(struct detector *det, const char *key, det->mask_good = v; } - } else if ( strcmp(key, "peak_sep") == 0 ) { - det->defaults.peak_sep = atof(val); } else if ( strcmp(key, "coffset") == 0 ) { det->defaults.coffset = atof(val); } else if ( parse_field_for_panel(&det->defaults, key, val, det) ) { @@ -738,7 +734,6 @@ struct detector *get_detector_geometry(const char *filename) det->defaults.res = -1.0; det->defaults.badrow = '-'; det->defaults.no_index = 0; - det->defaults.peak_sep = 50.0; det->defaults.fsx = 1.0; det->defaults.fsy = 0.0; det->defaults.ssx = 0.0; @@ -887,7 +882,6 @@ struct detector *get_detector_geometry(const char *filename) } /* It's OK if the badrow direction is '0' */ /* It's not a problem if "no_index" is still zero */ - /* The default peak_sep is OK (maybe) */ /* The default transformation matrix is at least valid */ if ( det->panels[i].max_fs > max_fs ) { @@ -1250,7 +1244,6 @@ int write_detector_geometry(const char *filename, struct detector *det) fprintf(fh, "%s/max_ss = %d\n", p->name, p->max_ss); fprintf(fh, "%s/badrow_direction = %C\n", p->name, p->badrow); fprintf(fh, "%s/res = %g\n", p->name, p->res); - fprintf(fh, "%s/peak_sep = %g\n", p->name, p->peak_sep); fprintf(fh, "%s/clen = %s\n", p->name, p->clen_from); fprintf(fh, "%s/fs = %+fx %+fy\n", p->name, p->fsx, p->fsy); fprintf(fh, "%s/ss = %+fx %+fy\n", p->name, p->ssx, p->ssy); |