diff options
| author | Thomas White <taw@physics.org> | 2020-06-11 17:15:39 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-07-29 18:53:44 +0200 |
| commit | 7617a4adccf8f6cb3845c1ac018abae949dafef1 (patch) | |
| tree | deaaad55ba44eead36763c32ff3d5705a90c4354 /libcrystfel/src/datatemplate.c | |
| parent | 46ac0a2dc406df8ceecad409ab30251d6e7c0680 (diff) | |
Set up adu_per_photon correctly
Diffstat (limited to 'libcrystfel/src/datatemplate.c')
| -rw-r--r-- | libcrystfel/src/datatemplate.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libcrystfel/src/datatemplate.c b/libcrystfel/src/datatemplate.c index cfba15ea..b9a30e0e 100644 --- a/libcrystfel/src/datatemplate.c +++ b/libcrystfel/src/datatemplate.c @@ -476,9 +476,11 @@ static int parse_field_for_panel(struct panel_template *panel, const char *key, } else if ( strcmp(key, "clen_for_centering") == 0 ) { panel->clen_for_centering = atof(val); } else if ( strcmp(key, "adu_per_eV") == 0 ) { - panel->adu_per_eV = atof(val); + panel->adu_scale = atof(val); + panel->adu_scale_unit = ADU_PER_EV; } else if ( strcmp(key, "adu_per_photon") == 0 ) { - panel->adu_per_photon = atof(val); + panel->adu_scale = atof(val); + panel->adu_scale_unit = ADU_PER_PHOTON; } else if ( strcmp(key, "rigid_group") == 0 ) { add_to_rigid_group(find_or_add_rg(det, val), panel); } else if ( strcmp(key, "clen") == 0 ) { @@ -1075,7 +1077,7 @@ DataTemplate *data_template_new_from_string(const char *string_in) p->name); reject = 1; } - if ( isnan(p->adu_per_eV) && isnan(p->adu_per_photon) ) { + if ( isnan(p->adu_scale) ) { ERROR("Please specify either adu_per_eV or " "adu_per_photon for panel %s\n", dt->panels[i].name); |