merged master with work

Change-Id: Iedfb2bf7f28bfe45201adacec0645cc13abffe59

secop_psi/calcurves/cma11r2ol.inp

@@ -0,0 +1,62 @@
+sens=cma11r2ol
+unit=Ohm
+type=C
+form=loglog
+curv
+45084	1.2
+29807	1.32
+20375	1.45
+14053	1.6
+10054	1.76
+7311.2	1.94
+5424.1	2.14
+4112.5	2.36
+3187.7	2.6
+2524.5	2.86
+2026.3	3.15
+1651.2	3.47
+1367.0	3.82
+1140	4.22
+960.79	4.67
+822.17	5.16
+712.02	5.7
+622.86	6.3
+550.69	6.96
+491.37	7.69
+442.05	8.5
+400.72	9.4
+366.15	10.39
+336.75	11.49
+311.82	12.7
+290.41	14.04
+271.96	15.52
+255.93	17.16
+241.99	18.97
+229.79	20.97
+219.08	23.18
+209.60	25.63
+201.23	28.33
+193.78	31.32
+187.15	34.62
+181.22	38.27
+175.89	42.31
+171.11	46.77
+166.80	51.7
+162.92	57.15
+159.40	63.18
+156.20	69.85
+153.24	77.4
+150.64	85.3
+148.17	94
+145.83	103.6
+143.61	114.2
+141.53	125.8
+139.55	138.6
+137.69	152.7
+135.92	168.3
+134.26	185.5
+132.71	204.4
+131.25	225.2
+129.88	248.2
+128.63	273
+127.41	300.8