merged master with work

Change-Id: Iedfb2bf7f28bfe45201adacec0645cc13abffe59

secop_psi/calcurves/x37342.inp

@@ -0,0 +1,88 @@
+sens=x37342
+unit=Ohm        ! sensor format (mV,V,Ohm), log formats are choosen automatically
+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
+5415.493374	1.206752613
+4747.986725	1.299090896
+4180.676443	1.399849988
+3373.518006	1.600691945
+2833.112672	1.800317833
+2446.259346	1.999351695
+2155.746629	2.19904102
+1930.936718	2.398457238
+1750.825962	2.599780609
+1603.999702	2.802110593
+1486.56402	2.997456677
+1384.241772	3.199426263
+1298.306853	3.398382823
+1223.094888	3.599951554
+1157.673728	3.8005973
+1100.91193	3.998225773
+1051.451368	4.191612886
+965.0359425	4.591180816
+893.1152109	4.996417888
+819.8481588	5.503743652
+739.352187	6.210638537
+668.5319342	7.020777422
+600.8417719	8.032881997
+548.6714557	9.041711926
+506.9104706	10.04721234
+472.1997804	11.06281225
+443.2149916	12.07199761
+418.4514779	13.08021171
+396.9793756	14.08524473
+378.2961725	15.08105001
+361.6388231	16.0776196
+346.7520949	17.06826977
+333.3229963	18.05892179
+321.1295517	19.04743552
+309.9544517	20.03626438
+298.6946745	21.12616944
+283.8478521	22.71800965
+270.6691904	24.31285067
+258.6727612	25.93298422
+247.768787	27.56451225
+237.9641129	29.18601637
+227.9254232	31.0030598
+217.4183451	33.11826043
+204.2665322	36.12296457
+192.8157725	39.12772964
+182.8064699	42.11247422
+173.8963947	45.11153437
+165.9188961	48.10303508
+161.0350302	50.10484635
+150.1755882	55.10098825
+140.8655317	60.1034188
+132.7853527	65.09901632
+125.6860893	70.10437511
+119.3985515	75.09806481
+113.7930326	80.09501075
+108.7413724	85.09261262
+104.1727159	90.08703311
+99.9981164	95.0899334
+96.18604309	100.0922684
+89.46221937	110.0771918
+83.68245162	120.0790457
+78.66179354	130.0741289
+74.25609722	140.0697789
+70.3608622	150.0655921
+66.89165633	160.0683035
+63.77569002	170.0708132
+60.96786868	180.0736291
+58.42889208	190.0695589
+56.12020923	200.0788513
+54.00696273	210.0877227
+52.07877723	220.0849127
+50.30351224	230.0812
+48.6691464	240.0969195
+47.15854869	250.0896564
+45.76003996	260.0992008
+44.46302665	270.0979475
+43.2586392	280.1084345
+42.13569868	290.1197964
+41.08823336	300.1322266
+40.1061292	310.1430744
+39.63806835	315.1577652
+39.18737989	320.1617401
+38.66500317	326.1611063
+38.32671309	330.1678422