From c9675d111a61075ebe4031ec6bdf285a76be0fce Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Mon, 23 Apr 2018 16:11:04 +0200
Subject: [PATCH] jungfrau server: fixed the settings for gain2 stages

---
 .../jungfrauDetectorServer/RegisterDefs.h     |  18 +++++++++---------
 .../bin/jungfrauDetectorServer_jungfraunew    | Bin 112100 -> 112100 bytes
 .../jungfrauDetectorServer/gitInfo.txt        |   8 ++++----
 .../jungfrauDetectorServer/gitInfoJungfrau.h  |   6 +++---
 .../slsDetectorFunctionList.c                 |  16 ++++++++--------
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/slsDetectorSoftware/jungfrauDetectorServer/RegisterDefs.h b/slsDetectorSoftware/jungfrauDetectorServer/RegisterDefs.h
index 845d2629f..0875a7a35 100644
--- a/slsDetectorSoftware/jungfrauDetectorServer/RegisterDefs.h
+++ b/slsDetectorSoftware/jungfrauDetectorServer/RegisterDefs.h
@@ -299,21 +299,21 @@
 /** DAQ Register */
 #define DAQ_REG							(0x5D << MEM_MAP_SHIFT)
 
-#define DAQ_SETTINGS_MSK                (DAQ_HIGH_GAIN_MSK | DAQ_FIX_GAIN_STG_1_MSK | DAQ_FIX_GAIN_STG_2_MSK | DAQ_FRCE_SWTCH_GAIN_STG_1_MSK | DAQ_FRCE_SWTCH_GAIN_STG_2_MSK)
+#define DAQ_SETTINGS_MSK                (DAQ_HIGH_GAIN_MSK | DAQ_FIX_GAIN_MSK | DAQ_FRCE_SWTCH_GAIN_MSK)
 #define DAQ_HIGH_GAIN_OFST              (0)
 #define DAQ_HIGH_GAIN_MSK               (0x00000001 << DAQ_HIGH_GAIN_OFST)
-#define DAQ_FIX_GAIN_STG_1_OFST         (1)
-#define DAQ_FIX_GAIN_STG_1_MSK          (0x00000001 << DAQ_FIX_GAIN_STG_1_OFST)
-#define DAQ_FIX_GAIN_STG_2_OFST         (2)
-#define DAQ_FIX_GAIN_STG_2_MSK          (0x00000001 << DAQ_FIX_GAIN_STG_2_OFST)
+#define DAQ_FIX_GAIN_OFST               (1)
+#define DAQ_FIX_GAIN_MSK                (0x00000003 << DAQ_FIX_GAIN_OFST)
+#define DAQ_FIX_GAIN_STG_1_VAL          ((0x1 << DAQ_FIX_GAIN_OFST) & DAQ_FIX_GAIN_MSK)
+#define DAQ_FIX_GAIN_STG_2_VAL          ((0x3 << DAQ_FIX_GAIN_OFST) & DAQ_FIX_GAIN_MSK)
 #define DAQ_CMP_RST_OFST                (4)
 #define DAQ_CMP_RST_MSK                 (0x00000001 << DAQ_CMP_RST_OFST)
 #define DAQ_STRG_CELL_SLCT_OFST         (8)
 #define DAQ_STRG_CELL_SLCT_MSK          (0x0000000F << DAQ_STRG_CELL_SLCT_OFST)
-#define DAQ_FRCE_SWTCH_GAIN_STG_1_OFST  (12)
-#define DAQ_FRCE_SWTCH_GAIN_STG_1_MSK   (0x00000001 << DAQ_FRCE_SWTCH_GAIN_STG_1_OFST)
-#define DAQ_FRCE_SWTCH_GAIN_STG_2_OFST  (13)
-#define DAQ_FRCE_SWTCH_GAIN_STG_2_MSK   (0x00000001 << DAQ_FRCE_SWTCH_GAIN_STG_2_OFST)
+#define DAQ_FRCE_SWTCH_GAIN_OFST        (12)
+#define DAQ_FRCE_SWTCH_GAIN_MSK         (0x00000003 << DAQ_FRCE_SWTCH_GAIN_OFST)
+#define DAQ_FRCE_GAIN_STG_1_VAL         ((0x1 << DAQ_FRCE_SWTCH_GAIN_OFST) & DAQ_FRCE_SWTCH_GAIN_MSK)
+#define DAQ_FRCE_GAIN_STG_2_VAL         ((0x3 << DAQ_FRCE_SWTCH_GAIN_OFST) & DAQ_FRCE_SWTCH_GAIN_MSK)
 #define DAQ_ELCTRN_CLLCTN_MDE_OFST      (14)
 #define DAQ_ELCTRN_CLLCTN_MDE_MSK       (0x00000001 << DAQ_ELCTRN_CLLCTN_MDE_OFST)
 #define DAQ_G2_CNNT_OFST                (15)
diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_jungfraunew b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_jungfraunew
index ecb64f97fa50a068927256d5cba33b359ecc895b..67b9fb957d24a9dbe5ced580ebffaf84f3875b16 100755
GIT binary patch
delta 12784
zcmai42~<?a((Yz1GA!yKj6e{XVP8Z>PyqoQP(*M+6nE575HPM$R8%6kMPp2Ywt`y}
zag9-<!6=C4kvwC}i^qUVa7)7V0wH1ypwS_}k^k$NF&g2#=Q%ZBcU5)W>Z<C#eH&{U
zI@C0D$n%x`_-kl^m`WWt4RUiCsgj8!RgX>#6sMy#T@`#%D{8wCPWO6lT7AHLn95Qd
z#scVQ8p~EvyQ%9k3RH4kd0Ay?tR^?T@q|jJIY~8^x-L2*IV@4=vg#UJ3EJlu<&}jV
zAkwFcvg(>z6ErlvqI4DbRf}_NtQ1;tzlv~@re^3<D$3@lDoTAJ{fRxIpF2lpgdT_&
zyDhN-DVT*yD^@@oBx%^c%_h^|m|7MRGb^pJtg)2X$YHG-a*(t$JxJYHnrqWlL8P)Y
zMUY~XS|^uxb|lg%Lyt&4nR1O*d<=b%^l$c&Y-xDmqUy40jM|P-X(qkf3%Q<+nsAa9
zr4wlaB(|Hhq6c^&X%=`1EKvx~>6|_tKF$UoB+1h!p_hpsNTTUU=&eByB>kB-9KDU`
zfuu)igVEc99!PqSHUPa{=z*l#v{3Z+qX&|HO6!H*QS?AkRhl1qCFp^qiot2_=w3h<
zBz>FK4ZX|gfuyg}l;~YY4}_3(LhmkmAcTa6wgx?rbd1HByV414rujO$nl+gx&`HHn
z9sV#=UQFR}&b6^XoHx3|b9ea4hFZo@7q-cApfY5>RupmwC`vq<LqSCPx%gMh0D%r>
z4xNH&E*siuAiZAvVW*Xp#xYxknufAq{Ccx7`0dJ;DEiO@c1$sl?qf}gUeuns+YY1|
zEZsJoUT6Ez_F=!+`qN#^uFF8$$i{VXrFCpc7gy)2b4v>49c>-;g^D1z*@{h3;(QMZ
zBGN*3vWqA6VpUzdJNDH1iECO5CPr(Bbd_1#xq9ABCx$8v^&}!lIyF_UBWI_o_LgeJ
zRPaF3eU@O?$N$5rEh+SDKh%ns>;$hiN3H1NML0<-r@nyz4nhwkEn}bB#nCaW#m<Gk
z!yN3>X@8buuXG506PZJNjv_wgUKA9hLmjeD>?hGq%tASUJ}iz^-my~7PSuJLJqajE
z%w9=BL|V*3RFjdFt*Uey$SV8Tb+(+)Q{^YhpBblfiMgs>=+7)t?X0X!(TW)upYh80
zJ8X`6hQk&}Y9Oh3MY4N*N4C;a$)2n4QU$x?Hq+C3eB1H0<2tGuOT|(mJr6D{Ba#c7
z>HalMV}Tyu$;fo0g)W{R%6ro=$v{jp@TKo463_SOW>)1H5WF}1M42Ntj_R_n5Ms;>
z6eU&%QV@}Ljcxm6%-ri!YQ=u>TBK|p(^h_qz2$v?E?^EmpDSbAk*k^L6Q)$PBl(jB
z`tDS2o7y%eMeHp<2lm7_O_|V+bONNyl@{$tY#H_6Lyxh&{!5jGquctrj0N@>uAJA7
zB#v$B;XuD(ANO#kf3dH7%uqVEqt(m?1e~F(*wcU+?m45{+Mh6rmu3frF;g`xr{~A?
zSLPcyODQF`)jrQY4h(lFYe%v*v7AK(D49a@0qx25Xufy2IH_%vDn=UfzN1&F!-{s~
z>rHaMpbS~>Nk-ixL2gP1=)PW`$WqW+*?%S)wN?bX@hAq{(KF1pj~%-doIz)>UcK#P
z^Ae02$-UEL-AvlId%MwAz9y(8wAac$n_$#A-p7q@HSqVa+CEDiMoefshw&qfx*Pgt
zsD%jxFEpa709At;QRjJKiUcCLP6l7v!0bZY{qME2Ivxy<Q<ax0p!1eNU!M#c(kwPD
z#67I69sRF|yWvHr!ZS1=Ep+>aRh%V~XIMFYL&K`^8_CXx%u;S2-ZoYXS!8IGa&9}4
zA&iB_c^*sVuS3BRztW-Pazh)x(%$3>LmR)+PDaCy(Sz*Mut>!2w=lK$!C`HmlshaP
z8(wP&kHH6%cnn%tpMLKCiR0SpP8t@C7&OB3YJ-0IBp!p?Y;`~PFu!*6dk=F)3<&0r
zxaklJ=|IQ{jNTGbh~GmYJQ7FQ&;3?=zBvgqG0i7+(#!cwne=i#<Jr3KKFU4VKVIM8
zK4z8SAJXA$TEtA}Aw%2x?KX56=D3>GMyQp3?Z^e@92x8IEWYi?AL3uE5_?t@nN8<1
z*Z$$kk?rg>6WP4}>ttqQjJ4KjfQPassja<-EOx+Zvu#PNd{#g2BXMmN*2FpBJ);UC
zoTSJ&BAsCYT4%F4ajZPkk7a7dnmHOr`?WJ#FpN&ZXpnS%2$50@qkkJ>933@Qwr#Z0
z!+TL~%H`O9Uf;>rGN<Tq^mq1F^g3m)A#EMBW*r9x(*PDVFwCrc6#F8&JKHg^oAPRG
zTh*iNyMY7f8fHDn$uTF^8uO}$XZ0a3UmKaRtTEA^jT}@&1@>srhsp<o+nTw^3Sy?w
zm8>Nupz99EU-vk3uwim(gR`j(lLpUJTC}4ivT3m=X(qE9GEKQKrtL$9vv-FC1dM7&
z(j$hKU}r@kmQ<2DudEQ~BRNi)IwlS2V`d)1Dm0EPDDHx6m1*DV6z`!-O=#=qToxO@
zTIOidx)<-J{J#-xwal5*&?WS9wrS`}x}U8aW=B^r?_m?@978*nZ5<Xxqj}q`+d!uE
zw%<HlPJIo1*+9g>gGCR|rn}j{hKDP2+u1%gu+Ae=l!G97{rEA0ts60kM{q=}Q~%+_
zrXx;2FV1=;ILnma+!MqGCb(k}q$jBH(n(CTGy8XxA^4XPuFxP>Ffxa_aW;L%{1ZK?
zId9wktUXy;gp)u<IN>B!u|<i#%Ad4tlTgBn6V+Y+-HzlVEyC<qY(HucrJltTMo*>m
zYgU>RX=fJiCti5Y4@gw!CibA%$eHDsS*~XWzu@Q1h!QV_Q;?r{6q=)OGCa)K7&R?m
zpX2u(R)yb1tYwVaEET0RtDonp{%w6r?w^A_<acjhd}IjtcsR$Fk9AS@YG)CKvtwh!
zXbt;itU9ozofRbO@5PsR1eSON>_qyBC58zQ=`ITy=hF3BJ7a!~WEx*r_U^c~bTR8Z
zK1?~G9i<dDdHnlS&Kkx~>uwR*b_!xdS8U%zTH?cYPwdMIC#>N6*~DqQwkFzH#+t;n
z#UD)^LmiG_6}>pT)kjdVKH@gcvP+p|a=3C*JIizin~=OoCLe6vUd$$YDDStknjW*t
zDRykc<Yd|57^CJ_(A?0D<`#oyrzx4T2$SZHDQ-&Fb~JsVxmI>{kkQ`UsUFHxgWAsi
z3wCJgYFUO!D_ZBFjEC0iuaYFTT$j#Qfo_(%Ls(lY)uFbk>e41e@r=!jS3@VZd0MV4
zbD;70e$zeZSi@q~v6ShnWmYEs^XYE<Yc|D>K4pDUX42zqPf9q=GjMjW-&1DEMn)Sg
zEJ$^u!3KUL`#5!`>~WOI@(d69gJF49vy>ULXg>RXMmWtfa8@zbw0E%)e4O^K(!Ot7
zzwzQp55x0UrrWuG)5i(N^9t-_3Vipz$no_kDqfEw(si!W`FJ0`>-j4-mEy%LZDlvo
zL+Bwc!A7jkI6&WE-()Pr#{}o#>uIL9@~Z)DH?zy^y_rMlSynakr0?+FCrafu0gjtW
zD@x^~a6AdrXu>pjij*H{t7$%=&~(sr#@bxYPQIy3to9*NNl*S=ULB3^{b(GVddG`C
zxF_&gqS%Dnfe3C*aLj|3i|j_CGQW+;g{=%r_-i^y<PQV~ZO(tf9A+Kj`{Jx{<%!_7
z@xi`0dk?-LKb<{8>E4d~FXlVPn-;UgIqvikTQo=A^<Ge0E9Zg?yWtOWvQPpEbHkKj
z?JUEA?4!ABWe*~ZN$oe!gI?k5kKSYp=gp!Yu%G9J)A<Gtz9r_*<EQiaDe4}*+CHvB
zFNDv=9Nz*&@?+Kug4x)&vUpj%6;3_S|HRBKoE6T0gI!&qGP~!<Y!(DDuZ3B>^cIFI
z^ZK<-7z%OW4CU&;w$GZ(W@bhy$G0O1V*kqAM=!IKMKhG&_G~+HANz4pq_VIb$+F_W
z#m6Xa0)AZbske0i?oI~d?qsl9G*g%%qjUZFZA7Ty>pc$=kQB;_v-oYojVynPPqC#@
z?u|WEx>m`&mDh?qmT;2ldhqKG6?!0PPw|YUTPdy@{%=|E)U*D$+JFEgo$}Y}oG|!u
zt5z%o4<sD{kAn9VcqQP0q(c7_I!o|Mz`G0{NXqvw)Tu=+X_bzF+Xya5dXK%o+*$dy
zf4R;U`dcCCF@$i!CB^yW{y8ZTS}_?MkTe<XY_vhrIJ6I=4U!VkzK%9Xit&#Zld`Qq
za-H#dtR51O6zWgw2~iOItCta6U&Z123dhBuh=1~XgAbCtIN$4)0m%@6q$K}Vsk*gQ
zy5Fi2_jvf=Ghi=!KiktO$=^>TrkfOfIPR{X55j%WciHNgYyQ<`exe>Pu6w1?8nxI;
zaK9H^jY3TIM;_NAk87jEyKxl6??8U<W7LikYrw0C<M%V^tk>Ii{=fUlb)j|VTf>nt
z<2b&%>ad5|#A8bFQQ%T8!H34Yw;gB_TlcoB@(a@_D~w8l9!Sb$Wp8`ZO-y{-J0=FT
z<0n3bf6agUR~f_?$`5`<ew4T|o`S|{iqg3^NkM!u-Er26d9VkP{MqmoF3P(>a*e)_
z%B^r7ItK|z8pU!}gjn>24@7ci=U4d3yBpfF2=;KrXE9&;>I;d@JcU+#FpO}LvV03m
zPnOEZ;>+EUzdm?N0lDLF!bv*pi_0jqK~j+~H@lA2<^<cVeTAQ6;HNVG+%VUvuka@r
z`2CThtPzBhq+qLa185jKnX9Jt>{_mOh`nzom54K#O#(ui5G~$4Y9`vNaDj=je32Pz
zCd-`ETcDPbpaqgjS+AALX&F1V(vu!$*H(_^XVFy)sXN=b>U;W-&06i6u*RotAt*Gw
z5R^V`Q|{iou}pzGE&X2w6Pu72BKZWrC<%U*Y{zb`cBc!A|5|NL!@l<Brpy0PV~K&>
z^jL2rKT6CRNkQCDYH(wjD=x5z<jbPgDnrb?V>PNYqh37Z6N6r8^9RL18@e{tc1Dc^
zjXI56nZ({->p=Ig18W0gCk2|85*FBtwecvlRT|JDH|$C4M-mYvF)yC5tk8chyvvY+
zq(RL29p|Z}Z@id{g`Av?w->%2Ug=5Aed0wOWV*j)fA^%CKGoB3%>a$@&={YsU<CaX
z^i9?npUot;^_^P*J8+X3+7TBGI0Ywxy3kgsqJ_(Uw9w-Bwgv7p6LFuJNTfAv=ekKW
zl|5b8hc0IU>(?pcthnYEmbqg6Ux-#m-h0ZvUGGkv*>CIBxSs3$ZVdf}jd@p%Q^=Bc
zLnv-R-yJ|FvfuIBj|FZRNXN5<8&c?PR)zKj=KS9Kme!q!jSOE)YIgEHPunzit$1@3
z0jWi7Mbd8e%X@(n-f?d%m239KtHd4HPM80o6&0fis0AKmxvRuAqy?MlJn%K(YevsR
z1ZKNuOly@aTi0Oym%t)Oa(m4>KFK!*;$vygM(4=hf7|i@haDe-ov)v3VP_<)gQTC_
zUV5qUAyQZNbfbSHac?R$dieD53lEpV!^dvi!=>=B0sNO9*1K^J*FNWGlYBPy{Z=}i
zP5r<Z*A(x5ptg;0E7{w!mq=5(J8IM#-2Srxo0aBwy7IqM-1uO!W%pP4PX2a8TJ2I@
z)>MW)2wt8WEtWQ;(tl(#KU7;?RvT?SbYY>JyLrrlk<l(CCtFUI?)`JGO1wfEPf(4O
z#!bA8@G2e?>54(o=}s3S1)HoshSkR=tM4<*JhfG}$?9&SRcBb0y<+v=-&U((wfqs0
zRv4|m2dh#yqpv<msJ0}duQ<!*sc8@PU7jy>V1J<9fjMlNVS7y_=Q)ICNzzh8<U98M
zrg5G3s6JEWPTPbCUT#KJvXIR#-rw00$=zf*V+;{9#uzQXt;$oWruBmE5$NvXx=tTM
zmzs3fLwCJNcM_Yk*`@O^)l?OkW{VL^F=7@IH@o;}VMK+q(eKL`aoIG&PZg<BiNlCm
z9D#|BfqpF4cS?f(QIq~N=sz>*V^&OU`-dx^RmNC&Iku&cNWZZ-=82Utk9p%0xd82z
z>^vJlr?J17KfT3#xAby&s46K8wW)W+-#IkDri=JHRh&+4Rl(lc5+w_DEn%MnySnDH
z7U1LVnJjXvdyYmIHC82_g=aS#jo8@8PeP~05l&KN_e6Nl<u%}|ME&<sNydJ;N&hDJ
z)3Elq&S?|xior%bY=ERsy9b(VeD#`*-8rTKrwsz4dEv}v6aR?8kjHrZ8ErgHN8R})
zkPbcF_)-LAb$31f;AEwW7xUIyfl3Ooy-9NN@{Pn#Hv%y_x2CZX<$oEYFOTO(gw*a$
zrGiQ%8a6S12<=t8FW-gIl;ST7ex$hQ*|Xi<>B7TR7Yk+668d2kw01U2;@*{Dn!Aec
zZ2yGPd&TQ;M@mmK=Z|8d{&*m!3_)miL4NH)S4^0<?muwS4Z$ehzVv{5?~#nTBy;aC
zyurP<F=^f?-uuy~W;xRuRN@9wy0=wIZs6C;Sw)RyeBam%1EU+x7OlEymP^6sye;6x
zHR$&mdmo?|-O%qJ8hPM_HsG(R7jsvI?kkU`V~x5S!SB&fUHWCTO5BFFS3|3m@wiob
zhkak@>FnPi*PK17*p!>VC#;9O1H9tcops*p?5cnqp*H*#tvvdL&ad~4I+Vrjb#ZOJ
zZ`6s#U)qd1e`5T1(BUYtwR<NAoPy2}L;V$jw+XUTLZn~(R3h&mfb>KPuQuLW#X1)`
z#VopCQpo3`p9bGdl35t1@Fvoirg1qKXB%%EH5oEKdJ*RhGqy(;&nX&8>9?$OpNr-0
zUsd84P&mzg-p71r|B9npidKA{vofiqFgHQ2k?V33Xi_x7z_qj{?eT2q{yxr;&~6!4
zQm8kCiOU^Lat&+PA2Pw-WUckfl}Y--OR%QbT{2nQ0qy#Fe#)~^7+(s1)yp+s!bL8*
zQ*Vu`;H_rP#bkK9qTY!0Z21B2z-LV=akqgh*HCEi_Hk%%yoga0ws?DgJ^#Ep&ngcD
z1Rez6(xkfvx;)&seT;hBxXd(Wv0==IEa0Fk&0)h2-k~AP_YkAs6rVqo=<A}<$BSBh
zZn_nIsi@IAXr_~RpoPXt)G+@_{}_!vT1;BPwYc02Z7$R5rxP3w!Pn@asmCF42_Kn<
zlSv-VF7i|b8wM>4{2u`uQOkB#_VRpb$!LY!Yh#HuRXSK2$3ezyuO9jzKHj+M5B=P9
zOC8s@y!MUZIhon<csj0c3_fSVE2GDpZ}6D?aV-|(bf$4J*S|MC#~1~zAtJBFqSuWj
zF<O0$aX$J~l3Us;?R;j@(aUi{X%uY6X!ytvPrO+gD`sX}fE+aO=eQTfXY=P8qFVgh
zjZbKlF&I2V9Sj3`NDwF(=3yNU<&Gd8))^#6W0B4u5iLe6F#}of5$sl#vo#OYXlAMF
zh^e<$eQu%AkJ)4cS=r5f|08V6Zw0&zTk*+TkIc;1-@?1G_~W}}9sbAIm6F}dvFszM
zSLA;!Bb17{#zr#+N9qz9s_9^3X&<ZMfq9WM>ze;nh>0~$uRL*K&Cpkpm7DHhD#*V>
z%<j~<$Ng;|&qu`Yh5Wg>f;`4|jWvnY7~`3=gl8bvR3@)yfJYx$V6nCC*2d@)uE`eF
zj<L|{2`>>=S?m6aXMfcOOw#JjVN)5DqgiLlS`xCBv;-rOE#tBohBoqK$ZzUv%Vs!6
zBcFz)GlMAcsbYLKfAZS8SmfB?FS}M3_wvcbp1<_5GB;NC)FxL;Zn}3CRwi55G{D6F
zt|{;pzN|Ui#2?rk(ov)50s4DP^S@qd7AHJ9ATungkxPwP<1;Z6M=muMHV(_+8z1fT
z)WyMA@I1HEu_w*I?6fzbSv>sdJZfHDWhGX#FZHeFM=Pwvqs3phFzf$bZD$sl)8(?4
zGd<HHr=vUn_b~-C9qH<qLkj+IqytPNj0>C3;2&FEL823#fDu~besHGPiQeg87dpRH
z`l<EhmtU*&d%<26bvRS5qCTPOimimaN{hD;au)O)GzhZwXDlbsp_VzhM+sSAqM&1h
zbTUy_;EO(Qb3X6)h3*UTL3{cc*g8$fW6(sjIYyh1_qmJ{=kdP%D@4wa{-o$UA@Xt~
z)&C0)nrI{NMW44hpZC9bg^rxDO`&(X(yW5tmQrtew?Mg!y3!K`eU_n@S}=JT^*7g*
z5pu6UolPAqeNaW$L4yj8K|(zWZgD+*0bPz!nFVSN4+^4|Q+K+tU<U6w7OdsH9t9sS
z$AIL58|axkx=@nOEjpVIG9%<fflD@Yww;N}raR1X))UgQQ6Ty?gy`1`<SDMcp4toK
z?rcKt&KF3<56DXm@By${AeG$-sq_Q(2Sx*tpUQ*4Q@|2|T+Joq>IcAl;4Xn&+eXMW
z$gh<E&k5xEUCasgt~Ueq0?E0tfsh+{0=aP<cuF8uIzp=E0%53X4RABCP#`z63AwpS
zAh)~-xz!sO0fYlm53G!Sz-ZtQARa932O`<hXTWEK)L03mrVG#!_zn;b*6acn;V*GD
zb!a>mNNoo~YC8dgfDr-#o7C9=9f93|gMh<;m~q_>fi$@h(&Pmk3>*Rc0Js_W74Sa-
zX@<RKJh&N-HADWW6Csbf3gpQ-LY_eW<Swu}N1)~^Ld|;u`vM~b>S#}>qZ`l<r~y7B
z)X7SqPF;YQLB(yPq8cIhLdX$`%89_~K+LG}2(SWp6DdGSuWkTd0#+aeg-F41gkC`C
zF|q5_z?=sN{d|Nz3%DP67$MI<$QJ|QY1Ku9+7F@D0HJpadXfgA?F&o>rUG{Wks|3o
zz^e!?B3IJ^h)C8TH8n_aO+N4<@CxuD@EIbF)K0J6h6Wx~djZ%Ce1Z`7Mu<a!uv7;J
zpIktwVED;%6sH*?<$*}~2~=J}sJt8zazv!M15W|ZAyNd9>Hu5-Ty~~pB@OAQ+)c=V
zB7q$E6Zl*p2j3v%VD~e^hxD2(CzOz_Ncq-mU@j2P+j<Fj75IZdwm`lG@_Yp$`S!rR
zKujzj0m#<@bAfAs`+*2xJ_3=CiRQ!q{Ca^D$O$Px#0xO40OJbI0>2Q*HjLkf@j2U2
zGusg9Z9f6;0iO}Fod{$*YG!*E;6Wf#yZs6ff!K~fZAYMXMi8=73j}{B_&ZROJ5ZB5
z5aAuo0@-z(kX@e%<fD;<e3T@R-D3&aJrTGJxB^%NJcvcG2SvUIMZTvWus=`-L~8f^
z0K5&<1Cg@5YY5r9ULZva2q{_&JOMlfM5KxksiH>UV}a~L@$a(&4gwAV{s~0X_xljC
zzX$LgAZl~}P2k-eq-6@yf+9X}8h94z>5ue81L65Wcz$p$Z~<^5Fb{}OA4I4RLjNH2
z55e#u7(Rs6c4#ngB5(>2wR~tc@Gh_#2uBXVk;9nqVNCdNUtmr@fqa6{e}d4T&L-q^
zu0YOX;CT$Zf(Kr~18?@k{u2Zo0vrjP4tx^`M{XV!$dAc{{HPPi9WO%e_z9#Mk*h}J
zsviUO0&b9TBv=7NWJN?4S0A_*1HMT}jyM+$6&N1CAYfl09xQH#fp{1gf&OLmD}V@@
zh?zWaBjf>c{aZaDzdaBru_BZx1ZsxuLPi8C%K~Nt%YhdJDxfd${zUYrKz|DKrvtZ<
z97=X!HR-XMo(a^dE1_0z0FMBV11|$BfKPysTiXz7jR#p{)me7~VxO|c{$-8*%eo(M
z3vdVUIPf#z72s8Yb{a`&rz9X8=mZBk<pQy48tQTgX}B*?B@8J016Kf7VdJvL#^ng?
z4s-(|^jAk=pBjvP3N`V#4)5<~^bw&O<I%s5K32tz5$GqQ{}BB@@h%I+yDS2D7>HC+
zq=+I#W~eE%1p;v|_&%R%b5da)3BL*}R~xZQAwe~G%2glqdtf(2saKss!ZVTZEZ{j{
zId;7+*!8+%^FpQ8LcbP?uSMePP#|?_0_|K!Xy^MFpO5i7fCqs`Fdj?e=2+;X0&BI{
z1Zpv@+IS4aH0w|qb>o4UMkNwm*%OGhS&7oF+y*QJ!lBA@FbK!1FpVlyZWY$%O)RCG
zX_x>eQiIB?HG^F%*b`t+4n$b%RM6K#AB9zyi~bsH0(IBXxCsH`R)x4WY49cs1?~dw
z2Ob3?0?lvWjRphF%YZ29<~2Y(xEY&3GsZV#jXfgJN8XzJfYCrqtZ4%<ANU3EBJ|)`
za~EKLU_3T~M^+dJ#*=dF_g8=@^(QqroYdoR@<1RhHaM&((8mMxSj0aU5%TkCf&77)
z|FItLg~fO;tPp62L4<Y~B2bILgj&Q4)aD_fHqEHGPN=vp0`0P&&@LwgYM)A|{d`p5
zL=>Pca;5Bt${Qq5RaZh)ZxnRfPTd23z@g|i-a9{mus^i)fDamAZy<uxG6gstm<D|F
z%<S#7n0BngwtFAjZ!_>oL64nubk108j1#dzW&lxTMJs@)@uEE779gflbPz9T#QNG1
z;3;4^Uebu^b+~W?Nx!iR{EOiK2YnCpeSqhH(5pnXR-$NXk=$BGAaYfE0?GA4PW@0_
zm0v*tL9ca#zzbLi!~+|E4M=VS<PDHNLDf8Yh!`J4jN!=B1(^3@^e>=)3G@66^F+*>
zP@PSv&Su1;8S!Y|49o`}2Yv=b5jCTT^q8=Iwva&d0vag478MM@0X;m`!&5yB>S0hn
z3Wx|*pkHxXpbpW5It&I51C9i`0lk2|fuUzE@1i^HI?l#>a6aCLr-5e+GEdN<F^K)v
y`*`>I;oXZ>lRpxe1k40x0TIZ21Ty~%;8(z#z`MXk;A4R_!i~o9XM~fqTKIoC3Dk@L

delta 12721
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

diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
index ec17f27eb..6afa90e77 100644
--- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
+++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer 
 URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: 5ff2e8606011ef6e37b5cfe6254acf80eaa50e5b 
-Revision: 137 
+Repsitory UUID: 03e781a0ac53cb73af5d00003a131383125ab40f 
+Revision: 141 
 Branch: jungfraunew 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 3771 
-Last Changed Date: 2018-04-13 11:25:18.000000002 +0200 ./RegisterDefs.h
+Last Changed Rev: 3776 
+Last Changed Date: 2018-04-23 16:06:57.000000002 +0200 ./RegisterDefs.h
diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
index 515f55c9d..61955d913 100644
--- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
+++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "5ff2e8606011ef6e37b5cfe6254acf80eaa50e5b"
+#define GITREPUUID "03e781a0ac53cb73af5d00003a131383125ab40f"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x3771
-#define GITDATE 0x20180413
+#define GITREV 0x3776
+#define GITDATE 0x20180423
 #define GITBRANCH "jungfraunew"
diff --git a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
index 7c42f1542..5a7cb80d1 100644
--- a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
@@ -829,22 +829,22 @@ enum detectorSettings setSettings(enum detectorSettings sett, int imod){
             break;
 	    case FIXGAIN1:
             bus_w(DAQ_REG, bus_r(DAQ_REG) & ~DAQ_SETTINGS_MSK);
-            bus_w(DAQ_REG, bus_r(DAQ_REG) | DAQ_FIX_GAIN_STG_1_MSK);
+            bus_w(DAQ_REG, bus_r(DAQ_REG) | DAQ_FIX_GAIN_STG_1_VAL);
             printf("\nConfigured settings - Fix Gain 1, DAQ Reg: 0x%x\n", bus_r(DAQ_REG));
             break;
 	    case FIXGAIN2:
             bus_w(DAQ_REG, bus_r(DAQ_REG) & ~DAQ_SETTINGS_MSK);
-            bus_w(DAQ_REG, bus_r(DAQ_REG) | DAQ_FIX_GAIN_STG_2_MSK);
+            bus_w(DAQ_REG, bus_r(DAQ_REG) | DAQ_FIX_GAIN_STG_2_VAL);
             printf("\nConfigured settings - Fix Gain 2, DAQ Reg: 0x%x\n", bus_r(DAQ_REG));
             break;
 	    case FORCESWITCHG1:
             bus_w(DAQ_REG, bus_r(DAQ_REG) & ~DAQ_SETTINGS_MSK);
-            bus_w(DAQ_REG, bus_r(DAQ_REG) | DAQ_FRCE_SWTCH_GAIN_STG_1_MSK);
+            bus_w(DAQ_REG, bus_r(DAQ_REG) | DAQ_FRCE_GAIN_STG_1_VAL);
             printf("\nConfigured settings - Force Switch Gain 1, DAQ Reg: 0x%x\n", bus_r(DAQ_REG));
             break;
 	    case FORCESWITCHG2:
             bus_w(DAQ_REG, bus_r(DAQ_REG) & ~DAQ_SETTINGS_MSK);
-            bus_w(DAQ_REG, bus_r(DAQ_REG) | DAQ_FRCE_SWTCH_GAIN_STG_2_MSK);
+            bus_w(DAQ_REG, bus_r(DAQ_REG) | DAQ_FRCE_GAIN_STG_2_VAL);
             printf("\nConfigured settings - Force Switch Gain 2, DAQ Reg: 0x%x\n", bus_r(DAQ_REG));
             break;
 	    default:
@@ -865,22 +865,22 @@ enum detectorSettings getSettings(){
 	uint32_t val = bus_r(DAQ_REG);
 	printf("\nGetting Settings\n Reading DAQ Register :0x%x\n", val);
 
-	if (val & DAQ_FRCE_SWTCH_GAIN_STG_2_MSK) {
+	if (val & DAQ_FRCE_GAIN_STG_2_VAL) {
 	    thisSettings = FORCESWITCHG2;
 	    printf("Settings read: FORCESWITCHG2\n");
 	}
 
-	else if  (val & DAQ_FRCE_SWTCH_GAIN_STG_1_MSK) {
+	else if  (val & DAQ_FRCE_GAIN_STG_1_VAL) {
 	    thisSettings = FORCESWITCHG1;
         printf("Settings read: FORCESWITCHG1\n");
 	}
 
-	else if (val & DAQ_FIX_GAIN_STG_2_MSK) {
+	else if (val & DAQ_FIX_GAIN_STG_2_VAL) {
 	    thisSettings = FIXGAIN2;
         printf("Settings read: FIXGAIN2\n");
 	}
 
-	else if (val & DAQ_FIX_GAIN_STG_1_MSK) {
+	else if (val & DAQ_FIX_GAIN_STG_1_VAL) {
 	    thisSettings = FIXGAIN1;
         printf("Settings read: FIXGAIN1\n");
 	}