merged master with work

Change-Id: Iedfb2bf7f28bfe45201adacec0645cc13abffe59

secop_psi/calcurves/rx198.inp

@@ -0,0 +1,180 @@
+#sens=rx198
+#unit=Ohm
+#type=Cernox ! Cernox and RuOx is the same type
+# calibrated range 0.065 99.5 (other points extrapolated)
+# created with /afs/psi.ch/project/SampleEnvironment/Neutronscattering/Dil_Thermometer_WL/Thermometer3_2014/combined_calibration/makecurve.m
+#curv ! curve follows R[Ohm] T[K]
+5865544.	0.015
+5124096.	0.016
+4513248.	0.017
+4004209.	0.018
+3575681.	0.019
+3211638.	0.02
+2842874.	0.0212
+2533444.	0.0224
+2271343.	0.0236
+2013326.	0.025
+1768277.	0.0266
+1564912.	0.0282
+1374972.	0.03
+1201417.	0.032
+1058432.	0.034
+939278.9	0.036
+838970.9	0.038
+753757.3	0.04
+664165.7	0.0425
+589506.3	0.045
+526655.1	0.0475
+473261.8	0.05
+419176.1	0.053
+373792.7	0.056
+323838.7	0.06
+283213.8	0.064
+249712.4	0.068
+221788.7	0.072
+198401.8	0.076
+178717.6	0.08
+158312.1	0.085
+141630.7	0.09
+127891.8	0.095
+116465.3	0.1
+105096.3	0.106
+95690.25	0.112
+87795.40	0.118
+80063.13	0.125
+72725.80	0.133
+66612.15	0.141
+60851.28	0.15
+55511.26	0.16
+51032.24	0.17
+47228.86	0.18
+43964.35	0.19
+41135.64	0.2
+38206.53	0.212
+35688.12	0.224
+33501.97	0.236
+31292.05	0.25
+29128.10	0.266
+27272.87	0.282
+25479.97	0.3
+23778.86	0.32
+22321.46	0.34
+21059.37	0.36
+19956.10	0.38
+18983.57	0.4
+17918.89	0.425
+16991.66	0.45
+16176.80	0.475
+15454.95	0.5
+14690.36	0.53
+14017.55	0.56
+13236.47	0.6
+12562.49	0.64
+11974.63	0.68
+11457.06	0.72
+10997.59	0.76
+10586.73	0.8
+10130.16	0.85
+9726.339	0.9
+9366.444	0.95
+9043.530	1
+8697.118	1.06
+8388.419	1.12
+8111.446	1.18
+7822.092	1.25
+7528.690	1.33
+7268.392	1.41
+7008.379	1.5
+6753.269	1.6
+6527.760	1.7
+6327.018	1.8
+6147.205	1.9
+5985.232	2
+5810.898	2.12
+5655.055	2.24
+5514.822	2.36
+5367.895	2.5
+5218.450	2.66
+5085.464	2.82
+4952.248	3
+4821.183	3.2
+4704.948	3.4
+4601.104	3.6
+4507.721	3.8
+4423.257	4
+4328.339	4.25
+4243.463	4.5
+4167.078	4.75
+4097.941	5
+4023.138	5.3
+3955.931	5.6
+3876.234	6
+3805.985	6.4
+3743.570	6.8
+3687.722	7.2
+3637.427	7.6
+3591.870	8
+3540.590	8.5
+3494.653	9
+3453.239	9.5
+3415.688	10
+3374.975	10.6
+3338.308	11.2
+3305.092	11.8
+3270.059	12.5
+3234.200	13.3
+3202.131	14.1
+3169.889	15
+3138.082	16
+3109.828	17
+3084.541	18
+3061.732	19
+3041.019	20
+3018.502	21.2
+2998.147	22.4
+2979.636	23.6
+2960.067	25
+2940.014	26.6
+2922.078	28.2
+2904.058	30
+2886.304	32
+2870.558	34
+2856.500	36
+2843.877	38
+2832.482	40
+2819.711	42.5
+2808.325	45
+2798.109	47.5
+2788.888	50
+2778.941	53
+2770.031	56
+2759.531	60
+2750.397	64
+2742.430	68
+2735.463	72
+2729.351	76
+2723.908	80
+2717.761	85
+2712.114	90
+2706.805	95
+2701.729	100
+2696.116	106
+2691.098	112
+2686.583	118
+2681.857	125
+2677.058	133
+2672.796	141
+2668.539	150
+2664.363	160
+2660.673	170
+2657.388	180
+2654.444	190
+2651.791	200
+2648.933	212
+2646.378	224
+2644.080	236
+2641.674	250
+2639.231	266
+2637.061	282
+2634.894	300
+2632.768	320