From c0b89ac5bfb90835ef01573267020e42d4fe070c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 23 Aug 2015 12:17:05 +0200 Subject: Imported Upstream version 1.8.0 --- spectro/dtp41.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) mode change 100644 => 100755 spectro/dtp41.c (limited to 'spectro/dtp41.c') diff --git a/spectro/dtp41.c b/spectro/dtp41.c old mode 100644 new mode 100755 index a2f7e83..5c3361c --- a/spectro/dtp41.c +++ b/spectro/dtp41.c @@ -923,8 +923,9 @@ char id[CALIDLEN] /* Condition identifier (ie. white reference ID) */ if ((p->mode & inst_mode_illum_mask) == inst_mode_transmission) { if (*calt & inst_calt_trans_white) { - if (*calc != inst_calc_uop_trans_white) - *calc = inst_calc_uop_trans_white; /* Ask user to do calibration */ + if ((*calc & inst_calc_cond_mask) != inst_calc_uop_trans_white) + /* Ask user to do calibration */ + *calc = inst_calc_uop_trans_white; return inst_cal_setup; } @@ -934,8 +935,9 @@ char id[CALIDLEN] /* Condition identifier (ie. white reference ID) */ } else { if (*calt & inst_calt_ref_white) { - if (*calc != inst_calc_uop_ref_white) { - *calc = inst_calc_uop_ref_white; /* Ask user to do calibration */ + if ((*calc & inst_calc_cond_mask) != inst_calc_uop_ref_white) { + /* Ask user to do calibration */ + *calc = inst_calc_uop_ref_white; return inst_cal_setup; } @@ -1283,7 +1285,7 @@ extern dtp41 *new_dtp41(icoms *icom, instType itype) { p->del = dtp41_del; p->icom = icom; - p->itype = icom->itype; + p->itype = itype; p->cap = inst_mode_none; /* Unknown until set */ p->mode = inst_mode_none; /* Not in a known mode yet */ p->nstaticr = 5; /* Number of static readings */ -- cgit v1.2.3