diff options
| -rw-r--r-- | doc/man/crystfel_geometry.5 | 6 | ||||
| -rw-r--r-- | libcrystfel/src/datatemplate.c | 30 | ||||
| -rw-r--r-- | libcrystfel/src/datatemplate_priv.h | 10 |
3 files changed, 0 insertions, 46 deletions
diff --git a/doc/man/crystfel_geometry.5 b/doc/man/crystfel_geometry.5 index 541d729e..e4edf06d 100644 --- a/doc/man/crystfel_geometry.5 +++ b/doc/man/crystfel_geometry.5 @@ -261,12 +261,6 @@ Specifies that the saturation map should come from the HDF5 file named here, ins .IP \fBno_index\fR Set this to 1 or "true" to ignore this panel completely. -.PD 0 -.IP \fBrail_direction\fR -.IP \fBclen_for_centering\fR -.PD -Specify the direction in which the panel should move when the camera length is increased. \fBclen_for_centering\fR is the camera length at which the central beam intersects the centre of the detector. If you've only calibrated the detector at one camera length, perhaps using prior known values for the rail direction, then this should be the camera length at which you calibrated the detector. \fBclen_for_centering\fR is the camera length \fBbefore\fR applying the \fBcoffset\fR, i.e. for CSPAD/CXI/LCLS data this value should be an "encoder value" in metres. If you specify the rail direction, you must also specify clen_for_centering. The default is for the panel to move in the +z direction, so rail_direction = z and clen_for_centering is irrelevant. The modulus of the "rail vector" should normally be equal to one. Otherwise, the camera length changes from the centering value will be correspondingly scaled (which might sometimes be what you want!). - .SH BAD REGIONS Bad regions will be completely ignored by CrystFEL. You can specify the pixels to exclude in pixel units, either in the lab coordinate system (see above) or in fast scan/slow scan coordinates (mixtures are not allowed). In the latter case, the range of pixels is specified \fIinclusively\fR. Bad regions are distinguished from normal panels by the fact that they begin with the three letters "bad". diff --git a/libcrystfel/src/datatemplate.c b/libcrystfel/src/datatemplate.c index 37bb623c..5ed6aef8 100644 --- a/libcrystfel/src/datatemplate.c +++ b/libcrystfel/src/datatemplate.c @@ -565,16 +565,6 @@ static int parse_field_for_panel(struct panel_template *panel, const char *key, panel->cnx = atof(val); } else if ( strcmp(key, "corner_y") == 0 ) { panel->cny = atof(val); - } else if ( strcmp(key, "rail_direction") == 0 ) { - if ( dir_conv(val, &panel->rail_x, - &panel->rail_y, - &panel->rail_z) ) - { - ERROR("Invalid rail direction '%s'\n", val); - reject = 1; - } - } else if ( strcmp(key, "clen_for_centering") == 0 ) { - panel->clen_for_centering = atof(val); } else if ( strcmp(key, "adu_per_eV") == 0 ) { panel->adu_scale = atof(val); panel->adu_scale_unit = ADU_PER_EV; @@ -1085,10 +1075,6 @@ DataTemplate *data_template_new_from_string(const char *string_in) defaults.ssx = NAN; defaults.ssy = NAN; defaults.ssz = NAN; - defaults.rail_x = NAN; /* The actual default rail direction */ - defaults.rail_y = NAN; /* is below */ - defaults.rail_z = NAN; - defaults.clen_for_centering = NAN; defaults.adu_scale = NAN; defaults.adu_scale_unit = ADU_PER_PHOTON; for ( i=0; i<MAX_FLAG_VALUES; i++ ) defaults.flag_values[i] = 0; @@ -1336,14 +1322,6 @@ DataTemplate *data_template_new_from_string(const char *string_in) reject = 1; } - if ( isnan(p->clen_for_centering) && !isnan(p->rail_x) ) - { - ERROR("You must specify clen_for_centering if you " - "specify the rail direction (panel %s)\n", - p->name); - reject = 1; - } - for ( j=0; j<MAX_MASKS; j++ ) { if ( (p->masks[j].filename != NULL) && (p->masks[j].data_location == NULL) ) @@ -1355,14 +1333,6 @@ DataTemplate *data_template_new_from_string(const char *string_in) } } - /* The default rail direction */ - if ( isnan(p->rail_x) ) { - p->rail_x = 0.0; - p->rail_y = 0.0; - p->rail_z = 1.0; - } - if ( isnan(p->clen_for_centering) ) p->clen_for_centering = 0.0; - } for ( i=0; i<dt->n_bad; i++ ) { diff --git a/libcrystfel/src/datatemplate_priv.h b/libcrystfel/src/datatemplate_priv.h index 94b3f8a9..053e9d13 100644 --- a/libcrystfel/src/datatemplate_priv.h +++ b/libcrystfel/src/datatemplate_priv.h @@ -165,16 +165,6 @@ struct panel_template double ssz; /*@}*/ - /** \name Rail direction */ - /*@{*/ - double rail_x; - double rail_y; - double rail_z; - /*@}*/ - - /* Value of clen (without coffset) at which beam is centered */ - double clen_for_centering; - /** \name Position of the panel in the data block in the file. */ /*@{*/ int orig_min_fs; |