merged master with work

Change-Id: Iedfb2bf7f28bfe45201adacec0645cc13abffe59

secop_psi/calcurves/cma11r4rc.inp

@@ -0,0 +1,62 @@
+sens=cma11r4rc
+unit=Ohm
+type=C
+form=loglog
+curv
+35372	1.2
+23387	1.32
+15987	1.45
+11028	1.6
+7891	1.76
+5739.2	1.94
+4258.8	2.14
+3229.9	2.36
+2504.4	2.6
+1984.1	2.86
+1593.3	3.15
+1299.1	3.47
+1076.1	3.82
+898	4.22
+757.41	4.67
+648.66	5.16
+562.26	5.7
+492.31	6.3
+435.70	6.96
+389.16	7.69
+350.47	8.5
+318.04	9.4
+290.93	10.39
+267.86	11.49
+248.31	12.7
+231.51	14.04
+217.03	15.52
+204.46	17.16
+193.52	18.97
+183.95	20.97
+175.55	23.18
+168.11	25.63
+161.55	28.33
+155.70	31.32
+150.50	34.62
+145.85	38.27
+141.67	42.31
+137.92	46.77
+134.54	51.7
+131.49	57.15
+128.73	63.18
+126.22	69.85
+123.90	77.4
+121.84	85.3
+119.87	94
+117.96	103.6
+116.12	114.2
+114.36	125.8
+112.66	138.6
+111.03	152.7
+109.45	168.3
+107.94	185.5
+106.48	204.4
+105.09	225.2
+103.74	248.2
+102.47	273
+101.21	300.8