merged master with work

Change-Id: Iedfb2bf7f28bfe45201adacec0645cc13abffe59

secop_psi/calcurves/x29746.inp

@@ -0,0 +1,55 @@
+sens=x29746
+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)
+!excit=300uA    ! (off,30nA,100nA,300nA,1uA,3uA,10uA,30uA,100uA,300uA,1mA,10mV,1mV) (if omitted: default from sensor type)
+!range=0        ! range in sensor units (if rang=0: determine range from table, if omitted: default from sensor type)
+curv            ! curve (sensor,temp/K) follows, must be ordered, but can be increasing or decreasing
+49333.99112	1.4116
+40387.72213	1.5146
+34106.41201	1.6114
+19665.68338	2.0075
+13089.00524	2.4137
+9648.784253	2.8112
+7540.340823	3.2138
+6185.056903	3.6051
+5157.829585	4.0308
+4828.585225	4.2045
+4206.629648	4.6054
+3333.444448	5.4221
+2771.772271	6.2256
+2352.775098	7.0895
+2020.773552	8.0461
+1766.784452	9.0416
+1561.889887	10.1022
+1409.284365	11.112
+1193.773279	13.0209
+1100.352113	14.1043
+963.5767971	16.1061
+860.437102	18.0749
+776.8800497	20.0802
+696.4273278	22.4982
+628.8912647	25.0358
+574.5343399	27.5292
+529.1929279	30.0186
+490.2369315	32.5414
+457.1533064	35.0344
+401.8032932	40.1605
+324.0503704	50.4402
+273.4616415	60.4027
+236.7071199	70.4182
+210.2098946	79.8848
+187.6771203	90.0922
+169.5349149	100.3197
+136.4565509	126.0394
+114.9441142	150.7499
+99.12060202	175.8608
+87.23339294	200.8987
+78.00312012	225.9038
+70.09231157	253.0469
+65.28864108	273.1334
+65.2239137	273.4244
+59.74857798	300.9599
+54.5	330
+
+