summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.pc/.quilt_patches1
-rw-r--r--.pc/.quilt_series1
-rw-r--r--.pc/.version1
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/0001_jam.patch6
-rw-r--r--debian/patches/0100_spelling.patch116
-rw-r--r--debian/patches/0105_dispwin_segfault.patch2
-rwxr-xr-xspectro/linear.cal272
-rwxr-xr-xspectro/strange.cal272
9 files changed, 50 insertions, 626 deletions
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/debian/changelog b/debian/changelog
index bb38595..43cb0b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-argyll (2.0.0+repack-2) UNRELEASED; urgency=medium
+argyll (2.0.1+repack-1) UNRELEASED; urgency=medium
* debian/copyright: Add copyright for numlib/quadprog.*.
+ *
- -- Jörg Frings-Fürst <debian@jff.email> Sun, 03 Dec 2017 20:41:38 +0100
+ -- Jörg Frings-Fürst <debian@jff.email> Wed, 11 Jul 2018 22:21:14 +0200
argyll (2.0.0+repack-1) unstable; urgency=medium
diff --git a/debian/patches/0001_jam.patch b/debian/patches/0001_jam.patch
index b0469f3..976f485 100644
--- a/debian/patches/0001_jam.patch
+++ b/debian/patches/0001_jam.patch
@@ -8,7 +8,7 @@ Index: trunk/Jambase
===================================================================
--- trunk.orig/Jambase
+++ trunk/Jambase
-@@ -941,7 +941,7 @@ else if $(UNIX)
+@@ -945,7 +945,7 @@ else if $(UNIX)
# UNIX defaults
@@ -17,7 +17,7 @@ Index: trunk/Jambase
CCOPTFLAG ?= -O2 ;
CCDEBUGFLAG ?= -g ;
CCPROFFLAG ?= ;
-@@ -951,7 +951,7 @@ else if $(UNIX)
+@@ -955,7 +955,7 @@ else if $(UNIX)
CHGRP ?= chgrp ;
CHOWN ?= chown ;
LEX ?= lex ;
@@ -26,7 +26,7 @@ Index: trunk/Jambase
LINKOPTFLAG ?= -O ; # Affects creating .so's
LINKSTRIPFLAG ?= -s ;
LINKDEBUGFLAG ?= ;
-@@ -1037,7 +1037,7 @@ else if $(UNIX)
+@@ -1041,7 +1041,7 @@ else if $(UNIX)
RMDIR ?= $(RM) ;
RSH ?= rsh ;
SED ?= sed ;
diff --git a/debian/patches/0100_spelling.patch b/debian/patches/0100_spelling.patch
index 9797224..1b7d8cb 100644
--- a/debian/patches/0100_spelling.patch
+++ b/debian/patches/0100_spelling.patch
@@ -41,7 +41,7 @@ Index: trunk/spectro/dispcal.c
comport = atoi(na);
if (comport < 1 || comport > 50) usage(0,"-c parameter %d out of range",comport);
-@@ -3111,7 +3111,7 @@ int main(int argc, char *argv[]) {
+@@ -3114,7 +3114,7 @@ int main(int argc, char *argv[]) {
/* Black level adjustment */
/* Due to the possibility of the channel offsets not being even, */
/* we use the largest of the XYZ values after they have been */
@@ -54,7 +54,7 @@ Index: trunk/spectro/spotread.c
===================================================================
--- trunk.orig/spectro/spotread.c
+++ trunk/spectro/spotread.c
-@@ -509,7 +509,7 @@ int main(int argc, char *argv[]) {
+@@ -517,7 +517,7 @@ int main(int argc, char *argv[]) {
/* COM port */
} else if (argv[fa][1] == 'c') {
fa = nfa;
@@ -63,16 +63,7 @@ Index: trunk/spectro/spotread.c
{
comport = atoi(na);
if (comport < 1 || comport > 40) usage("-c parameter %d out of range",comport);
-@@ -518,7 +518,7 @@ int main(int argc, char *argv[]) {
- /* Display type */
- } else if (argv[fa][1] == 'y') {
- fa = nfa;
-- if (na == NULL) usage("Paramater expected following -y");
-+ if (na == NULL) usage("Parameter expected following -y");
- dtype = na[0];
-
- #ifndef SALONEINSTLIB
-@@ -526,7 +526,7 @@ int main(int argc, char *argv[]) {
+@@ -536,7 +536,7 @@ int main(int argc, char *argv[]) {
} else if (argv[fa][1] == 'I') {
fa = nfa;
@@ -81,7 +72,7 @@ Index: trunk/spectro/spotread.c
if (strcmp(na, "A") == 0
|| strcmp(na, "M0") == 0) {
tillum_set = spec = 1;
-@@ -574,7 +574,7 @@ int main(int argc, char *argv[]) {
+@@ -584,7 +584,7 @@ int main(int argc, char *argv[]) {
/* Spectral Illuminant type for XYZ computation */
} else if (argv[fa][1] == 'i') {
fa = nfa;
@@ -90,7 +81,7 @@ Index: trunk/spectro/spotread.c
if (strcmp(na, "A") == 0) {
illum_set = spec = 1;
illum = icxIT_A;
-@@ -623,7 +623,7 @@ int main(int argc, char *argv[]) {
+@@ -639,7 +639,7 @@ int main(int argc, char *argv[]) {
/* Spectral Observer type */
} else if (argv[fa][1] == 'Q') {
fa = nfa;
@@ -99,7 +90,7 @@ Index: trunk/spectro/spotread.c
if (strcmp(na, "1931_2") == 0) { /* Classic 2 degree */
obType = icxOT_CIE_1931_2;
} else if (strcmp(na, "1964_10") == 0) { /* Classic 10 degree */
-@@ -712,7 +712,7 @@ int main(int argc, char *argv[]) {
+@@ -728,7 +728,7 @@ int main(int argc, char *argv[]) {
/* Filter configuration */
} else if (argv[fa][1] == 'F') {
fa = nfa;
@@ -108,7 +99,7 @@ Index: trunk/spectro/spotread.c
if (na[0] == 'n' || na[0] == 'N')
fe = inst_opt_filter_none;
else if (na[0] == 'p' || na[0] == 'P')
-@@ -727,13 +727,13 @@ int main(int argc, char *argv[]) {
+@@ -743,13 +743,13 @@ int main(int argc, char *argv[]) {
/* Extra filter compensation file */
} else if (argv[fa][1] == 'E') {
fa = nfa;
@@ -124,7 +115,7 @@ Index: trunk/spectro/spotread.c
if (na[0] == 'N')
calstd = xcalstd_none;
else if (na[0] == 'A')
-@@ -743,7 +743,7 @@ int main(int argc, char *argv[]) {
+@@ -759,7 +759,7 @@ int main(int argc, char *argv[]) {
else if (na[0] == 'G')
calstd = xcalstd_gmdi;
else
@@ -133,7 +124,7 @@ Index: trunk/spectro/spotread.c
/* Show Yxy */
} else if (argv[fa][1] == 'x') {
-@@ -1479,7 +1479,7 @@ int main(int argc, char *argv[]) {
+@@ -1513,7 +1513,7 @@ int main(int argc, char *argv[]) {
/* Or something is wrong with instrument capabilities */
} else {
@@ -159,7 +150,7 @@ Index: trunk/spectro/dispwin.c
===================================================================
--- trunk.orig/spectro/dispwin.c
+++ trunk/spectro/dispwin.c
-@@ -5234,7 +5234,7 @@ int ddebug /* >0 to print debug sta
+@@ -5238,7 +5238,7 @@ int ddebug /* >0 to print debug sta
vinfo = XGetVisualInfo(p->mydisplay, VisualIDMask, &template, &nitems);
if (nitems < 1) {
@@ -242,7 +233,7 @@ Index: trunk/spectro/i1pro_imp.c
===================================================================
--- trunk.orig/spectro/i1pro_imp.c
+++ trunk/spectro/i1pro_imp.c
-@@ -2701,7 +2701,7 @@ int *pinstmsec) { /* Return instrument l
+@@ -2780,7 +2780,7 @@ int *pinstmsec) { /* Return instrument l
break;
}
@@ -251,7 +242,7 @@ Index: trunk/spectro/i1pro_imp.c
/* Compute overall delay */
dispmsec = (int)(samp[i].sec * 1000.0 + 0.5); /* Display update time */
-@@ -3154,7 +3154,7 @@ i1pro_code i1pro_imp_measure(
+@@ -3233,7 +3233,7 @@ i1pro_code i1pro_imp_measure(
}
}
@@ -260,7 +251,7 @@ Index: trunk/spectro/i1pro_imp.c
if (user_trig)
return I1PRO_USER_TRIG;
return ev;
-@@ -3816,7 +3816,7 @@ i1pro_code i1pro_imp_meas_refrate(
+@@ -3895,7 +3895,7 @@ i1pro_code i1pro_imp_meas_refrate(
}
}
} else {
@@ -269,7 +260,7 @@ Index: trunk/spectro/i1pro_imp.c
}
return I1PRO_RD_NOREFR_FOUND;
-@@ -3911,7 +3911,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
+@@ -3990,7 +3990,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
return I1PRO_OK;
}
@@ -278,7 +269,7 @@ Index: trunk/spectro/i1pro_imp.c
s->dark_valid = 1;
s->ddate = m->caldate;
-@@ -3956,7 +3956,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
+@@ -4035,7 +4035,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
return I1PRO_OK;
}
@@ -287,7 +278,7 @@ Index: trunk/spectro/i1pro_imp.c
s->cal_valid = 1;
s->cfdate = m->caldate;
-@@ -4312,7 +4312,7 @@ i1pro_code i1pro_save_calibration(i1pro
+@@ -4391,7 +4391,7 @@ i1pro_code i1pro_save_calibration(i1pro
write_doubles(&x, fp, s->idark_data[3]-1, m->nraw+1);
}
@@ -313,7 +304,7 @@ Index: trunk/spectro/ss.c
===================================================================
--- trunk.orig/spectro/ss.c
+++ trunk/spectro/ss.c
-@@ -375,7 +375,7 @@ ss_init_coms(inst *pp, baud_rate br, flo
+@@ -376,7 +376,7 @@ ss_init_coms(inst *pp, baud_rate br, flo
p->gotcoms = 1;
@@ -322,7 +313,7 @@ Index: trunk/spectro/ss.c
return inst_ok;
}
-@@ -1744,7 +1744,7 @@ ss_interp_error(inst *pp, int ec) {
+@@ -1745,7 +1745,7 @@ ss_interp_error(inst *pp, int ec) {
case ss_et_FilterOutOfPos:
return "Filter wheel out of position";
case ss_et_SendTimeout:
@@ -331,7 +322,7 @@ Index: trunk/spectro/ss.c
case ss_et_DriveError:
return "Data drive defect";
case ss_et_MeasDisabled:
-@@ -1864,7 +1864,7 @@ ss_interp_error(inst *pp, int ec) {
+@@ -1865,7 +1865,7 @@ ss_interp_error(inst *pp, int ec) {
case ss_et_BadHexEncoding:
return "Message received from instrument has bad Hex encoding";
case ss_et_RecBufferOverun:
@@ -370,7 +361,7 @@ Index: trunk/xicc/cv.c
===================================================================
--- trunk.orig/xicc/cv.c
+++ trunk/xicc/cv.c
-@@ -101,7 +101,7 @@ main(int argc, char *argv[]) {
+@@ -102,7 +102,7 @@ main(int argc, char *argv[]) {
printf("There are %d parameters:\n",np); fflush(stdout);
for (i = 0; i < np; i++) {
@@ -667,34 +658,7 @@ Index: trunk/link/collink.c
===================================================================
--- trunk.orig/link/collink.c
+++ trunk/link/collink.c
-@@ -1122,7 +1122,7 @@ void devip_devop(void *cntx, double *out
- }
- /* We've got the input profile PCS' at this point. */
-
-- /* If we're transfering the K value from the input profile to the */
-+ /* If we're transferring the K value from the input profile to the */
- /* output, copy it into locus[], which will be given to the inverse */
- /* lookup function, else the inverse lookup will generate a K using */
- /* the curve parameters. */
-@@ -1204,7 +1204,7 @@ void devip_devop(void *cntx, double *out
- if (p->verb)
- #endif
- {
-- printf("White point hack mapped %f %f %f to %f %f %f, hit withing %f\n",
-+ printf("White point hack mapped %f %f %f to %f %f %f, hit within %f\n",
- p->in.wp[0],p->in.wp[1],p->in.wp[2],pcsv[0], pcsv[1], pcsv[2],dd);
- fflush(stdout);
- }
-@@ -1254,7 +1254,7 @@ void devip_devop(void *cntx, double *out
- if (p->nhack == 2) {
- /* Ideally we would create a 4D PCSK -> PCSK gamut mapping */
- /* to smoothly and accurately cope with the changing source */
-- /* and destination gamuts acording to their degree of "K onlyness". */
-+ /* and destination gamuts according to their degree of "K onlyness". */
- /* In practice we're going to simply interpolated between */
- /* two extremes: unrestricted gamut and K only black gamut. */
- double map0[3], map1[3];
-@@ -4807,7 +4807,7 @@ main(int argc, char *argv[]) {
+@@ -4899,7 +4899,7 @@ main(int argc, char *argv[]) {
}
if (li.verb)
@@ -720,7 +684,7 @@ Index: trunk/spectro/dispsup.c
===================================================================
--- trunk.orig/spectro/dispsup.c
+++ trunk/spectro/dispsup.c
-@@ -721,7 +721,7 @@ static int disprd_read_imp(
+@@ -722,7 +722,7 @@ static int disprd_read_imp(
scb->serno = p->serno++;
scb->msec = msec_time();
@@ -729,7 +693,7 @@ Index: trunk/spectro/dispsup.c
val.XYZ[0], val.XYZ[1], val.XYZ[2]);
scb->mtype = val.mtype;
-@@ -1241,7 +1241,7 @@ int disprd_ambient(
+@@ -1242,7 +1242,7 @@ int disprd_ambient(
/* Or something is wrong with instrument capabilities */
} else {
@@ -738,7 +702,7 @@ Index: trunk/spectro/dispsup.c
return 2;
}
-@@ -2344,7 +2344,7 @@ static int config_inst_displ(disprd *p)
+@@ -2346,7 +2346,7 @@ static int config_inst_displ(disprd *p)
/* Reset key meanings */
inst_reset_uih();
@@ -751,7 +715,7 @@ Index: trunk/gamut/gammap.c
===================================================================
--- trunk.orig/gamut/gammap.c
+++ trunk/gamut/gammap.c
-@@ -859,7 +859,7 @@ gammap *new_gammap(
+@@ -861,7 +861,7 @@ gammap *new_gammap(
#endif
if (gmi->bph == gmm_clipBP) {
@@ -764,7 +728,7 @@ Index: trunk/profile/profout.c
===================================================================
--- trunk.orig/profile/profout.c
+++ trunk/profile/profout.c
-@@ -1104,7 +1104,7 @@ make_output_icc(
+@@ -1105,7 +1105,7 @@ make_output_icc(
if (iccver < icmVersion2_4) {
iccver = icmVersion2_4; /* Need 2.4.0 for Display intents */
if (verb)
@@ -790,7 +754,7 @@ Index: trunk/xicc/xspect.c
===================================================================
--- trunk.orig/xicc/xspect.c
+++ trunk/xicc/xspect.c
-@@ -4454,7 +4454,7 @@ void xspect_plot10p(xspect *sp[10], int
+@@ -4509,7 +4509,7 @@ void xspect_plotNp(xspect *sp[MXGPHS], i
/* Given an emission spectrum, set the UV output to the given level. */
/* The shape of the UV is taken from FWA1_stim, and the level is */
/* with respect to the Y of the input spectrum. */
@@ -812,7 +776,7 @@ Index: trunk/spectro/ccxxmake.c
comno = atoi(na);
if (comno < 1 || comno > 40) usage(0,"-c parameter %d out of range",comno);
-@@ -508,7 +508,7 @@ int main(int argc, char *argv[]) {
+@@ -510,7 +510,7 @@ int main(int argc, char *argv[]) {
/* Serial port flow control */
} else if (argv[fa][1] == 'W') {
fa = nfa;
@@ -821,7 +785,7 @@ Index: trunk/spectro/ccxxmake.c
if (na[0] == 'n' || na[0] == 'N')
fc = fc_None;
else if (na[0] == 'h' || na[0] == 'H')
-@@ -597,7 +597,7 @@ int main(int argc, char *argv[]) {
+@@ -599,7 +599,7 @@ int main(int argc, char *argv[]) {
strcat(outname, doccss ? ".ccss" : ".ccmx");
if (fakeseq && doccss)
@@ -830,7 +794,7 @@ Index: trunk/spectro/ccxxmake.c
printf("\n");
-@@ -813,7 +813,7 @@ int main(int argc, char *argv[]) {
+@@ -815,7 +815,7 @@ int main(int argc, char *argv[]) {
refs[i][2] = cols[i][2];
}
gotref = 1;
@@ -1298,7 +1262,7 @@ Index: trunk/xicc/mpp.c
===================================================================
--- trunk.orig/xicc/mpp.c
+++ trunk/xicc/mpp.c
-@@ -733,7 +733,7 @@ int use_fwa /* NZ to involke
+@@ -735,7 +735,7 @@ int use_fwa /* NZ to involke
error ("mpp->set_ilob, instrument doesn't have an FWA illuminent");
if (p->spc->set_fwa(p->spc, &inst, NULL, &white))
@@ -1324,7 +1288,7 @@ Index: trunk/target/ofps.c
===================================================================
--- trunk.orig/target/ofps.c
+++ trunk/target/ofps.c
-@@ -2612,7 +2612,7 @@ static int position_vtx(
+@@ -2613,7 +2613,7 @@ static int position_vtx(
if (tries > s->maxretries)
s->maxretries = tries;
#ifdef DEBUG
@@ -1333,7 +1297,7 @@ Index: trunk/target/ofps.c
printf(" oog = %f, eperr = %f, ceperr = %f\n",vv->oog,vv->eperr,vv->ceperr);
#endif
//if (tries > 10)
-@@ -2627,7 +2627,7 @@ static int position_vtx(
+@@ -2628,7 +2628,7 @@ static int position_vtx(
#ifdef DUMP_FERR /* Create .tiff of dnsq function error */
if (tries >= DUMP_FERR) {
@@ -1342,7 +1306,7 @@ Index: trunk/target/ofps.c
/* Re-run the last unsucessful dnsq, to trace the path */
pcx.debug = 1;
-@@ -6221,7 +6221,7 @@ static int ofps_findhit_vtxs(ofps *s, no
+@@ -6222,7 +6222,7 @@ static int ofps_findhit_vtxs(ofps *s, no
int hit = 0;
if (nn->ix < 0)
@@ -1351,7 +1315,7 @@ Index: trunk/target/ofps.c
#ifdef DEBUG
if (s->agrid_init == 0)
-@@ -8023,7 +8023,7 @@ ofps *s
+@@ -8024,7 +8024,7 @@ ofps *s
warning("Verify of incremental vertexes failed!");
printf("Verify of incremental vertexes failed!\n");
} else {
@@ -1360,7 +1324,7 @@ Index: trunk/target/ofps.c
}
#ifdef DUMP_STRUCTURE
dump_node_vtxs(s, 1);
-@@ -8443,7 +8443,7 @@ int nopstop /* Debug - number of opti
+@@ -8444,7 +8444,7 @@ int nopstop /* Debug - number of opti
fprintf(stderr,"Average dnsqs/position = %.2f\n",s->dnsqs/(double)s->positions);
fprintf(stderr,"Average function calls/dnsq = %.1f\n",s->funccount/(double)s->dnsqs);
fprintf(stderr,"Maximum function calls/dnsq = %d\n",s->maxfunc);
@@ -1457,7 +1421,7 @@ Index: trunk/spectro/kleink10.c
===================================================================
--- trunk.orig/spectro/kleink10.c
+++ trunk/spectro/kleink10.c
-@@ -729,7 +729,7 @@ int ix /* Klein calibration index 1
+@@ -730,7 +730,7 @@ int ix /* Klein calibration index 1
if (buf[0] != 'D' || buf[1] != '1') {
amutex_unlock(p->lock);
@@ -1466,7 +1430,7 @@ Index: trunk/spectro/kleink10.c
return inst_protocol_error;
}
-@@ -2068,7 +2068,7 @@ int *pinstmsec) { /* Return instrument r
+@@ -2077,7 +2077,7 @@ int *pinstmsec) { /* Return instrument r
break;
}
@@ -1570,7 +1534,7 @@ Index: trunk/spectro/specbos.c
/* See if it's a 1501 or 1511 */
if (p->model == 1501) {
-@@ -1669,7 +1669,7 @@ char id[CALIDLEN] /* Condition identifi
+@@ -1693,7 +1693,7 @@ char id[CALIDLEN] /* Condition identifi
if ((ev = specbos_get_n_a_cals((inst *)p, &needed, &available)) != inst_ok)
return ev;
@@ -1583,7 +1547,7 @@ Index: trunk/plot/plot.c
===================================================================
--- trunk.orig/plot/plot.c
+++ trunk/plot/plot.c
-@@ -2459,7 +2459,7 @@ static void dprintf(char *fmt, ...) {
+@@ -2521,7 +2521,7 @@ static void dprintf(char *fmt, ...) {
printf("~1 found NtQueryInformationProcess\n"); fflush(stdout);
if(NtQueryInformationProcess(GetCurrentProcess(), 0,
&pbi, sizeof(pbi), &ulSize) >= 0 && ulSize == sizeof(pbi)) {
diff --git a/debian/patches/0105_dispwin_segfault.patch b/debian/patches/0105_dispwin_segfault.patch
index 3ead582..d69d9d6 100644
--- a/debian/patches/0105_dispwin_segfault.patch
+++ b/debian/patches/0105_dispwin_segfault.patch
@@ -10,7 +10,7 @@ Index: trunk/spectro/dispwin.c
===================================================================
--- trunk.orig/spectro/dispwin.c
+++ trunk/spectro/dispwin.c
-@@ -6277,6 +6277,7 @@ main(int argc, char *argv[]) {
+@@ -6281,6 +6281,7 @@ main(int argc, char *argv[]) {
/* Display number */
else if (argv[fa][1] == 'd') {
diff --git a/spectro/linear.cal b/spectro/linear.cal
deleted file mode 100755
index 64b2392..0000000
--- a/spectro/linear.cal
+++ /dev/null
@@ -1,272 +0,0 @@
-CAL
-
-DESCRIPTOR "Argyll Device Calibration Curves"
-ORIGINATOR "Argyll synthcal"
-CREATED "Mon Jul 09 03:30:52 2018"
-DEVICE_CLASS "DISPLAY"
-COLOR_REP "RGB"
-
-NUMBER_OF_FIELDS 4
-BEGIN_DATA_FORMAT
-RGB_I RGB_R RGB_G RGB_B
-END_DATA_FORMAT
-
-NUMBER_OF_SETS 256
-BEGIN_DATA
-0.00000 0.00000 0.00000 0.00000
-0.00392157 0.00392157 0.00392157 0.00392157
-0.00784314 0.00784314 0.00784314 0.00784314
-0.0117647 0.0117647 0.0117647 0.0117647
-0.0156863 0.0156863 0.0156863 0.0156863
-0.0196078 0.0196078 0.0196078 0.0196078
-0.0235294 0.0235294 0.0235294 0.0235294
-0.0274510 0.0274510 0.0274510 0.0274510
-0.0313725 0.0313725 0.0313725 0.0313725
-0.0352941 0.0352941 0.0352941 0.0352941
-0.0392157 0.0392157 0.0392157 0.0392157
-0.0431373 0.0431373 0.0431373 0.0431373
-0.0470588 0.0470588 0.0470588 0.0470588
-0.0509804 0.0509804 0.0509804 0.0509804
-0.0549020 0.0549020 0.0549020 0.0549020
-0.0588235 0.0588235 0.0588235 0.0588235
-0.0627451 0.0627451 0.0627451 0.0627451
-0.0666667 0.0666667 0.0666667 0.0666667
-0.0705882 0.0705882 0.0705882 0.0705882
-0.0745098 0.0745098 0.0745098 0.0745098
-0.0784314 0.0784314 0.0784314 0.0784314
-0.0823529 0.0823529 0.0823529 0.0823529
-0.0862745 0.0862745 0.0862745 0.0862745
-0.0901961 0.0901961 0.0901961 0.0901961
-0.0941176 0.0941176 0.0941176 0.0941176
-0.0980392 0.0980392 0.0980392 0.0980392
-0.101961 0.101961 0.101961 0.101961
-0.105882 0.105882 0.105882 0.105882
-0.109804 0.109804 0.109804 0.109804
-0.113725 0.113725 0.113725 0.113725
-0.117647 0.117647 0.117647 0.117647
-0.121569 0.121569 0.121569 0.121569
-0.125490 0.125490 0.125490 0.125490
-0.129412 0.129412 0.129412 0.129412
-0.133333 0.133333 0.133333 0.133333
-0.137255 0.137255 0.137255 0.137255
-0.141176 0.141176 0.141176 0.141176
-0.145098 0.145098 0.145098 0.145098
-0.149020 0.149020 0.149020 0.149020
-0.152941 0.152941 0.152941 0.152941
-0.156863 0.156863 0.156863 0.156863
-0.160784 0.160784 0.160784 0.160784
-0.164706 0.164706 0.164706 0.164706
-0.168627 0.168627 0.168627 0.168627
-0.172549 0.172549 0.172549 0.172549
-0.176471 0.176471 0.176471 0.176471
-0.180392 0.180392 0.180392 0.180392
-0.184314 0.184314 0.184314 0.184314
-0.188235 0.188235 0.188235 0.188235
-0.192157 0.192157 0.192157 0.192157
-0.196078 0.196078 0.196078 0.196078
-0.200000 0.200000 0.200000 0.200000
-0.203922 0.203922 0.203922 0.203922
-0.207843 0.207843 0.207843 0.207843
-0.211765 0.211765 0.211765 0.211765
-0.215686 0.215686 0.215686 0.215686
-0.219608 0.219608 0.219608 0.219608
-0.223529 0.223529 0.223529 0.223529
-0.227451 0.227451 0.227451 0.227451
-0.231373 0.231373 0.231373 0.231373
-0.235294 0.235294 0.235294 0.235294
-0.239216 0.239216 0.239216 0.239216
-0.243137 0.243137 0.243137 0.243137
-0.247059 0.247059 0.247059 0.247059
-0.250980 0.250980 0.250980 0.250980
-0.254902 0.254902 0.254902 0.254902
-0.258824 0.258824 0.258824 0.258824
-0.262745 0.262745 0.262745 0.262745
-0.266667 0.266667 0.266667 0.266667
-0.270588 0.270588 0.270588 0.270588
-0.274510 0.274510 0.274510 0.274510
-0.278431 0.278431 0.278431 0.278431
-0.282353 0.282353 0.282353 0.282353
-0.286275 0.286275 0.286275 0.286275
-0.290196 0.290196 0.290196 0.290196
-0.294118 0.294118 0.294118 0.294118
-0.298039 0.298039 0.298039 0.298039
-0.301961 0.301961 0.301961 0.301961
-0.305882 0.305882 0.305882 0.305882
-0.309804 0.309804 0.309804 0.309804
-0.313725 0.313725 0.313725 0.313725
-0.317647 0.317647 0.317647 0.317647
-0.321569 0.321569 0.321569 0.321569
-0.325490 0.325490 0.325490 0.325490
-0.329412 0.329412 0.329412 0.329412
-0.333333 0.333333 0.333333 0.333333
-0.337255 0.337255 0.337255 0.337255
-0.341176 0.341176 0.341176 0.341176
-0.345098 0.345098 0.345098 0.345098
-0.349020 0.349020 0.349020 0.349020
-0.352941 0.352941 0.352941 0.352941
-0.356863 0.356863 0.356863 0.356863
-0.360784 0.360784 0.360784 0.360784
-0.364706 0.364706 0.364706 0.364706
-0.368627 0.368627 0.368627 0.368627
-0.372549 0.372549 0.372549 0.372549
-0.376471 0.376471 0.376471 0.376471
-0.380392 0.380392 0.380392 0.380392
-0.384314 0.384314 0.384314 0.384314
-0.388235 0.388235 0.388235 0.388235
-0.392157 0.392157 0.392157 0.392157
-0.396078 0.396078 0.396078 0.396078
-0.400000 0.400000 0.400000 0.400000
-0.403922 0.403922 0.403922 0.403922
-0.407843 0.407843 0.407843 0.407843
-0.411765 0.411765 0.411765 0.411765
-0.415686 0.415686 0.415686 0.415686
-0.419608 0.419608 0.419608 0.419608
-0.423529 0.423529 0.423529 0.423529
-0.427451 0.427451 0.427451 0.427451
-0.431373 0.431373 0.431373 0.431373
-0.435294 0.435294 0.435294 0.435294
-0.439216 0.439216 0.439216 0.439216
-0.443137 0.443137 0.443137 0.443137
-0.447059 0.447059 0.447059 0.447059
-0.450980 0.450980 0.450980 0.450980
-0.454902 0.454902 0.454902 0.454902
-0.458824 0.458824 0.458824 0.458824
-0.462745 0.462745 0.462745 0.462745
-0.466667 0.466667 0.466667 0.466667
-0.470588 0.470588 0.470588 0.470588
-0.474510 0.474510 0.474510 0.474510
-0.478431 0.478431 0.478431 0.478431
-0.482353 0.482353 0.482353 0.482353
-0.486275 0.486275 0.486275 0.486275
-0.490196 0.490196 0.490196 0.490196
-0.494118 0.494118 0.494118 0.494118
-0.498039 0.498039 0.498039 0.498039
-0.501961 0.501961 0.501961 0.501961
-0.505882 0.505882 0.505882 0.505882
-0.509804 0.509804 0.509804 0.509804
-0.513725 0.513725 0.513725 0.513725
-0.517647 0.517647 0.517647 0.517647
-0.521569 0.521569 0.521569 0.521569
-0.525490 0.525490 0.525490 0.525490
-0.529412 0.529412 0.529412 0.529412
-0.533333 0.533333 0.533333 0.533333
-0.537255 0.537255 0.537255 0.537255
-0.541176 0.541176 0.541176 0.541176
-0.545098 0.545098 0.545098 0.545098
-0.549020 0.549020 0.549020 0.549020
-0.552941 0.552941 0.552941 0.552941
-0.556863 0.556863 0.556863 0.556863
-0.560784 0.560784 0.560784 0.560784
-0.564706 0.564706 0.564706 0.564706
-0.568627 0.568627 0.568627 0.568627
-0.572549 0.572549 0.572549 0.572549
-0.576471 0.576471 0.576471 0.576471
-0.580392 0.580392 0.580392 0.580392
-0.584314 0.584314 0.584314 0.584314
-0.588235 0.588235 0.588235 0.588235
-0.592157 0.592157 0.592157 0.592157
-0.596078 0.596078 0.596078 0.596078
-0.600000 0.600000 0.600000 0.600000
-0.603922 0.603922 0.603922 0.603922
-0.607843 0.607843 0.607843 0.607843
-0.611765 0.611765 0.611765 0.611765
-0.615686 0.615686 0.615686 0.615686
-0.619608 0.619608 0.619608 0.619608
-0.623529 0.623529 0.623529 0.623529
-0.627451 0.627451 0.627451 0.627451
-0.631373 0.631373 0.631373 0.631373
-0.635294 0.635294 0.635294 0.635294
-0.639216 0.639216 0.639216 0.639216
-0.643137 0.643137 0.643137 0.643137
-0.647059 0.647059 0.647059 0.647059
-0.650980 0.650980 0.650980 0.650980
-0.654902 0.654902 0.654902 0.654902
-0.658824 0.658824 0.658824 0.658824
-0.662745 0.662745 0.662745 0.662745
-0.666667 0.666667 0.666667 0.666667
-0.670588 0.670588 0.670588 0.670588
-0.674510 0.674510 0.674510 0.674510
-0.678431 0.678431 0.678431 0.678431
-0.682353 0.682353 0.682353 0.682353
-0.686275 0.686275 0.686275 0.686275
-0.690196 0.690196 0.690196 0.690196
-0.694118 0.694118 0.694118 0.694118
-0.698039 0.698039 0.698039 0.698039
-0.701961 0.701961 0.701961 0.701961
-0.705882 0.705882 0.705882 0.705882
-0.709804 0.709804 0.709804 0.709804
-0.713725 0.713725 0.713725 0.713725
-0.717647 0.717647 0.717647 0.717647
-0.721569 0.721569 0.721569 0.721569
-0.725490 0.725490 0.725490 0.725490
-0.729412 0.729412 0.729412 0.729412
-0.733333 0.733333 0.733333 0.733333
-0.737255 0.737255 0.737255 0.737255
-0.741176 0.741176 0.741176 0.741176
-0.745098 0.745098 0.745098 0.745098
-0.749020 0.749020 0.749020 0.749020
-0.752941 0.752941 0.752941 0.752941
-0.756863 0.756863 0.756863 0.756863
-0.760784 0.760784 0.760784 0.760784
-0.764706 0.764706 0.764706 0.764706
-0.768627 0.768627 0.768627 0.768627
-0.772549 0.772549 0.772549 0.772549
-0.776471 0.776471 0.776471 0.776471
-0.780392 0.780392 0.780392 0.780392
-0.784314 0.784314 0.784314 0.784314
-0.788235 0.788235 0.788235 0.788235
-0.792157 0.792157 0.792157 0.792157
-0.796078 0.796078 0.796078 0.796078
-0.800000 0.800000 0.800000 0.800000
-0.803922 0.803922 0.803922 0.803922
-0.807843 0.807843 0.807843 0.807843
-0.811765 0.811765 0.811765 0.811765
-0.815686 0.815686 0.815686 0.815686
-0.819608 0.819608 0.819608 0.819608
-0.823529 0.823529 0.823529 0.823529
-0.827451 0.827451 0.827451 0.827451
-0.831373 0.831373 0.831373 0.831373
-0.835294 0.835294 0.835294 0.835294
-0.839216 0.839216 0.839216 0.839216
-0.843137 0.843137 0.843137 0.843137
-0.847059 0.847059 0.847059 0.847059
-0.850980 0.850980 0.850980 0.850980
-0.854902 0.854902 0.854902 0.854902
-0.858824 0.858824 0.858824 0.858824
-0.862745 0.862745 0.862745 0.862745
-0.866667 0.866667 0.866667 0.866667
-0.870588 0.870588 0.870588 0.870588
-0.874510 0.874510 0.874510 0.874510
-0.878431 0.878431 0.878431 0.878431
-0.882353 0.882353 0.882353 0.882353
-0.886275 0.886275 0.886275 0.886275
-0.890196 0.890196 0.890196 0.890196
-0.894118 0.894118 0.894118 0.894118
-0.898039 0.898039 0.898039 0.898039
-0.901961 0.901961 0.901961 0.901961
-0.905882 0.905882 0.905882 0.905882
-0.909804 0.909804 0.909804 0.909804
-0.913725 0.913725 0.913725 0.913725
-0.917647 0.917647 0.917647 0.917647
-0.921569 0.921569 0.921569 0.921569
-0.925490 0.925490 0.925490 0.925490
-0.929412 0.929412 0.929412 0.929412
-0.933333 0.933333 0.933333 0.933333
-0.937255 0.937255 0.937255 0.937255
-0.941176 0.941176 0.941176 0.941176
-0.945098 0.945098 0.945098 0.945098
-0.949020 0.949020 0.949020 0.949020
-0.952941 0.952941 0.952941 0.952941
-0.956863 0.956863 0.956863 0.956863
-0.960784 0.960784 0.960784 0.960784
-0.964706 0.964706 0.964706 0.964706
-0.968627 0.968627 0.968627 0.968627
-0.972549 0.972549 0.972549 0.972549
-0.976471 0.976471 0.976471 0.976471
-0.980392 0.980392 0.980392 0.980392
-0.984314 0.984314 0.984314 0.984314
-0.988235 0.988235 0.988235 0.988235
-0.992157 0.992157 0.992157 0.992157
-0.996078 0.996078 0.996078 0.996078
-1.000000 1.000000 1.000000 1.000000
-END_DATA
diff --git a/spectro/strange.cal b/spectro/strange.cal
deleted file mode 100755
index 5f4d4b4..0000000
--- a/spectro/strange.cal
+++ /dev/null
@@ -1,272 +0,0 @@
-CAL
-
-DESCRIPTOR "Argyll Device Calibration Curves"
-ORIGINATOR "Argyll synthcal"
-CREATED "Mon Jul 09 03:30:52 2018"
-DEVICE_CLASS "DISPLAY"
-COLOR_REP "RGB"
-
-NUMBER_OF_FIELDS 4
-BEGIN_DATA_FORMAT
-RGB_I RGB_R RGB_G RGB_B
-END_DATA_FORMAT
-
-NUMBER_OF_SETS 256
-BEGIN_DATA
-0.00000 0.00000 0.00000 0.00000
-0.00392157 0.0000567518 0.0118787 0.0186065
-0.00784314 0.000184387 0.0206820 0.0302263
-0.0117647 0.000367355 0.0286065 0.0401466
-0.0156863 0.000599076 0.0360094 0.0491028
-0.0196078 0.000875445 0.0430471 0.0574042
-0.0235294 0.00119354 0.0498068 0.0652184
-0.0274510 0.00155112 0.0563438 0.0726496
-0.0313725 0.00194640 0.0626960 0.0797678
-0.0352941 0.00237789 0.0688909 0.0866232
-0.0392157 0.00284433 0.0749493 0.0932533
-0.0431373 0.00334462 0.0808876 0.0996872
-0.0470588 0.00387782 0.0867187 0.105948
-0.0509804 0.00444307 0.0924533 0.112053
-0.0549020 0.00503962 0.0981003 0.118020
-0.0588235 0.00566676 0.103667 0.123859
-0.0627451 0.00632388 0.109160 0.129583
-0.0666667 0.00701040 0.114585 0.135201
-0.0705882 0.00772579 0.119946 0.140720
-0.0745098 0.00846956 0.125248 0.146148
-0.0784314 0.00924125 0.130494 0.151490
-0.0823529 0.0100404 0.135689 0.156754
-0.0862745 0.0108667 0.140834 0.161942
-0.0901961 0.0117197 0.145932 0.167061
-0.0941176 0.0125991 0.150986 0.172112
-0.0980392 0.0135045 0.155998 0.177102
-0.101961 0.0144356 0.160971 0.182031
-0.105882 0.0153921 0.165905 0.186904
-0.109804 0.0163738 0.170803 0.191723
-0.113725 0.0173803 0.175665 0.196491
-0.117647 0.0184114 0.180495 0.201210
-0.121569 0.0194668 0.185292 0.205882
-0.125490 0.0205464 0.190059 0.210508
-0.129412 0.0216498 0.194796 0.215092
-0.133333 0.0227769 0.199504 0.219634
-0.137255 0.0239274 0.204184 0.224136
-0.141176 0.0251012 0.208838 0.228600
-0.145098 0.0262980 0.213466 0.233027
-0.149020 0.0275177 0.218069 0.237418
-0.152941 0.0287600 0.222648 0.241774
-0.156863 0.0300249 0.227204 0.246097
-0.160784 0.0313121 0.231737 0.250388
-0.164706 0.0326215 0.236248 0.254647
-0.168627 0.0339528 0.240737 0.258876
-0.172549 0.0353061 0.245205 0.263076
-0.176471 0.0366810 0.249654 0.267247
-0.180392 0.0380775 0.254082 0.271391
-0.184314 0.0394954 0.258491 0.275507
-0.188235 0.0409345 0.262882 0.279597
-0.192157 0.0423948 0.267254 0.283662
-0.196078 0.0438762 0.271609 0.287702
-0.200000 0.0453784 0.275946 0.291718
-0.203922 0.0469014 0.280266 0.295710
-0.207843 0.0484450 0.284570 0.299680
-0.211765 0.0500091 0.288857 0.303627
-0.215686 0.0515937 0.293128 0.307552
-0.219608 0.0531985 0.297384 0.311455
-0.223529 0.0548235 0.301625 0.315338
-0.227451 0.0564686 0.305851 0.319201
-0.231373 0.0581337 0.310063 0.323043
-0.235294 0.0598187 0.314260 0.326866
-0.239216 0.0615234 0.318443 0.330670
-0.243137 0.0632478 0.322613 0.334456
-0.247059 0.0649918 0.326769 0.338223
-0.250980 0.0667553 0.330911 0.341972
-0.254902 0.0685382 0.335041 0.345703
-0.258824 0.0703403 0.339159 0.349418
-0.262745 0.0721617 0.343264 0.353115
-0.266667 0.0740022 0.347356 0.356797
-0.270588 0.0758618 0.351437 0.360461
-0.274510 0.0777403 0.355505 0.364110
-0.278431 0.0796377 0.359563 0.367744
-0.282353 0.0815539 0.363608 0.371362
-0.286275 0.0834889 0.367643 0.374965
-0.290196 0.0854424 0.371666 0.378553
-0.294118 0.0874146 0.375679 0.382127
-0.298039 0.0894052 0.379681 0.385686
-0.301961 0.0914143 0.383672 0.389231
-0.305882 0.0934417 0.387653 0.392763
-0.309804 0.0954873 0.391624 0.396281
-0.313725 0.0975512 0.395585 0.399786
-0.317647 0.0996332 0.399536 0.403277
-0.321569 0.101733 0.403477 0.406756
-0.325490 0.103851 0.407409 0.410222
-0.329412 0.105987 0.411331 0.413676
-0.333333 0.108141 0.415244 0.417117
-0.337255 0.110313 0.419147 0.420546
-0.341176 0.112503 0.423042 0.423963
-0.345098 0.114710 0.426927 0.427368
-0.349020 0.116935 0.430804 0.430762
-0.352941 0.119177 0.434672 0.434144
-0.356863 0.121437 0.438532 0.437515
-0.360784 0.123714 0.442383 0.440875
-0.364706 0.126009 0.446225 0.444224
-0.368627 0.128321 0.450060 0.447563
-0.372549 0.130650 0.453886 0.450890
-0.376471 0.132997 0.457704 0.454207
-0.380392 0.135360 0.461514 0.457514
-0.384314 0.137741 0.465317 0.460811
-0.388235 0.140139 0.469111 0.464097
-0.392157 0.142554 0.472898 0.467374
-0.396078 0.144986 0.476678 0.470641
-0.400000 0.147435 0.480450 0.473898
-0.403922 0.149900 0.484214 0.477145
-0.407843 0.152383 0.487972 0.480383
-0.411765 0.154882 0.491722 0.483612
-0.415686 0.157398 0.495465 0.486831
-0.419608 0.159931 0.499200 0.490042
-0.423529 0.162480 0.502929 0.493243
-0.427451 0.165046 0.506651 0.496436
-0.431373 0.167628 0.510366 0.499619
-0.435294 0.170227 0.514075 0.502794
-0.439216 0.172842 0.517776 0.505961
-0.443137 0.175474 0.521472 0.509119
-0.447059 0.178122 0.525160 0.512269
-0.450980 0.180787 0.528842 0.515410
-0.454902 0.183467 0.532518 0.518543
-0.458824 0.186164 0.536187 0.521668
-0.462745 0.188877 0.539850 0.524785
-0.466667 0.191606 0.543507 0.527895
-0.470588 0.194351 0.547158 0.530996
-0.474510 0.197113 0.550803 0.534090
-0.478431 0.199890 0.554441 0.537176
-0.482353 0.202684 0.558074 0.540254
-0.486275 0.205493 0.561701 0.543325
-0.490196 0.208318 0.565322 0.546388
-0.494118 0.211159 0.568937 0.549444
-0.498039 0.214016 0.572547 0.552493
-0.501961 0.216889 0.576150 0.555535
-0.505882 0.219777 0.579748 0.558569
-0.509804 0.222681 0.583341 0.561597
-0.513725 0.225601 0.586928 0.564617
-0.517647 0.228536 0.590510 0.567631
-0.521569 0.231487 0.594086 0.570638
-0.525490 0.234454 0.597657 0.573638
-0.529412 0.237436 0.601222 0.576631
-0.533333 0.240434 0.604782 0.579618
-0.537255 0.243447 0.608337 0.582598
-0.541176 0.246476 0.611887 0.585571
-0.545098 0.249520 0.615431 0.588538
-0.549020 0.252579 0.618971 0.591499
-0.552941 0.255654 0.622505 0.594453
-0.556863 0.258744 0.626035 0.597401
-0.560784 0.261849 0.629559 0.600343
-0.564706 0.264970 0.633079 0.603279
-0.568627 0.268105 0.636594 0.606208
-0.572549 0.271256 0.640103 0.609132
-0.576471 0.274422 0.643608 0.612049
-0.580392 0.277603 0.647109 0.614961
-0.584314 0.280800 0.650604 0.617867
-0.588235 0.284011 0.654095 0.620766
-0.592157 0.287237 0.657581 0.623661
-0.596078 0.290478 0.661063 0.626549
-0.600000 0.293735 0.664540 0.629431
-0.603922 0.297006 0.668012 0.632308
-0.607843 0.300292 0.671480 0.635180
-0.611765 0.303593 0.674944 0.638045
-0.615686 0.306909 0.678403 0.640906
-0.619608 0.310239 0.681857 0.643761
-0.623529 0.313585 0.685308 0.646610
-0.627451 0.316945 0.688754 0.649454
-0.631373 0.320320 0.692195 0.652293
-0.635294 0.323709 0.695633 0.655126
-0.639216 0.327114 0.699066 0.657954
-0.643137 0.330533 0.702495 0.660777
-0.647059 0.333966 0.705919 0.663595
-0.650980 0.337414 0.709340 0.666408
-0.654902 0.340877 0.712756 0.669215
-0.658824 0.344354 0.716169 0.672018
-0.662745 0.347846 0.719577 0.674816
-0.666667 0.351352 0.722981 0.677608
-0.670588 0.354873 0.726381 0.680396
-0.674510 0.358408 0.729778 0.683179
-0.678431 0.361958 0.733170 0.685957
-0.682353 0.365522 0.736559 0.688730
-0.686275 0.369100 0.739943 0.691498
-0.690196 0.372693 0.743324 0.694262
-0.694118 0.376300 0.746701 0.697021
-0.698039 0.379921 0.750074 0.699775
-0.701961 0.383557 0.753443 0.702525
-0.705882 0.387207 0.756808 0.705270
-0.709804 0.390871 0.760170 0.708010
-0.713725 0.394549 0.763528 0.710746
-0.717647 0.398242 0.766882 0.713477
-0.721569 0.401948 0.770233 0.716204
-0.725490 0.405669 0.773580 0.718927
-0.729412 0.409404 0.776923 0.721645
-0.733333 0.413153 0.780263 0.724358
-0.737255 0.416916 0.783599 0.727068
-0.741176 0.420693 0.786932 0.729773
-0.745098 0.424484 0.790261 0.732473
-0.749020 0.428289 0.793587 0.735170
-0.752941 0.432108 0.796909 0.737862
-0.756863 0.435940 0.800228 0.740550
-0.760784 0.439787 0.803543 0.743234
-0.764706 0.443648 0.806855 0.745914
-0.768627 0.447523 0.810164 0.748589
-0.772549 0.451411 0.813469 0.751261
-0.776471 0.455314 0.816770 0.753928
-0.780392 0.459230 0.820069 0.756592
-0.784314 0.463160 0.823364 0.759251
-0.788235 0.467103 0.826656 0.761906
-0.792157 0.471061 0.829944 0.764558
-0.796078 0.475032 0.833230 0.767205
-0.800000 0.479017 0.836512 0.769849
-0.803922 0.483016 0.839790 0.772489
-0.807843 0.487028 0.843066 0.775124
-0.811765 0.491054 0.846339 0.777756
-0.815686 0.495094 0.849608 0.780385
-0.819608 0.499147 0.852874 0.783009
-0.823529 0.503214 0.856137 0.785630
-0.827451 0.507294 0.859397 0.788247
-0.831373 0.511388 0.862654 0.790860
-0.835294 0.515496 0.865908 0.793469
-0.839216 0.519617 0.869158 0.796075
-0.843137 0.523751 0.872406 0.798677
-0.847059 0.527899 0.875651 0.801276
-0.850980 0.532061 0.878892 0.803871
-0.854902 0.536236 0.882131 0.806462
-0.858824 0.540424 0.885367 0.809050
-0.862745 0.544626 0.888599 0.811634
-0.866667 0.548841 0.891829 0.814215
-0.870588 0.553070 0.895056 0.816792
-0.874510 0.557311 0.898280 0.819366
-0.878431 0.561567 0.901501 0.821936
-0.882353 0.565835 0.904719 0.824503
-0.886275 0.570117 0.907935 0.827066
-0.890196 0.574412 0.911147 0.829626
-0.894118 0.578721 0.914357 0.832183
-0.898039 0.583042 0.917564 0.834736
-0.901961 0.587377 0.920768 0.837286
-0.905882 0.591725 0.923969 0.839833
-0.909804 0.596087 0.927168 0.842376
-0.913725 0.600461 0.930363 0.844916
-0.917647 0.604849 0.933556 0.847453
-0.921569 0.609249 0.936747 0.849986
-0.925490 0.613663 0.939934 0.852516
-0.929412 0.618090 0.943119 0.855044
-0.933333 0.622530 0.946301 0.857567
-0.937255 0.626984 0.949481 0.860088
-0.941176 0.631450 0.952658 0.862606
-0.945098 0.635929 0.955832 0.865120
-0.949020 0.640421 0.959003 0.867631
-0.952941 0.644927 0.962172 0.870139
-0.956863 0.649445 0.965339 0.872644
-0.960784 0.653976 0.968502 0.875146
-0.964706 0.658521 0.971664 0.877645
-0.968627 0.663078 0.974822 0.880141
-0.972549 0.667648 0.977978 0.882634
-0.976471 0.672231 0.981132 0.885124
-0.980392 0.676827 0.984283 0.887610
-0.984314 0.681436 0.987431 0.890094
-0.988235 0.686058 0.990577 0.892575
-0.992157 0.690692 0.993721 0.895053
-0.996078 0.695340 0.996862 0.897528
-1.000000 0.700000 1.000000 0.900000
-END_DATA