Merge branch 'developer' into cmake

manual/manual-client/Eiger_short.tex

@@ -96,7 +96,7 @@ We would recommend expert users (beamline people) to write their parameters file
 
 You will then need to setup the detector threshold and settings, the exposure time, the number of real time frames and eventually how many real time frames should be acquired:
 \begin{verbatim}
-sls_detector_put 0-settings [standard/highgain/lowgain]
+sls_detector_put 0-settings [veryhighgain/highgain/standard/lowgain/verylowgain]
 sls_detector_put 0-threshold 6000
 sls_detector_put 0-exptime 1[time_is_s]
 sls_detector_put 0-frames 10
@@ -104,8 +104,8 @@ sls_detector_put 0-period 0[time_is_s]
 \end{verbatim}
 In this case 10 consecutive 1~s frames will be acquired. Note that {\tt{period}} defines the sum of the acquisition time and the desired dead time before the next frame. If {\tt{period}} is set to 0, then the next frame will start as soon as the detector is ready to take another acquisition. \\
 
-For \E, at the moment 3 settings are possible: {\tt{standard}}, {\tt{lowgain}} and {\tt{highgain}}. According to the setting chosen, one can reach different energies. Refer to the settings requirements for your detector.\\ 
-Notice that the option  {\tt{settings standard/highgain/lowgain}} actually loads the trimbit files so it is time consuming. Only setting the {\tt{threshold}} does not load trimbit files.  
+For \E, at the moment 5 settings are possible: {\tt{standard}}, {\tt{lowgain}}, {\tt{verylowgain}}, {\tt{veryhighgain}} and {\tt{highgain}}. According to the setting chosen, one can reach different energies. Refer to the settings requirements for your detector.\\ 
+Notice that the option {\tt{settings standard/highgain/lowgain/veryhighgain/verylowgain}} actually loads the trimbit files so it is time consuming. Only setting the {\tt{threshold}} does not load trimbit files.  
 
 The threshold is expressed in (eV) as the proper threshold setting, i.e. normally is set to 50\% of the beam energy.  
 

settingsdir/eiger/highgain/highgain.cal

@@ -1,4 +1,4 @@
-3433.58  486.39
-3470.99  483.471
-3480.06  479.017
-3409.62  476.202
+3486.22 365.75
+3518.43 368.23
+3519.11 357.62
+3491.49 365.08

settingsdir/eiger/lowgain/lowgain.cal

@@ -1,4 +1,4 @@
-3685.67  246.055
-3732.38  246.328
-3741.86  245.924
-3696.84  246.167
+3415.26 226.24
+3406.35 223.45
+3407.89 225.60
+3385.72 220.54

settingsdir/eiger/standard/standard.cal

@@ -1,4 +1,4 @@
-3538.73  389.187
-3499.86  374.654
-3462.84  364.88
-3514.72  381.02
+3419.26 282.68
+3451.04 285.35
+3451.30 277.63
+3431.27 283.41

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

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

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

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