diff options
| author | Thomas White <taw@physics.org> | 2012-03-09 19:05:50 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-03-09 19:05:50 +0100 |
| commit | 051654a3f4b931fe2c105c2996d4ddf1c9ed7924 (patch) | |
| tree | f438fca4aba2dc70f8ba7c58035788bd1db72e58 | |
| parent | 29d658bb5d5fdc40791d659c857e977c5d3f2441 (diff) | |
Remove integr_radius field from detector description
| -rw-r--r-- | libcrystfel/src/detector.c | 5 | ||||
| -rw-r--r-- | libcrystfel/src/detector.h | 1 | ||||
| -rw-r--r-- | tests/integration_check.c | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/libcrystfel/src/detector.c b/libcrystfel/src/detector.c index 491f7e8a..685767c0 100644 --- a/libcrystfel/src/detector.c +++ b/libcrystfel/src/detector.c @@ -603,8 +603,6 @@ static int parse_field_for_panel(struct panel *panel, const char *key, panel->res = atof(val); } else if ( strcmp(key, "peak_sep") == 0 ) { panel->peak_sep = atof(val); - } else if ( strcmp(key, "integr_radius") == 0 ) { - panel->integr_radius = atof(val); } else if ( strcmp(key, "badrow_direction") == 0 ) { panel->badrow = val[0]; /* First character only */ if ( (panel->badrow != 'x') && (panel->badrow != 'y') @@ -684,8 +682,6 @@ static void parse_toplevel(struct detector *det, const char *key, } else if ( strcmp(key, "peak_sep") == 0 ) { det->defaults.peak_sep = atof(val); - } else if ( strcmp(key, "integr_radius") == 0 ) { - det->defaults.integr_radius = atof(val); } else if ( strcmp(key, "coffset") == 0 ) { det->defaults.coffset = atof(val); } else if ( parse_field_for_panel(&det->defaults, key, val, det) ) { @@ -736,7 +732,6 @@ struct detector *get_detector_geometry(const char *filename) det->defaults.badrow = '-'; det->defaults.no_index = 0; det->defaults.peak_sep = 50.0; - det->defaults.integr_radius = 3.0; det->defaults.fsx = 1.0; det->defaults.fsy = 0.0; det->defaults.ssx = 0.0; diff --git a/libcrystfel/src/detector.h b/libcrystfel/src/detector.h index 7214ac29..799719f8 100644 --- a/libcrystfel/src/detector.h +++ b/libcrystfel/src/detector.h @@ -61,7 +61,6 @@ struct panel char badrow; /* 'x' or 'y' */ int no_index; /* Don't index peaks in this panel if non-zero */ double peak_sep; /* Characteristic peak separation */ - double integr_radius; /* Peak integration radius */ char *rigid_group; /* Rigid group, or -1 for none */ double adu_per_eV; /* Number of ADU per eV */ diff --git a/tests/integration_check.c b/tests/integration_check.c index 0eacd6ba..7e812ad5 100644 --- a/tests/integration_check.c +++ b/tests/integration_check.c @@ -196,7 +196,6 @@ int main(int argc, char *argv[]) image.det->panels[0].cny = -64.0; image.det->panels[0].clen = 1.0; image.det->panels[0].res = 1.0; - image.det->panels[0].integr_radius = 10.0; image.det->panels[0].adu_per_eV = 1.0/1000.0; /* -> 1 adu per photon */ image.width = 128; |