Merge branch '2.1-rc' into developer

2025-04-26 08:10:02 +02:00 · 2016-09-01 18:12:59 +02:00 · 2016-09-01 18:12:59 +02:00 · c940607088
commit c940607088
parent 90d2e6b82a d2240884b4
14 changed files with 20 additions and 20 deletions
--- a/settingsdir/eiger/highgain/highgain.cal
+++ b/settingsdir/eiger/highgain/highgain.cal
@ -1,4 +1,4 @@
-3433.58  486.39
+3486.22 365.75
-3470.99  483.471
+3518.43 368.23
-3480.06  479.017
+3519.11 357.62
-3409.62  476.202
+3491.49 365.08
--- a/settingsdir/eiger/highgain/highgain.trim
+++ b/settingsdir/eiger/highgain/highgain.trim
--- a/settingsdir/eiger/lowgain/lowgain.cal
+++ b/settingsdir/eiger/lowgain/lowgain.cal
@ -1,4 +1,4 @@
-3685.67  246.055
+3415.26 226.24
-3732.38  246.328
+3406.35 223.45
-3741.86  245.924
+3407.89 225.60
-3696.84  246.167
+3385.72 220.54
--- a/settingsdir/eiger/lowgain/lowgain.trim
+++ b/settingsdir/eiger/lowgain/lowgain.trim
--- a/settingsdir/eiger/standard/standard.cal
+++ b/settingsdir/eiger/standard/standard.cal
@ -1,4 +1,4 @@
-3538.73  389.187
+3419.26 282.68
-3499.86  374.654
+3451.04 285.35
-3462.84  364.88
+3451.30 277.63
-3514.72  381.02
+3431.27 283.41
--- a/settingsdir/eiger/standard/standard.trim
+++ b/settingsdir/eiger/standard/standard.trim
--- a/settingsdir/eiger/veryhighgain/standard.cal
+++ b/settingsdir/eiger/veryhighgain/standard.cal
@ -1,4 +0,0 @@
 3538.73  389.187
 3499.86  374.654
 3462.84  364.88
 3514.72  381.02
--- a/settingsdir/eiger/veryhighgain/standard.trim
+++ b/settingsdir/eiger/veryhighgain/standard.trim
--- a/settingsdir/eiger/veryhighgain/veryhighgain.cal
+++ b/settingsdir/eiger/veryhighgain/veryhighgain.cal
@ -0,0 +1,4 @@
 3381.13 493.21
 3385.45 490.36
 3374.03 492.96
 3363.40 483.72
--- a/settingsdir/eiger/veryhighgain/veryhighgain.trim
+++ b/settingsdir/eiger/veryhighgain/veryhighgain.trim
--- a/settingsdir/eiger/verylowgain/standard.cal
+++ b/settingsdir/eiger/verylowgain/standard.cal
@ -1,4 +0,0 @@
 3538.73  389.187
 3499.86  374.654
 3462.84  364.88
 3514.72  381.02
--- a/settingsdir/eiger/verylowgain/standard.trim
+++ b/settingsdir/eiger/verylowgain/standard.trim
--- a/settingsdir/eiger/verylowgain/verylowgain.cal
+++ b/settingsdir/eiger/verylowgain/verylowgain.cal
@ -0,0 +1,4 @@
 3323.57 124.58
 3336.87 124.85
 3302.45 123.64
 3338.19 124.44
--- a/settingsdir/eiger/verylowgain/verylowgain.trim
+++ b/settingsdir/eiger/verylowgain/verylowgain.trim