merged master with work

Change-Id: Iedfb2bf7f28bfe45201adacec0645cc13abffe59

secop_psi/calcurves/x2060.inp

@@ -0,0 +1,91 @@
+sens=x2060
+unit=Ohm        ! sensor format (mV,V,Ohm), log formats are choosen automatically
+!tlim=325       ! setpoint limit (automatic if omitted)
+type=Cernox     ! sensor type (Special,Si,GaAlAs,Pt250,Pt500,Pt2500,RhFe,C,Cernox,RuOx,Ge) (special if omitted)
+curv            ! curve (sensor,temp/K) follows, must be ordered, but can be increasing or decreasing
+68000	1.0
+44881.28899	1.2
+36817.49567	1.309
+31135.18899	1.403
+21987.20345	1.604
+16114.99662	1.8
+12258.05661	1.996
+9918.666931	2.168
+7915.149596	2.385
+6521.88091	2.604
+5617.346366	2.796
+4894.762604	3
+4329.19174	3.206
+3898.635478	3.402
+3541.829	3.6
+3258.390355	3.79
+2984.005729	4.008
+2766.634389	4.208
+2446.004452	4.583
+2155.218862	5.037
+1900.670937	5.555
+1642.521599	6.262
+1428.551021	7.074
+1234.644114	8.097
+1092.227708	9.12
+980.9691976	10.168
+894.9346698	11.189
+825.2867872	12.198
+767.6953785	13.194
+719.0106414	14.182
+677.2773451	15.159
+640.4098623	16.138
+608.3465142	17.103
+579.6429399	18.071
+553.709856	19.038
+529.6610169	20.026
+506.2778453	21.091
+474.856356	22.692
+448.7524681	24.208
+424.6284501	25.792
+402.9983074	27.367
+383.0390317	29.007
+363.2532965	30.805
+342.3719529	32.938
+320.7389826	35.453
+295.3162837	38.904
+276.640478	41.85
+260.0577328	44.825
+245.1701481	47.852
+236.2055933	49.856
+216.3050767	54.918
+199.7722596	59.894
+185.5735149	64.889
+173.2922053	69.877
+162.4378675	74.916
+153.0620054	79.837
+144.6319839	84.804
+137.0163323	89.804
+127.6014751	96.795
+120.8444611	102.471
+109.8273514	113.175
+103.8928657	119.86
+96.20883586	129.725
+89.42109592	139.773
+83.5152527	149.804
+78.34370646	159.81
+73.77685637	169.797
+69.71875787	179.768
+66.09775467	189.689
+62.84505418	199.59
+59.90371916	209.464
+57.26569688	219.289
+54.85259174	229.086
+52.65354288	238.856
+50.64578201	248.587
+48.80362619	258.316
+47.10439353	268.003
+45.54155793	277.656
+44.10190663	287.254
+42.75989139	296.854
+41.52116147	306.381
+40.92174382	311.132
+40.35810065	315.861
+39.70434603	321.478
+39.27574259	325.239
+