diff options
| author | Thomas White <taw@physics.org> | 2012-03-09 15:58:15 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-03-09 15:58:15 +0100 |
| commit | e38375cb0af448c3a7f3667594cf06d1117132c7 (patch) | |
| tree | f23e49509f032a84d3f774846106755beea64160 /libcrystfel/src/beam-parameters.c | |
| parent | be33bf078a8ed1ec4c5439095285add97b823fd1 (diff) | |
Use ADU per eV in geometry file, rather than ADU per photon in beam file
Conflicts:
src/get_hkl.c
tests/morphology_check.c
Diffstat (limited to 'libcrystfel/src/beam-parameters.c')
| -rw-r--r-- | libcrystfel/src/beam-parameters.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/libcrystfel/src/beam-parameters.c b/libcrystfel/src/beam-parameters.c index 082e9651..654d7550 100644 --- a/libcrystfel/src/beam-parameters.c +++ b/libcrystfel/src/beam-parameters.c @@ -51,8 +51,6 @@ struct beam_params *get_beam_parameters(const char *filename) b->photon_energy = -1.0; b->bandwidth = -1.0; b->divergence = -1.0; - b->dqe = -1.0; - b->adu_per_photon = -1.0; do { @@ -88,10 +86,6 @@ struct beam_params *get_beam_parameters(const char *filename) b->bandwidth = atof(bits[2]); } else if ( strcmp(bits[0], "beam/divergence") == 0 ) { b->divergence = atof(bits[2]); - } else if ( strcmp(bits[0], "detector/dqe") == 0 ) { - b->dqe = atof(bits[2]); - } else if ( strcmp(bits[0], "detector/adu_per_photon") == 0 ) { - b->adu_per_photon = atof(bits[2]); } else { ERROR("Unrecognised field '%s'\n", bits[0]); } @@ -125,15 +119,6 @@ struct beam_params *get_beam_parameters(const char *filename) ERROR("Invalid or unspecified value for 'beam/divergence'.\n"); reject = 1; } - if ( b->dqe < 0.0 ) { - ERROR("Invalid or unspecified value for 'detector/dqe'.\n"); - reject = 1; - } - if ( b->adu_per_photon < 0.0 ) { - ERROR("Invalid or unspecified value for" - " 'detector/adu_per_photon'.\n"); - reject = 1; - } if ( reject ) { ERROR("Please fix the above problems with the beam" |