merged master with work

Change-Id: Iedfb2bf7f28bfe45201adacec0645cc13abffe59

secop_psi/calcurves/x29630.inp

@@ -0,0 +1,54 @@
+sens=x29630
+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
+48169.55684	1.4156
+39885.13082	1.5093
+33567.18472	1.6042
+18364.12385	2.025
+12342.47911	2.4072
+8837.044892	2.8225
+6892.748828	3.2075
+5551.237926	3.6128
+4511.413877	4.0785
+4292.582418	4.2035
+3718.163227	4.5988
+2896.451846	5.4278
+2394.808056	6.2113
+2036.162241	7.0161
+1689.6744	8.1367
+1470.891066	9.1364
+1295.118698	10.2046
+1167.106277	11.2029
+986.8745682	13.092
+917.2628875	14.0398
+797.0667942	16.1077
+708.1149979	18.1232
+638.1213707	20.1642
+572.8689276	22.5405
+516.7157547	25.102
+473.3055661	27.5305
+434.3482604	30.1509
+403.209548	32.6337
+377.515195	35.0112
+329.2506256	40.5518
+268.6438857	50.546
+227.6556026	60.5653
+198.3103954	70.4865
+174.8129501	81.0062
+158.1702861	90.4686
+143.4637897	100.7613
+117.0960187	126.0159
+99.40357853	150.7981
+86.65511265	175.2525
+76.27183281	201.6172
+68.46032724	227.2484
+62.66842138	250.8951
+58.17674094	273.0018
+58.08212813	273.5107
+53.61355351	300.0167
+49	330
+