From 66db11421f4530fb20c4d08b1a3f704a100c1ba6 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 17 Nov 2015 10:30:53 +0100 Subject: [PATCH] implemented fifo depth configurable from client --- slsDetectorSoftware/commonFiles/error_defs.h | 4 +++ .../bin/eigerDetectorServer | Bin 254830 -> 254830 bytes .../multiSlsDetector/multiSlsDetector.cpp | 19 +++++++++++++ .../multiSlsDetector/multiSlsDetector.h | 6 ++++ .../slsDetector/slsDetector.cpp | 26 ++++++++++++++++++ slsDetectorSoftware/slsDetector/slsDetector.h | 5 ++++ .../slsDetector/slsDetectorCommand.cpp | 23 ++++++++++++++-- .../slsDetector/slsDetectorUtils.h | 6 +++- 8 files changed, 86 insertions(+), 3 deletions(-) diff --git a/slsDetectorSoftware/commonFiles/error_defs.h b/slsDetectorSoftware/commonFiles/error_defs.h index 61b9517ac..9223daa91 100644 --- a/slsDetectorSoftware/commonFiles/error_defs.h +++ b/slsDetectorSoftware/commonFiles/error_defs.h @@ -51,6 +51,7 @@ using namespace std; #define ALLTIMBITS_NOT_SET 0x0000000000002000ULL #define COULD_NOT_SET_SPEED_PARAMETERS 0x0000000000004000ULL #define COULD_NOT_SET_READOUT_FLAGS 0x0000000000008000ULL +#define COULD_NOT_SET_FIFO_DEPTH 0x0000000000010000ULL // 0x00000000FFFFFFFFULL /** @short class returning all error messages for error mask */ @@ -157,6 +158,9 @@ public: if(slsErrorMask&COULD_NOT_SET_READOUT_FLAGS) retval.append("Could not set the readout flag\n"); + if(slsErrorMask&COULD_NOT_SET_FIFO_DEPTH) + retval.append("Could not set receiver fifo depth\n"); + return retval; } diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer index 42c94e73b75481328511a2f5b302c36c00d0d1e2..8e535164802002b319c398d06c715fc047750438 100755 GIT binary patch delta 19414 zcmcJ0eOy&l_V-!ma+Rx~2L%BExd6l-S^iGd7_--+j(T(E82u`{%iz&-Lu}ve#aF zz3sIR*Pp)Z`O}v@i(WNXOY*qt^@U3;;fkE3e=D76j)@Lb+MN8m(l*WBJ(9{RtGa7M z)tc(MnyM>Ly7neItJU`yM~#&sJqHur)>4(Bvg}e>p!g64X=QF<6sMha8=Yrz$+gJt zx!p}Us|HI_oTSL%lE7I^?@qEiS#_LE&QeWdhNzNMFW`K@et>HQTnN||aE*XVRMY4? zfGY%C2KYMQQUUJ)d{NDlq#}W+0^$@H>;kR^d=XxJkO#?PX zOKokS#aB5KfPhD~s5&NZ2GR8#PLPK&g6Dc7pP7I-vpY_whKu9|{= z&}T_qZCZHvBFfiF!V_qNRu?{yN;Id4HmK}0^ffbFUNrm{w-j@MUQB#I97RImOSxTDJHJ zRH4;O>r?r8d^vUIsMYEcMsz}$VORI7nr(IhmcRt<`$TW@(pnS4C|nC2wM4rz%FA-y z(9M#hRgW4NkY@LneB*73DSFYYjFmwXa&pbwAiZ}AuCz+0(YuINXnV$7qw!jO(g5wV zB&)oIFdRn*@$W!w@>nZ9t7VNHM}yvcbf9(#;N>?T9Y>ouwB*qiZP)k_+U9X%xu%Ja zISk!;xm<@|ys*5xZZxTKg=U>FQj^E;#LjD{EYf;EHu%07T8{~CG!{%(XpdI0Jgw4} zj9fbo-XtyavqSguR{3d)J5ea+ zZZt5tTEo`0G%J^i~P z{Rg(EfA@T?akg;j67AD81&%A--e3E2j)xfCos(?n(V6^Hnk(5VThn?HmFgj9eey}2 z>&cIeN0yT+6>rn_%=Jeootzuyk@V}*4ULGZF=C4ZMim|oFc@R5lgP_ zJk~lS|AUt(qhd(iYc=b9AEZaz{5h1U70+*@bYVCb&9uPZ*zz)sE$|g~_{)OvWY?@2 zH?=p0kI*JA)T66tMz-esbZ@~j@@Ws`W$M#y)B>YKYl(|}v|Wo51+`mdtK7p`5FX_V zBz}}9Xb(Mem7da+B@+y|@}(t2bVIXeJ$^sm3(wx7i(1xFA4EanQlFR@zT;F$8KH-? z{QY`ife=-C<;(-L<$@NfN`DB}>LFu@*1B{!`D)EC%+uI1D@E%gpKL3oYBkvlv>n;L zD19~A&m%!Nymh%k<;a8u!CwhksjBqyvtpcr@i{S`iSczU?m2&KBJH_AzLn?3(NXRA zbJK7l`941!nVZv3UUWpW=Je}zaU~CdaMV;d&r6k7!Ku#&!u7|&xKd~I0Am;hXel|< zL`Zy+^DF@o`hri)Aiipc75;idXrZXmODi9swQJ}Onulh8!G{)VCHVJQ?Z69$EmrGx zSfE{a(O0*_JZ(;{Rky=D?NYA0Zi{)^jFs-XE#?h!R;3ps#EL4$B*saq^ulg2PUJk= z?Uj$fot5D);gp75@^ri8{gb=cn*O|Y&F(_ewcB={GG43Z82i-Lu9`w>W!p4F3dG@rig6?ghVi+itMzwQKw%{0W#);wStjn<}$y)Q8 zSiw4aZ2;1TPp?^fOdD4iuca(>*UrDjMJa{DsaT&pai6DFTzCw-v#pzfwGXTdq}s~5 zb^av8^m^l}81*O`j|vyQzK`}y(Gh)gn3_@XmU3H#?_8#R`=(ys>@hi7t|qF4)@_5I zNAa&~oLjLLw_&vG=A_v-j3Gbm=!U@dlzc0I_G_VU1)>C`yp`aZsmg~h^8H0v-Rye7 z{phWW{HWciFKmx_L3@eCi^+duN}m)nN=i8I1`xTrWiYc*pV_zAt4l9Ql@G;e_3H*| zbBk+WP3xw$dO|<8S_^wS9GkVhJ$%q_l;vIqu5(u=^}-SR_5||QT;55b4B?nS?Zi7S z=nT)l^R?U?VT96e+T7_FL-Ew^ZhmT*UJRfkQbJOV9rh04XW_4oV%gzgL`v^eZNruY zWYb!=45uP3YU@BstxVh6o#-UonWh~reVFgX9+Rb|Z{r72`u14eG!Mz{F51cM!^v9d zv|}p)SCjpOMmvWX&fCHtwL1@E_eJlht&H2%om{I`d2g^F z)T8=5q3tX0@7=1(dp2PMN|+r*y+kT7ICO=0JJUt>aM99shk1vq^81(nJ7c2e{@wt2 zk{go8A90-a-V70jU%xkgP)t#t#5>1iV*!tR$O`W`RCbGa@yOTW-j5}&;5_ZZ`(8K~ zTi*Y>I4k;UVS7cqF40cxbwNm--y2BhwO0IlRpjDN9N!^Yc)mEYN~RTK`;zCXC0a#17FjRGQd57+8HnLt)8^wUpK zAb3+1T0K?I4t^|tbZ8*a0nux5bY;zF=nK#5m1Og{A=)=JUOKbh-<2MTMSZ9{l3;#T zm11Kw>*u3oPj@Z-^M9jXPW$5tlX-|LCGFKhj|F-!*DYf6JgLgBd#KWO(WZMgXc@=e znSU|bCQ)=L`lFiIw{2g3EvZu9uYl`e;3S-^eGdYbAK=*u9FoibGNhYgtZi+%&ZeC8 zAybdXfmfBR=RlXx;^W#7I9H)2%SxKzaFUb;swJ{Zwi6W-ackK+F90t!Wuw&7+;#$*+9eqE-2|R}jDA z=Hr#7-TunoBOlo5ov?cVkJYmN6sFDj`aGK6s1rLZXLV_IuU4)8#KW?;q$wx+%HB>| z=*br?UiWAfCkNwtS$8rL|0<^jqLN0RT5Zv5OgNu=^weM+na!vCQA3n(Vlhs}zr~dW z-y9=cX;Ny3!_5V?FH)1{bY`;m8d$+SCP8v;Pcd$1Rm#|}Wu6&G>$DALUhm)6nVZSJ zRdQD4moMA%@T4yK5p0-m?p{s#vyV3SPX&X5I&s2I(fj#wfQZD#=-^pDYn8WjY zalBnx`Q)@5Y%fG5>kv-G`JQ#b2S-5Rh2gjh0TVH$oj-5hg`B+nD>*BJC*-VrbXtxo z-QC$v$Ug2`T-{+@Ia=!`BP)|HPR0eJ1pn4)O&34!;p?Kx&mB^w z*SDb=o3havJzM?Xd_0EnQfP#jZwNT%tJ3O&nsUhp6(RIe;E++j-nDOrVY=lzJ0Fta zl5d5Udud$6Syf)XTb1%Xa$oX+#yfN;=G92i+;*e3NG?1_5T@>8)n={b(k|SZO6uEi zaF<-}C;Pc*)t4U~kZI|(w!tm=85ccy=?#6h+0d>@DcpZvWKf-&QJ|KK=KOnNw2 zrZ$T;(a(w7k{0q4v8|zXHwoia$=nIQ+X=OS|%K)S%Rc zG3exr8#c=QoVD<)193LbygC=9^uX28@-ug|)~hTaX;p$0q^}Hl_HI)jsP)f`)vEr_ z1=mawx?ZZh_zA7#@67dR2PX5Nme{z%T(8QR&uWd0+w=StRbGTcLP`;aHZs)a9|inA z;G=<;d4Fw~(mxIOO~4zkNF@K<4&jRejJFt+Z5YmfPbZognd8M_ReD-KyLGc^mLDIT zavUOgL&TTjm92fLW>tQgU%r21si&8V7beGzrL1}dL~3K#PtVdyf86StC>BSuFWjp& z_Yc&TTuXPIDX@sth2C2IwF{^X)lL3xxIt#D;IblXta~Q3U3vl))BVls-MTEe4k$)b zuJ_3cKwFkE#IS>vPY9UMRv#=5*H-;--O~Q5NvD$`Fd!Nt?(jg%`{Pahx{BT!jmUyk zz+Xjjv>Gx43V=J+A%DRUZV;Pv`4t$&C9W%PFr|QMZO`=ymi3&CLvQ{x!J^moaC^XU zE%m2&ESq!*9J>9}+j;YE>7W$Q*s=5ZQ}o%^fZM1)DfjA+JU_<3_jdyRKqq{Fz$?Ia zx*5;62)r-w`5pY}H=uZbD6K?mZq0o>Ld4Q=PWl(Z$CQvXg9=l%TVja_C{mFMlP+;ig?nGuLjUDk4LhMCJS+N5Cd(8@w3Cwt(+W z_O>exaXlcm?2d(k*;!Zmo&4y}j_4k=l`On#=%&g^Ygm0xn(TVCW9_89tab_Y=^Ka? zO`5_zr%Fyn%Gm-NfxFH!6?&{skc72!?{7WFyuwZ@)UQjB6ZlrKW`+95K?-wrqrvg* zCNZHK71T%)K`a^cdTr#GOza(5StmR8OLkVgRgt3?4sYdi$-95#Eg^uAhvL*7=&Q<6SBkQb##jF6YsNnR4Gwvx{iD}F;- zGNdgO(pJHi=XG02$~je%-8-qQzj6Za^!6=5<<3jEvqUTP?H}2mr=2xMF^#+-*08Xw z0P+dgU}zk9@xO|Da%j7SJBvdtj$C1gi(C(t&l)O698o3Gy&$YyBi86tT7FCAp>Drn zmRhVqVhwL*>rd!~SuP#{2Y-XRNtK80Hn@i#VF&utBfUa+#m(xd)Db^#45YyUoy^xd zQ@`QJ5qhf-ZVN%_AL`1I11Z5AuF4T#v7$gaO^M7FgfnX~D-5D>l*ysK?57|aM3-6p zAhNRPU?^8&;GYQw{wY=*Op#`6A#9DKHkiWXdwGl43BAr-LTG4@L3$T$bY!7>9myf| zD!C?eQyRFz-VTUgMy>@NxIvp7w!!32ojcZ$#axa4?1NCc-QyvtgL&XsRyBkUPfyg{ zBM;y&gI#!VqWb7>^24QvQajiOJb|(p1Rnj(4|qh0d`M3^L#F|v|9Pm89e)@`F|(G3 z>3wsxDhKapwUcPD<8&CElwF%T#P*-U%7@b5DTEb8(mXP6j35tYiK3}~Av}?D_0B&! zw0&&v79GwLhuOA}J1dMr?Mr55QCMpbtBs;Du0%4NpYcpdpjf_Q9}7!Kpg=zKxa`PDpi5o&-KNJKmi8$9Q6COtLE~`H zjAupTXol6RV1QwvJoJvSv^;Yl@)mtmkw} zv^0W|U+;>UZz}n)Wz)&s9Hdg)DONb0B8Oz(lTB^nay7IHWD%w9cX%DQn9Gi1wcW^x zg+31bn^n4di={sfvnFGRn#P9(7;a|O7<%jH4YC`rdhY7Cm2g{>FUC)>*2ig#IRirv zmNWyCHmG#x2QGh+rG~2n(1R&6$dmmtgS^m*(H$6VCOB{Fq@DxG z;#B(g3LaCBJ^rsdI6#cfh5i-5J00#`qx-a3zr@_%c`Fwe~aGXhfBjHzO8=pty?VRbyy>6 zF1>-Iq+9D*$vhg#y4c8@d-xX8*#^I7tJH!dw~;^hTg!LM&WAM^?st^g=mK$n{qvlW zK11eGHw!{GS^{nzJNY|0!O1rcIUxHq{))sh=aWxN)S5xKTfteI2IChdNCNz2F*Dw( z$T5SWe~Y%IoyKbB(>3q0d`g5>+JdKhhwpwG!jAqP^_^Jr?{NdV{)5AL0lh&1(VX1~ z4N2-?ZyL|-6Jd>3nZ1bIlT>Qb`*vXXPawEX&Yiej1$UO9Wp>c6>94OaFP|w3$#d2j z!CEX>M|5J{FKBxNZA&Mb{yG6-YB)_Oe6|yP1+y>2F)*GrE<~NZ$WouC1i!|WgYk!X zye~z8c<8>?mwp_?DxM}!*L{3VIOVKLKfc1wK20-lg9=?lYrDm`8~OJ`469j0f!@(7 z{qU^LEybjWBy&-z@eXTUL^~|$26rP);!Ipn3I*uL>N4paORWL^9cnJ7z(KCqg&y^I zr(SBjBli2w&?KfsrN6(WN59n1Z{r-C=_L$BtZgwB(nMDH4E2{sxUh<6Xsc_KPy=P< z>Sk8|H1+NFvl$&)HJj?h?OSCV)(z16 zM{3aB8D2V~i8W?XZ2URcqfR%GB%cu?c;(ldjtFZkzyH+nop3SwZ*J(yHX#a)>$7x> z_HonrvZSRH=;7TiB5})|4KSsm()ZI@?owK2Nz|=e6PwCzFQqZT_rU1-Nmf-d@9UT; zrE%8CnphjNEz^6`nx!~6b}gel-UaQ3N3-LlQvF*zDsi~Pv5I9hphuf9Yit#02U%%0 z&Bf78^*HmFQ*Tr6`Z&CEu{q(EREif2R7XX5?1MGr*0afBLVv}@_5~VzuhaDfY9-6%s0^XH6)5zs z9F;FnI1c~n%9=Q;OrSzk`tBSHdJ(9j0u>6>W=GnK=*RQg{|cm6?QkisAtpgmIwJ1; zZd7#s=f`5`i(EM$Bg`wqxBA^Y!W!3z`06}oh&au&S78o!L4-Bl89Yh%$Kbb5;HA>j zFHwMN0}llK7DVU$SkOvZ6z~+6fj4+UuXvaH_4;-_t5^yBJ=n>WGaN0irW2 z9QCUyfh?H@>GT;#$SYJScWS`tlpAY&mHb`z2>ZjmC$BR10t&O7jkh9(eu!^m$pz%Y zJA#vV6;?obW;p!hLe^YB^CBJywy(e7K3SE(|2omu#$OlXjw^26BcoM1agOD$LFBE$ zPscpj;WgxJP5~AN)*4tWf;Fz89c~ZE{AwL5SxY_^5xifcVy=aViL7BQ4ZRnH)6lgSF7zWg#s>&*TG5x+bCnZvp5ltf-S<~w8i2+Yylj+7!?K=8`;_FE7h+M(@dNT7{0JYX|I0+snQ z{x=BYinzJ0kgF7KOGpI%BFo)K;{uYzOeE-MgWBU5cF_Nv5n)Y8XAK*vf8Rqlc+E+b zy7E^yUExC>ahP*xJhL+LY>%iz2U#Mczo)n05qko0_m? zFMhhNA3UuH^1bf;E{UpL9YLE=XYoF{>22EOktNi`*>iAKw9V9rr-db!qeTAk9ZIGG zrj+3HIMZndnY#UL3B@d~1n<<)6qeB7A?18s{`Y3P^R(iQ+HpXCx5aZ9dvBjv%^La4 zLwu$uo3nvq0?iM>Xlg$+exnqjHkd&w}Web`D+!VLq)nOtl-$KV+*Fc^T z3AV&6mb(?L^z;dBty45*T{NrT3dSm?l;UQ2ghiLqw7iz~jp`R$szTl2c9*^sw-a$a z9EH5B+9qiE5744OdqvPjKR`nns9MNr9G_Uy{xW`4HtTuC47mRB7KKRpNzT4h4)m=?=W@oX+eY(_!}FF7kBzSVm*Xj4gf`?1*}o7MR?Up_x~QE8m~U z_UxuMyw<7Ri|*yUL5|w@=q9=G9hs;k7dlX-DLKD(Q-MQMJ|dZl5uFhlJ}K48-s! zK>qg#={BooAL zSsq8b-`XHwqhMwy*~gr&$mHcHC3yzrWwzZ_T<-t&j5FY#p>212)`@Z2{XD;#lMCJw zd<*|O--Gk=9z^{AgnKsqO1ZrIcHgu0R}A;j|2N9@-19%n=vnWfk`6GoLHXfIz$^GQ>POOcC>C8VBk203PAEj(Ae}u9;{zzwA z`NPf*^G6B0#2*=~Efw>Babf<`0p_p-{)lFC`J;v9@kbNe${#1$Vg9hOOVi~ya4B2z zxZK}TrO@FtRH=cE$xq22%PeJQYm=9nQxrN{>X`79{GHhtvq1~wC#jGXERc)MXB9e<;|R`> zcaXVMp|2C!sfF^#Vp#CB+&s&!K=_9gs?e7%7&?8zhhN<0*!TGGcrzbv)3Ldnp6~}H&Jf4WERsJlCn|I*mlb7V(IkC1VX=I(e4O>24;Ikj_42boT$ZbPGZ5=WhLj6cS@4?P|kOv7T-oz`HcLSxkRCp z)l6O@$6In0`X&Qs?VnkFzMQ~bcvfD@eqJKGn011qTb3L`mJEeXr$|z-;rEzcGV3_U zoo6{6M*S1$z29bM7RtWtbdKDOUD9N4ws@KRk~x)AS@SaaW*UT^&c{Y>LP4>S4<#wU zg)4X(TAjwWWW^v3#x6P0pA&0gm|BE`JOo6sHSh-LTdPe2F`FeUms89I3Y{rp@rAM{ zdw;n+g!>pFd~rDpY7C2?gBL>}#qi>vn)qtE7yopgV|6e7xp1M*!am8BGx~e=;+ufwUsjecohuPu*GZ%B>))K-SPo(HT{TNu38@JB zE1{C)JMw<1C2rk!8;U>0m*q^3r7y`|G%Eyx4NKNl@HKQx))jE9Zpq8ee5hOULJMcm zEqNi64|Pjk;1Y~{_*)(4)h&4;hh52&KeE6uKf-#}X%FbbY^$)ra87kRyGr&Y9*hk438AC_qEAmLP*cECj!5_8$#3TB1R{biZ={U!! zSLH{^f>`_~(qh242iN`E8gRk@|IBdwV+~)o9+H}w@|s*@!Lt7-M2!B-^QJd_907?LTx7{DdNgK);G;M&f&31?naiAii{s~ zNs&+Ts(xH%%_XSnI+De1mNP6iw4lC{^hhWJ-O5gGhLiNRlwI5`CzxmVvn4c-JK}h@s~Q;(**iYm*nL{c1QYUc|NCq{k=S0hH&du+0O|_r~|@!5zbHu z@^mcx5fMt!j*4sYRH7D#={ld)A^gcWZ&j76Qr@dY(@R67WHc^$%ct zoW4sdMI|g#QOjjZ)Rt2I+2*^~V zAK-Xdc%lostnPe=!jN57E7H%ctfADDKxbLdHWPm61}Z;gu>UT%6zTUFn4N3DU7he7 zJouIB1w25Zu2JAm6YvN~Q&}0rpfPROW}1vvF>1Rh44rKHb|9Nr86Ix1P`d)o-zqfT zowabL92T_0G&c`^Hs3Y`THaG=tsUHAK})4VD{e!f3_<@=p~(v9X9bL=+1H(!OibNdT>c8gTxp~OAT1-M93w-|*Mz#)=q2<$dNkzSh# z3!E45EQJO(u&6R@E|g`LnI^l{fa+{eyPFmItcsm2GljXqDI~(AJJM%%K6Bq`3JXYw zY`fszsz`q;0xW{1`(FJtPTy&INj5vN2F`vQQsNADmnRj|Oh}a!_`WZ+U8GQ9EsJ^= zmJDL){1MGIylcwK%K%fOkrA$7dYLCuz9Gc*RfU{+Jct6|x*3^{McM<(wE~%p0F#9Q zT|ZZ-A_YpMi1`=c@l5cGcyj$&p^QYpg5CqisXX0@ZP*19u(PRxC` zX>tH;*zSm)7Zm9dY$W9fwk9O`0hYhpv?Q+-=sgBn$w90(02WFpZ(^)}K*vYfu2A-Q zh_wm+53u(GAc(yyF#StSfJL$?XBFvoC(|qcQ0Pf3=6f0Q-P{!F-z5zb!Uf`Cqi>Kl z7~6A;g_V-ohWAVf5jEJQSl8_ZMLG@R$#r7dDn2=F!;G}B9 zD!omLRNM@Hks-Z3jONz4OwjwGB=e9JR_#4pp&}QoCt|60l0s86U>LF*3-+E0#jTj& zY}Dx9_)p5uga8)y?fnOZb|qn7LgC(<_)Q1%6UBl%6-o|e4SP(JBM?4jXG5%eH-0w< zTxzhn<8HFxHpHre9;7$W>3dO`@>v-kZU~lk>$>kz=&f43c}2lOD7V*34-*ddR+jn! zBAm-QYRK|<5o7%W7#|Oudt2+-(GN_M`X555P^sX?}!cvII+d z{$yO~oC}4Rf1_=M*(8yyUR^ma{}?)Zc`M|R#)9^t;-mm8+~<|0&>P1Ai}3Km0r_ zRoHJ_b$yfR0aJ zoa$YR}wzzdmV=s*FDXk`yk9lds>005(s}dEe>#|fJZ2_=_ueD0Y9qX z=e-c(GKJRL0H+8#%HP0nmi;jr1h}Z(CH>GBnvb(8pz)5i;bS!RQJ7R>O!7y~mPp_mmfLkbH33+q@v zP^7jR$hC`wK3AkWsVwP$X;R)2?ko|}0ak@xlO(Z7p#4y;1@9*a7^h<9~8kNB4q+_jINeg&_R^) zvuwjbTom%bF2wbJ2ixSZgzenGf5}2Gb1=I@eE-7=g*8B$DDM5wqnxSC{S(u&yjDYl zzy%7i60iu7flCy6JP5F;n1LuN&u|f0f*);2VIo!(mJEbtOI$z~I|_tl?;HnwTkuyy z#d7cqiv@nI(9$YN>e1eB1^yqH*v8yHHHD2T?N}!WZ$JBCE2ce$oS;a=HxIRF0i$+Q zJAq#j@KXM^hUI^18u`1Q!Pb6$1szfFsuHk>prF$V{sSoHi4Y6I)#bL@iNBdo<{!w# zCs3Pr@RplaL-tPtZO(7#8`%7?llaDq_=)>p7>u;INxS+yw-f2<5T JWO{7C{{hObAd+5D-+#mx+mqsY!WVaYe->#iByNvJDG2 z?1c^{Dkhed6^3@Hu&}k%#KIQKl2$5xudZxSQQ3y_dCu!KSI~Oz_x;cJJ{~V#bLN~m zbLRY-GjlKBe$e;Z5BioqVXIQuq^gZ2%iVodmTEjTR+?*}${L3?s3)!0i+Ycu(whCf zb)qU=^L&h|Y8pKI6V>T0eI`+3O?clCL@j!TI+9U)O|j}vC8Q?FqLPaT+9Tn&}0fHh4R{=fmrU+W@Ca_%PrN zfKw#g0C+XvXbCp~UIy4M;by@1c%Va-9p`H7{bzYmNlkv}A}dwvE#V2&s0R!m%dGAC z?BNOIT~juEgq33T`p6)ft+zzZB8MJ#^Dv(*%`(h0PEiQlE(>lkc3Y{Qck?{IYRxiq zOPtc#3Cuc8vCK5*veoOYH!r0IeRk9ouhRtG1~BBi%x z3B72HQhI87bo5fn(JP{psX%Xz9!BeQYfL9ZwvK$t29uYL`OT}zWEZg76r|@l^m^;n zaUZds?RruC5mI$+>;ekV_l^z0S{lbjQQ|WRf1^y$#p_oRHkowUdQnPG%G0e$b1|1A zX$qC=^)m+4yqC0xx>MBZ&B_9&lGDe5q~YBz?iG5rSRmtQV-ICT{jfV!b+a`<8k7@i_(}<@U$)r(X(%e3f^P z^2sq`zb9gUm@D>s=ja#imiAn(zn!VVYL(9o(Lb2$BU@MJrkN6VM}M2?Nm@-uW?!OW z!{6-p-fK|Z`-b_-wQ5TFdVTM_Aox+kyeOZD-{&2V2wint@~eeSd{>9S8LV&y)^0Ps zzjveVJzr?H^6mjO&&~HH*88$v`=_hSqgAh6@MkfNJ?k;rs8?l;z#NTPA(86~9RB&G za52-JJUWECb#eYq#-D7|ZS`$B)jM&iP`6t0&q?4&fQI1k;jD9Bv$N}VqXkb3xZ z(PYZj?b$yf?~2Hoy4Y~A(ph=B+mim0XxtJXgk{E(PHF~GoSw4GUw>g~ip2KH>0q91 z5^YcaEY_T% zsACPUW?yfVItbU4$KSjGw@Tt7H03XzdJA~?=p8G@kX3Jcc!ADW+R1LT{PXOTsMqH$ z(s$(rAoJDdJ&4R8;2o<}Dn%$P3fm`nWoXKyb7VUm?SryC8|_ni;sZfgMCJn_Vkr+y zqP_aj2WDVH3V3h~!Z$yNUexXRgZq8CTKGUTGAgX+t0`+?)dxdh`=g*+_)Pv_w&V&3 zqYzf<`7@+Xyp?~yh_i@?{o}pFq+Lq*;(IBCswrz0-hewLao(D;`ifrkus==LEAV%Y zUi+}AipLB!EYiW#%m&}Z%! z1KkWh4mDP9Tc03FCp;O9_z}bFpFDyvF#}|ve)=iFOf4CsKk-zOp1#jpFE2TwPbwL! zZ`m*yv)672q1u|}4M8Ls^?UlfZ1pLfj3gJmae#hb=^>-_E}cfwTOqU+y?dqp*)v9p zD~iw83v`(%^j>9wK1IJzb6!PyV%Y?yw(3P?6Un9@E(>wRVRotUx^mg0DRZbO^n^E(HJ?X+_#6< z1&tky*IPCW)901fL!b67PZ|-8%pCP>G#2Z4cFgcU$jtrBzV20-(hpngvr~w4kFCj+ zE=?1nAK&VM%JB5o4_QAr60*N#o6P=Bsm!a}=8rbA0c1o_D4My#{;Jpyf43nsr;q6? z{S)=F?Tbj$JGPIZd_8u@FiNb++|iq8KTMpdAFjMvtfeSESI^oh_N1)m5)9Sc#QL}E z4bP1sw;JoN9fZF6ynA%o9cdbGyLdJ3eizb}KA+(8xeS;9p-EFR?^wO%`MH!;llVe! z@~qO>D`66G6zS(4eczrTe&;l{cMBGvMin8iS183Mg&~kAXL>O2c0KdOC_i6~z5LaG zCG-i`y`zv~% zOOkMdo_%EN!uR7G3dL2TQmRjQ*73oIilz+OhrT{$pMo8B&`!YY2AU1%LyQFprCZ|d zot*`4mi&$3cOFdyt)|!y098MOyd1EXM=v89KJgVN;sy82@U438CsF#`4^N}~jXl20z0TlP37!nv%Uu&pA1aR_SFY z|2o94P3Wm;hXVI{^sAymys3w=8Jqf>w@Fw3?yt}LqW5E_ps#A$PH~F#bg_ff z;a%+he81>7GSqgnFpX9QRn+YNY$DO2n#-rL?;g~>znBDn&irB?%Er1c=F(I>{Y;SG z`GO}y@2uFuuwHUz3{FPqiHUd77cMxHU%2j@{MBJo z@>kzBBVSXlZgAm*WUEurM}yDn-pxbVpbkB;`CW?DJDR5c)wBLc2@z*QB8UHe)dA_I z>Q?RUzF9^q0p)tZ*-4}8G`8wRaJf>j#vc;zGK^SQufz%6jo+?#h#-NRddpc)gZ`n- z_o9ULZ22n=QWY(o*vKos8q5OP^}4Ta8@kk}0;T57QA$9EDZ`5I4K7MxxE}s>2oiqU z*Zy$I?5~47LrwmH6&hRdrM~y;l{0gVdZHJOO*grYO@qxoxjDmu?1q#TO1l^x;|Scp zHdzszECm=>)a%aN>ofWN2lTveenFzjIX96W(yPyHW`S+Gc77PWspp=bhjU5e`3Y>f zkM8|H92(vGKS6Yl-ta$XJTs&dV@q4MO5gua?zy+CC+DO-`@$~UQH|xSf9B$IO9o%o z*wU|{vvjF(Uvq6i0qDnGqQs$}iIQ9Pr=ou!`pr8NB`B+l_tJRtT7&WoS|zBg8!k}y z_}AR&)fkPyGPsI#=Hd!VEk$DbBd$v}$jg$WCRe+)i|dm6_1b^!@C=td2=K-4>yF<- z^^||8Jl!3q7Dww~{T;tSdefzWo+*;d17tD!*cfgPZb9Nozm~Yz!s)WV75%l{`r~E)W%PGDT`vqa`-fQ3zpfj-I|LsB zq18Bjc-sI^wada;U+QUXyM|+1%Gv}XJBYk-_=&sbJIavm)Ly#p_b=F@HMRf;;0yjW zXTRS|Hn{BkU-i--qiiK;y{{ies~N40`eoU=rzWC(X%ElPEP4Y^o;^h<3?ZdbsqFu;plGJ(HrWr3rRGlB_T@W<{X0M zOj<2e8m)ws$0sZHE|pFajw0*5kaAHVm{%v0&WrxF5*K3+sW41*T@88L$)X_sx+nIl zO1XS*Oq9f1J?T$ul9w~R5A7iLU%|AO#!`3k%YA8D(%!DQQ{NYJAmf=;_jXs5hamb> z7Yi+Fiq(u}M@XZ_Zng1sD&2l($OXt!aD5h>xUCp{8A^|F$etnNx3e@sBg8V+T@=y^ zo?E(fMM_+!IbVzta+%w`Xhf1rl@^r3GHr#rk_gh@M5EdQo6&;hsQS=Q*A&35=fz$$ zik9&@FG?P-NqvY>!A8}^CT?+2n*xQF0=K%GK;AbBbkq0=#>RyOb(hGcYw(^RYDNWo zWJc&N(S&6MOZ@rMSQncxlQ;FFi9X$=nqV_WPFT$&`qMCQ;Nw&ipOL6B#J`^xKQn-Q_;;Wf z^qsp9-<1V5Hg2XVYtljP7*0c-Y#{kqZq=|Z-zlA!%xXZUOpT5G)#ZUm=*Escsy-}N z(yqOp@z@hQa}X`{t1!|3T6_a~va@9n;gIRdiP;*9kKvd7X$BqSX#w;bS-BQSW9UU* zBwo{b+h7XdO@S0d>AXFVhO#l90(A?!<$#IH9SmFvFC9#{;*}^rfm#}NRO%G_$LK>S z5?T$tAl9303)Jqs4HT3^X4EL+(Sgp z=$)JG?(^}JS@QE8+*RXBbChfd2*j}42y_QR&qgqdiBH^`Kz;V zrbT61&_k?d)W(7!vq0`Xc`PPhYfc`!g{#5jADk}dSoX(rm}~LB#}$3uxncW^b(h?N z#ZnAKDp40Tg+z*UEu+AkV$@In>lBGYAjwXN?mh*w^{9>J6r*0;EU5NKX5G?7cb!09 z!K~0#D0gR83ub~($R>@AJY@16`8oLFn<)P25Q^?MOeE*r zt|ULwi~EMqh~RFz?wAexBj96Po>&I@4_#jZsqO4djl z4-Kc0eZq|*9=QwiM!fIL3a2N?GgihG`bNYE&UUBoO$cGn+%ClMea`$5h|KOabNJ&1 zF+UtZ|LHUQLKpF{dw4@6y*o49a27Un6BOow7!f6;OprGvc99QV1>=N*#@H7@W5$tk z)9h|EvZT5xkGI^6av_j=MA6H(DvgDmaMnf9FU-@Gma&W>i+TM>`X{NpvOhBCd!uMF zMzr051bY4<8i3-Xm!9;u-aIXqhWQ!QfH-Tcy(!K(>zL<`IA2~8OHmZd>tZqCczz+4 zCMM-~i4^p`nP8NRwK81AZN=K`IFq4hhf9WN7rDjxI&DO#i)Xj;%MYXp$d!wE(PY8_bC92&65z%=60nsa zcO}vbwgQd$9^?&)w9B(XP7RkB_zEvb!WMp%S0}-}Vt89V)Z;mh;(J8EK?f%Bv~e`T zhMjSsCodRBL84w9aFJJzqsK&jH()*wPo@OHeLyhJPNopi^!e3UnoMVVh?7)bAD(v` z{Y^CcOy!A_XerI-dnVCx+i8t?E^`KGbPM%}ysR;g7(RP4y(^-j_c9)EJAG_J8tb)% zx7|)tYZ<#`u1hLzjyfMurc3aHtQ%zzwKb|{P z68AjD>!;F#*o)%spkcOfjr9!UaGlY5mf=1vZ@U{a`H8N#X*X|}OOMcDu4U2~^E^4K{uV1Q&IHX`z9$nS zmT~JnaH~*_e%UB|X*7?-Z+hjs1dt3A}D6pq~#&e9n~4 z_G35Twg_B|{g&cxD~RY?!OsuLv6WLg|6^8p39gcme!fQ_qm^6glK!izel|`5pt~Sc zFqr-9$s1$f*rf-kH=i|+)**oDC&c7DnkAg&Cq%u2Mh(wI)5r8R7Coi&>Omp9*biV! zSu>4+Z?u2U%N@uwd(cEuchDIUKJml9h0Z4Q7;^#b-Td62=(y z)(gYJa9c*;cQHYV8@>@8i`B6B;c)@Hav}Mn?yNIkrx(&Czk38xj9uA|w|AGGzP*(< z|CvVk`AM|+zM?ytoc2ZZG?ATGXVXCU`9g6q_PA)?2(WOx1jUavgamF~j9bGbZnnhb zbi=tzoS4ncbU&rB3xDaN#23l2W4qx_NL*P_&>&;d?cI>Z9R}pv!;2Opzirejy(4(h zbJUX`UrezyfAbO~<)3)Y5=y2+}L>%yV?-`)^Z9iOzG0g`ItXGiH}Xy=-esksio$E$0F68zaLe5 z2BOv5lwhT1+*PYbqTqI8F_=f$KYe#iAK_nO%6BLat z#{{lg79l~caqr5j+WN7Tyfl}RWA;gd^yoUOk2N$^w1YVybG%WS(mC_as&Z`8=KE0} z{+lP>PlE@KZG+o1i`5Hi<99>!&6{#W499N)j?gio)nuQTF2i3bLl#ms`g$2JTR|(` z!wqTc6B4<)k|uToGgl(GG(+qCemo=?Tq|DbE0l=B8t<&6SG-*1q#NoUB#IUkAbB*# zR)OY8J@@Glo*aX$8ZZ;dq%)6vvDs4#s)SY4-{N&N5!X8oD~?Q+*s`eEkEi65zk8Eu zkLLGzRz8J8p3p8ySM$C3l;9q0uC95G6CN^;JbeY)D2(X~ zoO&Oo5!dSC0FA!b#LGlix}<`Oe}N)bbmhn{WcM$^xb+cqmB=o9);+^Pi%xQbsux9 z+|u*bVvMjDXxc!Ndc9MAwhC8SkFFtmpTq{?2*!bnPLJl*Yj6WGYc-`OJ#>R~?bl29 z*^5%Tc9D~i%q@^A+LZLONPccLO`H0q5ExNnN!e!JG(Z?}_1R6}PmS9{EV7%xN#b7b z27y0C-LQs+^hs>*68FvSny=1pDm;bBQ~y`r{7wE;_*jwxG@o zb0%&<62~36bt}E#Gg}IS?eNX};~bU?c*DF~X;EaZp-lR8Fo94+Tpx@J00=d2~MW{9VxSU*$$j;anHO1tFGYTm4H6y z>6J7ive~sv;~Y)J5lhS>#h1G1ra$LL`06)&{ zTj>_(*yqTTJkPn-pwYflJaY^A^0w!2^s0D;dhs>8=pG-0(>{E;>tZp%8!!&WyRg46 zb4FB=KeJ&~uO&Ito~K0?pIC_J+hv}Y7f$K?VKQ&sOKJb_QZAAg*tk^&jh0m#r)Wc`37gjL3+W1 znw_a1QePW2Ix{||GyUnZGx{4^?oK7n%2xVYe`?s2#U|0AO?%m;;G`l#h395@J}y{M z?IGU2}G`1e-k z>#Vb~<30R}JFliYZg|Q8SM$o=?1jRP&Z`+mJFm`YGvA{9e|cuQ{om;RD=+ZiA9=9R z?$uyc*LiiOo73vaxHZ1C^Xg+aKC@+CJ>LJz^XO6DQxoQ|7B{9n$**?7wFoaUkFEQ)e@Mml>t zDOzO%WAVh{NyL+aClwC@Z(s(VOgs)e*?4mCT6w1c(|Aw@UL`zPyo&ie z@$%+{;+4jCh*vg$SG?Bov*MM`J2No;KkYndCO`*I7B4%WCtl6GP`sM>4)NO0-xV*7 zpPk8`rb@p2E;huyLZx?8Q3eikPMgo(U_5;en`$#U`Ezsdn~GH68=QUbX8kN?n-9H* zJ>lMaYfykkEfS@(3`1e@;)q^b1mVy;)+>+0>_WG<VRld*g!%ys8zsaN z7{2Nuw$A2_W&pqX5R0>=sq}dXPk5L$$fn05Y&pWW;1L#JbAT?JZ+nE@>0YAJ7sZM) zsQnLgzJkA4023M{{H+3(Jw)jz76Hvas;*iwPa#|oD&z4h>HPkf4sP>#6;E9au5kKq zycH#2-1S^5yn4TA3O-*wq~hoQ;lT+wT2vZYNl4NabD76gVS z&t!)0n|(^>O48%OThDz&b|7j2&ikA9EWJppb;pYy~M z>^5?TFaD6OC_^XRIPX8!gAxk(A>H}idNJ=&a5~M^r&zr^ru{AtKKiThKY!l-6icxc zpl=9qZo`O)3&9bQO+$r0=82}^j6YWkT0@0D9_IN^vje^U)2`BQ4n>K0TX^8@{2!}XPagjaEAUdU zUUNp1i2H10AG*WII_!!P*>F95vGBeQJOAJr_Ahrkn$3z56@I;b_Sg&rFDU~}vr1Q* z;9~`X<~hEmoIRn2QmAnMBVxEfJ8L&He{ye9sdK-g#C&s&^ckDc=k(dadXf8n6rCvh zN8Ky3`ccN)Dv;HUPM)xhWxH!ANUe%;O9Thr&KtJDNJf#$zud-BZDknV#D{KYqii?@ zk=1$cb{1r(3g?=4*hxmI&h$g-Hm@qb514 z+Rv+gL}war5s>2aZD;*=U{8+FEkU+ig`o;b*DWEoQZ!3>zG(U?_%~u+DVj}aHaU;# zmaW#9T-Z{vD2j)8L$jq4_B7#CUkUe-aFesF+!DoNDg_Kj=!@5TswEv6)PNEH%15Rx z5l4#B8}K>68NB^j%e-JgX2meDrw4E=<=qWN`GYT&^R`+#nO8abMGC@j%g-W5@O9fQ zQH2P2mTGoeV^zzYMPfMOWguSTRa%w^c#p*2r7C}mMkuvPc!5e)vB1xka2~=Q>DP9& z9~0A9SBu>m_*Mx&u3Dy70j>mpAK*8uH1hdcbmU0}dsKQ*3<#C*n`j#!!1!1{Qfaz_ zXYH^|E6m1n15CcQa081!CYjjOM1s7APf=;C6>x;f);2>`j+KGDTEa_Ir6U(`gM=Tt zf!_v|<}{!$PU2rwmBKlpkVh)U_J&I7c_2uW1Ser0!NV%yuT-+u0gjgNWmS2*8j4Rb z;U2wJvK4jVdxWX96AOgm414uRR4p@v;)G$~K0RitqbLEEP)a31j;dUQ;hD5Vj{;Tc zEmkNM+2b))`Slz>S7}M6Iv%>yf?wnT8!kuxq$+>LbgaOHds^|M!dU35MZ!Z>>KOp~ zObL$#w`g7kHYiNb?X*losTlj5B?^^n)^q4=;#GKgi2#rSxP7LQ*1_8ak%Ncsvdk-l zoo$y*hVCz^^rTp?oY1{SrH5J|P`1Q>pwbd7}MfENabqq(=jKz87zfqV5( z$zAxB9N#NIrQSmSQlGs>sca+(iwg!2vsb)Ii^>6NCc|D+ROPAJ(7Em6VnMx{tn?@*P0lmeE{ z()$%-H_qB^S;MTY{G1@K2A4#W+~Z!=g8%nKCV}k-LE5D%mDKXs=b=dto+Vy(UiQ4D zurM7&7tDz81ks~Vu(Hl%;`xM1ZUum40`T01NIwc#I+SNMBDn+#l?wEHPo?TO2$3$w ze+i3cfL@x@^H-I!!vRZt9}ksSMk_CS0V;4{oDAqbw~@* z(f5q1oE1TsFUeXFX#y;RO+_t!xtr?M?^L=M(vq(^-pfnHZCxq`M9Yqw&ALG;GneO;pwfm| zUiOkDIc5)5Dd+WiSXDmuhH{$au(hi4TQ=C#N?3=DtlavtCAlyk-BQP1&8qTIE8uWR z2A$_*0&X$ke$e>>(6crPyQ}nU4#X{%@BmerUJfy&C-sX`X>$d}UyyhW>Zk)O)zL3Y zrG5(zqeBYNuL!PK$(w{+;6qZ5evK;KQV+hVlFv67VtfGO)9)vt6oD&Ld?Hr zdD;sLQF2Vd2jU=*f0^f1Tc*t~LHBHP?7$;%Z(&~P4+FnK<>LWZ@nQ-zIq+NaNat1} z+594|T7j0q>f2M$ijOI?ub)ajsXTNaGEN+NrTKhwVZLg>(mi~!L4GKLMkYMpb=Vk5vJzxjDw9%k{BM$?1WkP?r*@S^^=-6)#@DGB~LILMUc&tiW_5!Y#@NFs;Xkh3o z;pwP1LwP&a5t9kBT-m){C4U%M$&m1VRXM&Nu$0UH1Gs2D&)ARHsz-OLNfr=>lBSAR z?T5SP@FwxHbL#=i&4q7V#+*_q0a(OrD9u%=1@=_w^*rDUOfG?eC=#r|XG<7G!{Tz_ z>m)oGIO78tpTM~=D3r=vc+}Xob3jB(`Yk98KWjyY!}Op)?4_H8(yArFL3m6RV3}Y8 zPhfjM6?ecAHNOe-wwS{PBTs*Q71uV5=e^pgF z_keGaoajAOxsu3JYb|#a-Y1MDJvtaS1y2cU$`A;?2@4i{B;VjtCfGXzQHK4^e)B|XZJl5or@H5mfUZfyr%t|$bWy;2SMvZSwr zh|si4V<8`^w4y>$`nc+?kpF>-HSYbkC2Bl0;hHBD*O-H0QOjPFPv|K4w=ej_Nf^1~ zZCHv_39k^hHGJLMmT`Z&d;xT!vj32Zt4hGqgF-)6l|XNdlP(sDqs!&!ZuD(v8y}3v zCyc2yX+IhfCcm&jD#e8I&^nw7+`z^|cK;bUD+l6A#|c9k*jUcnumberOfDetectors; idet++) + if (detectors[idet]){ + ret1=detectors[idet]->setReceiverFifoDepth(i); + if(detectors[idet]->getErrorMask()) + setErrorMask(getErrorMask()|(1<sendInt(fnum,retval,i); + if(ret==FAIL) + setErrorMask((getErrorMask())|(COULD_NOT_SET_FIFO_DEPTH)); + } + return retval; +} + + + + + /******** CTB funcs */ /** opens pattern file and sends pattern to CTB diff --git a/slsDetectorSoftware/slsDetector/slsDetector.h b/slsDetectorSoftware/slsDetector/slsDetector.h index fbe6c2f5d..5d505a748 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.h +++ b/slsDetectorSoftware/slsDetector/slsDetector.h @@ -1682,6 +1682,11 @@ class slsDetector : public slsDetectorUtils, public energyConversion { */ int enableTenGigabitEthernet(int i = -1); + /** set/get receiver fifo depth + * @param i is -1 to get, any other value to set the fifo deph + /returns the receiver fifo depth + */ + int setReceiverFifoDepth(int i = -1); /******** CTB funcs */ diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index 4f18a06f5..2c539829f 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -407,6 +407,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { i++; + /* flags */ descrToFuncMap[i].m_pFuncName="flags"; @@ -916,6 +917,9 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdReceiver; i++; + descrToFuncMap[i].m_pFuncName="rx_fifodepth"; // + descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdReceiver; + i++; /* pattern generator */ @@ -4186,7 +4190,7 @@ string slsDetectorCommand::cmdConfiguration(int narg, char *args[], int action) string sval; - if (narg<2) + if (narg<2 && cmd != "rx_printconfig") return string("should specify I/O file"); myDet->setOnline(ONLINE_FLAG); @@ -4203,7 +4207,7 @@ string slsDetectorCommand::cmdConfiguration(int narg, char *args[], int action) } else if (cmd=="rx_printconfig"){ if (action==PUT_ACTION) return string("cannot put"); - myDet->printReceiverConfiguration(); + return string(""+myDet->printReceiverConfiguration()); }else if (cmd=="parameters") { if (action==PUT_ACTION) { sval=string(args[1]); @@ -4351,6 +4355,19 @@ string slsDetectorCommand::cmdReceiver(int narg, char *args[], int action) { sprintf(answer,"%d",myDet->enableTenGigabitEthernet()); return string(answer); + } + + + else if(cmd=="rx_fifodepth"){ + if (action==PUT_ACTION){ + if (!sscanf(args[1],"%d",&ival)) + return string("Could not scan rx_fifodepth input ")+string(args[1]); + if(ival>=0) + sprintf(answer,"%d",myDet->setReceiverFifoDepth(ival)); + }else + sprintf(answer,"%d",myDet->setReceiverFifoDepth()); + return string(answer); + } return string("could not decode command"); @@ -4367,6 +4384,7 @@ string slsDetectorCommand::helpReceiver(int narg, char *args[], int action) { os << "resetframescaught [any value] \t resets frames caught by receiver" << std::endl; os << "r_readfreq \t sets the gui read frequency of the receiver, 0 if gui requests frame, >0 if receiver sends every nth frame to gui" << std::endl; os << "tengiga \t sets system to be configure for 10Gbe if set to 1, else 1Gbe if set to 0" << std::endl; + os << "rx_fifodepth [val]\t sets receiver fifo depth to val" << std::endl; } if (action==GET_ACTION || action==HELP_ACTION){ os << "receiver \t returns the status of receiver - can be running or idle" << std::endl; @@ -4374,6 +4392,7 @@ string slsDetectorCommand::helpReceiver(int narg, char *args[], int action) { os << "frameindex \t returns the current frame index of receiver(average for multi)" << std::endl; os << "r_readfreq \t returns the gui read frequency of the receiver" << std::endl; os << "tengiga \t returns 1 if the system is configured for 10Gbe else 0 for 1Gbe" << std::endl; + os << "rx_fifodepth \t returns receiver fifo depth" << std::endl; } return os.str(); diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.h b/slsDetectorSoftware/slsDetector/slsDetectorUtils.h index bd663af23..3e69f88d3 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.h @@ -711,7 +711,11 @@ virtual int enableReceiverCompression(int i = -1)=0; */ virtual int enableTenGigabitEthernet(int i = -1)=0; - +/** set/get receiver fifo depth + * @param i is -1 to get, any other value to set the fifo deph + /returns the receiver fifo depth + */ +virtual int setReceiverFifoDepth(int i = -1)=0; /******** CTB funcs */