summaryrefslogtreecommitdiff
path: root/spectro/i1pro.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-05-01 16:24:15 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-05-01 16:24:15 +0200
commita30ba67504ffd12c4db499adbb5ce47a7d1f6036 (patch)
tree9ae1a7e3849dda6bbb5c578232f6f2fa5b2e7e7e /spectro/i1pro.c
parent89e99e8a827859729729dfc92d74be4a8f96f1a4 (diff)
parent094535c010320967639e8e86f974d878e80baa72 (diff)
New release 1.7.0
Diffstat (limited to 'spectro/i1pro.c')
-rw-r--r--spectro/i1pro.c44
1 files changed, 32 insertions, 12 deletions
diff --git a/spectro/i1pro.c b/spectro/i1pro.c
index 2cac518..cc2d7f2 100644
--- a/spectro/i1pro.c
+++ b/spectro/i1pro.c
@@ -35,6 +35,9 @@
/*
TTBD
+ There may be a bug in HiRes emissive calibration - if you do an initial
+ cal. in normal, then switch to HiRes, no white plate cal is performed.
+ Is it using a previous cal result for this ?
Should add extra filter compensation support.
@@ -273,9 +276,13 @@ double *ref_rate) {
if (!p->inited)
return inst_no_init;
+ if (ref_rate != NULL)
+ *ref_rate = 0.0;
+
rv = i1pro_imp_meas_refrate(p, ref_rate);
+
return i1pro_interp_code(p, rv);
}
@@ -283,7 +290,8 @@ double *ref_rate) {
static inst_code
i1pro_meas_delay(
inst *pp,
-int *msecdelay) {
+int *pdispmsec, /* Return display update delay in msec */
+int *pinstmsec) { /* Return instrument reaction time in msec */
i1pro *p = (i1pro *)pp;
i1pro_code rv;
@@ -292,11 +300,20 @@ int *msecdelay) {
if (!p->inited)
return inst_no_init;
- rv = i1pro_imp_meas_delay(p, msecdelay);
+ rv = i1pro_imp_meas_delay(p, pdispmsec, pinstmsec);
return i1pro_interp_code(p, rv);
}
+/* Timestamp the white patch change during meas_delay() */
+static inst_code i1pro_white_change(
+inst *pp,
+int init) {
+ i1pro *p = (i1pro *)pp;
+
+ return i1pro_imp_white_change(p, init);
+}
+
/* Return needed and available inst_cal_type's */
static inst_code i1pro_get_n_a_cals(inst *pp, inst_cal_type *pn_cals, inst_cal_type *pa_cals) {
i1pro *p = (i1pro *)pp;
@@ -307,7 +324,7 @@ static inst_code i1pro_get_n_a_cals(inst *pp, inst_cal_type *pn_cals, inst_cal_t
}
/* Request an instrument calibration. */
-inst_code i1pro_calibrate(
+static inst_code i1pro_calibrate(
inst *pp,
inst_cal_type *calt, /* Calibration type to do/remaining */
inst_cal_cond *calc, /* Current condition/desired condition */
@@ -514,9 +531,11 @@ i1pro_interp_code(i1pro *p, i1pro_code ec) {
switch (ec) {
case I1PRO_OK:
-
return inst_ok;
+ case I1PRO_INTERNAL_ERROR:
+ return inst_internal_error | ec;
+
case I1PRO_COMS_FAIL:
return inst_coms_fail | ec;
@@ -601,7 +620,7 @@ i1pro_interp_code(i1pro *p, i1pro_code ec) {
}
/* Return the instrument capabilities */
-void i1pro_capabilities(inst *pp,
+static void i1pro_capabilities(inst *pp,
inst_mode *pcap1,
inst2_capability *pcap2,
inst3_capability *pcap3) {
@@ -655,7 +674,7 @@ static i1p_mode i1pro_convert_mode(i1pro *p, inst_mode m) {
}
/* Check device measurement mode */
-inst_code i1pro_check_mode(inst *pp, inst_mode m) {
+static inst_code i1pro_check_mode(inst *pp, inst_mode m) {
i1pro *p = (i1pro *)pp;
i1p_mode mmode = 0; /* Instrument measurement mode */
@@ -671,7 +690,7 @@ inst_code i1pro_check_mode(inst *pp, inst_mode m) {
}
/* Set device measurement mode */
-inst_code i1pro_set_mode(inst *pp, inst_mode m) {
+static inst_code i1pro_set_mode(inst *pp, inst_mode m) {
i1pro *p = (i1pro *)pp;
i1p_mode mmode; /* Instrument measurement mode */
inst_code rv;
@@ -703,7 +722,11 @@ i1pro_get_set_opt(inst *pp, inst_opt_type m, ...)
{
i1pro *p = (i1pro *)pp;
- if (m == inst_opt_noinitcalib) {
+ if (m == inst_opt_initcalib) { /* default */
+ i1pro_set_noinitcalib(p, 0, 0);
+ return inst_ok;
+
+ } if (m == inst_opt_noinitcalib) {
va_list args;
int losecs = 0;
@@ -714,10 +737,6 @@ i1pro_get_set_opt(inst *pp, inst_opt_type m, ...)
i1pro_set_noinitcalib(p, 1, losecs);
return inst_ok;
- } else if (m == inst_opt_initcalib) {
- i1pro_set_noinitcalib(p, 0, 0);
- return inst_ok;
-
/* Record the trigger mode */
} else if (m == inst_opt_trig_prog
|| m == inst_opt_trig_user
@@ -815,6 +834,7 @@ extern i1pro *new_i1pro(icoms *icom, instType itype) {
p->get_n_a_cals = i1pro_get_n_a_cals;
p->calibrate = i1pro_calibrate;
p->meas_delay = i1pro_meas_delay;
+ p->white_change = i1pro_white_change;
p->interp_error = i1pro_interp_error;
p->del = i1pro_del;