summaryrefslogtreecommitdiff
path: root/spectro/dtp92.c
diff options
context:
space:
mode:
Diffstat (limited to 'spectro/dtp92.c')
-rwxr-xr-x[-rw-r--r--]spectro/dtp92.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/spectro/dtp92.c b/spectro/dtp92.c
index 9524326..1ed9bc1 100644..100755
--- a/spectro/dtp92.c
+++ b/spectro/dtp92.c
@@ -819,7 +819,7 @@ char id[CALIDLEN] /* Condition identifier (ie. white reference ID) */
if (*calt & inst_calt_emis_offset) { /* Dark offset calibration */
- if (*calc != inst_calc_man_em_dark) {
+ if ((*calc & inst_calc_cond_mask) != inst_calc_man_em_dark) {
*calc = inst_calc_man_em_dark;
return inst_cal_setup;
}
@@ -833,9 +833,9 @@ char id[CALIDLEN] /* Condition identifier (ie. white reference ID) */
if (*calt & inst_calt_emis_ratio) { /* Cell ratio calibration */
- if (*calc != inst_calc_emis_grey
- && *calc != inst_calc_emis_grey_darker
- && *calc != inst_calc_emis_grey_ligher) {
+ if ((*calc & inst_calc_cond_mask) != inst_calc_emis_grey
+ && (*calc & inst_calc_cond_mask) != inst_calc_emis_grey_darker
+ && (*calc & inst_calc_cond_mask) != inst_calc_emis_grey_ligher) {
*calc = inst_calc_emis_grey;
return inst_cal_setup;
}
@@ -1405,7 +1405,7 @@ extern dtp92 *new_dtp92(icoms *icom, instType itype) {
p->del = dtp92_del;
p->icom = icom;
- p->itype = icom->itype;
+ p->itype = itype;
icmSetUnity3x3(p->ccmat); /* Set the colorimeter correction matrix to do nothing */
set_base_disptype_list(p);