merged master with work

Change-Id: Iedfb2bf7f28bfe45201adacec0645cc13abffe59

secop_psi/calcurves/psam.inp

@@ -0,0 +1,90 @@
+#sens=psam
+#unit=Ohm
+#type=Pt250 ! test
+#curv
+0.001	1.0
+1.806	11.014
+1.855	13.02
+1.909	14.627
+1.924	15
+2.019	16.858
+2.087	17.962
+2.122	18.462
+2.165	19.053
+2.391	21.605
+2.561	23.17
+2.68	24.154
+2.848	25.4
+3.551	29.725
+4.154	32.689
+4.656	34.85
+5.112	36.661
+5.534	38.241
+6.279	40.827
+6.933	42.954
+7.241	43.924
+7.833	45.742
+8.64	48.081
+9.402	50.233
+10.11	52.159
+10.768	53.915
+11.415	55.611
+12.021	57.17
+13.16	60.054
+13.709	61.422
+14.73	63.939
+15.735	66.413
+17.176	69.883
+18.516	73.074
+19.803	76.131
+21.014	78.997
+22.173	81.727
+23.3	84.385
+24.368	86.89
+25.426	89.382
+26.427	91.735
+27.424	94.083
+28.371	96.319
+29.323	98.565
+30.224	100.689
+31.133	102.843
+32	104.889
+32.865	106.94
+33.708	108.941
+34.537	110.912
+35.359	112.864
+36.15	114.752
+36.954	116.669
+37.73	118.519
+38.501	120.368
+39.266	122.204
+40.007	123.973
+40.756	125.779
+41.485	127.528
+42.201	129.251
+43.622	132.682
+44.32	134.373
+48.378	144.217
+52.255	153.673
+56.564	164.241
+60.698	174.433
+64.687	184.307
+68.544	193.884
+72.767	204.422
+76.379	213.474
+80.392	223.56
+84.256	233.308
+88.516	244.079
+92.107	253.192
+96.145	263.468
+99.966	273.226
+104.27	284.239
+107.917	293.61
+112.073	304.315
+115.569	313.341
+119.4	323.15
+123.24	333.15
+127.07	343.15
+130.89	353.15
+134.7	363.15
+