From 2c6ded89ad3c1b6ea59798c53af072ca57f2b7ca Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 28 Jan 2026 14:59:49 +0100 Subject: [PATCH 1/7] xilinx server: not allowing power down as default dac values for the power regulators and not allowing to be set to these in the future either --- .../slsDetectorFunctionList.c | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c index af5804c82..4b6a2b460 100644 --- a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c @@ -413,9 +413,15 @@ void setupDetector() { } LOG(logINFOBLUE, ("Powering down all dacs\n")); - for (int idac = 0; idac < NDAC; ++idac) { + for (int idac = 0; idac < NDAC_ONLY; ++idac) { setDAC(idac, LTC2620_D_GetPowerDownValue(), 0); } + for (int idac = NDAC_ONLY; idac < NDAC; ++idac) { + if (idac == D_PWR_EMPTY) + continue; + int min = (idac == D_PWR_IO) ? VIO_MIN_MV : POWER_RGLTR_MIN; + setDAC(idac, min, 0); + } resetFlow(); cleanFifos(); @@ -1296,6 +1302,9 @@ int getPower(enum DACINDEX ind) { } void setPower(enum DACINDEX ind, int val) { + if (val < 0) + return; + // validate index and get bit offset in ctrl register int bitOffset = getBitOffsetFromDACIndex(ind); if (bitOffset == -1) { @@ -1303,10 +1312,6 @@ void setPower(enum DACINDEX ind, int val) { } uint32_t addr = CTRL_REG; uint32_t mask = (1 << bitOffset); - - if (val == -1) - return; - char *powerNames[] = {PWR_NAMES}; int pwrIndex = (int)(ind - D_PWR_D); LOG(logINFO, ("Setting Power V%s to %d mV\n", powerNames[pwrIndex], val)); @@ -1322,16 +1327,8 @@ void setPower(enum DACINDEX ind, int val) { LOG(logDEBUG1, ("Switching off power enable\n")); bus_w(addr, bus_r(addr) & ~(mask)); - // power down dac - LOG(logINFO, ("\tPowering down V%d\n", powerNames[pwrIndex])); - setDAC(ind, LTC2620_D_GetPowerDownValue(), 0); - - //(power off is anyway done with power enable) - if (val == 0) - val = LTC2620_D_GetPowerDownValue(); - // convert voltage to dac (power off is anyway done with power enable) - if (val != LTC2620_D_GetPowerDownValue()) { + if (val > 0) { int dacval = -1; if (ConvertToDifferentRange( @@ -1339,9 +1336,8 @@ void setPower(enum DACINDEX ind, int val) { LTC2620_D_GetMinInput(), val, &dacval) == FAIL) { LOG(logERROR, ("\tCannot convert Power V%s to dac value. Invalid value of %d " - "mV. Is not between " - "%d and %d mV\n", - powerNames[pwrIndex], val, POWER_RGLTR_MIN, POWER_RGLTR_MAX)); + "mV.n", + powerNames[pwrIndex], val)); return; } From 9a876075abc54a0ef5bb2f358209dd4253bb8dff Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 28 Jan 2026 15:12:55 +0100 Subject: [PATCH 2/7] updated binary --- .../bin/xilinx_ctbDetectorServer_developer | Bin 305832 -> 305832 bytes slsSupportLib/include/sls/versionAPI.h | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer index d3c921dfeba4d78589624362d28a371de4eea199..35a9ed29e5c025148fdcb428002ff0d79b984133 100755 GIT binary patch delta 60542 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 E054v3$p8QV delta 60635 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 diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 8e7c2d493..245acb823 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -7,6 +7,6 @@ #define APIGOTTHARD2 "0.0.0 0x250909" #define APIMOENCH "0.0.0 0x250909" #define APIEIGER "0.0.0 0x250909" -#define APIXILINXCTB "0.0.0 0x260122" +#define APIXILINXCTB "0.0.0 0x260128" #define APIJUNGFRAU "0.0.0 0x250909" #define APIMYTHEN3 "0.0.0 0x250922" From 9e7952048a6317bd407f94bb90f9977adc9522a8 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 28 Jan 2026 15:20:34 +0100 Subject: [PATCH 3/7] calling setPower instead of setDac as the conversion should happen here --- .../bin/xilinx_ctbDetectorServer_developer | Bin 305832 -> 305832 bytes .../slsDetectorFunctionList.c | 7 +++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer index 35a9ed29e5c025148fdcb428002ff0d79b984133..61496029026f44393148f4b88585f85b351e9e44 100755 GIT binary patch delta 51798 zcmb5X33L=i_XpZFNg#oQBqSl*g!C{8kc}h|NZ30p0)i4C2nfiq2?$6~Q8D5SBA>V* zDGDf5kO_*)ra@4MvJ8T_frL$2Wdi!SB0)tR74m-7J(Udo|K2(8d5+AjU){QOYrA!8 z>B^g@TE2OzWkpSxV@!}D{&UbX`=VFWTlBz+`aZ_*_KoCfGg7ks#qf(!mf%?SSjtb9 zyj<@5h{QP+qSPtwOj=%F&x;f#wzj$E(=jEBJ`Ai=Am+-VbAfdT#JpK_7O;#!Ov|Rz zfTaau?rb^dH0VV~4jvP7~SX?0H$)O{FMFnDN2YM&4=7E^2104jcNg(EB z_oQC6D0ytC`hrEtXBX9U%bLZkb%!>ry)E4GsZNG?Q$3aX z7g}6R*c_OJ^XX%>%w zY%DFaxS7(7>cZ4!Y))pTMQP4n&TJ!o_93J;XFp|jXyDPBGkaF1#SzYiX0>hY3a8$n zpiMLWspqwm73y6SOkV*lq!F;NtS%`2XIXEko^X2b-+JziRD89Onom<)!^`xr=6e?j z9$_@Qy+w;)A7npaQCqO?Ikn^)meRoqwMWFDlZh5g9iq&2vEp2NliFOZ`lV*<{@m92OK;Sd&Qg>W7*Z>?KcKA8 z>&_cReJF@G6$MN+3b;WJYrY@Zp4=jj-pH= z`~$+Z?X+rdmR7AQN~XYFz%K(w+TkLt*GSuXc%2{~O>HR?pYXvTFDlAw+3yXn^nmJ?t93*&lyQ&m_gj1o0oR%KTJx&;9wy$sQGguA!wC-+c7onA)!sU(h_Y`9SIRGB%Q+&J0%m1b?#JZ^~BJ6kst;F zVvq z&9{?1Q($ecCg@7G_AB|Wi1e382%D&fHQ(#(NWr)?HIecF1|hAlpJ9m*0Q+-^-O)Lo ze8#4BR?}RG)Fq<*Z6nyT^|0of>u3L*ZS0(!_|61n1qNi5qU2K;vuZIwy_l9(u?wBk zoZdt#0w4bcQTV+_i13$RsMt&oYrdhP{GyIrNpz&Z{B^B@hv;F=cbnirSWF>0uOpe> zF5>(H)Qz}5glZV9-Tl1G)g_HQ&o*=^%2KQ}GeEKi?k@#5S~MBIfkj|>g|W<9nAl87 z5oWZ8Xeq3BVQZ^9h3X3X>sW|*Pl!OT`G?IfJUTLain1a#Sea|HD5bAv75mn6eR_te zYfatjG+!>NLHvs5cJEYtl{<~@^ne~lvm#!F)ORdOtQf{_$XLbJ7A0sNLqL*Wz&4TK z0|@xQ5HMa3Yrge<0c#;Z*Bldp5YnDqFH+lUsk#;xzmOM2qJ0pu&k)jI4{N?>S2uH$+U zTq+eYBiP0s*`wV?;4BzY!7tn|>snr|TzO+|tarB+^>u2m|V-!pr( z(nb%w{=c-+5C?6(`oqxbej)HEGB|2zrMD>P34X2aMkd=Q6j!_P|9k94&s4I8rSwWD zQ0%l+Bt3zoCk)*bJ*@fqBWVVbS%|;J9Clru%WOuk2Ho!aU%I)$2;E-x>()^S{0bR- zW$5-b(zrp}{kpXlx{ZQv`2R6>rI(#dV9~u33LI%PUL-w-q~{FX4v3_nL-G4F2J9tS zZ=N)xs@VA6Mg6=+AQMcfQKr^Z({du1;lRw1NUxTe?>;eusqL8O0E_<_7&X7+GU6 zs))C(UW_}~er-pn(oPS&!-n;V?V%!oI=y@yDe?Q5knj^E{$!}qRu5~wnSNEo1Xl?@ z_ir$)>`1Xy^R}bY1k+U{x@xEqqlY!$Xe4r46xtn$#P2Ztt~YA7ifHY1Eq-Geebi8g z5m+EpYVSe-S-j;}N%R-@Kal>9q0%)`3!uBOrG1hIO%|cP#nrmEKw#Ik4BAPgs7H!= zL!XO+2Xq>KL!rZ~7=nIVS4CVIdTvYEwLUR-929wC+^=s}>=P2jNPYyVFjHJB-cw)d z2F}1!X;{iCvABs9xg9`m2aMc2A~(<>+lTcHCH>Sa`Z*9eMYz$PLZUF_yCF$YRty*J zmKW|(>^NnGGA==PN<{ePSmBCk)h*cCe(|mUKqyrWIwdFF8|8a9-Uw3Ql&%;~#;&; ziZOIU*e!I!Zxwz;O<@|VX6kLRmQ`a}hoP-PgjSVo*lkr-HHX@SQ2#tCD&Po&dy_R7 z+mr#;Qg;rGF=??+Fr;d}VEkgLt5DQ@YC}ST8M`-1plgpcT8K#JpYw&_Z6Y1~u|L?- z0okRV4)iwxw1Y>|4t*93>-4bZ`{sAQ;Jik`Xkn~1;_ozyHQ*C{hM7G7@u+pAq7HjlpoUFr@)rH zvfVc5dt!Cx(NrO^IaG%uBDgE5251+f&tx1!S9nn=oI*0 zIIU~gyuo(jWG@cxk?rb8f7aOyCru<W;)S@t>{i)ZoYeQoDDFxIm zfPj8DL=S5|3h@d-LHzyjhcT$Tek~jN;R%FAKfKHa-H{AuaM+#kA%g!DTX=_Nbr;aN zrkqp!IZx7aRy)(FrktbwIp2kxU1D_lbAHQ|^J;(2Z|XTOL(a+MCFE*n6?aBhJ)LPc zQ_lYtHHG%cLe6o0yU-4%jL(XAbox}0aX^tD5g99_p~w^c8P8?WLzBs9WSkHT_Q`C} z&~_xA%^ljE%w}7MW)D>h=}&r|Mq`V5=YAc||7w_nJYf#d=onBHio1|r)O7$q^bnon zIX$fTYQWFRN>VVr-&WF^I9TJVk}D=e=h4p55`R@P!z>QJSKt}xMendDP8cX%@S5dX%8 zHb-M%u~! zEPo^;dF&(5+V&qtT8Y)sm8vMU9Nwbo4h#9{KGDoJD$U~P!3K=#73%1Qye*q9v8AI@ z$$M<;s8Xw|8?6I{tJ(|%wrRX}$H|tP~!Aic;k~O?)d8x_7O1YY%+RnFFHVEH~m)J&eWwRby||%Usn;-GURf{`4r4kwIfURViMDUJ>d14dq6^cu@~) zzONxi7}0bKKwVR`#`PNpC`#2F3m5OxMhPp~m9cBAE<$&R)c*NL^fHGY)_fb-hH-`C z`$FdBR~356?`#moq7M@yaWSpI2_YT>zc9&Ij4s6PqCUMVL3Ejr*xZ6Cu#Y|kcGtsw zd@j~?yqe+&qAmeMf+4bxZmzQRa39~?tGsoQr43s>KBCAIBv!>(@CVZ!<~%&X^j?u9 zU?Oj+hc(|Qc42(BT??V50tlF96+Mh~3<@HO&1!05nRbuO>JFj3L|lNQ^P{L(I6Ap( z!98hKr3vjI7y_obvw}g`e75JF_Etv|ni7zkkp8J)z^HGrolK}9R!`F z)6c=!702UNwJCjE0RC3iz|dX~YrffR@x(H#t0^5L0DpH95<>K_=DVFmPl_jX+cPF* z6RQ?RMN`SGKOt!AFCwh@er0nf7g*h4^okBZ6@V@l;lVI1Us8&yNN(B($H1^cPn(s-LKQ-H`hEt~i{4FlB$kM}_uZ+!~ zst$C7(=q}0n^`be^|0ofhysbQf6u2v!LIXE5$A7l5f`n8HQ!yVc4}et<4AEGW={;V zh4uBNK`i55RZ}BqKf&fNg$v2*z$kWZI^)-qyu@nnML%po<3!Scjw+f$bkruyHcf2M7f-VmxLeSA0SEN` z&3YJy=VugDY-_`PRusc7c*W)hqtjx@IksV1npKOW-w1YpA>2@~LJy1m=5ME=F{9`a z0r-1{V3@CmHQ!!VJbjMk??2c()BBJ??E3VltezNY zSAqe<&B{K#&ta)Z)K9mVHZw$QylRLHINYjG9C5TeuukaJy6-M}wl|J;0Tyt$RiS9D zXg;uj!!5XAt!Or|fWxf{MTw{FfQjWvgFHt(Z3E01aJYru7Eeyi1b8`oZv`#abR<<7Y2wX@LOu<-`Uz>gJE^*V(Vz zPW}jZgqV!6AK{d22i9`5gZ4th^P{dyJQALX#*xrs>& zfuYW-6pR8iT=gg!?`3z+O(GAm8FOK*I?yU1V;N*FGh~j_!~K2tvdXzui;~Os%}pFI zxSDqBzE&8H6n7h~;>KpczD*=*$l11)MtcJYD4zENP>S5B(E_4RcMRzB`> z#pgbNc~@2F#vh;{Xt)-~h0mrz*hyf*fhxvauV>`y$htq6Xz~5P?s{;MMeD@QJ(x(2 zvFi_>Ps9?=J*vO&MycT*6bny8RJ51<_)t>LQb<~lXaNzh3TLMMRIG3Dc z&pg}-r%QVtR;^wm$>Q&^qjcG#=kY#hkyj1#J&YbwM286FWM^#)sSgYB?j1N|lBHIzx~%C0_=NDi~GM|WT>?0qz;-D9OSVTtnxHzlxVwlc-Afv))>PH%TAQb`-Ar`CGV&A>XLHiga7 zF;5TrIxuMibqq_7N?_6k>X@r1T?0(oKppe;q#T&EfjXx3qRW9b*gze0_o7PyN*kzS zN^iOZn6!a9=IBiq0h2aR$KYu{0qhnVh#ov2nBN9s!_TmRL;P5S4Se%E-3D5Ef6soI zWw&SqHv;0=^zuY!SsSX3cI=v{C{gMs>T`;c`lUXBYZm%OuylMZ^fgI)Ewob7aB*Le zv^R*pENLy6u9mbrn68wx5<-_t+7UvRffkoAFg1kG=Vb)k&}SqKkMlp0hHtq@(n?e6 zlC;*8E|9dlDSb@R-lp^sNvomsAxS$z>0C*BLY?$}8BoLMOi8=K=yXYY!{}5=Yt85+ zNxPfT36h5AH%`)U^2SIS{@h)XhG#ZH(ny!acG|iT@+LC5S+SQV_m9!E= z?UHuIP*u|27@8t!EtV!p+8s;dB@I_3R?@CG8ttc@!uMz)BOI-0b4hzz(NIaN@iauz zu6SyZv^SpC2l+cGT#0`r?MR?LNxKv1ACguQDOUG}H}6QKbwP^L2zV0d6&ax=(H|x4 zPNLsQT1}?kNZOrDFV(KNYXfUJRoUTD)mU(n@aacT2tx!lJ=-{r=&F--63g@jcyaPQw%?xs=d_^ z(S~l8v}UJoO4?(m8zilz(e;vcrO|bg#&OgdNh|5}MbNtC($eWFNxRc2le9OTIxA#A zZA+I*8iz;EN*aelPfJ>BN1u|kyB%F9X-_-)grwE>v|Q3St9ew?-u85!q;U%KfI&O! z6n6%lBO{bdI!n^7Ogcl--b{M0q_r$MS<>z->X5WIi;kDHnoaMPv^$%Qk~B^mN+s>e zp~Hfl{wnh3&^u)WP7Vf3+SP#$l(e@4?JsF9m-dmgJD2vBH1_^`NZOG{yGq)VN4rQG zrxl$f?R4eSJQ;vPl_P1bBh8ewyCZEUY3#M9N!rng+9d7iL|aQ*EuhJgb`{VBNqY-u zoTRnRv?XY#-a*`*X{3x$y3lY*!y5{dw5JPgB5Add21(jgNEJ!LW4VFDdZW`7(Z40_ zE~0-*TIouEm$aj+lU|bnPgnYjq}6WpCrM++@_R{pyU}kY?dVP~N!rt$UX--jgPxbP zs|P(JX>SkurKGi<^n^}3#TCS!v_?iKz3351J9^R2B<<-%KbExGn;w+3t2f;bTAxJ~ zh3=KKOQ9b~+N;oAlGX@)SJG}m-@(DBKe2_rEop~^Zjm(hzcxx*4Wh40+7(1!l{Dsl zx1=%m`|nF&xfo1elDHZ|xuo486qm~Md}04XD7HkCA-h+s*>hai&1zQs+f2K5nv{fd7it;Ey6B<+Z&*A3dK?@RnDBa{Ss zRnl-GewMT+f&L(AHIe>T(yl~$S<+tI&XP2IhzpX24{=t~N;3UQ(%3sVNnrnVO})wV zn2gY@^b1M5t@LwA!=d;@(rOC*NYaiJ`k|!ZTwhg6K`kJIw8?BVI%SK<3wAV&omNfi~)sptKp({Zf z{=Z_U%Vh+dj%AW|+3E9=R?_G*l6Iug|47=KMi)uikxpHbhI6q%(vG(DF-g1I(nloi zZR?~D$$;99&Xu&I9lc-Da4u#_8qURZNyE7imzeaLP%`KwNxL%W1W9`{=r~DhnRJY# zJ(=__ofiH-9EuS#0uDuqq?K%Xhol|Z^ma+Zp%@@(I28RP4Tl0-7Jh{~&|Z>;57AxH zN-iyuv@4f(#`yQQaUSg`X&mq8N*c~Wwxm7zR9ubHOYG=K+e+Hgk=iA#cA~1J-JNKP zq~Q}JN!ndN5QgV`HKo zYkOT$ZxQ`h(m1!omYg5&O8-!#{daVuzcoa3qji$T9Dha9*hu(M(vBYVJ4q`&={J(b zR9-7-wHN(b((YdLoTM>*pO&=S*_)m+0#yp;@8goj{C!l?3ZaK3jf1UEC9PQKAxXO| z^nj$5AnK7crs+MBR)XpKl6D2toq|UDS1DQu-612CCUl#mT}|j)l2)41&638n`=+EZ z?QW1XrrPzA#`L;Q((W+2M$&3C`l6&Ui#k`yfZCigNxPfV3P~&Bbg87Vgnm}i-f;S~ zq%m_oC23CtT_|bHmQP3;Gi14>wMhD?K|8T$5=rOD2uzC)NZJ)e=SbQcMRBEFbR5)H zG@T)7Pc*$((wGS+OWMgc)y`q#bee zPDx{y8!Tz8lm|-M+luy=G*-v>^2Ly&CeYrJb|=stl2#IFS4lfDgLRPsC5d*Dv@40` zNgA_Oj-*}5G*i-;wAx7;la|;L(@W{G;yRR{)>3F|Nn=7vmb9xiO#m(IKYD&D66DE@`Z4!z8WQsMr!SGPcnmNvmyWeP0DDg1lvP5!?&098@ z;NWmse6Wg(2JHMYYiPkGV{>wOMS22yAd;gUgJ?%TEa;}JXGMa=(SnVt=t}Nlw4!gs z50~rtuK(7<8CGIHW3?5lEovkyr-``yyON&nh~C&(%*e)K!g*^brVo2wTk z!6vMxHzlFBU^TWnLP@v@D+{J1%7l4CDTy^<@SjP7;&TRMTw^PXpu}ootZ6}sYQiuu zNty|(Ye`9a6XuPjB-@1LfVKwLr&zmq9Wl~|n^5Q93VZz)AX#dqFu)<2o8WUERLW$di zc~dEQ&4j^RkvC0Po}H2{CafZjk}81-4-vyoFERGT$PN=@9s0s96XwXE#ACv0&_52E zFb#d-6BFjnq2zD?<`iuLw~^EYfC4MSFga<$u!BTSo3Ij$obx6Oeiixt7Ocuv23zs7 z35yD%PEuzAJt36*Zo(?i7ydF~c`zW^!3~`dHCSbHqksHs;&Y>aD8$5<00XCESRoqK zUu9F##-V0Lv}d>p)6gVQCQQXpj5T2usQv^KCTi6hh&iFPs8%%)1eS;KnP$RDy1>Gj zunG*%Y!g<4;hAT`JQ$t@Cael(-dS`DSYwM)VBt)d8)H^8VPeSkGhr35gab`jT~io1 z6Xt>?EHN;rzxr!zUbJVaiLnf}f3yj!!6Y@#gehoahY3?#!NQp^7l!uqTQDbVe`{E{ zTfiC{To6)b!n|!@;Y^s44hv_(u+k)tn=lPS)@8!-V3wb9nm`pDWQhsGW-WQ%gq5Iw zRG2WVugD4$<|%}MGhq(2`x-yyG7VG3^nt87)m5}L3m%z&?%uoBE{Z<;VMD{e7iYB(&R3DeML zb_h(I5E)en7YUtamx&Q^WVZ<`fob*Jf?+9!8?y&ZSP5p-PfQqAvgB|82LBH;AZ$QQ z04T6JWOCAkMZsjAHeoebVx2c(6_|RxCaezb_ctaCyAV$Dy%|LB&kGLhTs5{bSh$}} zd^MO->r9wfvi)wt>M+~=bqiK!D?tHZ(aah)v> zmTQQKQG?|wF<~XJT%{%q`|4!03B!Il8E3{|%pA91&N^EStl5-XKqv#tHQj_&!M&Pg z!b)Jx%1oFW2I(OaR)vY^Q4=OQ>*G!ns9+*;HDVKmZ{R?0eaeKDptCM9VO2q}jwZ|v z*Q~;XRlsnq@MFUN(=(}q1G3u0=!KP9W5P7_V7Cc#qXWNY!m7}L-!x&Ovu?Q+bJ}na zN2+cGZ8ew`cbKp|*o9ptOht#=ZNgmWa2^vT?8iY9R)N0tNszN)yz8~#fl)bp3uBed zf$FL;VWPH9Hez}Qc0<9_jTq!r+45jn&zrCcm~^ki;Q#52E>zby67*v=aJjxWVO21< zKbx>9nAy?M)c&RFHxO z%qglLvmJ(5Q3GgT3fiuR2~*J*G!s^a_UvcEumMX3nlNnMlOZOo&WUy^F@aI&!KEfl zLv@WdVO8kC<4l+rwcs#ed9Z|2Ojr~w;dEeK{63ss3%F85W|SNLG+gqI(&l5cd%k->AMw@5)?Bij&D|Pnb;VK*pO3l= zExyV^a0Py8TI~-nXA#?nl2_UI?W3A31$O^=cIVzU?ELmm#PZ@>!Fg=h&g7KW zzQdP$_(bzku2$_8_v#&q4Qa-)XLj17FC$Gl($pf2w_K|}&i3r=7Yk%{NPL?r4vv09{wEQ}h1AT;_)fF2GEy7lJjaeeLQ8h-{g{Xh z@aj)op*qI0=nq`s4z+=C6kGd&T^w$GFu3_6U!nM-Ruvl?x-X7p@7^7v0jp=*{!HB- zz9)`YG#j(;z0cyZv1NPPT9h_y=icJrDDbelZLutBUqSPYU;2eO>=3erRIq>drGz`$ zh#WCEgJ@@#?y-~Id~OMeVdFdn;%Lk>4tM^4@g(7ep|JgfNje*ee_OK3{XHyd8oRi^ zC;5$~eCQ-6*xC=r#_v9bEb#57s7r_Ookoq~NMn%)61xT?d;doTH45&eo)q6p6&jz? zitjsIdRX)Q4H>>}_;3R-BgX$AxdEiv^9R zRdDsU^gVVB%&xX9`CxzBdtg2VW>qkR8q6tzhGg83EbYh^9!yTm!oeV(=gCC<)(~&I zhT4c`?;f=0tcDD6ByaJ{09R?f7c%e!lF0mDK_hb^Z-_3hf1o@iqd{IB>-v%1_6X#O z!}VH`&R>A917u9qW!w`eL(OcEahz@Y$WF$vQy&$vXAVU&>!Ael1M7UqPKwx=L$C_j z?72goh2cIFk3oIrkQ!A7?*?DdppB~(Z%1lnVISkhSPqLkl)wgmoI-wQGd?aP9a-ha zG2{$;_v0mK?_QrIkzH)eCwbwx^eTHtB3t>19g)?a^ibV8T&3Xn?dA!?y2H5?tU8v@ z;yyh}2>bTa9^p8nkP^1DoX_l}8yoi70DRH%;%DXLT^9FwD#>P@Kc7YzTl={?9NQL> zJ(~?WY$w~89f{egZTR4NfAZJRZ(2a#RqrC*}{{_EbmA`m`$Rb#NlJI zr;ZebP$YbV?LQK0QS;eXM<$Y=S=TQ{;kh>YMR~-|;VJixxzCF;Zg>`v?hJpcMzOZO7tRpPES#!vaK2gs7n?Cpp&F z5_*x{d7%x{PKB`9$HK!^+{5u7NW%ghvxiObOR_;ytVJteA0L}Y>R86{ap9hV2Huw# zJ#G)PfmfKh4tjx4A1@Gd$%#k9vC}4n-p%LA}KI+Q|Wyb8fw1 zQ6yiF>vv{cM9Z2+P1~@oXNE@obF>j@ ziSn|N&l6bM*@CEV0wQ8%gzIcU#F2oApVONm!>3>w8+W$RYLY`!IT)=0B-5Sb$jxD`lCzIH=3&~^_ zJ941_J=^kimt+l+VugXgL@J&v@XvTv!CH4V;_D93?a8n25@Y-8gP5IPxtP?$`$dCc z#Wk27vnU0K}x+Gma7++P-3j(o=U?r6D!Ox=D>5>EE7gUNAL`RgdlZV{2hVt=!x;Of{(%q@ZWx%4n*!cW=o z-)l?cTbYYPW_!4c9&p9X(l$5 zrY*DmW4GM+nBDfzZFqEL=|AO`M?cnwRo=f2;i3Gyh;(LgHztQzkySmLdo-S{xG~Oh z^AP*>#$6%bAClmdn`t5aVWSqYr8kSh)!>E#Kg*8Yw4=qY-yG0lGuUDO^ckV_7=Iy! zB(W*=1tBXM#O$c=yK*Q=BoD8QCZmXBS$KXBQNxv{4Fad}@gm|EzA%Vj#TVKTF@%3AB2MrtL1aMm?2j5vspw=M z@&3X8-!yK;D}y0tE&nL^)|@T;8X|(9fn?@A70a_jaIW2kPYl6XjTXk&g`iFyygGyo zw)hV6CQZm)3j`Yffop4;vw@w~J-=}Nr(h2~^uxZ0v2J7^kiXc|t&rC?tVdf@ZJNZJ(11x-Nf zy~N9Z2}fSf^RNh_6)8~-oIiYM=8U8Ru^#sN-%(Iu#eT<9(Tm3*?&k}UI>pnN`t$#j zntvUEd`h@aic(@* zZi^)Lj2nm&4wYU^cT0Li2=PCr;DFHidKk-pK0A`Mx2iF8w?O>wScq(=>tW4ziEoP} z9e89k2?<#Usk%j26-9FJB?8ZlB8jbb1O1?#e}Ms$ggk2$FTW>>yhl3oxM(uRlK7#p z&)gl2WUg3#G#Z_=l>ZQo{&$6UZi#{a6<^wt474h7RIJUVs%|K4;QQmyg+}sk;|M3`_<~ksGWn3#wi2QecxpWKS9sTW z}@zg})nfcgXZrwI_5Yor>ONNg5I zBA=NExwHA=M96Kzk0nBG9nVN2J*?QW48__yuwHhEH7wr4=)e~y>GiTI34-6{amf(8 zhR;t%GItU+*f31}FV#5w$jp z4J&n)FKmrG5AN0T{Jk~ubfwVqVma;aqN3fG=wZAf!0{;bVDd6wkcvc$jYM^+NTjr; zYfXs;`4b)BIVuv3*yEq| z@TO!1-`M8X#82}JNK9IA{4^WnHKCxz$p&S?<73qr(Q*xJonwGfUWbzd53 zXK|!)mPWdTVxvJA&@g@~jb!)mw2_k^7~8;{5{m7kO_$#AC&srYW3W{A_C-(VYZ&Yh zJ*@ehyk|Noh`<*q{^?U>^+Y;}4|mubl=_larbFNH{G)VK=x;owEpD}V`4??TC!tYL zJ2I^KhTZ7!hWpAVv?Gfx3wQIEGGRPo+hal>&lhHpc6^PXF)G`WMWVN4kf)pf^+7{A zw(d#>?~#ca=p?Vr!d$T>6L*NJct#d(2RPDsc^10U58&r~Sf+^1LVtQvuudTN@#1V$ z=qSEa{Pg2zvXMq<%d>KjW&zS<8EMAlAWbVybI2o>zuxD~I^fk5OpP5dHG23<9biH* zHFkgqOpUoH>}!0C_<4bE%O&Mx4$sL$Xp9J@^4IdnxX5nr!z^O7xQ!hp9+^)*Y90bm z0vGeiHu5FMrzelVJcV^4Bgm_Kd?zw9WC`Z7XZik)D2lfeDIyQ;Oe`SX2}$2MvNP0! z6*y9e@f5)`ipT*>dHG#oWJ0^*`dhJ}`(oT7CYj^jb$haFXLVOH)Iu)supR{K%68&Q ztvX@PI`HBi5r1BSwG0Wo^ zA_0pWZx$Z+$}%4JIw+PXpnLJ+K2Q{4E{k|_@WG3&~ z4^2GiU86P>M|*y>ADP-bCjjW(pG+mud_#Xo`ez5f*&l*EyxVPPiLQL)ZDeT5u^q@2 zUV_EHV}1l-ywHAJRouV6#rNMvI*~p6`fczon(~wZBv**Ja{#%G{J>WZAVb?M6zSo2 z$@B{lcIE32!fg`xl^v|b_Ey|FkQ7Bs4Ul~spEwY*NAi^e$^#baZu2I2l< zr=2N-P}JrZw);z`W^?E54TVA3w>225fMCJ1Tqgb6`+ zsR{P*w+53r;f@T^c)G`1z%zzm=zYNN7(x=P-VC}#hzfXHtUwRrv0lD#2rj~Cnf&4q zn7In>8$wv{Oen`)gD^#0=Ns-ITO!<<`al<*69fI8J4w6#N)}awkiy38!!2U5SE%{g zB02nl=^j^;mX)7z*DYimAqI9W_S;-`i~)H~cZf(-7q4$;51 zGA3&R$3V1&f}`{OSU?3TGFuO8zV8fiHK@VYM_?R!`Hv$=Tk-&pE=61I=eCg;(gRCL zLHbz9i4W9VCTZDzX|MB2uu36?{Du(nA0cD_#^Q{TC~GsmekId zI6gd!=dayG3PKJddg{tVJ1O3SANb`k@wLfHPF_<|X@f9>U~W{_T(w@%H#(7VRd z??dN@YWI;9N%*o+3D!1h!OF%McpU5d;-PxI^K{~=Gf5k~1tost_~@AgM_irw%$YDR zSNP(Y!o}=Fw_#o79vked9NQ0bplkSeJ>1Xt6~8c(#FGX5`b?BgDd4%YkZw00G>asQ z-Zu-^1+@ac8ED+v%{Xmb6m8^-FDHeWc#5By1wRdck>|Mst+{PB%=_bf&}?{1t}eo! z=*4@7=iiUPf{8->l<@iYlj%cTg;Xrz+=Wo8u%FKXrB>?Ue!fU#BtAWIqmW|JDGI76 zMf8G*?+*U%{cs@S8vcwP?&m{e%pqlBlUC+f$~VqIR_FMUIb?9+=uK#Z39yY5(2k07 zO&nZ!;eEB``DG*_9N%K1ALx^C1|M05bX9zQ8N8L%{7e~nE`A=8i<4Jxcl|ZhOsInm z#csTOE*28g_}aOc3xoNYx$x=HmmeTgnz_4)N~$1AcfR=n(zcn_y&-(=0n#Ph)x9Cd zM|jGE#BRB{k@tC!+)g-O`XC0@!j1X>3VsM3Y7(FL5E&72$3{7tYXq9hbLN3Daig(n znGhfiBFU>cKUzmr!gq6y}=$mlvAJ#poy$_S5kOT-mgl$NerH3)X zxAF8x!1J=;N#?5`!Lmo~$v=1m#{0~h_55j_^XEsv`2e>)3eIr`=ZZ(60=}YoC}74E zDyV)HUgF0dg$kW`%6#aZ@}^$E74vaudgBc!9WWjF{NbxS;xUW^_eBa$ z#8F-bk1Z!N!qr|46*-PSQ;w#)%(s>kcQ`(6m2KLdk9iysZ}SC@lL5^KHHzU!A1BMh zamPY(UgonGfb%|%@3mhSXCU}!&)+e&^8QaCs({aU0>l0bzU>L(3Rg%&{2boXiDvxc zbw0^S=5yx~5)$#`>;5GM?DD7liW6mltK}lI!WD~1SR;mhG=JAc>@8MZ z8GPk`AlBQMdI>-CAEb`tH}r^R4Px)-#ZMD^>h;%*dToy<`SD0{wOlodksPcw7nvpU zHBaL{{1`s$8H^4060EP<3i@2ntFPAcK4HeB1Cu3ulM2PvoJM246*wUGV2vYo1PYOv ztn>%?jAzlQ+VE}SXE*mfiy04V&gaM@Vb4IWnAe}>!9JgsaJ7{Trvgjb0XTVKg|*({I~q06{LMyfI=~-GPkglj#L_pW44nh znu6audGtzxM?>T2nwu!B6H6DT@rd|9J*@ej;KeJkY9>5n70C{41+&OS5E%!N3;m-1 zar1jtk@#lbII1_AqZN0q!W`8e@pJgvRU{z^&!Cte6x3POczzVDU1Gty8}*}uxbfCr z=;VJLT{O_i8zQXvnt|^f$>-*+IY}y1fQgp}^t9f18Y|L{K>6^Zsz~b*X+i(tuIH~v zJ|zLFk;KBE0j`iBE*dE!@hBu7WhCAr5`(@3KJm(co(c9e_ld-(0Rk{UTuA*{Fpovz zu}0$6dRX&)0ltSNpDTe!u14a60B1?ilR!@k<~c|_$4LB?9@c#CgKv`LQxf?Ek+=%r zXbEbG^q^oKio`>W#ASLIf0zt>cS=5NnZAw0UDg2XCqaDbUnQ8QA@MXL@i;xK`IdvP zo8)uzo2yAu;u2ta!0MgB8@=$`EEdCihco>m`r{=&>_u`Bn|1jwVI6UmZ+(ea3j%tl zKA_=78r7)M9FbMP!u8C*BCPo$g@6&f9nW7h-C z=kwN+SytRl$`RUhM}y#Ap?8^9edccw7PWF?J(+IBgErxUqYxa02FEVJ0U9T3ui{fh zEU#ZhT^!*duiz=?EcrJMF#pGgu`u(=Xk^hkwH7UL~!`u ztri^OuLZ&(^1&ekhec`6|JeYMgLvHQ2)f#H=j#Zz=Px2?#kHe!!SAnNk^Y!Zgf$;F zoZcY)tk|!K5FGxd7aY}s15JOGFL(n-8`!w{T_FA=B*EdtX!SD86(fN`O6;=>n0B0FGEaj2Gv5^d=Np&Ee&nAUIqd0o@gf0^*BHOD1)rdL_&r0!-xH$S!&pO>i}dForpK;vECBBMp+7Yhd2JkaRMpCXLERK~ZyMTUgC zJBld|Gdy0#;302g4iA2rcZjgG;@aD!Do)Hm;+#!5xXaO3MV6RYs)!mewyFZg7U)jA zcNJ8?fm9Wo*Al+5icD#)VQq_CeJ`R_Jxwf$QSnN(v^m~L&6mlGw-GHAmz6~5Jbz{z z$sHE{l5Ur=ozq!|-AFA8ABEv6wk5m>i#vC)LeR+IIUsnj@~MTGzd-A8NDs}ASMacR zh#IPa6R#yd#`E97=Ye%yg;$s4babWDj=fL#Jc-SZzA64$wjPRXXPG zLMH>04xNrEh4da^(xKBaMpOgeNr<|(A5z#1Gn9mHpHLjg*MPRCqD^mbsP@C_Mz zi)epf(xKD&w60VGCLKB*!$&FIfeD8WO$wjOaOhh2G2zgaZzm(MPCK@pjIfZGgg<8s zt|Fdp;xXZ!jveGWY3u1uZ?8x7jz#~&)aXWM_(ROIpgYQ{R(tdE_b_%Gy*Yo6v~KO` zO}%zP8}3YpYSnm1q#9b)5Jll9-Xr%E;CsCoA=f|I3%UFB$sd0$a<#a3;u>D8JUN_L z+z;rbarB@|`P7{-7Hzmp!;d~^7MYHTh?g@{g);Kb&rLRTPl zKsUi=s6v+k3+N`8BM5yKSU@+aQ9Oh$1{TmwY7|_VaRCeHCdk7=%Yg-S6Xao`53hDM z{z++3feKc#bHNzUO=`qQo&_wRo79NEKQawiKsSMc!E_R^fNlZ>gXwr+=5CVb$8PYI zhp^G`JU8ClxAV0h;M-hph~e~~{Qz#Qm*4yV4e|+3+)awaAN<%T8rDC7D5%(xdRX7m z-c1f#ad$-gUpc>H4_0mW^U6J9dq0fV??FQjT{~v%5nw98b{XD^g zZS=Az(d5a_=Jdjz%wNS{I7IHToLXtD=w_|bEda)iqXIMFdmmz1=HZ`xh>;z)ig!Cmvf8V$ zRE$Q81K%WtV&gR^WYfZxFvyD(9Vhqb*Jwj;qJMjOb8Q$g+nuYO@kD%FN zlV%}8vkZO@;w({CW0Jv=XfxOXtOr^@p1uz3mfnO#NF}gadK1(S`u9X@Rr_$s}qZW-O`(sWcmcKTY3||6P*w2mfqw^rVj!0 zTMzgY#w0VqkI7vF90FfCgn`|S7k@0wht)72PkfA%6qt{X4fF8{9@ZGhmw!SYAX|CJ zr{uwr))m;QPKMhPtQ-@!+$uZC*|#-4#SjP2%$;j&N8?4y(n|Onq5~=3*0dXpgd1*f zC0t+8@&1dk?gl-UANiD|rcV>1;kK=Zc>Tj4I2V6Iq~162VV@f=98TRnBe7{7gb=$O zu}#r?UqvSC5vy~0jkqm*&}U>qOg{*%@1*!HEh5H%P*i^OA||Gq&#+}Mke~UCWRadc z^1Oh$A@Wc#3a4f~!=xe9=)b zwgV&nP^n=2TC52{kKk91;E@_kyHha18S5)=CVg{G=670ND^KGeEl}zPRk7D(Twc}Cpe5eaI z0RR^9#2VrCwbw(q6Ho(|_xQvbJmKNxy^djcIx_f#VCTRp@`Abq=;1 zC|`aI&D6+#4(zRl`Pt`!y|PeO1-+g(JC1Vp=jq3>bUw~2kCT|-#o**?j$s4K5Fr*$ zKVXgQ##+B}sNu@5)Wg^t;n63EHB`x@?y;J$EAM=QsIBnzhP%7wn?~{HI`E4^S18bW z<_VIRdPeCps^;imJYNeiejPGX(Yj&CtQL-)$S7Ftz)zeccUfE=c-ASb zs~3PtMCkR0VH(0mo@ulZTd?E#Bz0*=1ixv#r`oX<~bHp0!5|(YX`$ja13C!?(s>BQKst~8NOx!Y%-`r+-7%iK;}4XhhjiA%#o{#LJPs3Z zT790xr*wtf*Ct2PR}Jf3VNtsn=eD@iW#P69IDT<-!O3SjA9n#4B(UAl2>0{d$;sE`QB~Md^OU4%+F z8k8!{;j=Fq^?Q*dWT-vq9+7cxDALOGO+u7%pK3@mT2fzo40alS}AcsfRURD_(nv z^c}fvDf(l5&_=OLB;~H-mx2hUZ`bh6z`tD-MZbZOziiB16&43RI`KElgNRRE6FC=; ziI-k7R^k=8T>zH1ufzIGsrzM9%k zw+R*(UJKFn4c>I+`9^)$LlvVFG|{D<<@8(Vi(`#%al(dWlinpznMe3_L?jOi&{w3b z^vhSYP@el=nD`!i(0@rys9(8O`?5>9&|Bllof`oYF5`r{uWtobJJJwK4_P**q= zsh{Q7e!y)I%*{WNq?V#EqV=Y4RMZXL zpftg()F`2-u&iXV34J&tPBdA1W>`m>&&oR3SVzkynPY>Vtb>hn(#9$1*ksRGLD?BJ zEhsBViSvH{|1H}(uIJH@|9ijNf4{8DhL1mQ+?>27otB-lubvZU{8Vh?45DRdKiJ4A zU0{|zc;iO=d-&njo(6df>8oLD+sx`kthV*kCQ}2P&(NHCDTmCzXaX4EG_b=6G|LEi+(f5m zcfCiQU)X8u9^A;II(iYt?C@T6KlpqH9A#GlQ+mYXz2HT6tpl9TZ$~eKJAQPQ-6`BB zbbHx2=>JnM3&rZ3`Pnvd_%K4*d>SuHZl|56?X3Rz9^Xat0WW=V+D?uMc`x?CUgSN4 z0{JBc&)ELdONIYA>o^ZSgLbo$9y@~vBs%DgGuV`u40N7`^RRtXt<^Np`7L-8P>ymw zR%?ag90$CxeH12&IA;@hVf!dFq{SYE|DzXT5j_mjP*c;{ch3*Sf8TG+f+ zf|(F5Se@WJ0A6f3uQkEB54^B_6au`;Spi61Nc(U-^eU#e#xH*Rz zMeD!9Mye^%Y^2`!3LEy04m&anJ4UXD5}rd^lk{^x`ftnU?Bi1tITq&Te1}f+%FEkf z`}a*6rAJzs5HBbQ)v@D?th_uNuU?) zRVO=BSU>FC>2uy~4ARH`U)x!J>|ckngdC*@;IV}z(4!|&>DSoUWc}phKJn51SeTE1 z--%`mVMkA|vIX@2WNP`^#_zrQogbJJR?IKxbf~K@_4~%YCvGnc>W+!QMi)fMVA}W% z3i)$-{u>-`RS$9Wan=BgJLsQWF88tp{Ecq^4a((hNJ<7rl6@V>XlK|X_J9$&0St>$C#pEg{1y+)V)_5AJ$%+{%tpyh47b@DaBk!X z!p_Z7_Z}gXa!6nrEduUxVikH>OI{9gfZ& zZZr?~2HU}Nha1fc40S#O&mC?wuX?ES@rHFj9r|i!>rm%I2)e_K=7okiN5ON48_la9 z=DZ7@JKSiVHQad{Ja@R!JlrMxGk7xG>~`0ETZAWvzGojbgUv?j?!sV$JB9p9t2Ffo zyOAezZj#m1^#g{1DDs`RM+~kWZU^kd6=!tIoU{qkNc8fN-VEk6j^cpfFb1fwz^4gm|*rb z>ZhPRi^eFm-1osF2nh?XPcb(mq-OIAq7g6RaWSQq;OS55QOd`K8KHLgtx3)uY+Hsa zj?k;qA%5I6LS?{LACI~{stJ#X!dEIi=z%Ys@OV^{{zXvK&p+svNHB3rBU1UJn($~R zn0Uj5nYYq`NHxLNU2{o6A*w05pb&d6h1-i$>1N!#<6GRl)VU~Ynl@2N5B7$Mlk`My zm9I*2=#$=RDh?fzqtr~it4%jYL8Sq2P^wi?B{Ot<5p*UBDjOU7MXPk29%D0tsCUzp zKHz54(mtv%svcVnF#nAjn29m9kGkI1@Gt`W)5T)zz$aIAfOuH2ubSt3@^ZMu{KET9 z^h{rc`=QEN!gt)m+N4LP^~4vWYW%oUl6jfLao)!w5H!UYRp`fNBH=QL10sRFKtGl5 z4@5c_m?NWh2$i)%r_EcFDy8332$N^#03f25`>BAcj-+?{p`7r3U_X`ZZ;EvO$~scv zY-5d1<6&%?-d`nRinyV_N=sPvOS4_Gtt3Zx=TI-_{>Fdpuga7k4;lKxjBu;@Gw%v9 z$)V)EYPVV(=#Ao2FRoaRRdYl{SAE1Ry}ZxG82#Ks*hg{84E1*E9|(2LhRill=2@-1 zoh7^l{Q%!M`oMhS$fMJFyo88X@qRpgIG;H^km$+l;vAgAPO2V%zd^b2>NWk6qT0;w zBqgXcwAEJ=)HM64#?A!Q*G_n?8nOd^wQt)ud0iNHH`aqLB5$G^R5T0FbLZs~O<=#o zqMzh-%>mU1!}y!Uryz|FoH`d}zW|?Qa4Xn!xhRL_Hq*Z(s*EV?k~o!24T%c7{b+hC zQB94)-iEoWC^|_6hP0a053s^_145X$pNoj(f^W71eegAu1S(EasZmXRv{n&4lB6<* z;ARusIL2D|Sj#0^cnb2}B=~7HGGoc>Q#nJhv0;q{*1%_BF4c&^8I+-sBm10JiM|Ob^woaQuyjcP6XE#3w2N^Sp`5ljRlikwh;|R>?8- zKC`34ByuCQOjapl-h+5pJtOR7=PCBk7asZ=4|8=ouj?%uoUN)t$bs)U9Q?X z$XUUnGF0>Mq3`r!ApR}2WvdaT_?r9u(Bk!T2*VYZaRhiw@e1z6*nWJ7vl!}Hz}9*q zy4reX>Dv=sJj3Jfwc`2T%}%M-78_O*-91Gmd+!C#$5FZtONKZLh!+84`hm@NUldMv z7>-8zGo-b9h%vPTDY}dN54BBEg9e`GNM^-eRQdiP>OWPDiz&gkmH3PZLGGo3sVb#B zOJZ8;#v}%{!j7l(mI6mr!=b}(cxcD2Jid_mCFe5^=LT`++~6slp4~MF@>D-X z#g93_afM~&b)^3(EBM%>d1!{S;(g_^th_|irzw2r37;;MoUEiZ(^SgDb_jBl;DfeH zBEy@xzvoDLBeLEmvSm6wy9=+FOjFZRD%nTcPsOzw=}(c?X6n;$MjW7dIm+j~jRnz4 z-Kw~iDsm8vg>NQGFe&tM4%QHOk2^;tjlcrBlwC<dREu3VaiIcThwaR|Lni1 z-*h#?Up>rOz-VGGEDq=DdCV;P=Hi^EXu6s(-N*iMOz!$mK>7sIpG}z0OFOj2;U?&6 z+>pXCcgxR>JU5#>Ixt-&#Wdl|mlA6WeLfwrE}+O6Ds5>8%YOD#A)FT7&%ook&J+f2 zZDBRLld*_^lTxL2w*Cnp>sZV zVRtZ$V;+RIImool_xMH`{>IHrsCvJLx9}#1H^cK(R$qx_$HiDaV!5zbKBPzTR7OlI zzO*T^pxE&};Mu6u|W||k8;G}`)PG*{i`#3|ub0;&+v$7l?cNOhv)Oot%eM8>88sYeREZzjickc=PCVI@;o(f!lRJ-^miDGV9ACh zUPFHeUh8O_wAR`|UO($43vN>D{FO|lo_Wfba41|6?pX0N8k4VThO|!Ar*&E!J1g$p zZLWG~8ois3c2P$s^VMR$iClnSDrso}wwd*`7O9CV*gsBx-5hz5ZbOXB`xJ&+9^mD% zZ8~3Qx^~@8hYM6XZ_>Uhfcg0peT~YB4Pldp+2R>C2>RcR3$9VWiyzf~Yo5hdhtMrT zt>uOvB{X(BPO11&2DGyqx!ngzNGbP4Eg(3PMa zDcwDrK$`>IJ-a|#L7PBhQoDPOfo>Vv-E#rdgYm#02RgF5CkM10v>4Pss=H@(9De98 z2Y=LoQ4G2Vv=;OT=&I4(J*PqEXCNTlaoq}<0a}MA=I4VR&+P751-c{H-BSyiG`_oM zH)!#M?w)4QBcL6i2eZ0+V$s_QCwBK_f|h{J2JM*C-BXsZ&a$#5clXqQVP$vsYzJ+h z1;?PVv%7mdS6Nmjs2?6=*Z)R?w<~?w3IU7Y5wx_k0Ln~J*|zp*1q2i$P5FG7PME4TL$)R~ome;wd?m?sxTM{73zodZ8JjJE`T z$H$01{tnW>Bn(8}!} zThQOwiN%w)8MI(vL>dN=3J9mR4(#s15394(s%QE?+fTjm@kbE0*ff4K7i-@Jwpl|h z10xbKz?|e%Jw?Z90%lw!exKRePr1ygqEaT=w4O;hZ37t^@}YQ)i;`zzp6#2rxsQ71 zm-L$SC!WX$8ydBg99?n&K2@&&xXVLHQwudgBe1yW)l!Jox zj78%R{#@|c;$rY)a5w>r?PI&?{6bi)0}rJF9$u2@WRgMNt3dWr(2yb!)sEx1w20(h ziz89fS#%12N3O=-S=7K%nbg8$C3P|>$FT-T5(SyWQxTJcRKcW)93~|=lmIEF7A7^+ z$)t+BNg(AEWKv5-Osc4Y$#!y>)KdeKt<=KgAayc1&DfyGvv{7Youvmw#z&!hP>~N{ zHdXi{(p39Y9W?Fsp~TbaRfdx2eGp&fG*qk3sgp?)c_Tm$;gfYB$Eb)&D^)OQZ*(F& z3q2!ikDA$}Ug&P2O+uT6wl+pbd4}6~_$(OhnQ7NGRz!Q2MdCXONBVoZqriSU(Q`Z4 zW0O36dLua{#S`ET7VSyd+-mo2tV!|Yu=as~hx-snLPV@pN1dE5X^c+w3{duJ@}+sk z0WL`M%!9C#=6MJtIvuIH#-eo3WL|qbHWW$Zbf^cY?s{ikY z2ZNkpo6&(9$TwW`i4zTfa)X7r&o33nRKc$XB zjb5NBqmUhpf}^0*N)2H8YW{p>of>Lm_~8Fs+3{ZTj)svflslTG&Rp3D#t6X5^A$Zl z+A|l@Ev$5i@WY6SzRqWLqS=K-_b^i)d<2-YH*$YD&;X$3Ror0HB={Qef zLCm`$%`VpeTh>v5V{SBNtAu|__+>X5`9s2wz%0Y=M$iE^mwuB`TPg5pfuk-MwGF}_ zC;aT+8~#?|XA6HjrDmeMvIZJ+yg=ZqSm4uClxa#e(=*REe}j?AHbT}xk;>(x$BZanCv)X=?`5R!dT&#|2?GLxuMMwe$t(WpCrL7 z5PspTOYPh&{HU>-KMLPd1kX4XpG9|1fYR|djqSw} z!9h{lN(~cGuB(d;?AmM-cnh@w#(t^`#(W#*=4sEEB=r@<)|WlkQf?NE#1Aq?$^>32 za5+_Ep@#R~Qm9zY}I>!834i7*L)^Yx|+FAeFmUQ*z% zzX*RNJvj+O#vy8B<1245+B>wYWepeKSU*e#+%A2%O5hxU>nWGv*^#C~c~0f)4uQ8& z1>oe&B_YkO7x)(f$DE_*CS#ypLMJDqcyfLvF^JgTL=1CTHk|nT7$?UCj>STXizk~( zv(YT7$N>o^Z8AnGwMWaEBT~h!CWdn1FA@F)>SXP+lsW|!g*j^qQcbjC3d#m^7MQ-; zSB=R+QSFU)ZP;-Yj8&yy-BnS1r{tiPl6IItk4QT^E7GfIeGW>nke-AT zgb(L<9tv9DU7C4(RbR)|+}rTo>}(MJ396Wm&Uj8Kex&B!nT1U!IEGmeC(zM zNMVz6c&6^5-Vk(_NRhb>`!}MqiE=~mm{Tn!Z5x+u0@u+tXe*DG{wsv8c7*I)7|T2; z1uW8Yaet8mI7>l>%TJi_n*?4d@IfjCjE4@_Nete0()W% zf48XJEc|AAG7p7YOl@p@alVl{BvLPn)Cls_}MI8CkJPvh__P#Qoi>6qN9w>onrC?Igq+$ z>v99THSnImF-J{yVr--Kh47CC4S&C3TR#flYN4-ZqlwCw|;I z{FbTFJ)*ur_`B~mW{-IcutoS766PRF2XWdA(m`!7eof|`#(1q5iNR^0Hr`3^g}`6#HPv_2oP z`3odA+sJ()VrA3-D`OUHDo22D5 z3qM4`YhbQSiqkLN&Ila1-k6&&{2ztC>21TWk%EiGDKHla_RKKnJNSWtH%XCX3S3AB z0IzEf82E^2UoUX{Urdm0o^KO=t*p4*CUmdxV`MSnw!BK=>-$iM*tPSx@S9I+`*hQ_ z9#L-nY8{|WTC?{F}gP16u5~Ru0_+xqPA}mtG!8j(6kqbS`RqWsC@r9U$u}4{m zIHN|wY7L)a!#tyEM5sd`#bgs8Kr0V&_=5k}Z;7C(wG z&f6K@{+5B=jo2{U1K@!0-1{QH_1Bn+mAS#X{vw>a2$?%d6)aWU%NW@%Vb_XOCT(Ll zL)H@b_?*6868IRk07mtnT!eU=DR{k(zTkS~ac`?JSt2@9(a|}s8gd}ztC|zirrZWs zBJg%Pz;MRnM*E0yXw?e5l{y)=WF|c-@ZO8ssf!uDY<>F=f!nEw;ay)D-)-f=fu_);aAg6)=sAnL41pgjg;FekBihwO1%kt&iS&1aN~`^ zJ$$bHs2o~!6J|qnYl!(4FEm#2#n+7@hN5OT-fMEbO5iGio5XwM%t+b+BmSZ zmqM!ib|d8xBMZgI2nqsL=^xNFOFcjLrGIH6a{K*XMGPOVT#8VN*BUEs6R}c_uV(zx z3Y;uHV6^93<{B(;ITbOS)z@e@3q0$h_Iidl+;3nvBX^`I*4Sr~QYR#!kZhW9yNQj|JZRwU0%u)q za+^u`9oa-IhJD2x$)b?P{UTK%Qk$q0QYz_vT3d`Ue1ja07K+&OB6g4t6k}*wNzu2! zSj_xOjeRRp#Z&|sZ!NCB1yfPgEF(2SY%NPOfz?slEnJYYSZ&A7o3Eb<+)mzG0iVqZ zX?CrxiM2`K*_6w$)oEZi*Lwxdqzb?V7v@}AC`ScOa*Ucgm!1&*jyH_F+gUFNe>JtR zw~`4)&4ov#o2;xNdpXKDgM7XO=GLtGS^!IZ=z1N zwVk3%unay{VFD@>DK*r1^dF~1CFuCIw7vws+!OwC5t}7qo2UU+Ak_w`f)igEV{Tb) z5UIfTA+6{3>?eeO?gPVLB354z{%*=GMTq!La4A|r&T=D_AyS`;6!t2R^6h`uI6W?K zkHA0cq$zn?tV0>;pA9qF#XV@i1x>RuqG=aMH)g{7MMcfYIBea60j(u!gx$EYs!%c+e zr~y*Gs0qf%V)3{_;AU!LBgNDOBWNKb%RJ)>Vr7NumhW349N%qxxRw5)@XOl`zuY#~ zJB7c2ww1y6o-YmTW?%q%9FMKLsRiC}8ff1Esixb-h_PWU5UG_EyaQ6jRLW9*SpgP{ z)YBq$oE*TgwG+a=LrEsLZlIrw6wZxUs+ywjgw&49n%8*QP?u2=V61c2-^oKy2|abE zXRJ#9klqHxeeA9~(V226_b$YP*q$+7=If5J^W0{-baifg`92>HcB{B?c5+ipATt=xYu#2dp z^(!DX;yn}P36c7XNbR8pz!=C6uYjvfFB++pA~g^_hwG`3ym!OM>P{2yImv2JU>uDx zykU=l^F@1}z|HvVJ>Wp4f!#K>R^S@i#&DDDTU_{Qfib`VE=a%IXwMhp`vp$A)9{OJ z1H2>rSed9@bH{~$nu7Nr!(~)(4>DYH**r03jLGmWavcJq-oSe$ zn{x$Dr#6Q3e>AW=YpfOcIC<{{y!tK!yM?hu;7ZB`jGndhUhWO$CPKG4wu{s;+Qw4* zX&$y(}7C<2MRi zM-71O`HhF~_spD#v-{}hJ>#M`$nI(bS;YE>w5BZ40UvXlO^6+I$6?a Kzu@@~&;J8TT;IR| delta 52371 zcma&P2Ygh;7dCunlR!cel8`{!CfQ}FDUd)QgivlM0@6Yg5s;+|f+RLj#9c&16ePod zWBt1U5dqO4A_PU2CMqBS3!sz@#a@Dnx+3O#X6{b1+}H2>UVlH_GtWJ9=FH5QGiS=Z zdF}INuYKOEygH)WxDZYJ*NvXu6E~;MA`^4!`WV04Hj-bOkapXii#i```8%FHnD&FE zyaPY)CCyzL(P}j2LP0j30l-fVg+u;#&-Er*T*78{JYbLcQ&k-?ZRhYkYPC>Yb( z?HRvVoE_P4+tU_jE<0~)ZCUjgOYhKY zC%TDUx93{Comj_~DHdlw8{G1Hi#wkcIBq67d&JS#qIKtcW|1^@$uY*_>&}W=O|kfT zvX@&846W9@z1a_~hLSU^uyr=rXSD8(|G(P0z~UzCeCzh)H5SpPZ^UC$wbj0{des^> zv28BV*yC+(iI^O~$^>TdT3BM+o)LWm;3x^YL)c1ytpi{enOkR#+6_wy5!gJv3XNSh znP{VHhU-;EN3*-y6Y(qP{<*zC1<8}^GmyItIXmi&Il@Hxg*%T%uI{3340;4rTE!{l)DN0A+tk0kEaQ9 zWMx{sk!*NYn{;0!^@W6Nnsu#?*G$!@Z%HWqA7~+sfQ4msMeRS%+F-Lq(F6a~abJw) zuZhw9y5=5PD$}}uJ2K2=G`pR}6D1nH1v{R7hs7PuigIemWtP^#5$B23MmsH9HPP%; zL)J}fLwqC5G~Ue5}%pJ;yOB_6JT_r8#9JzWgb@C(a}WmbkwU-BG~MX z>3MUn*NvW|X{#~JR=;+)wpzBL9!vj1m3$efYKBqOS7ciEf5)micC&h8=|usgf+5vl zSSi!G|1%byn@E+*H~wA6-Jz>S`kkn% z=58kFOQ5x|RU>~Fzna!b)Jvq#Azjl}ukvN-RW>*YfxCg9GV+cTc|SMurjNWVhy@wV zROVxW%p$`PmXl{4?Tw==Oj;ENw0am?X^oy4`H2vsr5hR`y;G*qg@NZE$U@SLLh!tj zy_A}0iio6!y;V-_-I87=>%$Ot-v)pW`rvl!_dpEgbC6s0vo4^{ax zFwjD^ICN)~PTV7Vv%Jout+sgjugDk=LGij@lqf3X1N{rD=-jQFGeN35JfQB^;$b3~ z6Ag7&$+Yf2iRU77vw*sdSzNv~!`*^@CK!SY#4Xdh{~$8(k_bz47c4W?-!^UtPHEJzQ`hbR*jS@t|uZ1(d zzHt9*%$MK4hdYTr6O>Ps-6xQ5sgMgNb#f9cPK>I-4HhTxJ#2Cpo9;`ZE|DS7lR`k2 zOzZyAfBZkYpX)p9^mEeF}b6kHD47v2F3D3ik`=W|chxe04@B+`OiZ7Fs0-w6Hj> z2A{{uiVD)LS{jv=3Urz%X1gc`HuyKYui%)=KFtthw`il+Wfl9^av2Cz6K5LrysY~> zpsB>Kuqn?D&0n#@FwQcW*8T6`xlrIOiG5IR8!1ziyk`Vxf7T4VANg4?ny-E0#)h7=Nz@~p_T2SWB3Li)+H?q3!V@)(4y zMdpe?%`|rgeM;~+h`+*7ET@?QnJ)G}#O4-mCf8YV_xP)8G59NCUxnwQXPzcnf@fxNRmIfes-qLN)gJs-AblZ(NY^f8YCaoXDe@hLoWr`m zwJ?+-3Fv+|1WkvKeM(c^E|p7X_w~%a)oCQw|Cgp7JcEW`pz7jxt`K+(B^)y}m39F7 z_JF3hp^$BpimN>Mx0(5SW(=i5-|^5F$PM~BThdWN+NY5Aso|vSAjJc^AAZ|Il7$2s z*4t95dx1^wRj=->|58_TNOhkNsGBDWIEeyI8tR@E1%PgeU(vAXLfx@Y7yst5?|M1N zXcpZ&Dc|d$EkxF@ko7A=w|ycj=*IZ{5kvKYYD!xxsoQ!su6MV7x{+uPri@rqr@QeC zO?X>Cw<|*6c@%Ko(CsCe*8LaQ=e>1ZZ!MYi0P{)l@FJKm8q7;%TK9j5=b|D9g!90! zFj3F&;;IBTM$gapwWhlT<2T6ojZqEJY97#UfRQy+qmt-tWHpAc-TK?NI*r6uFlB__ zP>o9B#xqpo!c_>u?*l^M4=CUVL$lU0t@~#OG!rv)1^7I_>HZn)qhhO7Z%bzgreBch z7elLNGOhc^GSbHy?rAGk`IWWqW9#QN5)b{CDn2}e=q&+NgxPqmLFzR_m0INSfbPPU z^-0Z{B2s;etHh*&0aK}Y+R;uTM;&t18G4)(JfI!yc%KBTubmXX9O9!;i~3=YQM{j# zzVU_k3#ByeO7ZTx(Vn)&{#D=%_$W-qnKWLA-w*No4e@(~c+jEShV~676Wp2fV<2j3 z@}U2OL@|N93rUzCMvB1Dhd?f30z#DuNiuvA>EFhSpi!?10WN3BI=xT@dIJA}ZS9w8 z`C~l$q~9@@Gm9<=Do5B!t3WxkP>!&lbkq+~teB`OH6Ip+;(5?Cm?YDfZk1jI(5pbN z+6+CkIq`;GNUsrk;decLrCyN9tT!cK^3J;{l{~|S-c)IIXH%Py7nrt1y^lbyFI9&_ zP99*jYB{u-NrCqTLx%1TVI#nR6=bMj2*eXYLZx6pWO$V=8<1_ab)dfrpe@CNM8Qxl)4Kn27BMi_>g-653m_;~S|roDe;*q&aADrn+fen= zSflD#E1XB#hu>fDE2};!C=vpGl955F`Y%4&x34iuuSXza`0;ebqm_eo5jh(`8y^Zx47E2Io4o$^6V$o3DrRCF7lRnmfK9m1TA9p^TX3{4% zpwAfayTw=x=(EnG&x(LPFPZgu6#68FiL5K3lY=cE7VWZip@k;BEvUNxd^dZp&>O23ynHY{wOk!juk6}vJ#!KxL|b5bcVKrvx;Ps+6J zKgR4OHro?@u4~~_(rw|+bZuwN?O5Jkm!{YRHU)DW!zP!sBTuk%BYKAeasz73j+a;g z{ajLHbr#Syrt*se${)3`?$a!W2=KA_#ZX(s}r;$SbU85WRd&-HYo7_<8DW0VoE4GiZ4p_H{QL11?ZxT`tqQ|2Rv&bt-AX7Twyak+%pr3Cp@Ih3&mH z-|Fr`*9xv8^mUQpxrWKK?q@7+Tq?Pl<&109&DN7XCE(s*>us!@3uIdNKU7=C3m0mu zMPz_Nn}MfFq<=%>V5%P1napFm$91%1#j&5qwXk?%S)Vy&;@MqZMGi&mC45hKW=w+yN3A`5(pkKf~Q^kDMsTiHnu)0 zHCrex70f|XxK*Zg|6~?+d$!dRN^ciH&?MVLrgi^tHuUx$RxOMU6hKg<^1Em?L@I@B z{q3!+&M?|dFa%9wmjna6V0(7?_I6fp7;PI=gcxL>3I>eNq;2gdRTHbN5q(`E=pmpU zaNHW;c!@Qi{E*e%h(0cWz);e`&`G9s|9rM(a%sM=5uGZ4z>pLYVq{wPkN&xiUmhdo zOU-X-WH=6te$WxdPZ$G3eh`|L-^)@*mG0!ty%>AQvy&9pc@S90u0}> z@1}ON*ni^>|AD>S+-Y$GvBdvUJPZUiHZVUf)4KogPeu$7C&s)Ouf7O+EJ(1>d0{}X zmo1y7k9IbpJA)X6YSRJ?8w0`yLD&|t`H`TN1v}W#E4s5S2wyT8!^MCyQAnZ!4{~6 z8`=H_quBK6jbEb)qiBD@6WA+ug6E3hK|gh6TW9ob{xFswn$|X5yVcfI+nLuCPGI+X z7BLfM8%;Ar)*!nUJtXWpmJOPjK|W-&W+D!6N+SeY(D>Lc*kGoAvx=FC&9|6KDAIO+ z&5oi3PgDA{U=38j1LdBVY2AOGMc<)YoiX&J00PD$7?#L17PV~F9rG+SdlV}pKpyM|vm_*}&W!OSK*Tu1l z$0l}{{a^neFg9b(ZKMy|J7<*T^bdU4+a$fQFiPT0<|_}8#F+OtUJt=R5o}Y~<2g2Y zuA}kM@9TKok{o{Q3`u7j=T2%C1yP=h$@QU9_zx`Qu2;!9w)d`tC~U@7Z0PUzyxiaa zDyzAx9j1&X^HNAMYdtSN3QOmTQRv_|^{Oju`nCz~D?!tR0adko?8WxBurDK@bz$*Skj_XRKy4D$?z*)rYV|1hIvR*N@>y;+t_ zO4&zcR;#lET`Qh01@}^edzei3_fKKu?j(!1153R-*);|_*ie!E*sPLzxI5A(1>-_w zT-aaEnq6hOzyIa{@6LMOT@NNNbeH-X`bP;f2_ZtkniP1P% zkj`hj?;hxK=h54Qgqe^yv%lPXZ6wqE{VB+~XCbNb)z#H%Sm}5cYJSgt%+NNCZu<^- zKqJ~XA)+=NC7c6>UdSsJk%s62Umoo%WKD(asfM<{AR_UA4uNc#VI_O?o<&wqCz>kw z27qsX!FNdTf&Pl6-Fv1O%RkT9{{HKujgX*N#9N{OJ)fQwjH8fol#y|XO!xP5D6hS-f4?!uyhkF2eIB$`qVk={AvXIOGgB8ex)5_xIl;Dh1p3IGWTO zb_y_$qY<^(j48MUtGUk_j%Aau#p5jO{#M~Ok+5uP%JS~-oJNEUObAZs?HNB<#+=b; zBq8%jw)p;z7$aNn?~IeP%lF%?x*=!fx7dBUXpsdU043W4`;U?&|k2;1#eH#3h4y_6o8?izYGSR zmg)ZfwGbqFM>&aINE;1aNXIMMSx8R^{?5qX*)aHrWxBtA6)S#VaN`;@y}i1(;b4vI zMO27V4pw5GBDx(|=YUU>n5_q`1g0FU#IRD?3`{v#iTQfaSAi)9D>1z%tpKJRti(J$ zUGznO%E3wyYYYxdIarA~d(l(Th60!s@<7bdx??bLRwb0g_5T#DhtL-k?FpgJDq0JrYZUDarK=R}4W%nViz_IYcEad#^#I}U zGDRcueO%FqahE9C*@(Io?P)|8DOzhxA5^s7n9f(UyD`02(cZ?iOwqP*7rjd*+~M?2 zMf<|(9g5Z?=yXMUBIp!FYfb1RMI+LjplC#o;}nfR@fJlRnAEB##2 zIE+1^Xs0WU9#aWV8a<+DEuDU(Xg!^NplF_GHjqiniJ44n-sQ zdRx&pJKZX1ml%FHpnIeKK})(>(Vmv{HAUMTbiJZI4!Ty+J_mhS(KyC>QPIv;^f^U) zTG3||t+l31(Kw)Tm8*oiHC+K(dNmw6J*j9MDlJvCrwx5n(OO%&Skbn&^kGH2+tP)K z#^KHaMeFV8eTv4h&D{p=s@1gibe?+PY)|JX+Si`WQna2)XDHf}NvA3rv7%GadKR6i zXm=L9P0_gfHdfI%wivBwUp5^P;tJFlVc#(I04EcJ746HR0~M`zp#2r?=|KA^TI)!A zD;h@*JrwQjNDCEh%cWfv?arm0747on(p;55;FhCkPae%wwAP8XRW!EwTPfPxiP{xy z>rB%X?e0ud747RxlN61}skx#(`Lr2mm+Wt?3yo0^oLy*?qP<;cgraR-X(L5rH#tPn zzOGbLG@_X6IOmr#Jq7e{MdNDZpNe*NqrWTK+s#F%MAMrTjragJP>q(bHKmB11FhJU_EfYML%S@hXA9Ay&}{9HJGCzyWtDjhcB9Xk$eqhzM0QVhEyW?1}t~Rj0HMtp&ZN zXlD!hm!iEb=v9Mu$vux>)dOcD{YB9TB7Rh~Es1`oXm=9*TG75FdQs8hR+*v^L!4DK zVu&vl?M$I3741!-pAq2#Y)c++X6qHP&eEb66l?hLv~(Y_2S7WIbGHu{R9-8NdG zXrGP#Ptm%azMyEt8P6)(){?FPZN&e$$FoX3K+v&L(Y}^+xuTs8x=hht2Yp=8dMmm_ z(cV_nt!M-nixll`O&?UW)`rekwBE)=?^Ow0N-0ycw++2Z(FiW?R5XH%I~0xJLfnUv zE#YiOrzjd%J|-zzZ%-#E+S8tnQ?xCU-Xduc|0AFnr5+%lC{eUCiw;$^H;dk^Xap1k z6petQpP~^^U>78yP!8>-Xv7djipGXfH%0q8&@LGNfj;g?J1H7B3py$q!2)(h4IWz_ z6<4ZcjlFrajiPOxs6)~2PSmDotuswiG-84jMPp|rF+jUC1Om7+Xb9E2&^SeVy3nSI z*1FP2MeAK@xT3vXX_%rh_gfV0EueK++Dk?CZuB2Td%IC=bp`N3`iG|czqgS7R{x+o z#he_dWq10MqV*#By`sHE^czJxd(caY##D|C2qUk%Cq1WVtrz`D(U`tZDOz*&rk|?> z=I;}V#{7NEper?}Mvo}kr_qlTjdQUN6zwB)zoMNM>QywR>D`KUhR|J#_JzGfqrYZ3HCMY|*DbBe|+ z>Uu^c+)XG`v=&JbJ&0yR?IY<5MSCOZlZw`(=u$;v=6qDqwrILo(U>hCRy1bFg^I=s zdVxW^Dm6@z_o)Y%7VlQHFNV%jv>r?6DB2TCXDQkiM`tJ+GvQQ4+nQ0QqCL%Ue=$%Q zEuP+{Xm>mvs~P?uN+eL61_x@KKu0Lrn?Q#t8nfJBMPsErP|;8 z?yYDoiS|&mGl>=|+Jzact4cVNX=g?Il4-7@F>B>0+LuBz6|JYzwu;82C3eJQm)We; zu4s>yrYjl~QmUeTX*3D+c%zTgsn`*dG$x^DipC@qqi9bC6*uUN0&Fxw(OA`r9WevP zTN{dY+u5Y2Q^cz&3!i>9$`>x;qiPM|=~9-n(m`-WwldcWgE}nkUkA>=G;Ao(mucO9 zjlHyTF!`2GPABnUKMc@T>%1b0G;g-kIF;zD(OwtihGjKtSKhi4Owic8452*?9OEj4 z#(|bw)pBDqgto-3VWBGVMl)A=A#t**^1ji(U998#zOF-ntR;NLBIvVLcT?Io=wi4~ z>=)cl7H3E}tfHqn!D<_tBc`D_^q7X`aK;2RM+`f(>Q$E~Ca9%j8d};H)6mjdY=dYR zetk>3V;e+c5Hz%O46Q?Rcta+Af#2h31_V{&y&A33UfEsz`V|Iu1JKu#lF$ZFV!6F3 z3BLiWwwDk}qD)wI2qm#5Ob@3d!Gzf&DM>P6)ln{rdvo>Lpx|nIZc|EZCJe)xv@&5O z%_wPS!t?}6vQ1cdM@n){7$!oJFEBCP8%`2=`-zb1JuM zFq%hAjO8$zCrnr_Y+<Rv%gn3{KADS=? zws6FRA?7622Ii`7{%Q=9&rFPZ9wnztSY;GvDJN_#Da(_bd6ya~p3XuYq1%~aa8C`$e@@oBIRjhOh*@1Z6PD>f4DGJ%>M z9?pbelas`nFgKb%!GzVK`IAhTXjQ8T6Rm0sU@pV@EA8bNpRG)cm0jTBOjvCJTET?n zqWN=8m<`S>--N~Xf`hvebJR}y(SF1=wyKj!#b5bWWunaP247|97FL@6XwFXKY79gdSD>SO;{!DquhjH zbw*a3FdOXSSrg`kTYk}mdC=`1;&-V)0K=))uEAHoasy+n-G+XD&4lUb_t#BWF1n=B zgkejFyluit6XD?MF_-ZDI3LFNe6JofFem!XYr?RzLJpWP5Bl>%6PB9|uh)PTi}|G_ z9$wFkxsu`aOduj^a>|62Vm>(2fJvomF`Rr2m@K3ct#!$Sm7=x2HDS4!?0y7>9a1?1 z%FNZMNv(;|4I}*BgvG)L|1x31N&REO$}#LTOZ^CwWt3usg*IR=35p>W-T+Fh7H%}k zglVwqSQ91!kOUK^!_t#XnDm4uEH@AFpUnh1Vb!fnSanx;LKEghP?BxJ#6*;9!b)KM z`6jFqUDr)uf%p$KuC(j0{vJ0lR@yzn6PmDUG;2Q-R*s2ipb4vnr4KP-l`!CvAPn&z zW;^uz=payFxpsI$6ISAYCp2Ns*6@TT44YzPnh6u}pE))`rNW~Kj0xKo(geI)A5j>#@6SLy$Cd`eQ ztrC>V39H2L^xl9~+e;wufC;Nag!G{a!!np0F<~0Ys5USe z|DjnS5dQl!6JsgD>Qg2x7e4)r39H4_>oZ{`u>MOX40{;l+Z!-fwcQ8n&kYSW8pHvx z^dE0vthVREf@@8fShD?Y!b;G`f0?jK%y$3WfYsV{3~kL75?pYt-GlxNHDS5v_iz(d z3jZBt!bJ1OnlK-1A;E;j!UZP;0#DB8+%i+21P+$Oyg_oLR z!Ybj-N==xCiRfMv77K^8z=R27eaM8loUm563G~8RA8o)Ui|C~i4(SOK77JrtZo)JK z8|5af76!c9gq6U6pAGT5l&_YB=&;}yO^hB`u*ZaHu;5orSS$?qH4`R`^>q`5Q#?{x zkGZHUI2XqCc0Fid!>q8S}bHTWd+yGYEy=bm# z6DFGLvj$AsjFtiK*npuTSjM4c&X}-TxLcnI^TFF*0*3fc&VVv=F5K<6CdOE}+aFC> zDf~jM2@^XTznd^@ACtdKnAq(2rvY=xg2ir!*5HCA=0oj5O&HD&Nq7TB#Jo`%3QyR8 z$-JWZV@+5t#(RPZv$b`>6`H_m1esP7Wg)Y}_UX>B|;v>Jf!=76n(ZgMizy?>0>$@3BFf7rI{h3cKimw#bCTi2EO4k-N*ka^1-*I|8hd~ZLE3}#+5vt1 z&?-}4bu4X5uEi72hHpt0@7!$ZnD`>tDp0m)CJS0mD({PDZ-N8w4Q#=C0|~T~(7XsW zDKctu4zGZEK;ylEH>T!X{ZgK7pw7sS?*Uy5yme~vBp6k);dPWi=e)t_8+e(NZGU4h z`Gk=-Q^_Hg_GTj4%euVD$cyZwH@mYp-%KV;Sz6^%GM%ljd^w^gEeAyu(1eNj79#H?oC2wry+}$CCxDW?R0+*McR!T?hq7ygdM4b$RaX!Im+n*}0$7 zS?Kl&r0cfH+rtUo*qHs!r%^aKLtoYk!*jDiI~>g$Ly9;`6Yp-izrl5Dy!KJU>^tJq z-b6~Y&4rHmQWgR$;!Ud0JA-ZA;fVX`R2^@Py!eV#m2aV5b(US;(Ju<2sVbsB>$1}k zcLZ#qL2T36tevUN{(yL&OREZl0SNJ-8hd8vSc@~2{j#%*<2mFJr!YdTA>bTf=5|`y zfU4V~a0aIe`-W|)a*(^&@v3-of?ck1*gwL#6YjNUUWAbPS|IvTIX-0VcR2{&WyJsY zv9eul@pk-kyR!0LMn3VntvIv#4SCNiIe1sKUJefPl$Mn=f3YEi<;{rY~p;{y# zIpvqe&^j|%;k)iAZ$^E#$?V{}4uTg2-yIye_#|3GG_upidcSv^+`KJrcQ<13*x2Cr zXIp$WUUz~tXGh+TvpDVS{QJcuh1vHEj@)UY!#pX| zy1yx;1>UZx)@vUAHUSMyU5NSdP01UWEI|o zQ!fST7|^|BT6_y+@rSul?woqn9c=f94zh{WeAvULbr7)BB>Xcu$5bOeuE&a4&yS9g zNEZEZk0_k8fE6=P2;I%beC#0o*aIIA5U;|0ybvF@=y^DU6tIbhXIftRlnpzb&MqBZ z9EI%{m8UB!JK`X_*_tC6DIcGQs^Xt`=M-no0sm7SYGa=qnG)US(|~)%D~@Lw`689w zdNiM8u@y(hroM=5Z;7np^+&vGTA$UO%j%9!CV#NWpNu6wMvrB%Q=d$T-g`pIYK9js zt2iq@HXIeF$HrO;&$IN8Te7I?n5Nalms_vqK-Rw6k#P*Unxdgcijwg1KVH>TPO>so z>%@LJp3EMt9vD47NctQ|Pi4PX=c8dn=>w0qBJphQal8tMOG|+RdN|1Aj*Pnk;($uu7-`Mp}+eLZ0)@Qqk<$dNLN7IxGlH13EnV=VJ|g8Itd{FY}{M2BCkj5oc0a z=vVo~%L>05E9~g2vC*r8I8I8A*faUji-OQYK!-=q2txKrz7NmjW8S-dX1-;`X?EA~ zmh9QHaZ&EV`dVLR+s``49CrF_s%5^xk#sH&5lrT}uK0w-ak12@^`P%w4h&^{Q@{hyGgGE@ z{}1f!#ch$ZkK!p7{l>JKvTggN7YM=I{adKEjJD-;WpO@Pj)_>s8M;ft~)rK`yfEKMWv? zSpOf#lNqeyM`kHLEbB1gCud~F;d+I5Q6?tr+MgywUi;Vtx__QPPO`H#rEPOytZ7S<`#cKB= zq|k6cH4-z4^3S4`{>6MHF5EoA7GD`mQrXcfV@a6IrT=QT;#PgUDZ`#X2CP$l9gGkE ze)Q{DF~k4X!{XD}q~DUmLZQcNZ1J!0to*lp@)A4v+gK45|2`O>UYhm0qiGB(UWXwq zVq0>UJ^yBU9QHEt*rl5 z2fj%&>*@f~l5M^ET9lhmEfCCBvFU#}l6A-uA%zIR#1k={V0Dt|VHJP0P5B$c0Jd2r z0D z9;)MyqCgp}VBXhGJv-79=DGXs59|2DY|Y=8L@jL3-#v+gUH>}+kyhHZERxFxU2|9( zf5`5-c9W&zkPOm4yEcJ5!t(xEDx$G}mXO}8=k=+i4Xe05-x7X^rTlvf`IVLZ+dHfT zj_hf+{oig;ZY*5_HDAsA|2jx2FIx`d%&p6h-u^+utTTy~)eXm2diK`c&SI`4a91M| zM%-%($yhRb4JAv-K>WWg*9p#m+wclPCPd+F28gZ}c3;gSEX2`tECfC%+&R8~Fz5uo zE0nb46D*{8D;!>m>A*0uF!A}GO@b!guzC?&_!@{H`Mk-m1?4@7`(A%7`? zv?Xc$U<7HE?-ie~4&C&{ekdx2T%a4p$2qcu8bP0nIEm#qzT)N|&(oTal5lSna)xhO z#P4fDz9BpK#7NvZ(D^%&WJi=cy1rCs7iDM{MJ9B^xeU}U*W58Q4n+!@fRxYT*}h2RcQ!)jJ;kGA$v~?!o<1Wq3;GsG zADPBSetB6euFmNE@mTT>>CJn_k$J?yx5OcvFP?Ug6>2c4FU3v*DtJ4OYX+10lTU0$ z##(CjN;|A>Msh691YXySB)70ak+`Z@8wMrNeb7S6MLSgIUOaqg6dR<#k24)OZH+@qm5DY z-bVFBuWC*PN7-74My(W{=@kF2IV@@tk8VLYxy-L5kpy1Vf($1|ctj$>mrN4rmqKKq zgT;_~T&D3^Sw1-tilHKj7*Z<)e=4^n5qrKZiN0XUG$4@au(ytTTbr9CnqK02Q&9A> zBr=nX6lzQ*g@#0YD#LEYmWd&up?!W6D}8jse2y)v!6cUZlcC1nd;|>2;>7ns@DYy| z-B4W4|4|%&KLtIohxbfHF|YE9R9rXG__|eU&tQbD~+@yPx8rWWB?Y}8`H>mOY|OT3$}DtFnnq>;9+t2s_4)Go3HA zlhzoI6?Qmk++vYq4`yh_X2ZasmRT_N%21t8 zX-TF;pWPjpO7Wf17x?j(H)f_h%mE`z;_V%1j;;JY2RRcZ_DBO^V-cU&3c~k6i2Sg@ zX1z)X$4FY$inO(O9sJ!^q6=Xse}XhqYddS z^vP;VMnt~(9!%YcnPrH|E8F7M7~D}ivQk)9JF?W$|2^LQHbe|V+T$8UtM^2B%d6WH zXQbuE%#V?Cd~YW5?cyV{NQo71G400!J9t>mlWE=m8{eIUW?U}#qj)f5s4H&{k z_r%S=BYbZ$N!@X(Cyp!0gM3jj=}WQ%ww&1bus(1>1Np2zQ0_8c-v3V7LrQ- zKwqSu=g0dJX1Q-W-?bcOv%DWnWz=?~1vGD4{%1cjJ+dGOnAx99hptEaqj|%&%dXLH z5?#}d#)~ywkYC?(M5J|pU%u!jGCb|8w~<5`qc*!vBCRE0e@pZHx|4r*6X{G2@w5R5 zf8u!m0i+|u^ZN&on+ObW02yw7O5{hJsPZpG+MOpqUbso%fAXAxWO($vAh9KU*+7V$ z#CPKfd6`EKA_b)9j{bvC^T=V9fr5N!ze+xcYRycQ9sh z8~Mtt~2EbVmu^bj=tPQGynnPA0h zc(cX&GVnD+9g|)Qnb!T!bNf)jlJA2c$gb3KJIk{V?IE3Mzdwx8a&#zpJzC3@&L<%H z@nP^%&P@L1Fp`{^i<}6PPKcdcA9iw!;pfNVpXv#*7lwS*p*H^OF!FHRTW{Uij2J4z zNxUU(n>@zguMfxl*){y~a8ks5ePFRGM`2~+;yp{mT$05XmSBR|4H=WMO&!l)FTrrX zh1Zn89Q3!OIgB15W~ppCOe~&*%;9e=$%HvP%;^Y>)I@%E1X&sR+g8~NmDmU{oSJ7O z1{sWWB;3P$c=$HQXp860Q6xWcBhtUNFeZC~AVkzl^JVkRqeya-D~63q5dE9xbawDyv~=6 zCoZ_+hzW!Vmp=i*NARl?$jg!K-)txwCk`(WY%Sl8tlx8bJ6S?L;>{<4c^jWQ37V|t z-%TRDc*Y2XNHLSq!4LCdCvc1uC%6WQR0hwV4E@jslkp^yM^8Z?U)>_>{^%4u`GVH~ zB3@oN6+fGH(5WPZkXbv{Ohd5{{M~diHuB%s4Yf392R?WPNlqNJrH=P%X7pikW7&t5 zny&+2ID@3Y>peFEw;P=u`C;&q_Wbe;Tw?TfebEICwMWYY=!ug7cg;j z39AxwFa9V~FH9HLXQ6+u@u9O}vrum~t|QxchdW84#o37uxRbQBcslVr?<8%k*rPuL z=j@pj>aUp8Padhmn?c=;`E`lRp7vb4ti@e9j-Gvd*S3HR4<#*w|fZKS*UAS54>&heN zp$C&8Tf7J6>1&s3Qqf+Tvw#=jq3EM|q*UzqDuK82<5>M*`nfs}O*n-Ymy*QRxtq{C z1vm%)XY{A?EE7u%$SEgyUDg|z@H+EFrO3F8SCo=TWGyFUUl9)Ta4aM; zY2HG0Oy2p(E`K#(CI~z~!(_^;-%R4UZjv8ypL${#kedvRauOj+ zh5)JjteZHZ*MdpBohtr(!3-X~nB+&{Mzvz9<3kq{N5>q9X`eMGCvBYh&Eudg6S;x zKSH`iX^rX`mhhfS&?s15FChbBUs>N!-8V4l$m&)vfkmv~VUHqcy`N8hRGQ8I9);Pw z4fc(E@8c-b*|=UL)9T3=hsd&(&{=ou1 zOFXFKE0&^IPm>)e7XKmGe}Wt)x#B04uUaF>97EN~tCo{(q%)tp0{4lX zk$k|@@SA77B++FQ5lQby(V`n`@G)tL=~1){n0WuW9>dPv9AF)SF$*Gs$1w^JC-9DW+x?P-5h;06-p_(o|DX!zZQv^XR7L7zmPwhB}4 zd%SQJY1Q<`A~>fAUMl&rRm2fj0L8=$_Z33WJiY3v9lKYNaPps7up`b;Ja)ualO5zM zesncLS!jI<;Qb2pCDIFm`A%fM)5!d^OzZwnz&A(n+4$|xLhA#- zrYOvrL_ZO{^O1MHk@rEF*8RJ{cdO#_B=I*`xgOrSD=8>)c-R63ZSo?B&P&fogCM&D%m-n3?BIcY&2P97{#58#PFp8XtAT>1+qDW{J@94 zOtSO;-|}lV8up& zRH`X%xZqe^0_zgv9{I$S&m7^-ijUUltnk=Ff1{H3*cxzom* ztiuKarowdy&AqMo%5|s_&fJi+>aFPyf*o4|;&PYB&Se^Z(vj!90uFC$`msO)M@WL> zewoJK)#F>ifdx>?dK9pRcUdnAXv1G#j{*>MA!&8Cr85P)0|hvY0^(&__mAQ|Uj+xg zRCJR-0#y|S{OT8J_z1oi92RFgp0xoYvD>o&FPnMW@ux)6&)082w4n2!H=uYQk9ZAB zB42xYUgREy@h8lULr69tEkKT0K#z#q~O9QVt#tk7#@nicOeZxV=VQ*hiO z)A9&wqpb4t8%c`gz8Co>v@NgRNQR0nkBm*&Cm8)A@9+x1(VNIn@t2?mh^z%r2a6a{ z*l&M{vY^JE%-yn-Kn9j{93{BPtUFY)GENU7D9OP?0cRo{TW zyG-Nn0Pu<}Vug~+&u>9fPvibA1mBL&qqhr&z^RWYpovWD{+s#aH{{9Tt~XFX4*&cO zG9*gtB&JWy^7yU^&v_H`S5rRXO>(HYK*b50h*MX=e8q^t^ixS}K?AumXpDjGM8EhG zWe3be4veFWWbxAGbG1ilnTT99_b5MGr|c}61Tx~RPbQ;um)l*LHVJ{iRXFVTf`Rb z5zFV0O^@<%Z((nuq)>e4ImPA8rw@T&1$08D_;&bwU@D-Kn5PT98(0VEAmS>C;oDMk zfvJE_V$QDg4qz&vlNi1=H5Hf&=p<$G|eV_ioL_mkQ196uT&?N=1>kIesKlhR`mV2M$!}gJp2r`Dg zjW=3t-Ni?q6L&oMHu;UfMLqluNom^yEi8l*Ec<->32lk{iMUVVw}$C?9H#eLvFV?i}?5*Bsn<@Qbed%tUWT4SUh(dxr!*~D|TS`AL)u7-}T*02O!2r$SXsx>Wy-VZFu zATZyB&@x~_1_1>_=p0}{1_1>_=}cf|gXkW>U=Xiy>$~{c!85$+-CU{Z(ex8wLEVfpqUlG#ZXEY`&Gi7l zpl*gsZA$k53+m=d&D)gj0v6QGP%wsW2Nu-LP%ws80t<9=xf=IN0+<^27;O+Knnp6a@wf<4htN>`$xmLk zpTv_p_-Sy*T?%l^+w9<)#wQ+xA#^$bJ+YXXYtl10py$VY@`3->v+IB8SuFHSYusF_ z*^Zw+Kr)hFF{_Cy5<<;?dE7yg5UwMI`6iy{9E6rDOkilyHg;XoW1 zy-yz^+^VP14Wf5~;)GE$EuF@PxB!~ZcYTO$-yJ;XBXWJCQVAipF_^VD-lSeMapXM8o^q)2l>o~ zXW-q<>Ud)`%sSv}!7HEX#L*~es3-Y{gZL-==L2{FtXYjxmcdOye`Cm#=U?~$P?k7 z)>PbLn$PDRBT3;pPSuf`$5$M~;uR~#V`O=_&j9=I;%X7}wUsP5bgu@BmoKZv$5C)d zc!Fef!8!17i1#3dsK6iU6Ix%xYSaVz!BxiYYB|(Ivy>Ab{uu8(@T}syj-y`<2}2+u zS4cpNQ8Cz%a7IV~Jw70z3=%2|WCuc6d)i9y&jkNWqXVl2Kj`6n=n1m0`5B5N7WixL zljK)!Cj3p1yqIr^J@)Myg2nmqAJeeue59 zlsqB|!J?}Ii!M>k1u`uc*`Jamv837~kg?zxYp8XnOv|Y2Q+yi4m&rSRhC-|PpwCdK z8-K54H{S2+Thp+fdSa-Gr?ff9X#Enov*iQuNU*nKtr##f1!>@ftZprrL&Kb7NjEKp4Xodm~c z+%GsL@Z>MZQ=|)D{{`vXyz&OdY{|&^PhWr$li5l9z=xlNnc~E9{7Kvo3lrVIpbaus z;CN4H6sqwjPm=lB_{2yhRz;o-P=14<`~;cC-y;Qkz4B0OD$h9;P##9rlaD!tq7L%= z@YB3l=!A^`$uE=#M?1bza8&Y-PC@x)e9UQbYl4y;=xid zE;Sg}$uy3zP`GEE?tcZPRZI=Eg*T5UensvN_vOh>pUc;Lh57O-SVX56i_zVeP>XK- z!J!xU(XU8i-WojixgM#i=^G*bgl0GF4a>htYBX6V=^RVIBQ9l$?2qy0XE4}sA@2-n z6|Q0F2&2PLK0`8EcmqX=6U=~v#Q5U>I|HxuHm^EE#t$9@mOU<<&*FX7;1_uN0)J&{ z99;+V5=C3wU5vwI+!BkzGjWjo6K;U44Gdf2?IMm^i*YTd;w-^ixCN5kgU8?Svu8<0 zv#9}P)?az?~HfJ~L>D$lG(4g}5Ps7*3sQ`zNwS4b6bXg{^IY+E5 z#S7%(WEJ5Q3EehY@RsK0D>8~@`xDT>m2){7a=d-_nP!vQg3@^^|2eU0Dc!={G! zX@2|nxY78A57V5De+evZJ$MBV@nUV5s{3bTM6;%6`@4bivH6LED5t;Ddc8+gqWsonq{SrPa z%`yLN|J*k{hhF1MpY&$I^8f zM)z5K_+Ez8Ep*eL%NukH#5Co^)<}xK#H%ht1ssK3#^IU|Uj-26fmS-n)4s+7Z0vmv zpO5?esefT$r{dBu(3(!+C?Xt!Ct#*F@3v)3#do2_w3FFw#^#7v zfM*SVw1vGzR|4*wCE&ym|M2# zGUH>t9_u$OB(Jfs(hNJzlPSA!h0>&Mj9`@>x~>~1^^c;6eRziD=iS(ZRZ(X*9&PEw z6KrqLoA?uVxWSna)%Y0qQ2&8zK`%Mm;i34iP|lT<{uR!WT4LxvBwc>UP-QosFrBZJ z%SHLCM+YcZ;vj&P6RGDbEa$xx^EHOVNSgVzdH0mJAc^`f!>qVc$0gQk=e^KS#03qW z2a8HO?eF=L{_-_Wusg<3|JS;kUNEO2_PH0#3BKWyb@jlk198^#tUTbX?m9bdpO#)Q z1OARU%Qin?W1h?s@fb{D$#$tD-r^q|b#5?l)W_Os`!?b?SPo!A@QpcP)Z5VD*ew|7 zgP&gc#*CR#2A&t1mzEXS)Y`rbsLSto(}&)E2X%jAj$Qv|wLK{Nc>I1rOves1ja}~y zc4R=TK4BAx+x1sw7f7&@Sav{m?ULO>&Mt;-{>BVRvM04*mqdemQp&CTYp>fooTAj34BNtxy6oi<+au|Fz5_9 zI`-FECV0+}WAg%ItzLNJ3^_Ir--BQeogv5Oc@wR#z;lKin^&1=od?eua%^5l;uh-^ zn9h)6GjR{{Gw_@t$L3)d{&(=4A;;z!A#cAK?P>Wnp5b@| z2O3fS1GdNbWDy_s{DKPlv4IYx(DVK1tQY7&zgh40W7~u*=R8%S;?1{SuTs$__V@p0 zsu=SDdfilB3=bcfYPG%Tf#BOTQ$cbWtx{^Or}J0Hiw{pQ9V4$c)6loJ@Ccbwg|WCL z_J6stNpI(Vnq{Z$o0dVUQ3Ynw*&yZNsJK)z@|x~ax4FHuY^NsEvo7R?6D1d({K963 zXKZAQ-Ady_HSV9jFxGVB>WWVM;zG+Pw!z(5oY{PZ9-!!wwD{V6W+HQkO2 zN_36FP0Muq=wYC*eDuJmKS{N*$$t6CEZ7*BlS2oo~cgsAxY{Mur7*?KYni;GTO*d~)AoE8m83Jw=RSi-3 zZUfs7Fn7>#W@5A+qHgfK@d%26g@}Z_3m=`fi-9K*hpHu>7q5g{G+aV&4^{liW?TrW zww=;L)K(P;qCbZq`e=S3DqrEb!O6pr#C~8HidN~OCplS;w=7lsu${2Xb1p}{fj%6j zys=oAe~PW7Gu-)sJYlEpcMpfFG*sx);VQ#ZE*5Hq#BEM_P0ni*WB6U z8Ks7rk#ARGRXyU@2O7T4>cI&3cs*z_rAMjJ1Wo$qc%9(h zXf=vLJZhX9_n}xWjnX|TBQBs*Z@^prRLy0U>xWYRN~{+eJ!+!cA7ZP8(s7T%xTI50 z+2&PC2u+TG(}7{O%vri8My0rMA0p-*wj!#JU}WTLl%3R?{MPZ$U+%VqOSZsJ|@+^|kcuXtl(=hdv*z@Cx(@ z-C`iftwSdNHUlg5)x53x7#|b+ILkiq4YJetEE>&=WdlvWidC#DOQ`BgF zKqf`~jyKjm^|(2TI(=%c8vJlm+;la|G!HbbnxVW(?TNfJt76d}W*yvo*{q87bePo) z-hf#ZYvPes6L;^T7Ljafj3}Qtu_1+*3;k(m{n_y`Uq<~cmrltI2dU?3EqHN6%IyPk5Sny6|UB7)(iOq z<$58XzxmQET5DF0;v4&u6dsIwe75qap7L#RuZ^1bd^tuF9-~n;vbKSXQPzK~@IeO48!cn3)%0e%ik}h%Hs76b zhR|@NKSSEi8e+Ej$~e0>;ByXh)aa3eSY=`8B^8Y1v*xI2AuVy29DR$*=BW75^C8JW zD{}l4g9e_f``sMniSj{!4>;{y9I(<$9|K%84q$)3+Qr8(1CKY~d+2hP-$D9cT=pl} zE^oD64m-dq16+QcZlA00T`7F+k$3N?X51p43y;5oAbZS*50^QG*JeMSiymn2i}8Eo`Y z6ZO;Zc`9aD9dILY`-%>u{%1#M<~)VPAihsF5AJNG&GXcZlChi>4wRj&;*may^k*~j zcmY+buu`>M>%h$;oC1IRpqA$bkq23);jxWNoxqE)v`Tb7reX83R#;6_=Bu$`-?R2- zKNbF4Dw(e$+y+*y7&HH!em-A~4m-s{k9aS+gtxutqx4>UI8%(iM4!WGcmne0ki$P| z%#$f-0B=wg3sfm)@>~4qNw}ZrR~f;$N#p1B zw3q(mSMdXq|3H$Tk{g_e^MY~(DCPs9=r;<#RU>XYzsN>1>zcUrS zhJl}n;1Xc-^#$Hvg(LVf2eehoH2NV^c|z7euYZC2KpqOT&HGwJn0ZBRcx^fhlbYoA z2c6qLAGkcX&*;@Gl^o)i_rQ=F;+3W1(-UBg;}yZJ1^a~={=sSoIf!``E1i&Ua& znWcAPk1bMor+qg4c@g>k+qc__x_q1pCxz-RRYvx|Qf7_{H_y|m9JMvgKgT}8vLk@4h21*voTHA&9Lt^#a38iSFMc27r5G(6AuZT%hyAq!cJ%R{F172l{X(xupMO1SV)Z368G5Y?4JAKe@Dl|%e_BTyGpuWhw_VD*2Ahbj1DWP58H)Z{xZgFjCAJf<05r&o<*Vlgm zG!-;tq+zTB^@8pMO$BWSEd)IVx&buW+t*(MdJ%Lts5_yrzXdcE^cZN%xW4{g(B$!b z{juSo6Z`rzKtm_>^%sL?gKi4P&nK?KAKSs$3c3$;KWHmx-Q>RhbD*1&;Sh$AL!il^ z%~SgN^FZCczW$A%?Vz=w+0*;__kdQ<=<9C-y$IR`+LhYZAByf;F|)5f1+)e<8#H!y zU;nzuEe2k;?CakOMsiwT|4z_|Y-9|Y0qPoM7{#EmpoNQ20?>%XC;{j(&f(S zxqbc3pog#P>puY+oreg3=77dVA(EgOpe>-qps~xKzXgA!;g21l?(1OyG!gU!=mpST z&`>-d5gUz-5NHPIInZLz)O;8K%>&&5T37&m(0b4lpu6#UK`-b9&{z-b+yH&hWYA*J zO`uyU@JBQL*a3PBv>DX95(Yp^L3=?nR-r9m37ULkUw<8FGw6QM zR?t?^UeJ@EhgKt!qY;_HzWzke(wqAFb3j{)`zUuGE88j1vVTb9ms{kmrVGZ5yIK`1{}f zYdBc!WuwA^h=xT#BZH|_Ru{b%7~{YBH+p~dKJmYZ1h5>2&`TK(|+pI3T7nq z+9`oaC1pkiE%A7#_Vwd+3(h_?2YGU_GZ5?)YKVmAX*d)>CK1!Od38WDCU}#_;_mKO!|{2C}z+m{2id<3>OP)A6RwdiGu!i94CNe zQxOwCZD!I%Pcu132bk2*aVFK&1ETiKrr*cHY&+)9MoNzkiVxbJ)<+9+f;@vF@cdXa zZDw9$y6{$l*G31x!)HB?Gjv#>!TSJpN#dGzB%SIz&V`74$RLxv^KQ?F-<;4WKr}fVLsZKb)u3$7R z@a(pWxGzQAxvpZt56$SKwdp8G1`_+JAqF;g;G;`HV@E|Vz`%>vfU2rDpN)7fJZsxX z^?#baj|qDJ(`~guNp!d`D8~#mh5Z<`)`j!FGUbZL)4CRua@xzJl8!Q|rEVs56cz+h zPd+AlsDR0SDr3^pWCgjFyC#;l>*=FhXtmHfp^ZZKHwC+06HGL2U$AR|xuK~n*mct& zv%INwxU0_%_PbH8+rXY0?HV!|$@F-a7t0h##c%5{hc<1EcV)2lL9Z(c-hxC1g&G^E zo6~7c!3nMr%FH9rSl2Ybxno`UmNQvnUHpn@a3WG0nhFwKvrT}Hjzbb99p`#T9SftS z<6Tod(YNbjAbR$dVE;eNaFaFO73Fc??Y9|z^kBZcpvo9#ZI@!MC|DW*<_cl_toGp?nu$uP2! zGAFat`Kue*L1lo|i7)7}$*#qaKFUh7Xx0ArxbO@?qjZ3gjV$6g*c zCje-*ER{puY%+P~rnr`P605aT zniet+iIj^v*~q>}H0%`dZvvx-`VjO@G|}gpwk1sp<}5%)W76b;^*(sH3sZ&f|JZM5 z=eV{=_+7VaezZ8VO!!F)FSm2E@H?j1{7Lu#tG@0Mpm~H=NHI0PLiiiWoDR3~FxPZ6 z68|k)YO83sic}JnKuVqbD?L0N<7Mi<`)vWo+fYo`T)Lffkd682_;lA=%!KJPT+`IK z8FbeSDD8Vo+g>Ri91^8Xw08#Lnpdo0$7ZL%8>tg8-`RmNPhfGDoinCg`|@Fu=bTF^ zGZjY8#b_hz1TGTTk8gLOhPP7#OLcv!rSip-XG99K0^r<;T)(aEMI+_wkiZ?Semm{d z{D;C1T(9}DHfk7Wgda-2ncQH;=-hS+JO=9s?Q#jj#nRkb1)eW(ELniDV%Rkkq)vwO+O=h;MU4~KOJQ>WSNx#0YeYL=;84m0tWMlV zH_buEswvQ7wIWs{VujSeR(2lKnK&Kmb%C+(nS z!;^)*pEl1$`Mh*+E^Ke#r)@ixTPsqf)D2jjTTVkVTvJUf!!uAzUBA_iwn{s@AksNh zm4OH*;Yb+~te_(qu7`ZbzPY^cJZmI`0mtL}&baRp1j}YEPXm z@Q(0z9MOEQp|9h@&!(d=XU5X$dGNe-mX>N2sbox19Hcbz%|{sWuNajA46EVT)sz6n z25|Fy6s#VH#;}!=rUTw0wq6!nJE?m<>Z5Lj&MHUXZv<|of(6LxSg$U=(`2r}?tneP zl3)SysHVM;!p7{#0=tKX`Js~{A#)n`lcG~gnSSILQ7Mr&b(Wn1Z=eQfs}rI0M?bpS zPBJrL%za2pJHzeCFz-Vu z_u?=eBGiR_eI)S3Z*|^D!v8|}=VSQ4GhY%|9PM%QywI=J_lbJ7@T>3A{9`T+)CqqRRV_l1cFOh*Cd=G^1AfoOsML*P^IX*DNc?+CwRg_h3|`45HfC*Km}wlYhrISu8!z@=2O z1bx+CqTveBo)O`+goDubz{jRu9_>E~ zzwke_xf*FXZNkTnZz;@W$oLd1xt$mI;tFjpPxwCyf8D#9zf}SkisN1m3HHn|=h^Y! z8m^I$qzIfu2LW$s^lG?Ov~Ljj+`HOIr_8qszf@LSP7}IE_$T*iJ5I|h7k+fl<#rwu ze&cDIPphwUg?Tcr(beYky=O$oO;y*S2!{=A+wtWsf$M1Rb!ZwP)Oj6t1UZzM$AiR2 zI>TN=UyE^gZTI8R+KA(Lk?>>JYQEFx?-PDLHNc$bgwn1Z5_5F|@1&y)@BC2bRxI!# zfosWJ2G>@Sj|n!g%XqRIL=P{+n(D$hon@M-wF=O^*+uN)wNf_|Hziz;PI>GNEzF0p ze0?Iq7{soJ1Fltmn~mOLUp)dx(_V)2rRi=LI2I@AoK=82Vcc}l#O1EF>eTsrVJiTaFVz(*bAxfiB{*{h3b&ieSSs}zZDgmoT`N*< zYGBwkTpKwimGe7+_s~(msQ%L{;BO=OZm_-2y#Zyc?a(FzqB92_o&BmN3sRoSMLLd7 zg9`{;K?fOjJ*Kr=9ft(oMBNM@OVMz;xb$@mcL`i1a6WYc&fO{t9Q8toF=8dSC-Q>B^Hkk|J z^ZrxoILnMj;&c>x&uIQdu~jGhLfXaJ_)q|dC%ITlIj!=9NM%#PYV0`^uh<8M;BG(H ze#cx|u^O`>x;4Z+h0C>-9LeiO5ksgMJ{PJ>y;0x_fupID;SiUGlTD33FK`6DS`4`L zHErB+@g0E?S-{wq6cwT%o8Hq>8^p*pUhQc!HL#J0TXh~zWVd4k;)1l$QD|eMWfnoo zf18$aiIL@E#2_DF)%y`GEpk2R={>LWa{B#WL=1Osir`A>!`h0|M2rNTS0g3dgiMkT zYHere86&Wt3K$NNrFNU4uZ04)Qx(I3`?PVVAa@E}OnU+2bCE}GLV5D32gH;5!sVmJ zyCR%TnK#4M;rF#Ir+0oP@E$4yj9Yk*-V7swGg|7TIOLa2vzv~xk>Uq5yi?%RYjtVe zgdft4!eZD{%tluDZ9G<_%0y}%l|V{$wbR4J7{dcMYGe5#_L7Jlrh~;8ny^M&17o3i zmmB*=q*AE>FkUdPT7#*ma-o(=5?eQo)sEFs=Nb;AELKlp=grs81a6_QTL527_1o-P z(zDh!d-F@(WSKX&&KQGuA~ycxrefKR?T9I1nv!Jex9i96n?a{_8gHv zApB-J2y?jebDZ-|qTt(5j$)Yvo%-q#VXPuyUTN7aDd7FakYJFAcUwqRV-4^h}1r^ z0K?WU2z%XUw%I~zTYOysP3q$rRg9-p+ol|uO4?Sz?-|lct zRlUdPT~Iu4*mDOuQv_w+34iwZw2f>j`k+bL#$hVE6E^(R04c2W4sfcKPTvVt92b^C zHT!GrWV2-ds;FYfD}_`(?J9+n$ugEX1)erpXMkfvHc~9ZP>mS5UEmB#SdU%A2C7;Q zDdVr&%abDYo=DZuUcea0kE};l>t4}P8$@a(dJe}UiNfxJk-Tp0??ox9PvCWw$#CF` zEz=T#8>x)piw|jSr%gR9a4|J7TqpY$2YyCi3~+#Rd)I62JaMgA;I7*>zgT>FU-+kF zI(N*S5dIt8{a3H76^=u4Z}6xYdBWm#|7R^ z-JHjM3f_QftfPVr5I*;$-xjM8VRNd^Dut>T&NsEKW*I2P3yd>LhU=>|yx-L7iv>=i zPKLcdYS@`I9u{~Xh1~-K{&|bi1V$+fP zTnlEJ__D%Fu4%ym*;D5q Cg2(y* diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c index 4b6a2b460..7bed0d759 100644 --- a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c @@ -420,7 +420,8 @@ void setupDetector() { if (idac == D_PWR_EMPTY) continue; int min = (idac == D_PWR_IO) ? VIO_MIN_MV : POWER_RGLTR_MIN; - setDAC(idac, min, 0); + // will not enable power at startup (dacValues = -1) + setPower(idac, min); } resetFlow(); @@ -1327,6 +1328,8 @@ void setPower(enum DACINDEX ind, int val) { LOG(logDEBUG1, ("Switching off power enable\n")); bus_w(addr, bus_r(addr) & ~(mask)); + int startup = dacValues[ind] == -1 ? 1 : 0; + // convert voltage to dac (power off is anyway done with power enable) if (val > 0) { @@ -1347,7 +1350,7 @@ void setPower(enum DACINDEX ind, int val) { setDAC(ind, dacval, 0); // if valid, enable power - if (dacval >= 0) { + if (dacval >= 0 && startup == 0) { LOG(logDEBUG1, ("Switching on power enable\n")); bus_w(addr, bus_r(addr) | mask); } From 5811e4e9ab3dd7fa56ae78ee8b42a6cd9003fa56 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 28 Jan 2026 15:30:42 +0100 Subject: [PATCH 4/7] added tests to ensure startup val is not -1 or -100 after powerchip in config for xilinx --- .../tests/Caller/test-Caller-chiptestboard.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp index 795937ee1..a36576d7d 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp @@ -1046,6 +1046,12 @@ TEST_CASE("v_abcd", "[.cmdcall]") { if (det_type == defs::CHIPTESTBOARD || det_type == defs::XILINX_CHIPTESTBOARD) { auto prev_val = det.getPower(indices[i]); + // this is the first command touching power dacs, should not be + // -100 + if (det_type == defs::XILINX_CHIPTESTBOARD) { + REQUIRE(prev_val.any(-100) == false); + REQUIRE(prev_val.any(-1) == false); + } { std::ostringstream oss; caller.call(cmds[i], {"0"}, -1, PUT, oss); From 28b2aa9673b99b6c7164ead803b9478b55ea8784 Mon Sep 17 00:00:00 2001 From: AliceMazzoleni99 Date: Tue, 3 Feb 2026 11:45:12 +0100 Subject: [PATCH 5/7] Dev/add simulator tests in GitHub workflows (#1337) * added simulator tests in github workflows * indentation error * typo * debug * Logging for debugging * added more debug lines * more debugging * debug * debug * debug * dont throw if process does not exist * debug * added absolute path to sls_detector commands * some refactoring in test scripts * added absolute path to all slsdet command * typo * ../tests/scripts/test_frame_synchronizer.py * raise exception upon failure for github workflows * removed hidden tags * some refactoring in test scripts * some refactoring * fixed CMakeLists * fixed unsuccesful merge * updated python tests using simulators * debug import error * debug module import * python -m runs module pytest as script - everything in path available * removed integartion tests * enable file write not to log files * run tests without log files * increased sleep time for udp packets * added logg level variable to cmake * added testing policies to documenattion * disabled check for num_frames for jungfrau & xilinx * set log level as cmake cached variable * disable tests for jungfrau and xilinx_ctb * check frames for HDF5 * updated Documentation of Testing * changed withdetectorsimulators to detectorintegration * replaced [.cmdcall] with [.detectorintegration] * check_file_size only disabled for jungfrau - disable for all roi tests * changed time to wait after receive to 5 ms * take into account half modules of eiger * num udp interfaces needs to be consistent across modules * suppressed warning enclosing if * config added 2 udp ports per default for moench and jungfrau * write detector output to console * allow jungfrau to tests num frames, remove unused variable (numinterfaces), add comment for future to handle traceback to know which calling function threw the files unmatched, added documentation for tests (examples for .detectoritnegration and how to disable marked tests, removed addditional argumetns to disable for test_simulator as one can just use ~, removed the check that checks for jungfrau checking number of frames at master attributes and at rx test, removed unused advanced_test_settings in test_simulator script, the num_mods check for multiple modules is removed and default num modules set to 1 for test_simulator (to be increased later), back to raising exception for killprocess * removed integration tests from cmakelists.txt and cmk.sh, modified the tests workflow command to reflect the disable argument and removed xilinx_ctb from test (fix fromdeveloper merge to be done) * filtering by actual name for disable certain tests on github workflow * minor refactor * wip * wip * changes to run on local rh9 runner instead of github workfloa * modified yml to remove some leftover from github workflow * test * fix build_dir in scripts (github workflow) and pytest dir in gitea workflow * making the local machine use python3.13 binary * pythonpath added * changes for build_Dir back * allowing ctb api tests * allowed ctb api tests and set up slsdetname envt variable for shared memory being reserved just for these tests * added rh8 workflow for local runner on gitea * remnants from rh9 local runner * remnants from rh9 local runner * conda env for all shell for local runner * allowing hdf5 to build on local runner * run all tests for both the runners * refactored fixtures a bit and merged some tests that use one session for entire server * test fail * test fix * adding github workflow to test without data file checks and without logs * documentation changes * unnecessary import in conftest * allowing the session_simulator to test for multiple modules and interfaces etc * allow test_simulator script to run for 2 modules for all modules except ctb and xilinx ctb * run upon push * removing the disable file check on github workflow * minor adjustment * testing without synch * reverting to previous * with log file * without the space * summary from file and more error extracts from file to terminal * minor * trying nlf for more details * updated with no log file to print everything to screen also for det and rxr * trying a no throw * stoi was more about indent in yaml * tries * wip * debug * number of frames inconsistent fix=>just take first one, only test xilinx * jungfrau tests without frames caught check * extend the disable file check to everywhere that creates files * specify path for test_simulator * withoutprinting == * wip * back with printing===, but not parsing file for errors anymore * lang? * wip * safe log? * wip2 * wip * dont split error as its streaming live, just raise * with log files * lang? * last resort * wip * test no det with general tests * show tests live * also include hidden integration tests * without extra summary? * revert * last resort again * tsquash on int64_t? * tsquash on int64_t? mroe print * writing to /tmp? * all tests * might be the fix? * write to file * fixed a few quiet mode no log file tests * work on any branch for github tests, work on also release candidates for gitea tests * added frame synchronizer tests to github workflow * moved tests to run_tests.yaml from cmake.yaml * documentation * disabled general tests --------- Co-authored-by: Dhanya Thattil --- .gitea/workflows/rh8-local-tests.yml | 62 +++ .gitea/workflows/rh9-local-tests.yml | 53 ++ .github/workflows/cmake.yaml | 19 +- .github/workflows/run_tests.yaml | 57 ++ CMakeLists.txt | 12 +- cmk.sh | 2 +- docs/src/Testing.rst | 166 ++++++ docs/src/index.rst | 1 + integrationTests/CMakeLists.txt | 40 -- integrationTests/test-eigerIntegration.cpp | 204 ------- .../test-integrationDectector.cpp | 522 ------------------ integrationTests/test-integrationMulti.cpp | 108 ---- integrationTests/test.cpp | 5 - python/tests/conftest.py | 166 ++++-- .../tests/{test_CtbAPI.py => test_det_api.py} | 159 +++--- {tests/scripts => python/tests}/test_free.py | 26 +- python/tests/test_pythonAPI.py | 19 +- .../tests/Caller/test-Caller-acquire.cpp | 20 +- .../Caller/test-Caller-chiptestboard.cpp | 174 +++--- .../tests/Caller/test-Caller-eiger.cpp | 51 +- .../tests/Caller/test-Caller-global.cpp | 22 +- .../tests/Caller/test-Caller-global.h | 2 - .../tests/Caller/test-Caller-gotthard2.cpp | 45 +- .../tests/Caller/test-Caller-jungfrau.cpp | 35 +- .../Caller/test-Caller-master-attributes.cpp | 6 +- .../tests/Caller/test-Caller-moench.cpp | 3 +- .../tests/Caller/test-Caller-mythen3.cpp | 33 +- .../tests/Caller/test-Caller-pattern.cpp | 28 +- .../tests/Caller/test-Caller-rx-running.cpp | 31 +- .../tests/Caller/test-Caller-rx.cpp | 80 +-- .../test-Caller-xilinx-chiptestboard.cpp | 2 +- .../tests/Caller/test-Caller.cpp | 282 +++++----- slsReceiverSoftware/src/Implementation.cpp | 3 +- .../tests/test-ArrangeDataBasedOnBitList.cpp | 12 +- slsSupportLib/tests/test-Timer.cpp | 4 +- slsSupportLib/tests/test-Version.cpp | 2 +- tests/CMakeLists.txt | 4 - tests/scripts/test_commands.py | 100 ---- tests/scripts/test_frame_synchronizer.py | 47 +- tests/scripts/test_roi.py | 82 --- tests/scripts/test_simulators.py | 95 ++-- tests/scripts/utils_for_test.py | 217 +++++--- 42 files changed, 1243 insertions(+), 1758 deletions(-) create mode 100644 .gitea/workflows/rh8-local-tests.yml create mode 100644 .gitea/workflows/rh9-local-tests.yml create mode 100644 .github/workflows/run_tests.yaml create mode 100644 docs/src/Testing.rst delete mode 100755 integrationTests/CMakeLists.txt delete mode 100644 integrationTests/test-eigerIntegration.cpp delete mode 100644 integrationTests/test-integrationDectector.cpp delete mode 100644 integrationTests/test-integrationMulti.cpp delete mode 100755 integrationTests/test.cpp rename python/tests/{test_CtbAPI.py => test_det_api.py} (82%) rename {tests/scripts => python/tests}/test_free.py (94%) delete mode 100644 tests/scripts/test_commands.py delete mode 100644 tests/scripts/test_roi.py diff --git a/.gitea/workflows/rh8-local-tests.yml b/.gitea/workflows/rh8-local-tests.yml new file mode 100644 index 000000000..8865e43ce --- /dev/null +++ b/.gitea/workflows/rh8-local-tests.yml @@ -0,0 +1,62 @@ +name: Run Simulator Tests on local RHEL8 + +on: + push: + branches: + - developer + - main + - 'dev/*' + - '*.*.*.rc' + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Debug + + +jobs: + build: + runs-on: "detectors-software-RH8" + steps: + - uses: actions/checkout@v4 + + - name: Configure CMake + run: | + source /home/gitea_runner/.bashrc + conda activate det + cmake -B build \ + -DCMAKE_BUILD_TYPE=Debug \ + -DSLS_USE_TESTS=ON \ + -DSLS_USE_SIMULATOR=ON \ + -DSLS_USE_PYTHON=On \ + -DSLS_USE_HDF5=ON + + - name: Build + # Build your program with the given configuration + run: | + source /home/gitea_runner/.bashrc + conda activate det + cmake --build build -j4 --config Debug + + - name: Python unit tests with simulators + run: | + source /home/gitea_runner/.bashrc + conda activate det + export PYTHONPATH=$PWD/build/bin:$PYTHONPATH + export SLSDETNAME=gitea_runner_tests + python -m pytest -m detectorintegration python/tests --detector-integration + python -m pytest python/tests + + + - name: Simulator unit tests + run: | + source /home/gitea_runner/.bashrc + conda activate det + cd build/bin + python test_simulators.py -g + + - name: Run frame synchronizer tests + run: | + source /home/gitea_runner/.bashrc + conda activate det + cd build/bin + python test_frame_synchronizer.py diff --git a/.gitea/workflows/rh9-local-tests.yml b/.gitea/workflows/rh9-local-tests.yml new file mode 100644 index 000000000..4aa1a9f98 --- /dev/null +++ b/.gitea/workflows/rh9-local-tests.yml @@ -0,0 +1,53 @@ +name: Run Simulator Tests on local RHEL9 + +on: + push: + branches: + - developer + - main + - 'dev/*' + - '*.*.*.rc' + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Debug + + +jobs: + build: + runs-on: "detectors-software-RH9" + steps: + - uses: actions/checkout@v4 + + - name: Configure CMake + run: | + cmake -B build \ + -DCMAKE_BUILD_TYPE=Debug \ + -DSLS_USE_TESTS=ON \ + -DSLS_USE_SIMULATOR=ON \ + -DSLS_USE_PYTHON=On \ + -DPython_EXECUTABLE=/usr/bin/python3.13 \ + -DPython_INCLUDE_DIR=/usr/include/python3.13 \ + -DPython_LIBRARY=/usr/lib64/libpython3.13.so \ + -DSLS_USE_HDF5=ON + + - name: Build + # Build your program with the given configuration + run: cmake --build build -j4 --config Debug + + - name: Python unit tests with simulators + run: | + export PYTHONPATH=$PWD/build/bin:$PYTHONPATH + export SLSDETNAME=gitea_runner_tests + python3.13 -m pytest -m detectorintegration python/tests --detector-integration + python3.13 -m pytest python/tests + + - name: Simulator unit tests + run: | + cd build/bin + python3.13 test_simulators.py -g + + - name: Run frame synchronizer tests + run: | + cd build/bin + python3.13 test_frame_synchronizer.py diff --git a/.github/workflows/cmake.yaml b/.github/workflows/cmake.yaml index 32aba389c..a7a161c56 100644 --- a/.github/workflows/cmake.yaml +++ b/.github/workflows/cmake.yaml @@ -29,19 +29,20 @@ jobs: - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSLS_USE_TESTS=ON -DSLS_USE_HDF5=ON -DSLS_USE_GUI=ON -DSLS_USE_MOENCH=ON -DSLS_USE_PYTHON=ON + run: | + cmake -B ${{github.workspace}}/build \ + -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \ + -DSLS_USE_TESTS=ON \ + -DSLS_USE_SIMULATOR=ON \ + -DSLS_USE_PYTHON=ON \ + -DSLS_USE_HDF5=ON \ + -DSLS_USE_GUI=ON \ + -DSLS_USE_MOENCH=ON - name: Build # Build your program with the given configuration run: cmake --build ${{github.workspace}}/build -j4 --config ${{env.BUILD_TYPE}} - - name: C++ unit tests - working-directory: ${{github.workspace}}/build - run: ctest -C ${{env.BUILD_TYPE}} -j1 --rerun-failed --output-on-failure - - - name: Python unit tests - working-directory: ${{github.workspace}}/build/bin - run: | - python -m pytest ${{github.workspace}}/python/tests + diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml new file mode 100644 index 000000000..215efb8a3 --- /dev/null +++ b/.github/workflows/run_tests.yaml @@ -0,0 +1,57 @@ +name: Run Simulator Tests + +on: + push: + + + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Debug + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: 3.12 + cache: 'pip' + - run: pip install pytest numpy colorama + + - uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: libhdf5-dev + version: 1.0 + + - name: Configure CMake + run: | + cmake -B ${{github.workspace}}/build \ + -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \ + -DSLS_USE_TESTS=ON \ + -DSLS_USE_SIMULATOR=ON \ + -DSLS_USE_PYTHON=ON \ + -DSLS_USE_HDF5=ON + + - name: Build + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/build -j4 --config ${{env.BUILD_TYPE}} + + - name: Simulator unit tests + working-directory: ${{github.workspace}}/build/bin + run: | + python test_simulators.py --no-log-file --quiet --tests "[detectorintegration]~[disable_check_data_file]" + #remove --quiet to see more prints from simulator, receiver and tests + python test_frame_synchronizer.py + + + - name: Python unit tests with simulators + working-directory: ${{github.workspace}}/build/bin + run: | + python -m pytest -m detectorintegration ${{github.workspace}}/python/tests --detector-integration + python -m pytest ${{github.workspace}}/python/tests + + - name: C++ unit tests + working-directory: ${{github.workspace}}/build + run: ctest -C ${{env.BUILD_TYPE}} -j1 --rerun-failed --output-on-failure diff --git a/CMakeLists.txt b/CMakeLists.txt index 194a2abad..b4ea785fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,8 +40,6 @@ include(FetchContent) option(SLS_FETCH_ZMQ_FROM_GITHUB "Fetch zmq from github" OFF) option(SLS_FETCH_PYBIND11_FROM_GITHUB "Fetch pybind11 from github" OFF) - - # Allow FetchContent_Populate to be called with a single argument # otherwise deprecated warning is issued # Note: From cmake 3.28 we can pass EXCLUDE_FROM_ALL to FetchContent_Declare @@ -200,7 +198,6 @@ option(SLS_USE_RECEIVER_BINARIES "Receiver binaries" ON) option(SLS_USE_GUI "GUI" OFF) option(SLS_USE_SIMULATOR "Simulator" OFF) option(SLS_USE_TESTS "TESTS" OFF) -option(SLS_USE_INTEGRATION_TESTS "Integration Tests" OFF) option(SLS_USE_SANITIZER "Sanitizers for debugging" OFF) option(SLS_USE_PYTHON "Python bindings" OFF) option(SLS_INSTALL_PYTHONEXT "Install the python extension in the install tree under CMAKE_INSTALL_PREFIX/python/" OFF) @@ -292,6 +289,11 @@ if(NOT TARGET slsProjectOptions) target_compile_features(slsProjectOptions INTERFACE cxx_std_17) endif() +set(LOG_MAX_REPORTING_LEVEL sls::logINFO CACHE STRING "set logging level") +target_compile_definitions(slsProjectOptions + INTERFACE LOG_MAX_REPORTING_LEVEL=${LOG_MAX_REPORTING_LEVEL} +) + if (NOT TARGET slsProjectWarnings) add_library(slsProjectWarnings INTERFACE) target_compile_options(slsProjectWarnings INTERFACE @@ -400,10 +402,6 @@ if (SLS_USE_SIMULATOR) add_subdirectory(slsDetectorServers) endif (SLS_USE_SIMULATOR) -if (SLS_USE_INTEGRATION_TESTS) - add_subdirectory(integrationTests) -endif (SLS_USE_INTEGRATION_TESTS) - if (SLS_USE_PYTHON) find_package (Python 3.8 COMPONENTS Interpreter Development.Module REQUIRED) set(PYBIND11_FINDPYTHON ON) # Needed for RH8 diff --git a/cmk.sh b/cmk.sh index dd58a37e1..498d590bd 100755 --- a/cmk.sh +++ b/cmk.sh @@ -250,7 +250,7 @@ fi #Tests if [ $TESTS -eq 1 ]; then - CMAKE_POST+=" -DSLS_USE_TESTS=ON -DSLS_USE_INTEGRATION_TESTS=ON" + CMAKE_POST+=" -DSLS_USE_TESTS=ON " echo "Tests Option enabled" fi diff --git a/docs/src/Testing.rst b/docs/src/Testing.rst new file mode 100644 index 000000000..515571788 --- /dev/null +++ b/docs/src/Testing.rst @@ -0,0 +1,166 @@ +Testing +========== + +We use ``catch2`` and ``pytest`` for unit testing the C++ and Python code. + +CATCH2 Tests +---------------- + +To build and run the catch2 tests use the following commands: + +.. code-block:: console + + cd build + cmake -DSLS_USE_TESTS=ON ../ + bin/tests + +Note that this requires that you have catch2 installed on your system. + +Naming Policy: +----------------- + +Per default all tests should be visible to catch2. + +If a test fails in the github or gitea actions hide the test by adding the tag ``[.]`` to the test name. + +.. code-block:: cpp + + TEST_CASE("This test is hidden from default runs", "[.]") { + REQUIRE(1 == 2); + } + +You can run all tests requiring a detector by running the following command: + +.. code-block:: console + + tests "[.detectorintegration]" + + +.. note :: + + This only works if a configured simulator (or an actual configured detector) and receiver are already set up to run the tests. There is a script that automatically sets up virtual detectors and runs all integration tests. See Section :ref:`Simulator Script. ` below. + + +If you want to disable testing that involves a data file that require pc tuning optimizations, add the hidden tag ``[.disable_check_data_file]`` to the test case. Please note that only some specific disable tests have been implemented so far. + +.. code-block:: console + + tests "[detectorintegration]~[disable_check_data_file]" + +.. note :: + + Ensure that there are no spaces betweent the tags and no '.', else hardly any test will be matched. + +.. _python simulator script: + +Simulator Script: +----------------- + +One can also just run the following script, which will run your tests for all the detector types (simulators only) with a pre-determined configuration. + +.. code-block:: console + + cd build + python bin/test_simulators.py + +This runs all tests marked with the tag ``[.detectorintegration]`` for all detector simulators. +If you want to run them for a specific virtual detector or a specific test use the following command: + +.. code-block:: console + cd build + python bin/test_simulators.py --servers jungfrau --test "[.rx]" + +You can exclude specific tests by adding the option ``~[]``. Again, we assume that this marker is added to the tests that you want to exclude. + +.. code-block:: console + cd build + python bin/test_simulators.py --servers eiger jungfrau moench --test "[detectorintegration]~[disable_check_data_file]" + +You can additionally run all the tests not requiring detectors using the script ``bin/test_simulators.py`` by passing the option ``--general-tests``. + +One can use ``--no-log-file`` if you dont want to create a log files and instead print to console. If you prefer to not print to console either, add ``--quiet``. + + +Pytest Tests +----------------- + +To run the python tests use the following commands: + +.. code-block:: console + + cd build + cmake ../ -DSLS_USE_PYTHON=ON + export PYTHONPATH=$PWD/bin + python -m pytest ../python/tests/ + +If a test requires a detector mark them with the pytest marker ``@pytest.mark.detectorintegration``. + +To run only tests requiring virtual detectors use the following command: + +.. code-block:: console + #in build + python -m pytest -m detectorintegration ../python/tests/ + +There is a helper test fixture in ``slsDetectorSoftware/python/tests/conftest.py`` called ``test_with_simulators`` that sets up virtual detectors and yields the test for all detectors. The set up is done for every test automatically. + +Example usage: + +.. code-block:: python + + import pytest + + @pytest.mark.detectorintegration + def test_example_with_simulator(test_with_simulators): + # your test code here + +If you want to run the test only for a specific test use the parametrized test fixture: + +Example usage: + +.. code-block:: python + + import pytest + + @pytest.mark.detectorintegration + @pytest.mark.parametrize("setup_parameters", [([""], )], indirect=True) + def test_example_with_specific_simulators(test_with_simulators, setup_parameters): + # your test code here + + +There is another helper test fixture in ``slsDetectorSoftware/python/tests/conftest.py`` called ``session_simulator`` that sets up virtual detectors and yields the test for all detectors. The difference with the previous fixture ``test_with_simulators`` is that this fixture will set up one detector at a time and run all the tests using this fixture before cleaning up and moving on to the next detector. It saves time if the setup and cleanup is expensive. + +Example usage: + +.. code-block:: python + + import pytest + + @pytest.mark.detectorintegration + def test_define_reg(session_simulator, request): + """ Test setting define_reg for ctb and xilinx_ctb.""" + det_type, num_interfaces, num_mods, d = session_simulator + assert d is not None + + from slsdet import RegisterAddress + + if det_type in ['ctb', 'xilinx_ctb']: + # your test code here + +For more specific parameters, you can parametrize the fixture like below: + +.. code-block:: python + + import pytest + + @pytest.mark.detectorintegration + @pytest.mark.parametrize( + "session_simulator", + [ + ("ctb", 1, 1), + ("xilinx_ctb", 1, 1), + ], + indirect=True, + ) + def test_define_reg(session_simulator): + det_type, num_interfaces, num_mods, d = session_simulator + # your test code here diff --git a/docs/src/index.rst b/docs/src/index.rst index 4ba406a17..d62597601 100644 --- a/docs/src/index.rst +++ b/docs/src/index.rst @@ -66,6 +66,7 @@ slsDetectorPackage container_utils type_traits ToString + Testing .. toctree:: :caption: Firmware diff --git a/integrationTests/CMakeLists.txt b/integrationTests/CMakeLists.txt deleted file mode 100755 index a270593fe..000000000 --- a/integrationTests/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: LGPL-3.0-or-other -# Copyright (C) 2021 Contributors to the SLS Detector Package -# MESSAGE( STATUS "CMAKE_CURRENT_SOURCE_DIR: " ${CMAKE_CURRENT_SOURCE_DIR} ) -# MESSAGE( STATUS "PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR} ) - - - -# include_directories( -# ${PROJECT_SOURCE_DIR}/catch -# ) - -# target_sources(tests PRIVATE -# ${CMAKE_CURRENT_SOURCE_DIR}/test-integrationMulti.cpp -# ${CMAKE_CURRENT_SOURCE_DIR}/test-integrationDectector.cpp -# ${CMAKE_CURRENT_SOURCE_DIR}/test-eigerIntegration.cpp -# ) - -# if(SLS_USE_TESTS) -# set(TEST_SOURCES -# src/test-slsDetector.cpp -# src/test.cpp -# ) -# add_executable(detector_test ${TEST_SOURCES}) - -# target_link_libraries(detector_test -# slsDetectorShared -# slsProjectOptions -# slsProjectWarnings -# slsSupportLib -# pthread -# rt -# ) -# set_target_properties(detector_test PROPERTIES -# RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin -# ) - - - -# endif() - diff --git a/integrationTests/test-eigerIntegration.cpp b/integrationTests/test-eigerIntegration.cpp deleted file mode 100644 index 6fa4124d2..000000000 --- a/integrationTests/test-eigerIntegration.cpp +++ /dev/null @@ -1,204 +0,0 @@ -// SPDX-License-Identifier: LGPL-3.0-or-other -// Copyright (C) 2021 Contributors to the SLS Detector Package -#include "DetectorImpl.h" -#include "catch.hpp" -#include "sls/string_utils.h" -#include "tests/globals.h" -#include - -namespace sls { - -class MultiDetectorFixture { - protected: - DetectorImpl d; - - public: - MultiDetectorFixture() : d(0, true, true) { - d.setHostname(test::hostname.c_str()); - if (test::my_ip != "undefined") - d.setReceiverHostname(test::my_ip); - } - ~MultiDetectorFixture() { d.freeSharedMemory(); } -}; - -TEST_CASE_METHOD(MultiDetectorFixture, "Set and get dacs", - "[.eigerintegration][cli]") { - auto th = 1000; - - // set and read back each individual dac of EIGER - d.setDAC(0, di::SVP, 0); - CHECK(d.setDAC(-1, di::SVP, 0) == 0); - d.setDAC(4000, di::SVN, 0); - CHECK(d.setDAC(-1, di::SVN, 0) == 4000); - d.setDAC(2000, di::VTR, 0); - CHECK(d.setDAC(-1, di::VTR, 0) == 2000); - d.setDAC(3500, di::VRF, 0); - CHECK(d.setDAC(-1, di::VRF, 0) == 3500); - d.setDAC(1400, di::VRS, 0); - CHECK(d.setDAC(-1, di::VRS, 0) == 1400); - d.setDAC(2556, di::VTGSTV, 0); - CHECK(d.setDAC(-1, di::VTGSTV, 0) == 2556); - d.setDAC(1500, di::VCMP_LL, 0); - CHECK(d.setDAC(-1, di::VCMP_LL, 0) == 1500); - d.setDAC(1400, di::VCMP_LR, 0); - CHECK(d.setDAC(-1, di::VCMP_LR, 0) == 1400); - d.setDAC(4000, di::CAL, 0); - CHECK(d.setDAC(-1, di::CAL, 0) == 4000); - d.setDAC(1300, di::VCMP_RL, 0); - CHECK(d.setDAC(-1, di::VCMP_RL, 0) == 1300); - d.setDAC(1200, di::VCMP_RR, 0); - CHECK(d.setDAC(-1, di::VCMP_RR, 0) == 1200); - d.setDAC(1100, di::RXB_RB, 0); - CHECK(d.setDAC(-1, di::RXB_RB, 0) == 1100); - d.setDAC(1100, di::RXB_LB, 0); - CHECK(d.setDAC(-1, di::RXB_LB, 0) == 1100); - d.setDAC(1500, di::VCP, 0); - CHECK(d.setDAC(-1, di::VCP, 0) == 1500); - d.setDAC(2000, di::VCN, 0); - CHECK(d.setDAC(-1, di::VCN, 0) == 2000); - d.setDAC(1550, di::VIS, 0); - CHECK(d.setDAC(-1, di::VIS, 0) == 1550); - d.setDAC(660, di::IO_DELAY, 0); - CHECK(d.setDAC(-1, di::IO_DELAY, 0) == 660); - - // setting threshold sets all individual vcmp - d.setDAC(th, di::THRESHOLD, 0); - CHECK(d.setDAC(-1, di::THRESHOLD, 0) == th); - CHECK(d.setDAC(-1, di::VCMP_LL, 0) == th); - CHECK(d.setDAC(-1, di::VCMP_LR, 0) == th); - CHECK(d.setDAC(-1, di::VCMP_RL, 0) == th); - CHECK(d.setDAC(-1, di::VCMP_RR, 0) == th); - - // different values gives -1 - if (d.getNumberOfDetectors() > 1) { - d.setDAC(1600, di::VCMP_LL, 0, 0); - d.setDAC(1700, di::VCMP_LL, 0, 1); - CHECK(d.setDAC(-1, di::VCMP_LL, 0, 0) == 1600); - CHECK(d.setDAC(-1, di::VCMP_LL, 0, 1) == 1700); - CHECK(d.setDAC(-1, di::VCMP_LL, 0) == -1); - CHECK(d.setDAC(-1, di::THRESHOLD, 0) == -1); - CHECK(d.setDAC(-1, di::THRESHOLD, 0, 0) == -1); - CHECK(d.setDAC(-1, di::THRESHOLD, 0, 1) == -1); - } -} - -TEST_CASE_METHOD(MultiDetectorFixture, "Read temperatures", - "[.eigerintegration][cli]") { - std::vector tempindex{di::TEMPERATURE_FPGA, di::TEMPERATURE_FPGA2, - di::TEMPERATURE_FPGA3}; - for (auto index : tempindex) { - for (int i = 0; i != d.getNumberOfDetectors(); ++i) { - double temp = static_cast(d.getADC(index, 0)) / 1000; - CHECK(temp > 20); - CHECK(temp < 60); - } - } -} - -int to_time(uint32_t reg) { - uint32_t clocks = reg >> 3; - uint32_t exponent = (reg & 0b111) + 1; - return clocks * pow(10, exponent); -} - -TEST_CASE_METHOD(MultiDetectorFixture, "Read/write register", - "[.eigerintegration][cli]") { - d.setNumberOfFrames(1); - d.setExposureTime(10000); - d.acquire(); - CHECK(to_time(d.readRegister(0x4, 0)) == 10000); - - d.writeRegister(0x4, 500); - CHECK(d.readRegister(0x4) == 500); -} - -TEST_CASE_METHOD(MultiDetectorFixture, "Set dynamic range", - "[.eigerintegration][cli][dr]") { - std::vector dynamic_range{4, 8, 16, 32}; - for (auto dr : dynamic_range) { - d.setDynamicRange(dr); - CHECK(d.setDynamicRange() == dr); - } -} - -TEST_CASE_METHOD(MultiDetectorFixture, "Set clock divider", - "[.eigerintegration][cli][this]") { - for (int i = 0; i != 3; ++i) { - d.setSpeed(sv::CLOCK_DIVIDER, i); - CHECK(d.setSpeed(sv::CLOCK_DIVIDER) == i); - } -} - -TEST_CASE_METHOD(MultiDetectorFixture, "Get time left", - "[.eigerintegration][cli]") { - CHECK_THROWS(d.getTimeLeft(ti::PROGRESS)); -} - -TEST_CASE_METHOD(MultiDetectorFixture, "Get ID", "[.eigerintegration][cli]") { - std::string hn = test::hostname; - hn.erase(std::remove(begin(hn), end(hn), 'b'), end(hn)); - hn.erase(std::remove(begin(hn), end(hn), 'e'), end(hn)); - auto hostnames = split(hn, '+'); - CHECK(hostnames.size() == d.getNumberOfDetectors()); - for (int i = 0; i != d.getNumberOfDetectors(); ++i) { - CHECK(d.getId(defs::DETECTOR_SERIAL_NUMBER, 0) == - std::stoi(hostnames[0])); - } -} - -TEST_CASE_METHOD(MultiDetectorFixture, "Lock server", - "[.eigerintegration][cli]") { - - d.lockServer(1); - CHECK(d.lockServer() == 1); - d.lockServer(0); - CHECK(d.lockServer() == 0); -} - -TEST_CASE_METHOD(MultiDetectorFixture, "Settings", "[.eigerintegration][cli]") { - CHECK(d.setSettings(defs::STANDARD) == defs::STANDARD); -} - -TEST_CASE_METHOD(MultiDetectorFixture, "Set readout flags", - "[.eigerintegration][cli]") { - d.setReadOutFlags(defs::PARALLEL); - CHECK((d.setReadOutFlags() & defs::PARALLEL)); - - d.setReadOutFlags(defs::NONPARALLEL); - CHECK_FALSE((d.setReadOutFlags() & defs::PARALLEL)); - CHECK((d.setReadOutFlags() & defs::NONPARALLEL)); -} - -// TEST_CASE_METHOD(MultiDetectorFixture, "Flow control and tengiga", -// "[.eigerintegration][cli]") { -// d.setFlowControl10G(1); -// CHECK(d.setFlowControl10G() == 1); -// d.setFlowControl10G(0); -// CHECK(d.setFlowControl10G() == 0); - -// d.enableTenGigabitEthernet(1); -// CHECK(d.enableTenGigabitEthernet() == 1); -// d.enableTenGigabitEthernet(0); -// CHECK(d.enableTenGigabitEthernet() == 0); -// } - -TEST_CASE_METHOD(MultiDetectorFixture, "activate", "[.eigerintegration][cli]") { - d.activate(0); - CHECK(d.activate() == 0); - d.activate(1); - CHECK(d.activate() == 1); -} - -TEST_CASE_METHOD(MultiDetectorFixture, "all trimbits", - "[.eigerintegration][cli]") { - d.setAllTrimbits(32); - CHECK(d.setAllTrimbits(-1) == 32); -} - -TEST_CASE_METHOD(MultiDetectorFixture, "rate correction", - "[.eigerintegration][cli]") { - d.setRateCorrection(200); - CHECK(d.getRateCorrection() == 200); -} - -} // namespace sls diff --git a/integrationTests/test-integrationDectector.cpp b/integrationTests/test-integrationDectector.cpp deleted file mode 100644 index c02066513..000000000 --- a/integrationTests/test-integrationDectector.cpp +++ /dev/null @@ -1,522 +0,0 @@ -// SPDX-License-Identifier: LGPL-3.0-or-other -// Copyright (C) 2021 Contributors to the SLS Detector Package - -#include "catch.hpp" - -#include "DetectorImpl.h" -#include "Module.h" -#include "sls/ClientSocket.h" -#include "sls/logger.h" -#include "sls/sls_detector_defs.h" - -#include "sls/Timer.h" -#include "sls/sls_detector_funcs.h" -#include -#include -#define VERBOSE - -// Header holding all configurations for different detectors -#include "tests/config.h" -#include "tests/globals.h" -// using namespace test; -// using dt = slsDetectorDefs::detectorType; -// extern std::string hostname; -// extern std::string detector_type; -// extern dt type; - -namespace sls { - -TEST_CASE("Single detector no receiver", "[.integration][.single]") { - auto t = Module::getTypeFromDetector(test::hostname); - CHECK(t == test::type); - - Module d(t); - CHECK(d.getDetectorTypeAsEnum() == t); - CHECK(d.getDetectorTypeAsString() == test::detector_type); - - d.setHostname(test::hostname); - CHECK(d.getHostname() == test::hostname); - - CHECK(d.setDetectorType() == test::type); - - d.freeSharedMemory(); -} - -TEST_CASE("Set control port then create a new object with this control port", - "[.integration][.single]") { - /* - TODO! - Standard port but should not be hardcoded - Is this the best way to initialize the detectors - Using braces to make the object go out of scope - */ - int old_cport = DEFAULT_TCP_CNTRL_PORTNO; - int old_sport = DEFAULT_TCP_STOP_PORTNO; - int new_cport = 1993; - int new_sport = 2000; - { - Module d(test::type); - d.setHostname(test::hostname); - CHECK(d.getControlPort() == old_cport); - d.setControlPort(new_cport); - CHECK(d.getStopPort() == old_sport); - d.setStopPort(new_sport); - d.freeSharedMemory(); - } - { - Module d(test::type); - d.setHostname(test::hostname); - d.setControlPort(new_cport); - d.setStopPort(new_sport); - CHECK(d.getControlPort() == new_cport); - CHECK(d.getStopPort() == new_sport); - - // Reset standard ports - d.setControlPort(old_cport); - d.setStopPort(old_sport); - d.freeSharedMemory(); - } - - Module d(test::type); - d.setHostname(test::hostname); - CHECK(d.getStopPort() == DEFAULT_TCP_STOP_PORTNO); - d.freeSharedMemory(); -} - -TEST_CASE("single EIGER detector no receiver basic set and get", - "[.integration][eiger]") { - // TODO! this test should take command line arguments for config - SingleDetectorConfig c; - - // Read type by connecting to the detector - auto type = Module::getTypeFromDetector(c.hostname); - CHECK(type == c.type_enum); - - // Create Module of said type and set hostname and detector online - Module d(type); - CHECK(d.getDetectorTypeAsEnum() == type); - CHECK(d.getDetectorTypeAsString() == c.type_string); - - d.setHostname(c.hostname); - CHECK(d.getHostname() == c.hostname); - - CHECK(d.getUseReceiverFlag() == false); - CHECK_NOTHROW(d.checkDetectorVersionCompatibility()); - - // Setting and reading exposure time - auto t = 1000000000; - d.setExptime(t); - CHECK(d.getExptime() == t); - - // size of an eiger half module with and without gap pixels - CHECK(d.getTotalNumberOfChannels() == 256 * 256 * 4); - CHECK(d.getTotalNumberOfChannels(slsDetectorDefs::dimension::X) == 1024); - CHECK(d.getTotalNumberOfChannels(slsDetectorDefs::dimension::Y) == 256); - // CHECK(d.getTotalNumberOfChannels(slsDetectorDefs::dimension::Z) == 1); - CHECK(d.getTotalNumberOfChannelsInclGapPixels( - slsDetectorDefs::dimension::X) == 1024); - CHECK(d.getTotalNumberOfChannelsInclGapPixels( - slsDetectorDefs::dimension::Y) == 256); - // CHECK(d.getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::dimension::Z) - // == 1); - - CHECK(d.getNChans() == 256 * 256); - CHECK(d.getNChans(slsDetectorDefs::dimension::X) == 256); - CHECK(d.getNChans(slsDetectorDefs::dimension::Y) == 256); - // CHECK(d.getNChans(slsDetectorDefs::dimension::Z) == 1); - - CHECK(d.getNChips() == 4); - CHECK(d.getNChips(slsDetectorDefs::dimension::X) == 4); - CHECK(d.getNChips(slsDetectorDefs::dimension::Y) == 1); - // CHECK(d.getNChips(slsDetectorDefs::dimension::Z) == 1); - - d.freeSharedMemory(); -} - -TEST_CASE("Locking mechanism and last ip", "[.integration][.single]") { - Module d(test::type); - d.setHostname(test::hostname); - - // Check that detector server is unlocked then lock - CHECK(d.lockServer() == 0); - d.lockServer(1); - CHECK(d.lockServer() == 1); - - // Can we still access the detector while it's locked - auto t = 1300000000; - d.setExptime(t); - CHECK(d.getExptime() == t); - - // unlock again and free - d.lockServer(0); - CHECK(d.lockServer() == 0); - - CHECK(d.getLastClientIP() == test::my_ip); - d.freeSharedMemory(); -} - -TEST_CASE("Set settings", "[.integration][.single]") { - Module d(test::type); - d.setHostname(test::hostname); - CHECK(d.setSettings(defs::STANDARD) == defs::STANDARD); -} - -TEST_CASE("Timer functions", "[.integration][cli]") { - // FRAME_NUMBER, /**< number of real time frames: total number of - // acquisitions is number or frames*number of triggers */ ACQUISITION_TIME, - // /**< exposure time */ FRAME_PERIOD, /**< period between exposures */ - // DELAY_AFTER_TRIGGER, /**< delay between trigger and start of exposure or - // readout (in triggered mode) */ GATES_NUMBER, /**< number of gates per - // frame (in gated mode) */ TRIGGER_NUMBER, /**< number of triggers: total - // number of acquisitions is number or frames*number of triggers */ - // ACTUAL_TIME, /**< Actual time of the detector's internal timer */ - // MEASUREMENT_TIME, /**< Time of the measurement from the detector (fifo) - // */ - - // PROGRESS, /**< fraction of measurement elapsed - only get! */ - // MEASUREMENTS_NUMBER, - // FRAMES_FROM_START, - // FRAMES_FROM_START_PG, - // SAMPLES, - // SUBFRAME_ACQUISITION_TIME, /**< subframe exposure time */ - // STORAGE_CELL_NUMBER, /** list = m.getReceiverDbitList(); - list.clear(); - for (int i = 0; i < 10; ++i) - list.push_back(i); - m.setReceiverDbitList(list); - - CHECK(m.getReceiverDbitList().size() == 10); - - list.push_back(64); - CHECK_THROWS_AS(m.setReceiverDbitList(list), RuntimeError); - CHECK_THROWS_WITH(m.setReceiverDbitList(list), - Catch::Matchers::Contains("be between 0 and 63")); - - list.clear(); - for (int i = 0; i < 65; ++i) - list.push_back(i); - CHECK(list.size() == 65); - CHECK_THROWS_WITH(m.setReceiverDbitList(list), - Catch::Matchers::Contains("be greater than 64")); - - list.clear(); - m.setReceiverDbitList(list); - CHECK(m.getReceiverDbitList().empty()); - - // adcinvert - m.setADCInvert(0); - CHECK(m.getADCInvert() == 0); - m.setADCInvert(5); - CHECK(m.getADCInvert() == 5); - m.setADCInvert(-1); - CHECK(m.getADCInvert() == -1); - - // ext sampling reg - m.setExternalSamplingSource(0); - CHECK(m.getExternalSamplingSource() == 0); - m.setExternalSamplingSource(62); - CHECK(m.getExternalSamplingSource() == 62); - CHECK_THROWS_WITH(m.setExternalSamplingSource(64), - Catch::Matchers::Contains("be 0-63")); - CHECK(m.getExternalSamplingSource() == 62); - m.setExternalSampling(1); - CHECK(m.getExternalSampling() == 1); - m.setExternalSampling(0); - CHECK(m.getExternalSampling() == 0); - m.setExternalSampling(1); - CHECK(m.getExternalSampling() == 1); - CHECK(m.readRegister(0x7b) == 0x1003E); -} - -TEST_CASE("Eiger or Jungfrau nextframenumber", - "[.eigerintegration][.jungfrauintegration][nextframenumber]") { - SingleDetectorConfig c; - - // pick up multi detector from shm id 0 - DetectorImpl m(0); - - // ensure ctb detector type, hostname and online - REQUIRE( - ((m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::EIGER) || - (m.getDetectorTypeAsEnum() == - slsDetectorDefs::detectorType::JUNGFRAU))); - REQUIRE(m.getHostname() == c.hostname); - - CHECK(m.setNumberOfFrames(1) == 1); - - // starting fnum - uint64_t val = 8; - - m.setNextFrameNumber(val); - CHECK(m.getNextFrameNumber() == val); - CHECK(m.acquire() == slsDetectorDefs::OK); - CHECK(m.getReceiverCurrentFrameIndex() == val); - - ++val; - CHECK(m.acquire() == slsDetectorDefs::OK); - CHECK(m.getReceiverCurrentFrameIndex() == val); - - CHECK_THROWS_AS(m.setNextFrameNumber(0), RuntimeError); - - if (m.getDetectorTypeAsString() == "Eiger") { - val = 281474976710655; - } else if (m.getDetectorTypeAsString() == "Jungfrau") { - val = 18446744073709551615; - } - m.setNextFrameNumber(val); - CHECK(m.getNextFrameNumber() == val); - CHECK(m.acquire() == slsDetectorDefs::OK); - CHECK(m.getReceiverCurrentFrameIndex() == val); - CHECK(m.getNextFrameNumber() == (val + 1)); -} - -TEST_CASE("Eiger partialread", "[.eigerintegration][partialread]") { - SingleDetectorConfig c; - - // pick up multi detector from shm id 0 - DetectorImpl m(0); - - // ensure detector type, hostname - REQUIRE( - (m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::EIGER)); - REQUIRE(m.getHostname() == c.hostname); - - m.setDynamicRange(16); - m.enableTenGigabitEthernet(0); - m.setPartialReadout(256); - CHECK(m.getPartialReadout() == 256); - m.setPartialReadout(1); - CHECK(m.getPartialReadout() == 1); - - m.setDynamicRange(8); - m.setPartialReadout(256); - CHECK(m.getPartialReadout() == 256); - CHECK_THROWS_AS(m.setPartialReadout(1), RuntimeError); - CHECK(m.getPartialReadout() == 256); - CHECK_THROWS_AS(m.setPartialReadout(0), RuntimeError); - m.setPartialReadout(256); -} - -} // namespace sls diff --git a/integrationTests/test-integrationMulti.cpp b/integrationTests/test-integrationMulti.cpp deleted file mode 100644 index 40f77c6dd..000000000 --- a/integrationTests/test-integrationMulti.cpp +++ /dev/null @@ -1,108 +0,0 @@ -// SPDX-License-Identifier: LGPL-3.0-or-other -// Copyright (C) 2021 Contributors to the SLS Detector Package -#include "DetectorImpl.h" -#include "catch.hpp" -#include "sls/string_utils.h" -#include "tests/globals.h" -#include - -namespace sls { - -using namespace Catch::literals; - -TEST_CASE("Initialize a multi detector", "[.integration][.multi]") { - auto hostnames = split(test::hostname, '+'); - - DetectorImpl d(0, true, true); - d.setHostname(test::hostname.c_str()); - - CHECK(d.getHostname() == test::hostname); - for (size_t i = 0; i != hostnames.size(); ++i) { - CHECK(d.getHostname(i) == hostnames[i]); - } - - CHECK(d.getDetectorTypeAsEnum() == test::type); - CHECK(d.getDetectorTypeAsString() == test::detector_type); - - CHECK(d.getNumberOfDetectors() == hostnames.size()); - d.freeSharedMemory(); -} - -TEST_CASE("Set and read timers", "[.integration][.multi]") { - - DetectorImpl d(0, true, true); - d.setHostname(test::hostname.c_str()); - - // FRAME_NUMBER - int n_frames = 3; - d.setNumberOfFrames(n_frames); - CHECK(d.setNumberOfFrames() == n_frames); - - // ACQUISITION_TIME - double exptime = 0.3; - d.setExposureTime(exptime, true); - CHECK(d.setExposureTime(-1, true) == Approx(exptime)); - CHECK(d.setExposureTime(-1) == Approx(exptime * 1E9)); - - // FRAME_PERIOD, - double period = 0.5; - d.setExposurePeriod(period, true); - CHECK(d.setExposurePeriod(-1, true) == Approx(period)); - CHECK(d.setExposurePeriod(-1) == Approx(period * 1E9)); - - // DELAY_AFTER_TRIGGER, - // GATES_NUMBER, - // TRIGGER_NUMBER, - // ACTUAL_TIME - // MEASUREMENT_TIME - - // PROGRESS, /**< fraction of measurement elapsed - only get! */ - // MEASUREMENTS_NUMBER, - - // FRAMES_FROM_START, - // FRAMES_FROM_START_PG, - // SAMPLES, - - // SUBFRAME_ACQUISITION_TIME, /**< subframe exposure time */ - double subframe_exposure = 2000000; // ns - if (test::type == dt::EIGER) { - d.setSubFrameExposureTime(subframe_exposure); - CHECK(d.setSubFrameExposureTime(-1) == Approx(subframe_exposure)); - } - - // STORAGE_CELL_NUMBER, /** cmds{"v_a", "v_b", "v_c", "v_d"}; + std::vector indices{defs::V_POWER_A, defs::V_POWER_B, + defs::V_POWER_C, defs::V_POWER_D}; + if (det.isVirtualDetectorServer().tsquash("Inconsistent virtual servers")) { + cmds.push_back("v_io"); + indices.push_back(defs::V_POWER_IO); + } - std::vector cmds{"v_a", "v_b", "v_c", "v_d", "v_io"}; - std::vector indices{defs::V_POWER_A, defs::V_POWER_B, - defs::V_POWER_C, defs::V_POWER_D, - defs::V_POWER_IO}; - - for (size_t i = 0; i < cmds.size(); ++i) { - if (det_type == defs::CHIPTESTBOARD || - det_type == defs::XILINX_CHIPTESTBOARD) { - auto prev_val = det.getPower(indices[i]); - // this is the first command touching power dacs, should not be - // -100 - if (det_type == defs::XILINX_CHIPTESTBOARD) { - REQUIRE(prev_val.any(-100) == false); - REQUIRE(prev_val.any(-1) == false); - } - { - std::ostringstream oss; - caller.call(cmds[i], {"0"}, -1, PUT, oss); - REQUIRE(oss.str() == cmds[i] + " 0\n"); - } - { - std::ostringstream oss1, oss2; - caller.call(cmds[i], {"1200"}, -1, PUT, oss1); - REQUIRE(oss1.str() == cmds[i] + " 1200\n"); - caller.call(cmds[i], {}, -1, GET, oss2); - REQUIRE(oss2.str() == cmds[i] + " 1200\n"); - } - for (int i = 0; i != det.size(); ++i) { - if (det_type == defs::XILINX_CHIPTESTBOARD && - prev_val[i] == -100) { - prev_val[i] = 0; - continue; - } - det.setPower(indices[i], prev_val[i], {i}); - } - - } else { - REQUIRE_THROWS(caller.call(cmds[i], {}, -1, GET)); + for (size_t i = 0; i < cmds.size(); ++i) { + if (det_type == defs::CHIPTESTBOARD || + det_type == defs::XILINX_CHIPTESTBOARD) { + auto prev_val = det.getPower(indices[i]); + // this is the first command touching power dacs, should not be + // -100 + if (det_type == defs::XILINX_CHIPTESTBOARD) { + REQUIRE(prev_val.any(-100) == false); + REQUIRE(prev_val.any(-1) == false); } + { + std::ostringstream oss; + caller.call(cmds[i], {"0"}, -1, PUT, oss); + REQUIRE(oss.str() == cmds[i] + " 0\n"); + } + { + std::ostringstream oss1, oss2; + caller.call(cmds[i], {"1200"}, -1, PUT, oss1); + REQUIRE(oss1.str() == cmds[i] + " 1200\n"); + caller.call(cmds[i], {}, -1, GET, oss2); + REQUIRE(oss2.str() == cmds[i] + " 1200\n"); + } + for (int imod = 0; imod != det.size(); ++imod) { + if (det_type == defs::XILINX_CHIPTESTBOARD && + prev_val[imod] == -100) { + prev_val[imod] = 0; + } + det.setPower(indices[i], prev_val[imod], {imod}); + } + + } else { + REQUIRE_THROWS(caller.call(cmds[i], {}, -1, GET)); } } } -TEST_CASE("v_io", "[.cmdcall]") { +TEST_CASE("v_io", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1093,7 +1093,7 @@ TEST_CASE("v_io", "[.cmdcall]") { } } -TEST_CASE("v_chip", "[.cmdcall]") { +TEST_CASE("v_chip", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1105,7 +1105,7 @@ TEST_CASE("v_chip", "[.cmdcall]") { } } -TEST_CASE("vm_a", "[.cmdcall]") { +TEST_CASE("vm_a", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1116,7 +1116,7 @@ TEST_CASE("vm_a", "[.cmdcall]") { } } -TEST_CASE("vm_b", "[.cmdcall]") { +TEST_CASE("vm_b", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1127,7 +1127,7 @@ TEST_CASE("vm_b", "[.cmdcall]") { } } -TEST_CASE("vm_c", "[.cmdcall]") { +TEST_CASE("vm_c", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1138,7 +1138,7 @@ TEST_CASE("vm_c", "[.cmdcall]") { } } -TEST_CASE("vm_d", "[.cmdcall]") { +TEST_CASE("vm_d", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1149,7 +1149,7 @@ TEST_CASE("vm_d", "[.cmdcall]") { } } -TEST_CASE("vm_io", "[.cmdcall]") { +TEST_CASE("vm_io", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1160,7 +1160,7 @@ TEST_CASE("vm_io", "[.cmdcall]") { } } -TEST_CASE("im_a", "[.cmdcall]") { +TEST_CASE("im_a", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1171,7 +1171,7 @@ TEST_CASE("im_a", "[.cmdcall]") { } } -TEST_CASE("im_b", "[.cmdcall]") { +TEST_CASE("im_b", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1182,7 +1182,7 @@ TEST_CASE("im_b", "[.cmdcall]") { } } -TEST_CASE("im_c", "[.cmdcall]") { +TEST_CASE("im_c", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1193,7 +1193,7 @@ TEST_CASE("im_c", "[.cmdcall]") { } } -TEST_CASE("im_d", "[.cmdcall]") { +TEST_CASE("im_d", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1204,7 +1204,7 @@ TEST_CASE("im_d", "[.cmdcall]") { } } -TEST_CASE("im_io", "[.cmdcall]") { +TEST_CASE("im_io", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1215,7 +1215,7 @@ TEST_CASE("im_io", "[.cmdcall]") { } } -TEST_CASE("slowadc", "[.cmdcall]") { +TEST_CASE("slowadc", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1231,7 +1231,7 @@ TEST_CASE("slowadc", "[.cmdcall]") { } } -TEST_CASE("extsampling", "[.cmdcall]") { +TEST_CASE("extsampling", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1261,7 +1261,7 @@ TEST_CASE("extsampling", "[.cmdcall]") { } } -TEST_CASE("extsamplingsrc", "[.cmdcall]") { +TEST_CASE("extsamplingsrc", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1292,7 +1292,7 @@ TEST_CASE("extsamplingsrc", "[.cmdcall]") { } } -TEST_CASE("diodelay", "[.cmdcall]") { +TEST_CASE("diodelay", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1315,7 +1315,7 @@ TEST_CASE("diodelay", "[.cmdcall]") { } } -TEST_CASE("led", "[.cmdcall]") { +TEST_CASE("led", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-eiger.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-eiger.cpp index ae6a6c824..4f05256fa 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-eiger.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-eiger.cpp @@ -19,7 +19,7 @@ using test::PUT; /** temperature */ -TEST_CASE("temp_fpgaext", "[.cmdcall]") { +TEST_CASE("temp_fpgaext", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -34,7 +34,7 @@ TEST_CASE("temp_fpgaext", "[.cmdcall]") { } } -TEST_CASE("temp_10ge", "[.cmdcall]") { +TEST_CASE("temp_10ge", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -49,7 +49,7 @@ TEST_CASE("temp_10ge", "[.cmdcall]") { } } -TEST_CASE("temp_dcdc", "[.cmdcall]") { +TEST_CASE("temp_dcdc", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -64,7 +64,7 @@ TEST_CASE("temp_dcdc", "[.cmdcall]") { } } -TEST_CASE("temp_sodl", "[.cmdcall]") { +TEST_CASE("temp_sodl", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -79,7 +79,7 @@ TEST_CASE("temp_sodl", "[.cmdcall]") { } } -TEST_CASE("temp_sodr", "[.cmdcall]") { +TEST_CASE("temp_sodr", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -94,7 +94,7 @@ TEST_CASE("temp_sodr", "[.cmdcall]") { } } -TEST_CASE("temp_fpgafl", "[.cmdcall]") { +TEST_CASE("temp_fpgafl", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -109,7 +109,7 @@ TEST_CASE("temp_fpgafl", "[.cmdcall]") { } } -TEST_CASE("temp_fpgafr", "[.cmdcall]") { +TEST_CASE("temp_fpgafr", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -126,7 +126,8 @@ TEST_CASE("temp_fpgafr", "[.cmdcall]") { /* dacs */ -TEST_CASE("Setting and reading back EIGER dacs", "[.cmdcall][.dacs]") { +TEST_CASE("Setting and reading back EIGER dacs", + "[.detectorintegration][.dacs]") { // vsvp, vtr, vrf, vrs, vsvn, vtgstv, vcmp_ll, vcmp_lr, vcal, vcmp_rl, // rxb_rb, rxb_lb, vcmp_rr, vcp, vcn, vis, vthreshold Detector det; @@ -232,7 +233,7 @@ TEST_CASE("Setting and reading back EIGER dacs", "[.cmdcall][.dacs]") { /* Network Configuration (Detector<->Receiver) */ -TEST_CASE("txdelay_left", "[.cmdcall]") { +TEST_CASE("txdelay_left", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -253,7 +254,7 @@ TEST_CASE("txdelay_left", "[.cmdcall]") { } } -TEST_CASE("txdelay_right", "[.cmdcall]") { +TEST_CASE("txdelay_right", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -276,7 +277,7 @@ TEST_CASE("txdelay_right", "[.cmdcall]") { /* Eiger Specific */ -TEST_CASE("subexptime", "[.cmdcall]") { +TEST_CASE("subexptime", "[.detectorintegration]") { Detector det; Caller caller(&det); @@ -297,7 +298,7 @@ TEST_CASE("subexptime", "[.cmdcall]") { } } -TEST_CASE("subdeadtime", "[.cmdcall]") { +TEST_CASE("subdeadtime", "[.detectorintegration]") { Detector det; Caller caller(&det); @@ -318,7 +319,7 @@ TEST_CASE("subdeadtime", "[.cmdcall]") { } } -TEST_CASE("overflow", "[.cmdcall]") { +TEST_CASE("overflow", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -339,7 +340,7 @@ TEST_CASE("overflow", "[.cmdcall]") { } } -TEST_CASE("ratecorr", "[.cmdcall]") { +TEST_CASE("ratecorr", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -373,7 +374,7 @@ TEST_CASE("ratecorr", "[.cmdcall]") { } } -TEST_CASE("interruptsubframe", "[.cmdcall]") { +TEST_CASE("interruptsubframe", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -397,7 +398,7 @@ TEST_CASE("interruptsubframe", "[.cmdcall]") { } } -TEST_CASE("measuredperiod", "[.cmdcall]") { +TEST_CASE("measuredperiod", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -434,7 +435,7 @@ TEST_CASE("measuredperiod", "[.cmdcall]") { } } -TEST_CASE("measuredsubperiod", "[.cmdcall]") { +TEST_CASE("measuredsubperiod", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -474,7 +475,7 @@ TEST_CASE("measuredsubperiod", "[.cmdcall]") { } } -TEST_CASE("activate", "[.cmdcall]") { +TEST_CASE("activate", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -505,7 +506,7 @@ TEST_CASE("activate", "[.cmdcall]") { } } -TEST_CASE("partialreset", "[.cmdcall]") { +TEST_CASE("partialreset", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -527,7 +528,7 @@ TEST_CASE("partialreset", "[.cmdcall]") { } } -TEST_CASE("pulse", "[.cmdcall]") { +TEST_CASE("pulse", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -542,7 +543,7 @@ TEST_CASE("pulse", "[.cmdcall]") { } } -TEST_CASE("pulsenmove", "[.cmdcall]") { +TEST_CASE("pulsenmove", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -557,7 +558,7 @@ TEST_CASE("pulsenmove", "[.cmdcall]") { } } -TEST_CASE("pulsechip", "[.cmdcall]") { +TEST_CASE("pulsechip", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -572,7 +573,7 @@ TEST_CASE("pulsechip", "[.cmdcall]") { } } -TEST_CASE("quad", "[.cmdcall]") { +TEST_CASE("quad", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -588,7 +589,7 @@ TEST_CASE("quad", "[.cmdcall]") { } } -TEST_CASE("datastream", "[.cmdcall]") { +TEST_CASE("datastream", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -628,7 +629,7 @@ TEST_CASE("datastream", "[.cmdcall]") { } } -TEST_CASE("top", "[.cmdcall]") { +TEST_CASE("top", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-global.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-global.cpp index c27ff05d5..0dfc527ac 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-global.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-global.cpp @@ -125,12 +125,6 @@ void test_acquire_binary_file_size(const testFileInfo &file_info, REQUIRE(actual_file_size == expected_file_size); } -void test_frames_caught(const Detector &det, int num_frames_to_acquire) { - auto frames_caught = det.getFramesCaught().tsquash( - "Inconsistent number of frames caught")[0]; - REQUIRE(frames_caught == num_frames_to_acquire); -} - void test_acquire_with_receiver(Caller &caller, const Detector &det) { REQUIRE_NOTHROW(caller.call("rx_start", {}, -1, PUT)); REQUIRE_NOTHROW(caller.call("start", {}, -1, PUT)); @@ -172,9 +166,12 @@ void create_files_for_acquire( // acquire and get num frames caught REQUIRE_NOTHROW(test_acquire_with_receiver(caller, det)); - auto frames_caught = det.getFramesCaught().tsquash( - "Inconsistent number of frames caught")[0]; - REQUIRE(frames_caught == num_frames); + // TODO: maybe there should not be REQUIRE statements in void function at + // all, but traceback should be handled + { + auto frames_caught = det.getFramesCaught()[0][0]; + REQUIRE(frames_caught == num_frames); + } // hdf5 #ifdef HDF5C @@ -184,9 +181,10 @@ void create_files_for_acquire( // acquire and get num frames caught test_acquire_with_receiver(caller, det); - frames_caught = det.getFramesCaught().tsquash( - "Inconsistent number of frames caught")[0]; - REQUIRE(frames_caught == num_frames); + { + auto frames_caught = det.getFramesCaught()[0][0]; + REQUIRE(frames_caught == num_frames); + } #endif // restore previous state diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-global.h b/slsDetectorSoftware/tests/Caller/test-Caller-global.h index f93fc3cdd..3042b91cd 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-global.h +++ b/slsDetectorSoftware/tests/Caller/test-Caller-global.h @@ -88,8 +88,6 @@ void test_acquire_binary_file_size(const testFileInfo &file_info, uint64_t num_frames_to_acquire, uint64_t expected_image_size); -void test_frames_caught(const Detector &det, int num_frames_to_acquire); - void test_acquire_with_receiver(Caller &caller, const Detector &det); void create_files_for_acquire( diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-gotthard2.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-gotthard2.cpp index 54bba5ce2..b5264f5b7 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-gotthard2.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-gotthard2.cpp @@ -18,7 +18,7 @@ using test::GET; using test::PUT; // time specific measurements for gotthard2 -TEST_CASE("timegotthard2", "[.cmdcall]") { +TEST_CASE("timegotthard2", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -106,7 +106,8 @@ TEST_CASE("timegotthard2", "[.cmdcall]") { } /* dacs */ -TEST_CASE("Setting and reading back GOTTHARD2 dacs", "[.cmdcall][.dacs]") { +TEST_CASE("Setting and reading back GOTTHARD2 dacs", + "[.detectorintegration][.dacs]") { // vref_h_adc, vb_comp_fe, vb_comp_adc, vcom_cds, // vref_restore, vb_opa_1st, vref_comp_fe, vcom_adc1, // vref_prech, vref_l_adc, vref_cds, vb_cs, @@ -215,7 +216,7 @@ TEST_CASE("Setting and reading back GOTTHARD2 dacs", "[.cmdcall][.dacs]") { /* on chip dacs */ -TEST_CASE("vchip_comp_fe", "[.cmdcall][.onchipdacs]") { +TEST_CASE("vchip_comp_fe", "[.detectorintegration][.onchipdacs]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -228,7 +229,7 @@ TEST_CASE("vchip_comp_fe", "[.cmdcall][.onchipdacs]") { } } -TEST_CASE("vchip_opa_1st", "[.cmdcall][.onchipdacs]") { +TEST_CASE("vchip_opa_1st", "[.detectorintegration][.onchipdacs]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -241,7 +242,7 @@ TEST_CASE("vchip_opa_1st", "[.cmdcall][.onchipdacs]") { } } -TEST_CASE("vchip_opa_fd", "[.cmdcall][.onchipdacs]") { +TEST_CASE("vchip_opa_fd", "[.detectorintegration][.onchipdacs]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -254,7 +255,7 @@ TEST_CASE("vchip_opa_fd", "[.cmdcall][.onchipdacs]") { } } -TEST_CASE("vchip_comp_adc", "[.cmdcall][.onchipdacs]") { +TEST_CASE("vchip_comp_adc", "[.detectorintegration][.onchipdacs]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -267,7 +268,7 @@ TEST_CASE("vchip_comp_adc", "[.cmdcall][.onchipdacs]") { } } -TEST_CASE("vchip_ref_comp_fe", "[.cmdcall][.onchipdacs]") { +TEST_CASE("vchip_ref_comp_fe", "[.detectorintegration][.onchipdacs]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -281,7 +282,7 @@ TEST_CASE("vchip_ref_comp_fe", "[.cmdcall][.onchipdacs]") { } } -TEST_CASE("vchip_cs", "[.cmdcall][.onchipdacs]") { +TEST_CASE("vchip_cs", "[.detectorintegration][.onchipdacs]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -296,7 +297,7 @@ TEST_CASE("vchip_cs", "[.cmdcall][.onchipdacs]") { /* Gotthard2 Specific */ -TEST_CASE("bursts", "[.cmdcall]") { +TEST_CASE("bursts", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -370,7 +371,7 @@ TEST_CASE("bursts", "[.cmdcall]") { } } -TEST_CASE("burstperiod", "[.cmdcall]") { +TEST_CASE("burstperiod", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -392,7 +393,7 @@ TEST_CASE("burstperiod", "[.cmdcall]") { } } -TEST_CASE("burstsl", "[.cmdcall]") { +TEST_CASE("burstsl", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -403,7 +404,7 @@ TEST_CASE("burstsl", "[.cmdcall]") { } } -TEST_CASE("inj_ch", "[.cmdcall]") { +TEST_CASE("inj_ch", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -428,7 +429,7 @@ TEST_CASE("inj_ch", "[.cmdcall]") { } } -TEST_CASE("vetophoton", "[.cmdcall]") { +TEST_CASE("vetophoton", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -450,7 +451,7 @@ TEST_CASE("vetophoton", "[.cmdcall]") { } } -TEST_CASE("vetoref", "[.cmdcall]") { +TEST_CASE("vetoref", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -465,7 +466,7 @@ TEST_CASE("vetoref", "[.cmdcall]") { } } -TEST_CASE("vetofile", "[.cmdcall]") { +TEST_CASE("vetofile", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -479,7 +480,7 @@ TEST_CASE("vetofile", "[.cmdcall]") { } } -TEST_CASE("burstmode", "[.cmdcall]") { +TEST_CASE("burstmode", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -510,7 +511,7 @@ TEST_CASE("burstmode", "[.cmdcall]") { } } -TEST_CASE("cdsgain", "[.cmdcall]") { +TEST_CASE("cdsgain", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -540,7 +541,7 @@ TEST_CASE("cdsgain", "[.cmdcall]") { } } -TEST_CASE("timingsource", "[.cmdcall]") { +TEST_CASE("timingsource", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -570,7 +571,7 @@ TEST_CASE("timingsource", "[.cmdcall]") { } } -TEST_CASE("veto", "[.cmdcall]") { +TEST_CASE("veto", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -600,7 +601,7 @@ TEST_CASE("veto", "[.cmdcall]") { } } -TEST_CASE("vetostream", "[.cmdcall]") { +TEST_CASE("vetostream", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -646,7 +647,7 @@ TEST_CASE("vetostream", "[.cmdcall]") { REQUIRE_THROWS(caller.call("vetostream", {"dfgd"}, -1, GET)); } -TEST_CASE("vetoalg", "[.cmdcall]") { +TEST_CASE("vetoalg", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -702,7 +703,7 @@ TEST_CASE("vetoalg", "[.cmdcall]") { REQUIRE_THROWS(caller.call("vetoalg", {"dfgd"}, -1, GET)); } -TEST_CASE("confadc", "[.cmdcall]") { +TEST_CASE("confadc", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp index 4563cd32f..02334f40f 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp @@ -17,7 +17,8 @@ using test::PUT; /* dacs */ -TEST_CASE("Setting and reading back Jungfrau dacs", "[.cmdcall][.dacs]") { +TEST_CASE("Setting and reading back Jungfrau dacs", + "[.detectorintegration][.dacs]") { // vb_comp, vdd_prot, vin_com, vref_prech, vb_pixbuf, vb_ds, vref_ds, // vref_comp Detector det; @@ -95,7 +96,7 @@ TEST_CASE("Setting and reading back Jungfrau dacs", "[.cmdcall][.dacs]") { /* Network Configuration (Detector<->Receiver) */ -TEST_CASE("selinterface", "[.cmdcall]") { +TEST_CASE("selinterface", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -126,7 +127,7 @@ TEST_CASE("selinterface", "[.cmdcall]") { /* Jungfrau/moench Specific */ -TEST_CASE("temp_threshold", "[.cmdcall]") { +TEST_CASE("temp_threshold", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -156,7 +157,7 @@ TEST_CASE("temp_threshold", "[.cmdcall]") { } } -TEST_CASE("chipversion", "[.cmdcall]") { +TEST_CASE("chipversion", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -168,7 +169,7 @@ TEST_CASE("chipversion", "[.cmdcall]") { REQUIRE_THROWS(caller.call("chipversion", {"0"}, -1, PUT)); } -TEST_CASE("temp_control", "[.cmdcall]") { +TEST_CASE("temp_control", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -198,7 +199,7 @@ TEST_CASE("temp_control", "[.cmdcall]") { } } -TEST_CASE("temp_event", "[.cmdcall]") { +TEST_CASE("temp_event", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -219,7 +220,7 @@ TEST_CASE("temp_event", "[.cmdcall]") { } } -TEST_CASE("autocompdisable", "[.cmdcall]") { +TEST_CASE("autocompdisable", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -249,7 +250,7 @@ TEST_CASE("autocompdisable", "[.cmdcall]") { } } -TEST_CASE("compdisabletime", "[.cmdcall]") { +TEST_CASE("compdisabletime", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -279,7 +280,7 @@ TEST_CASE("compdisabletime", "[.cmdcall]") { } } -TEST_CASE("extrastoragecells", "[.cmdcall]") { +TEST_CASE("extrastoragecells", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -322,7 +323,7 @@ TEST_CASE("extrastoragecells", "[.cmdcall]") { } } -TEST_CASE("storagecell_start", "[.cmdcall]") { +TEST_CASE("storagecell_start", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -367,7 +368,7 @@ TEST_CASE("storagecell_start", "[.cmdcall]") { } } -TEST_CASE("storagecell_delay", "[.cmdcall]") { +TEST_CASE("storagecell_delay", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -408,7 +409,7 @@ TEST_CASE("storagecell_delay", "[.cmdcall]") { } } -TEST_CASE("gainmode", "[.cmdcall]") { +TEST_CASE("gainmode", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -457,7 +458,7 @@ TEST_CASE("gainmode", "[.cmdcall]") { } } -TEST_CASE("filtercells", "[.cmdcall]") { +TEST_CASE("filtercells", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -501,7 +502,7 @@ TEST_CASE("filtercells", "[.cmdcall]") { REQUIRE_THROWS(caller.call("filtercells", {"0"}, -1, PUT)); } } -TEST_CASE("pedestalmode", "[.cmdcall]") { +TEST_CASE("pedestalmode", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -657,7 +658,7 @@ TEST_CASE("pedestalmode", "[.cmdcall]") { } } -TEST_CASE("timing_info_decoder", "[.cmdcall]") { +TEST_CASE("timing_info_decoder", "[.detectorintegration]") { Detector det; Caller caller(&det); if (det.getDetectorType().squash() == defs::JUNGFRAU && @@ -686,7 +687,7 @@ TEST_CASE("timing_info_decoder", "[.cmdcall]") { } } -TEST_CASE("collectionmode", "[.cmdcall]") { +TEST_CASE("collectionmode", "[.detectorintegration]") { Detector det; Caller caller(&det); if (det.getDetectorType().squash() == defs::JUNGFRAU) { @@ -714,7 +715,7 @@ TEST_CASE("collectionmode", "[.cmdcall]") { } } -TEST_CASE("sync", "[.cmdcall]") { +TEST_CASE("sync", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-master-attributes.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-master-attributes.cpp index bf4cf9bac..e2ef3c9d0 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-master-attributes.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-master-attributes.cpp @@ -1032,7 +1032,9 @@ void open_hdf5_file(const std::string &file_path) { } #endif -TEST_CASE("check_master_file_attributes", "[.cmdcall][.cmdacquire][.cmdattr]") { +TEST_CASE( + "check_master_file_attributes", + "[.detectorintegration][.cmdacquire][.cmdattr][.disable_check_data_file]") { Detector det; Caller caller(&det); @@ -1041,8 +1043,8 @@ TEST_CASE("check_master_file_attributes", "[.cmdcall][.cmdacquire][.cmdattr]") { int64_t num_frames = 1; switch (det_type) { - case defs::EIGER: case defs::JUNGFRAU: + case defs::EIGER: case defs::MOENCH: case defs::MYTHEN3: case defs::GOTTHARD2: diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-moench.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-moench.cpp index 56353f44b..17ee3be1a 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-moench.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-moench.cpp @@ -17,7 +17,8 @@ using test::PUT; /* dacs */ -TEST_CASE("Setting and reading back moench dacs", "[.cmdcall][.dacs]") { +TEST_CASE("Setting and reading back moench dacs", + "[.detectorintegration][.dacs]") { // vbp_colbuf, vipre, vin_cm, vb_sda, vcasc_sfp, vout_cm, vipre_cds, // ibias_sfp Detector det; diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-mythen3.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-mythen3.cpp index 16295a3e1..602d0b2db 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-mythen3.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-mythen3.cpp @@ -19,7 +19,8 @@ using test::PUT; /* dacs */ -TEST_CASE("Setting and reading back MYTHEN3 dacs", "[.cmdcall][.dacs]") { +TEST_CASE("Setting and reading back MYTHEN3 dacs", + "[.detectorintegration][.dacs]") { // vcassh, vth2, vshaper, vshaperneg, vipre_out, vth3, vth1, // vicin, vcas, vpreamp, vpl, vipre, viinsh, vph, vtrim, vdcsh, @@ -184,7 +185,7 @@ TEST_CASE("Setting and reading back MYTHEN3 dacs", "[.cmdcall][.dacs]") { /* acquisition */ -TEST_CASE("readout", "[.cmdcall]") { +TEST_CASE("readout", "[.detectorintegration]") { Detector det; Caller caller(&det); // PUT only command @@ -201,7 +202,7 @@ TEST_CASE("readout", "[.cmdcall]") { /* Mythen3 Specific */ -TEST_CASE("counters", "[.cmdcall]") { +TEST_CASE("counters", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -233,7 +234,7 @@ TEST_CASE("counters", "[.cmdcall]") { } } -TEST_CASE("gates", "[.cmdcall]") { +TEST_CASE("gates", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -263,7 +264,7 @@ TEST_CASE("gates", "[.cmdcall]") { } } -TEST_CASE("exptime1", "[.cmdcall]") { +TEST_CASE("exptime1", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -292,7 +293,7 @@ TEST_CASE("exptime1", "[.cmdcall]") { } } -TEST_CASE("exptime2", "[.cmdcall]") { +TEST_CASE("exptime2", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -321,7 +322,7 @@ TEST_CASE("exptime2", "[.cmdcall]") { } } -TEST_CASE("exptime3", "[.cmdcall]") { +TEST_CASE("exptime3", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -350,7 +351,7 @@ TEST_CASE("exptime3", "[.cmdcall]") { } } -TEST_CASE("gatedelay", "[.cmdcall]") { +TEST_CASE("gatedelay", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -386,7 +387,7 @@ TEST_CASE("gatedelay", "[.cmdcall]") { } } -TEST_CASE("gatedelay1", "[.cmdcall]") { +TEST_CASE("gatedelay1", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -415,7 +416,7 @@ TEST_CASE("gatedelay1", "[.cmdcall]") { } } -TEST_CASE("gatedelay2", "[.cmdcall]") { +TEST_CASE("gatedelay2", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -444,7 +445,7 @@ TEST_CASE("gatedelay2", "[.cmdcall]") { } } -TEST_CASE("gatedelay3", "[.cmdcall]") { +TEST_CASE("gatedelay3", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -473,7 +474,7 @@ TEST_CASE("gatedelay3", "[.cmdcall]") { } } -TEST_CASE("polarity", "[.cmdcall]") { +TEST_CASE("polarity", "[.detectorintegration]") { Detector det; Caller caller(&det); if (det.getDetectorType().squash() == defs::MYTHEN3) { @@ -501,7 +502,7 @@ TEST_CASE("polarity", "[.cmdcall]") { } } -TEST_CASE("interpolation", "[.cmdcall]") { +TEST_CASE("interpolation", "[.detectorintegration]") { Detector det; Caller caller(&det); if (det.getDetectorType().squash() == defs::MYTHEN3) { @@ -555,7 +556,7 @@ TEST_CASE("interpolation", "[.cmdcall]") { } } -TEST_CASE("pumpprobe", "[.cmdcall]") { +TEST_CASE("pumpprobe", "[.detectorintegration]") { Detector det; Caller caller(&det); if (det.getDetectorType().squash() == defs::MYTHEN3) { @@ -632,7 +633,7 @@ TEST_CASE("pumpprobe", "[.cmdcall]") { } } -TEST_CASE("apulse", "[.cmdcall]") { +TEST_CASE("apulse", "[.detectorintegration]") { Detector det; Caller caller(&det); if (det.getDetectorType().squash() == defs::MYTHEN3) { @@ -660,7 +661,7 @@ TEST_CASE("apulse", "[.cmdcall]") { } } -TEST_CASE("dpulse", "[.cmdcall]") { +TEST_CASE("dpulse", "[.detectorintegration]") { Detector det; Caller caller(&det); if (det.getDetectorType().squash() == defs::MYTHEN3) { diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-pattern.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-pattern.cpp index 60dafd4f4..cd49c5ae4 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-pattern.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-pattern.cpp @@ -19,7 +19,7 @@ using test::PUT; /* Pattern */ -TEST_CASE("patfname", "[.cmdcall]") { +TEST_CASE("patfname", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -32,7 +32,7 @@ TEST_CASE("patfname", "[.cmdcall]") { } } -TEST_CASE("pattern", "[.cmdcall]") { +TEST_CASE("pattern", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -45,7 +45,7 @@ TEST_CASE("pattern", "[.cmdcall]") { } } -TEST_CASE("savepattern", "[.cmdcall]") { +TEST_CASE("savepattern", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -63,7 +63,7 @@ TEST_CASE("savepattern", "[.cmdcall]") { } } -TEST_CASE("defaultpattern", "[.cmdcall]") { +TEST_CASE("defaultpattern", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -76,7 +76,7 @@ TEST_CASE("defaultpattern", "[.cmdcall]") { } } -TEST_CASE("patioctrl", "[.cmdcall]") { +TEST_CASE("patioctrl", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -107,7 +107,7 @@ TEST_CASE("patioctrl", "[.cmdcall]") { } } -TEST_CASE("patword", "[.cmdcall]") { +TEST_CASE("patword", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -149,7 +149,7 @@ TEST_CASE("patword", "[.cmdcall]") { } } -TEST_CASE("patlimits", "[.cmdcall]") { +TEST_CASE("patlimits", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -176,7 +176,7 @@ TEST_CASE("patlimits", "[.cmdcall]") { } } -TEST_CASE("patloop", "[.cmdcall]") { +TEST_CASE("patloop", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -225,7 +225,7 @@ TEST_CASE("patloop", "[.cmdcall]") { } } -TEST_CASE("patnloop", "[.cmdcall]") { +TEST_CASE("patnloop", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -271,7 +271,7 @@ TEST_CASE("patnloop", "[.cmdcall]") { } } -TEST_CASE("patwait", "[.cmdcall]") { +TEST_CASE("patwait", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -317,7 +317,7 @@ TEST_CASE("patwait", "[.cmdcall]") { } } -TEST_CASE("patwaittime", "[.cmdcall]") { +TEST_CASE("patwaittime", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -379,7 +379,7 @@ TEST_CASE("patwaittime", "[.cmdcall]") { } } -TEST_CASE("patmask", "[.cmdcall]") { +TEST_CASE("patmask", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -405,7 +405,7 @@ TEST_CASE("patmask", "[.cmdcall]") { } } -TEST_CASE("patsetbit", "[.cmdcall]") { +TEST_CASE("patsetbit", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -431,7 +431,7 @@ TEST_CASE("patsetbit", "[.cmdcall]") { } } -TEST_CASE("patternstart", "[.cmdcall]") { +TEST_CASE("patternstart", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("patternstart", {}, -1, GET)); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-rx-running.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-rx-running.cpp index 844df6419..dc736e27a 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-rx-running.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-rx-running.cpp @@ -12,7 +12,7 @@ namespace sls { using test::PUT; TEST_CASE("Ctb and xilinx - cant put if receiver is not idle", - "[.cmdcall][.rx]") { + "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); @@ -60,7 +60,8 @@ TEST_CASE("Ctb and xilinx - cant put if receiver is not idle", } } -TEST_CASE("adcenable - cant put if receiver is not idle", "[.cmdcall][.rx]") { +TEST_CASE("adcenable - cant put if receiver is not idle", + "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); @@ -83,7 +84,8 @@ TEST_CASE("adcenable - cant put if receiver is not idle", "[.cmdcall][.rx]") { } } -TEST_CASE("bursts - cant put if receiver is not idle", "[.cmdcall][.rx]") { +TEST_CASE("bursts - cant put if receiver is not idle", + "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); @@ -105,7 +107,8 @@ TEST_CASE("bursts - cant put if receiver is not idle", "[.cmdcall][.rx]") { } } -TEST_CASE("counters - cant put if receiver is not idle", "[.cmdcall][.rx]") { +TEST_CASE("counters - cant put if receiver is not idle", + "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); @@ -129,30 +132,30 @@ TEST_CASE("counters - cant put if receiver is not idle", "[.cmdcall][.rx]") { } TEST_CASE("numinterfaces - cant put if receiver is not idle", - "[.cmdcall][.rx]") { + "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) { - auto prev_numinterfaces = det.getNumberofUDPInterfaces(); + auto prev_numinterfaces = det.getNumberofUDPInterfaces().tsquash( + "Number of UDP Interfaces is not consistent among modules"); // start receiver REQUIRE_NOTHROW(caller.call("rx_start", {}, -1, PUT)); - REQUIRE_THROWS(caller.call("numinterafaces", {"2"}, -1, PUT)); + REQUIRE_THROWS(caller.call("numinterfaces", {"2"}, -1, PUT)); // stop receiver REQUIRE_NOTHROW(caller.call("rx_stop", {}, -1, PUT)); - for (int i = 0; i != det.size(); ++i) { - det.setNumberofUDPInterfaces(prev_numinterfaces[i], {i}); - } + det.setNumberofUDPInterfaces(prev_numinterfaces); } } -TEST_CASE("dr - cant put if receiver is not idle", "[.cmdcall][.rx]") { +TEST_CASE("dr - cant put if receiver is not idle", + "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); @@ -174,7 +177,8 @@ TEST_CASE("dr - cant put if receiver is not idle", "[.cmdcall][.rx]") { } } -TEST_CASE("tengiga - cant put if receiver is not idle", "[.cmdcall][.rx]") { +TEST_CASE("tengiga - cant put if receiver is not idle", + "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); @@ -198,7 +202,8 @@ TEST_CASE("tengiga - cant put if receiver is not idle", "[.cmdcall][.rx]") { } } -TEST_CASE("general - cant put if receiver is not idle", "[.cmdcall][.rx]") { +TEST_CASE("general - cant put if receiver is not idle", + "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-rx.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-rx.cpp index 74fa821d8..f00c239e3 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-rx.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-rx.cpp @@ -25,7 +25,7 @@ python/scripts/list_tested_cmd.py to check if all commands are covered /* configuration */ -TEST_CASE("rx_version", "[.cmdcall][.rx]") { +TEST_CASE("rx_version", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); std::ostringstream oss; @@ -39,7 +39,7 @@ TEST_CASE("rx_version", "[.cmdcall][.rx]") { } /* acquisition */ -TEST_CASE("rx_start", "[.cmdcall][.rx]") { +TEST_CASE("rx_start", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); det.setFileWrite(false); // avoid writing or error on file creation @@ -57,7 +57,7 @@ TEST_CASE("rx_start", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_stop", "[.cmdcall][.rx]") { +TEST_CASE("rx_stop", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); // PUT only command @@ -74,7 +74,7 @@ TEST_CASE("rx_stop", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_status", "[.cmdcall][.rx]") { +TEST_CASE("rx_status", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); det.setFileWrite(false); // avoid writing or error on file creation @@ -92,7 +92,7 @@ TEST_CASE("rx_status", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_framescaught", "[.cmdcall][.rx]") { +TEST_CASE("rx_framescaught", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); // This ensures 0 caught frames @@ -126,7 +126,7 @@ TEST_CASE("rx_framescaught", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_missingpackets", "[.cmdcall][.rx]") { +TEST_CASE("rx_missingpackets", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getFileWrite(); @@ -171,7 +171,7 @@ TEST_CASE("rx_missingpackets", "[.cmdcall][.rx]") { det.setNumberOfFrames(prev_frames); } -TEST_CASE("rx_frameindex", "[.cmdcall][.rx]") { +TEST_CASE("rx_frameindex", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); caller.call("rx_frameindex", {}, -1, GET); @@ -182,7 +182,7 @@ TEST_CASE("rx_frameindex", "[.cmdcall][.rx]") { /* Network Configuration (Detector<->Receiver) */ -TEST_CASE("rx_printconfig", "[.cmdcall][.rx]") { +TEST_CASE("rx_printconfig", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("rx_printconfig", {}, -1, GET)); @@ -190,7 +190,7 @@ TEST_CASE("rx_printconfig", "[.cmdcall][.rx]") { /* Receiver Config */ -TEST_CASE("rx_hostname", "[.cmdcall][.rx]") { +TEST_CASE("rx_hostname", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxHostname(); @@ -222,7 +222,7 @@ TEST_CASE("rx_hostname", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_tcpport", "[.cmdcall][.rx]") { +TEST_CASE("rx_tcpport", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxPort(); @@ -261,7 +261,7 @@ TEST_CASE("rx_tcpport", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_fifodepth", "[.cmdcall][.rx]") { +TEST_CASE("rx_fifodepth", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxFifoDepth(); @@ -285,7 +285,7 @@ TEST_CASE("rx_fifodepth", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_silent", "[.cmdcall][.rx]") { +TEST_CASE("rx_silent", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxSilentMode(); @@ -309,7 +309,7 @@ TEST_CASE("rx_silent", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_discardpolicy", "[.cmdcall][.rx]") { +TEST_CASE("rx_discardpolicy", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxFrameDiscardPolicy(); @@ -338,7 +338,7 @@ TEST_CASE("rx_discardpolicy", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_padding", "[.cmdcall][.rx]") { +TEST_CASE("rx_padding", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getPartialFramesPadding(); @@ -362,7 +362,7 @@ TEST_CASE("rx_padding", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_udpsocksize", "[.cmdcall][.rx]") { +TEST_CASE("rx_udpsocksize", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); int64_t prev_val = det.getRxUDPSocketBufferSize().tsquash( @@ -382,7 +382,7 @@ TEST_CASE("rx_udpsocksize", "[.cmdcall][.rx]") { det.setRxUDPSocketBufferSize(prev_val); } -TEST_CASE("rx_realudpsocksize", "[.cmdcall][.rx]") { +TEST_CASE("rx_realudpsocksize", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); uint64_t val = 0; @@ -401,7 +401,7 @@ TEST_CASE("rx_realudpsocksize", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_lock", "[.cmdcall][.rx]") { +TEST_CASE("rx_lock", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxLock(); @@ -425,7 +425,7 @@ TEST_CASE("rx_lock", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_lastclient", "[.cmdcall][.rx]") { +TEST_CASE("rx_lastclient", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); std::ostringstream oss; @@ -435,14 +435,14 @@ TEST_CASE("rx_lastclient", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_threads", "[.cmdcall][.rx]") { +TEST_CASE("rx_threads", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); std::ostringstream oss; REQUIRE_NOTHROW(caller.call("rx_threads", {}, -1, GET, oss)); } -TEST_CASE("rx_arping", "[.cmdcall][.rx]") { +TEST_CASE("rx_arping", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxArping(); @@ -467,7 +467,7 @@ TEST_CASE("rx_arping", "[.cmdcall][.rx]") { } } } -TEST_CASE("rx_roi", "[.cmdcall]") { +TEST_CASE("rx_roi", "[.detectorintegration][.disable_check_data_file]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -782,7 +782,7 @@ TEST_CASE("rx_roi", "[.cmdcall]") { } } -TEST_CASE("rx_clearroi", "[.cmdcall]") { +TEST_CASE("rx_clearroi", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -808,7 +808,7 @@ TEST_CASE("rx_clearroi", "[.cmdcall]") { /* File */ -TEST_CASE("fformat", "[.cmdcall]") { +TEST_CASE("fformat", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getFileFormat(); @@ -827,7 +827,7 @@ TEST_CASE("fformat", "[.cmdcall]") { } } -TEST_CASE("fpath", "[.cmdcall]") { +TEST_CASE("fpath", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getFilePath(); @@ -849,7 +849,7 @@ TEST_CASE("fpath", "[.cmdcall]") { } } -TEST_CASE("fname", "[.cmdcall]") { +TEST_CASE("fname", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getFileNamePrefix(); @@ -876,7 +876,7 @@ TEST_CASE("fname", "[.cmdcall]") { } } -TEST_CASE("findex", "[.cmdcall]") { +TEST_CASE("findex", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getAcquisitionIndex(); @@ -900,7 +900,7 @@ TEST_CASE("findex", "[.cmdcall]") { } } -TEST_CASE("fwrite", "[.cmdcall]") { +TEST_CASE("fwrite", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getFileWrite(); @@ -924,7 +924,7 @@ TEST_CASE("fwrite", "[.cmdcall]") { } } -TEST_CASE("fmaster", "[.cmdcall]") { +TEST_CASE("fmaster", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getMasterFileWrite(); @@ -946,7 +946,7 @@ TEST_CASE("fmaster", "[.cmdcall]") { det.setMasterFileWrite(prev_val); } -TEST_CASE("foverwrite", "[.cmdcall]") { +TEST_CASE("foverwrite", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getFileOverWrite(); @@ -970,7 +970,7 @@ TEST_CASE("foverwrite", "[.cmdcall]") { } } -TEST_CASE("rx_framesperfile", "[.cmdcall][.rx]") { +TEST_CASE("rx_framesperfile", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getFramesPerFile(); @@ -1001,7 +1001,7 @@ TEST_CASE("rx_framesperfile", "[.cmdcall][.rx]") { /* ZMQ Streaming Parameters (Receiver<->Client) */ -TEST_CASE("rx_zmqstream", "[.cmdcall][.rx]") { +TEST_CASE("rx_zmqstream", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxZmqDataStream(); @@ -1027,7 +1027,7 @@ TEST_CASE("rx_zmqstream", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_zmqfreq", "[.cmdcall][.rx]") { +TEST_CASE("rx_zmqfreq", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxZmqFrequency(); @@ -1051,7 +1051,7 @@ TEST_CASE("rx_zmqfreq", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_zmqstartfnum", "[.cmdcall][.rx]") { +TEST_CASE("rx_zmqstartfnum", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxZmqStartingFrame(); @@ -1075,7 +1075,7 @@ TEST_CASE("rx_zmqstartfnum", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_zmqport", "[.cmdcall][.rx]") { +TEST_CASE("rx_zmqport", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val_zmqport = det.getRxZmqPort(); @@ -1123,7 +1123,7 @@ TEST_CASE("rx_zmqport", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_zmqhwm", "[.cmdcall]") { +TEST_CASE("rx_zmqhwm", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = @@ -1153,7 +1153,7 @@ TEST_CASE("rx_zmqhwm", "[.cmdcall]") { /* CTB Specific */ -TEST_CASE("rx_dbitlist", "[.cmdcall][.rx]") { +TEST_CASE("rx_dbitlist", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1183,7 +1183,7 @@ TEST_CASE("rx_dbitlist", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_dbitoffset", "[.cmdcall][.rx]") { +TEST_CASE("rx_dbitoffset", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1218,7 +1218,7 @@ TEST_CASE("rx_dbitoffset", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_dbitreorder", "[.cmdcall][.rx]") { +TEST_CASE("rx_dbitreorder", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1249,7 +1249,7 @@ TEST_CASE("rx_dbitreorder", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_jsonaddheader", "[.cmdcall][.rx]") { +TEST_CASE("rx_jsonaddheader", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getAdditionalJsonHeader(); @@ -1275,7 +1275,7 @@ TEST_CASE("rx_jsonaddheader", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_jsonpara", "[.cmdcall][.rx]") { +TEST_CASE("rx_jsonpara", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getAdditionalJsonHeader(); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-xilinx-chiptestboard.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-xilinx-chiptestboard.cpp index 6133962f4..3849be6fb 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-xilinx-chiptestboard.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-xilinx-chiptestboard.cpp @@ -19,7 +19,7 @@ using test::PUT; /* dacs */ -TEST_CASE("configtransceiver", "[.cmdcall]") { +TEST_CASE("configtransceiver", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller.cpp b/slsDetectorSoftware/tests/Caller/test-Caller.cpp index 65fd764fa..93c88713e 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller.cpp @@ -21,7 +21,7 @@ using test::GET; using test::PUT; TEST_CASE("Calling help doesn't throw or cause segfault") { - // Dont add [.cmdcall] tag this should run with normal tests + // Dont add [.detectorintegration] tag this should run with normal tests Caller caller(nullptr); std::ostringstream os; for (std::string cmd : caller.getAllCommands()) @@ -29,7 +29,7 @@ TEST_CASE("Calling help doesn't throw or cause segfault") { caller.call(cmd, {}, -1, slsDetectorDefs::HELP_ACTION, os)); } -TEST_CASE("Unknown command", "[.cmdcall]") { +TEST_CASE("Unknown command", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("vsaevrreavv", {}, -1, PUT)); @@ -37,7 +37,7 @@ TEST_CASE("Unknown command", "[.cmdcall]") { /* configuration */ -TEST_CASE("config", "[.cmdcall]") { +TEST_CASE("config", "[.detectorintegration]") { Detector det; Caller caller(&det); // put only @@ -59,7 +59,11 @@ void test_include_file(const std::string &cmd) { det.getFileWrite().tsquash("File write enable has to be same to test"); { - system("echo -e 'frames 2\nfwrite 1' > /tmp/tempsetup.det "); + std::ofstream f("/tmp/tempsetup.det", std::ios::trunc); + f << "frames 2\n"; + f << "fwrite 1\n"; + } + { std::ostringstream oss; caller.call(cmd, {"/tmp/tempsetup.det"}, -1, PUT, oss); REQUIRE(oss.str() == cmd + " /tmp/tempsetup.det\n"); @@ -69,7 +73,11 @@ void test_include_file(const std::string &cmd) { 1); } { - system("echo -e 'frames 3\nfwrite 0' > /tmp/tempsetup.det "); + std::ofstream f("/tmp/tempsetup.det", std::ios::trunc); + f << "frames 3\n"; + f << "fwrite 0\n"; + } + { std::ostringstream oss; caller.call(cmd, {"/tmp/tempsetup.det"}, -1, PUT, oss); REQUIRE(oss.str() == cmd + " /tmp/tempsetup.det\n"); @@ -82,17 +90,19 @@ void test_include_file(const std::string &cmd) { det.setFileWrite(prev_fwrite); } -TEST_CASE("parameters", "[.cmdcall]") { test_include_file("parameters"); } +TEST_CASE("parameters", "[.detectorintegration]") { + test_include_file("parameters"); +} -TEST_CASE("include", "[.cmdcall]") { test_include_file("include"); } +TEST_CASE("include", "[.detectorintegration]") { test_include_file("include"); } -TEST_CASE("hostname", "[.cmdcall]") { +TEST_CASE("hostname", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("hostname", {}, -1, GET)); } -TEST_CASE("virtual", "[.cmdcall]") { +TEST_CASE("virtual", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("virtual", {}, -1, GET)); @@ -100,56 +110,56 @@ TEST_CASE("virtual", "[.cmdcall]") { REQUIRE_THROWS(caller.call("virtual", {"3", "65534"}, -1, PUT)); } -TEST_CASE("versions", "[.cmdcall]") { +TEST_CASE("versions", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("versions", {}, -1, GET)); REQUIRE_THROWS(caller.call("versions", {"0"}, -1, PUT)); } -TEST_CASE("packageversion", "[.cmdcall]") { +TEST_CASE("packageversion", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("packageversion", {}, -1, GET)); REQUIRE_THROWS(caller.call("packageversion", {"0"}, -1, PUT)); } -TEST_CASE("clientversion", "[.cmdcall]") { +TEST_CASE("clientversion", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("clientversion", {}, -1, GET)); REQUIRE_THROWS(caller.call("clientversion", {"0"}, -1, PUT)); } -TEST_CASE("firmwareversion", "[.cmdcall]") { +TEST_CASE("firmwareversion", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("firmwareversion", {}, -1, GET)); REQUIRE_THROWS(caller.call("firmwareversion", {"0"}, -1, PUT)); } -TEST_CASE("detectorserverversion", "[.cmdcall]") { +TEST_CASE("detectorserverversion", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("detectorserverversion", {}, -1, GET)); REQUIRE_THROWS(caller.call("detectorserverversion", {"0"}, -1, PUT)); } -TEST_CASE("hardwareversion", "[.cmdcall]") { +TEST_CASE("hardwareversion", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("hardwareversion", {}, -1, GET)); REQUIRE_THROWS(caller.call("hardwareversion", {"0"}, -1, PUT)); } -TEST_CASE("kernelversion", "[.cmdcall]") { +TEST_CASE("kernelversion", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("kernelversion", {}, -1, GET)); REQUIRE_THROWS(caller.call("kernelversion", {"0"}, -1, PUT)); } -TEST_CASE("serialnumber", "[.cmdcall]") { +TEST_CASE("serialnumber", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -160,7 +170,7 @@ TEST_CASE("serialnumber", "[.cmdcall]") { } } -TEST_CASE("moduleid", "[.cmdcall]") { +TEST_CASE("moduleid", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -173,7 +183,7 @@ TEST_CASE("moduleid", "[.cmdcall]") { } } -TEST_CASE("type", "[.cmdcall]") { +TEST_CASE("type", "[.detectorintegration]") { Detector det; Caller caller(&det); auto dt = det.getDetectorType().squash(); @@ -185,13 +195,13 @@ TEST_CASE("type", "[.cmdcall]") { // REQUIRE(dt == test::type); } -TEST_CASE("detsize", "[.cmdcall]") { +TEST_CASE("detsize", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("detsize", {}, -1, GET)); } -TEST_CASE("settingslist", "[.cmdcall]") { +TEST_CASE("settingslist", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -204,7 +214,7 @@ TEST_CASE("settingslist", "[.cmdcall]") { } } -TEST_CASE("settings", "[.cmdcall]") { +TEST_CASE("settings", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -295,7 +305,7 @@ TEST_CASE("settings", "[.cmdcall]") { } } -TEST_CASE("threshold", "[.cmdcall]") { +TEST_CASE("threshold", "[.detectorintegration]") { Detector det; Caller caller(&det); @@ -374,7 +384,7 @@ TEST_CASE("threshold", "[.cmdcall]") { } } -TEST_CASE("thresholdnotb", "[.cmdcall]") { +TEST_CASE("thresholdnotb", "[.detectorintegration]") { Detector det; Caller caller(&det); @@ -454,7 +464,7 @@ TEST_CASE("thresholdnotb", "[.cmdcall]") { } } -TEST_CASE("settingspath", "[.cmdcall]") { +TEST_CASE("settingspath", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getSettingsPath(); @@ -470,13 +480,13 @@ TEST_CASE("settingspath", "[.cmdcall]") { } } -TEST_CASE("trimbits", "[.cmdcall]") { +TEST_CASE("trimbits", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("trimbits", {}, -1, GET)); } -TEST_CASE("trimval", "[.cmdcall]") { +TEST_CASE("trimval", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -510,7 +520,7 @@ TEST_CASE("trimval", "[.cmdcall]") { } } -TEST_CASE("trimen", "[.cmdcall][.this]") { +TEST_CASE("trimen", "[.detectorintegration][.this]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -532,7 +542,7 @@ TEST_CASE("trimen", "[.cmdcall][.this]") { } } -TEST_CASE("gappixels", "[.cmdcall]") { +TEST_CASE("gappixels", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -582,7 +592,7 @@ TEST_CASE("gappixels", "[.cmdcall]") { } } -TEST_CASE("fliprows", "[.cmdcall]") { +TEST_CASE("fliprows", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -617,7 +627,7 @@ TEST_CASE("fliprows", "[.cmdcall]") { } } -TEST_CASE("master", "[.cmdcall]") { +TEST_CASE("master", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -662,7 +672,7 @@ TEST_CASE("master", "[.cmdcall]") { } } -TEST_CASE("badchannels", "[.cmdcall]") { +TEST_CASE("badchannels", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -732,7 +742,7 @@ TEST_CASE("badchannels", "[.cmdcall]") { } } -TEST_CASE("row", "[.cmdcall]") { +TEST_CASE("row", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getRow()[0]; @@ -755,7 +765,7 @@ TEST_CASE("row", "[.cmdcall]") { det.setRow(prev_val, {0}); } -TEST_CASE("column", "[.cmdcall]") { +TEST_CASE("column", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getColumn()[0]; @@ -782,7 +792,7 @@ TEST_CASE("column", "[.cmdcall]") { // acquire: not testing -TEST_CASE("frames", "[.cmdcall]") { +TEST_CASE("frames", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = @@ -806,7 +816,7 @@ TEST_CASE("frames", "[.cmdcall]") { det.setNumberOfFrames(prev_val); } -TEST_CASE("triggers", "[.cmdcall]") { +TEST_CASE("triggers", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = @@ -830,7 +840,7 @@ TEST_CASE("triggers", "[.cmdcall]") { det.setNumberOfTriggers(prev_val); } -TEST_CASE("exptime", "[.cmdcall][.time]") { +TEST_CASE("exptime", "[.detectorintegration][.time]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -880,7 +890,7 @@ TEST_CASE("exptime", "[.cmdcall][.time]") { det.setExptime(-1, prev_val); } -TEST_CASE("period", "[.cmdcall]") { +TEST_CASE("period", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getPeriod(); @@ -904,7 +914,7 @@ TEST_CASE("period", "[.cmdcall]") { } } -TEST_CASE("delay", "[.cmdcall]") { +TEST_CASE("delay", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -934,7 +944,7 @@ TEST_CASE("delay", "[.cmdcall]") { } } -TEST_CASE("framesl", "[.cmdcall]") { +TEST_CASE("framesl", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -945,7 +955,7 @@ TEST_CASE("framesl", "[.cmdcall]") { } } -TEST_CASE("triggersl", "[.cmdcall]") { +TEST_CASE("triggersl", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -956,7 +966,7 @@ TEST_CASE("triggersl", "[.cmdcall]") { } } -TEST_CASE("delayl", "[.cmdcall]") { +TEST_CASE("delayl", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -970,7 +980,7 @@ TEST_CASE("delayl", "[.cmdcall]") { } } -TEST_CASE("periodl", "[.cmdcall]") { +TEST_CASE("periodl", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -984,7 +994,7 @@ TEST_CASE("periodl", "[.cmdcall]") { } } -TEST_CASE("dr", "[.cmdcall]") { +TEST_CASE("dr", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1026,14 +1036,14 @@ TEST_CASE("dr", "[.cmdcall]") { } } -TEST_CASE("drlist", "[.cmdcall]") { +TEST_CASE("drlist", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("drlist", {}, -1, GET)); REQUIRE_THROWS(caller.call("drlist", {}, -1, PUT)); } -TEST_CASE("timing", "[.cmdcall]") { +TEST_CASE("timing", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1095,14 +1105,14 @@ TEST_CASE("timing", "[.cmdcall]") { } } -TEST_CASE("timinglist", "[.cmdcall]") { +TEST_CASE("timinglist", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("timinglist", {}, -1, GET)); REQUIRE_THROWS(caller.call("timinglist", {}, -1, PUT)); } -TEST_CASE("readoutspeed", "[.cmdcall]") { +TEST_CASE("readoutspeed", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1192,7 +1202,7 @@ TEST_CASE("readoutspeed", "[.cmdcall]") { } } -TEST_CASE("readoutspeedlist", "[.cmdcall]") { +TEST_CASE("readoutspeedlist", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1206,7 +1216,7 @@ TEST_CASE("readoutspeedlist", "[.cmdcall]") { } } -TEST_CASE("adcphase", "[.cmdcall]") { +TEST_CASE("adcphase", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1236,7 +1246,7 @@ TEST_CASE("adcphase", "[.cmdcall]") { } } -TEST_CASE("maxadcphaseshift", "[.cmdcall]") { +TEST_CASE("maxadcphaseshift", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1250,7 +1260,7 @@ TEST_CASE("maxadcphaseshift", "[.cmdcall]") { } } -TEST_CASE("dbitphase", "[.cmdcall]") { +TEST_CASE("dbitphase", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1279,7 +1289,7 @@ TEST_CASE("dbitphase", "[.cmdcall]") { } } -TEST_CASE("maxdbitphaseshift", "[.cmdcall]") { +TEST_CASE("maxdbitphaseshift", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1292,7 +1302,7 @@ TEST_CASE("maxdbitphaseshift", "[.cmdcall]") { } } -TEST_CASE("clkfreq", "[.cmdcall]") { +TEST_CASE("clkfreq", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1312,7 +1322,7 @@ TEST_CASE("clkfreq", "[.cmdcall]") { } } -TEST_CASE("clkphase", "[.cmdcall]") { +TEST_CASE("clkphase", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1362,7 +1372,7 @@ TEST_CASE("clkphase", "[.cmdcall]") { } } -TEST_CASE("clkdiv", "[.cmdcall]") { +TEST_CASE("clkdiv", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1426,7 +1436,7 @@ TEST_CASE("clkdiv", "[.cmdcall]") { } } -TEST_CASE("maxclkphaseshift", "[.cmdcall]") { +TEST_CASE("maxclkphaseshift", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1446,7 +1456,7 @@ TEST_CASE("maxclkphaseshift", "[.cmdcall]") { } } -TEST_CASE("highvoltage", "[.cmdcall]") { +TEST_CASE("highvoltage", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1531,7 +1541,7 @@ TEST_CASE("highvoltage", "[.cmdcall]") { } } -TEST_CASE("powerchip", "[.cmdcall]") { +TEST_CASE("powerchip", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1583,7 +1593,7 @@ TEST_CASE("powerchip", "[.cmdcall]") { } } -TEST_CASE("imagetest", "[.cmdcall]") { +TEST_CASE("imagetest", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1595,7 +1605,7 @@ TEST_CASE("imagetest", "[.cmdcall]") { } } -TEST_CASE("extsig", "[.cmdcall]") { +TEST_CASE("extsig", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1649,7 +1659,7 @@ TEST_CASE("extsig", "[.cmdcall]") { } } -TEST_CASE("parallel", "[.cmdcall]") { +TEST_CASE("parallel", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1680,7 +1690,7 @@ TEST_CASE("parallel", "[.cmdcall]") { } } -TEST_CASE("filterresistor", "[.cmdcall]") { +TEST_CASE("filterresistor", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1724,7 +1734,7 @@ TEST_CASE("filterresistor", "[.cmdcall]") { } } -TEST_CASE("dbitpipeline", "[.cmdcall]") { +TEST_CASE("dbitpipeline", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1774,7 +1784,7 @@ TEST_CASE("dbitpipeline", "[.cmdcall]") { } } -TEST_CASE("readnrows", "[.cmdcall]") { +TEST_CASE("readnrows", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1826,7 +1836,7 @@ TEST_CASE("readnrows", "[.cmdcall]") { } } -TEST_CASE("currentsource", "[.cmdcall]") { +TEST_CASE("currentsource", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1968,21 +1978,21 @@ TEST_CASE("currentsource", "[.cmdcall]") { /** temperature */ -TEST_CASE("templist", "[.cmdcall]") { +TEST_CASE("templist", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("templist", {}, -1, GET)); REQUIRE_THROWS(caller.call("templist", {}, -1, PUT)); } -TEST_CASE("tempvalues", "[.cmdcall]") { +TEST_CASE("tempvalues", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("tempvalues", {}, -1, GET)); REQUIRE_THROWS(caller.call("tempvalues", {}, -1, PUT)); } -TEST_CASE("temp_adc", "[.cmdcall]") { +TEST_CASE("temp_adc", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1997,7 +2007,7 @@ TEST_CASE("temp_adc", "[.cmdcall]") { } } -TEST_CASE("temp_fpga", "[.cmdcall]") { +TEST_CASE("temp_fpga", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2014,7 +2024,7 @@ TEST_CASE("temp_fpga", "[.cmdcall]") { /* list */ -TEST_CASE("daclist", "[.cmdcall]") { +TEST_CASE("daclist", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2050,14 +2060,14 @@ TEST_CASE("daclist", "[.cmdcall]") { /* dacs */ -TEST_CASE("dacvalues", "[.cmdcall]") { +TEST_CASE("dacvalues", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("dacvalues", {}, -1, GET)); REQUIRE_THROWS(caller.call("dacvalues", {}, -1, PUT)); } -TEST_CASE("defaultdac", "[.cmdcall]") { +TEST_CASE("defaultdac", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2117,7 +2127,7 @@ TEST_CASE("defaultdac", "[.cmdcall]") { } } -TEST_CASE("resetdacs", "[.cmdcall]") { +TEST_CASE("resetdacs", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2142,7 +2152,7 @@ TEST_CASE("resetdacs", "[.cmdcall]") { /* acquisition */ -TEST_CASE("trigger", "[.cmdcall]") { +TEST_CASE("trigger", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("trigger", {}, -1, GET)); @@ -2185,7 +2195,7 @@ TEST_CASE("trigger", "[.cmdcall]") { } } -TEST_CASE("blockingtrigger", "[.cmdcall]") { +TEST_CASE("blockingtrigger", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("blockingtrigger", {}, -1, GET)); @@ -2229,7 +2239,7 @@ TEST_CASE("blockingtrigger", "[.cmdcall]") { } } -TEST_CASE("clearbusy", "[.cmdcall]") { +TEST_CASE("clearbusy", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("clearbusy", {}, -1, PUT)); @@ -2237,7 +2247,7 @@ TEST_CASE("clearbusy", "[.cmdcall]") { REQUIRE_THROWS(caller.call("clearbusy", {}, -1, GET)); } -TEST_CASE("start", "[.cmdcall]") { +TEST_CASE("start", "[.detectorintegration]") { Detector det; Caller caller(&det); // PUT only command @@ -2276,7 +2286,7 @@ TEST_CASE("start", "[.cmdcall]") { det.setNumberOfFrames(prev_frames); } -TEST_CASE("stop", "[.cmdcall]") { +TEST_CASE("stop", "[.detectorintegration]") { Detector det; Caller caller(&det); // PUT only command @@ -2321,7 +2331,7 @@ TEST_CASE("stop", "[.cmdcall]") { det.setNumberOfFrames(prev_frames); } -TEST_CASE("status", "[.cmdcall]") { +TEST_CASE("status", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2360,7 +2370,7 @@ TEST_CASE("status", "[.cmdcall]") { det.setNumberOfFrames(prev_frames); } -TEST_CASE("nextframenumber", "[.cmdcall]") { +TEST_CASE("nextframenumber", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2467,7 +2477,7 @@ TEST_CASE("nextframenumber", "[.cmdcall]") { } } -TEST_CASE("scan", "[.cmdcall]") { +TEST_CASE("scan", "[.detectorintegration]") { Detector det; Caller caller(&det); defs::dacIndex ind = defs::DAC_0; @@ -2593,7 +2603,7 @@ TEST_CASE("scan", "[.cmdcall]") { } } -TEST_CASE("scanerrmsg", "[.cmdcall]") { +TEST_CASE("scanerrmsg", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("scanerrmsg", {}, -1, GET)); @@ -2602,17 +2612,17 @@ TEST_CASE("scanerrmsg", "[.cmdcall]") { /* Network Configuration (Detector<->Receiver) */ -TEST_CASE("numinterfaces", "[.cmdcall]") { +TEST_CASE("numinterfaces", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) { auto prev_val = det.getNumberofUDPInterfaces().tsquash( "inconsistent numinterfaces to test"); - UdpDestination prev_udp_dest{}; + Result prev_udp_dest; IpAddr prev_src_ip2{}; if (prev_val == 2 && det_type != defs::EIGER) { - prev_udp_dest = det.getDestinationUDPList(0)[0]; + prev_udp_dest = det.getDestinationUDPList(0); prev_src_ip2 = det.getSourceUDPIP2()[0]; } { @@ -2631,8 +2641,10 @@ TEST_CASE("numinterfaces", "[.cmdcall]") { REQUIRE(oss.str() == "numinterfaces 1\n"); } if (prev_val == 2 && det_type != defs::EIGER) { - det.setDestinationUDPList({prev_udp_dest}, 0); - det.setSourceUDPIP2({prev_src_ip2}, {0}); + for (int i = 0; i != det.size(); ++i) { + det.setDestinationUDPList({prev_udp_dest[i]}, {i}); + } + det.setSourceUDPIP2({prev_src_ip2}); } det.setNumberofUDPInterfaces(prev_val); } else if (det_type == defs::EIGER) { @@ -2652,7 +2664,7 @@ TEST_CASE("numinterfaces", "[.cmdcall]") { REQUIRE_THROWS(caller.call("numinterfaces", {"0"}, -1, PUT)); } -TEST_CASE("udp_srcip", "[.cmdcall]") { +TEST_CASE("udp_srcip", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getSourceUDPIP(); @@ -2667,7 +2679,7 @@ TEST_CASE("udp_srcip", "[.cmdcall]") { } } -TEST_CASE("udp_dstlist", "[.cmdcall]") { +TEST_CASE("udp_dstlist", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2683,7 +2695,7 @@ TEST_CASE("udp_dstlist", "[.cmdcall]") { } } -TEST_CASE("udp_numdst", "[.cmdcall]") { +TEST_CASE("udp_numdst", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2696,7 +2708,7 @@ TEST_CASE("udp_numdst", "[.cmdcall]") { } } -TEST_CASE("udp_cleardst", "[.cmdcall]") { +TEST_CASE("udp_cleardst", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("udp_cleardst", {}, -1, GET)); @@ -2704,7 +2716,7 @@ TEST_CASE("udp_cleardst", "[.cmdcall]") { /*REQUIRE_NOTHROW(caller.call("udp_cleardst", {}, -1, PUT));*/ } -TEST_CASE("udp_firstdst", "[.cmdcall]") { +TEST_CASE("udp_firstdst", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2738,13 +2750,13 @@ TEST_CASE("udp_firstdst", "[.cmdcall]") { } } -TEST_CASE("udp_dstip", "[.cmdcall]") { +TEST_CASE("udp_dstip", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("udp_dstip", {"0.0.0.0"}, -1, PUT)); } -TEST_CASE("udp_srcmac", "[.cmdcall]") { +TEST_CASE("udp_srcmac", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getSourceUDPMAC(); @@ -2761,13 +2773,13 @@ TEST_CASE("udp_srcmac", "[.cmdcall]") { } } -TEST_CASE("udp_dstmac", "[.cmdcall]") { +TEST_CASE("udp_dstmac", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("udp_dstmac", {"00:00:00:00:00:00"}, -1, PUT)); } -TEST_CASE("udp_dstport", "[.cmdcall]") { +TEST_CASE("udp_dstport", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getDestinationUDPPort(); @@ -2788,7 +2800,7 @@ TEST_CASE("udp_dstport", "[.cmdcall]") { } } -TEST_CASE("udp_srcip2", "[.cmdcall]") { +TEST_CASE("udp_srcip2", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2810,7 +2822,7 @@ TEST_CASE("udp_srcip2", "[.cmdcall]") { } } -TEST_CASE("udp_dstip2", "[.cmdcall]") { +TEST_CASE("udp_dstip2", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2822,7 +2834,7 @@ TEST_CASE("udp_dstip2", "[.cmdcall]") { } } -TEST_CASE("udp_srcmac2", "[.cmdcall]") { +TEST_CASE("udp_srcmac2", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2846,7 +2858,7 @@ TEST_CASE("udp_srcmac2", "[.cmdcall]") { } } -TEST_CASE("udp_dstmac2", "[.cmdcall]") { +TEST_CASE("udp_dstmac2", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2859,7 +2871,7 @@ TEST_CASE("udp_dstmac2", "[.cmdcall]") { } } -TEST_CASE("udp_dstport2", "[.cmdcall]") { +TEST_CASE("udp_dstport2", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2888,21 +2900,21 @@ TEST_CASE("udp_dstport2", "[.cmdcall]") { } } -TEST_CASE("udp_reconfigure", "[.cmdcall]") { +TEST_CASE("udp_reconfigure", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("udp_reconfigure", {}, -1, GET)); REQUIRE_NOTHROW(caller.call("udp_reconfigure", {}, -1, PUT)); } -TEST_CASE("udp_validate", "[.cmdcall]") { +TEST_CASE("udp_validate", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("udp_validate", {}, -1, GET)); REQUIRE_NOTHROW(caller.call("udp_validate", {}, -1, PUT)); } -TEST_CASE("tengiga", "[.cmdcall]") { +TEST_CASE("tengiga", "[.detectorintegration]") { Detector det; Caller caller(&det); @@ -2926,7 +2938,7 @@ TEST_CASE("tengiga", "[.cmdcall]") { } } -TEST_CASE("flowcontrol10g", "[.cmdcall]") { +TEST_CASE("flowcontrol10g", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2957,7 +2969,7 @@ TEST_CASE("flowcontrol10g", "[.cmdcall]") { } } -TEST_CASE("txdelay_frame", "[.cmdcall]") { +TEST_CASE("txdelay_frame", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2985,7 +2997,7 @@ TEST_CASE("txdelay_frame", "[.cmdcall]") { } } -TEST_CASE("txdelay", "[.cmdcall]") { +TEST_CASE("txdelay", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3061,7 +3073,7 @@ TEST_CASE("txdelay", "[.cmdcall]") { /* ZMQ Streaming Parameters (Receiver<->Client) */ -TEST_CASE("zmqport", "[.cmdcall]") { +TEST_CASE("zmqport", "[.detectorintegration]") { Detector det; Caller caller(&det); @@ -3116,7 +3128,7 @@ TEST_CASE("zmqport", "[.cmdcall]") { } } -TEST_CASE("zmqip", "[.cmdcall]") { +TEST_CASE("zmqip", "[.detectorintegration]") { Detector det; Caller caller(&det); std::ostringstream oss1, oss2; @@ -3132,7 +3144,7 @@ TEST_CASE("zmqip", "[.cmdcall]") { } } -TEST_CASE("zmqhwm", "[.cmdcall]") { +TEST_CASE("zmqhwm", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getClientZmqHwm(); @@ -3161,7 +3173,7 @@ TEST_CASE("zmqhwm", "[.cmdcall]") { /* Advanced */ -TEST_CASE("adcpipeline", "[.cmdcall]") { +TEST_CASE("adcpipeline", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3196,7 +3208,7 @@ TEST_CASE("adcpipeline", "[.cmdcall]") { } } -TEST_CASE("programfpga", "[.cmdcall]") { +TEST_CASE("programfpga", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3212,7 +3224,7 @@ TEST_CASE("programfpga", "[.cmdcall]") { } } -TEST_CASE("resetfpga", "[.cmdcall]") { +TEST_CASE("resetfpga", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3228,7 +3240,7 @@ TEST_CASE("resetfpga", "[.cmdcall]") { } } -TEST_CASE("updatekernel", "[.cmdcall]") { +TEST_CASE("updatekernel", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3247,7 +3259,7 @@ TEST_CASE("updatekernel", "[.cmdcall]") { } } -TEST_CASE("rebootcontroller", "[.cmdcall]") { +TEST_CASE("rebootcontroller", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3263,7 +3275,7 @@ TEST_CASE("rebootcontroller", "[.cmdcall]") { } } -TEST_CASE("update", "[.cmdcall]") { +TEST_CASE("update", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3281,7 +3293,7 @@ TEST_CASE("update", "[.cmdcall]") { } } -TEST_CASE("reg", "[.cmdcall][.definecmds]") { +TEST_CASE("reg", "[.detectorintegration][.definecmds]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3319,7 +3331,7 @@ TEST_CASE("reg", "[.cmdcall][.definecmds]") { } } -TEST_CASE("adcreg", "[.cmdcall]") { +TEST_CASE("adcreg", "[.detectorintegration]") { // TODO! what is a safe value to use? Detector det; Caller caller(&det); @@ -3340,7 +3352,7 @@ TEST_CASE("adcreg", "[.cmdcall]") { } } -TEST_CASE("setbit", "[.cmdcall][.definecmds]") { +TEST_CASE("setbit", "[.detectorintegration][.definecmds]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3370,7 +3382,7 @@ TEST_CASE("setbit", "[.cmdcall][.definecmds]") { } } -TEST_CASE("clearbit", "[.cmdcall][.definecmds]") { +TEST_CASE("clearbit", "[.detectorintegration][.definecmds]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3400,7 +3412,7 @@ TEST_CASE("clearbit", "[.cmdcall][.definecmds]") { } } -TEST_CASE("getbit", "[.cmdcall][.definecmds]") { +TEST_CASE("getbit", "[.detectorintegration][.definecmds]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3430,7 +3442,7 @@ TEST_CASE("getbit", "[.cmdcall][.definecmds]") { } } -TEST_CASE("firmwaretest", "[.cmdcall]") { +TEST_CASE("firmwaretest", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3447,7 +3459,7 @@ TEST_CASE("firmwaretest", "[.cmdcall]") { } } -TEST_CASE("bustest", "[.cmdcall]") { +TEST_CASE("bustest", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3464,7 +3476,7 @@ TEST_CASE("bustest", "[.cmdcall]") { } } -TEST_CASE("initialchecks", "[.cmdcall]") { +TEST_CASE("initialchecks", "[.detectorintegration]") { Detector det; Caller caller(&det); auto check = det.getInitialChecks(); @@ -3486,7 +3498,7 @@ TEST_CASE("initialchecks", "[.cmdcall]") { det.setInitialChecks(check); } -TEST_CASE("adcinvert", "[.cmdcall]") { +TEST_CASE("adcinvert", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3514,7 +3526,7 @@ TEST_CASE("adcinvert", "[.cmdcall]") { /* Insignificant */ -TEST_CASE("port", "[.cmdcall]") { +TEST_CASE("port", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getControlPort({0}).squash(); @@ -3538,7 +3550,7 @@ TEST_CASE("port", "[.cmdcall]") { det.setControlPort(prev_val, {0}); } -TEST_CASE("stopport", "[.cmdcall]") { +TEST_CASE("stopport", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getStopPort({0}).squash(); @@ -3562,7 +3574,7 @@ TEST_CASE("stopport", "[.cmdcall]") { det.setStopPort(prev_val, {0}); } -TEST_CASE("lock", "[.cmdcall]") { +TEST_CASE("lock", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getDetectorLock(); @@ -3586,13 +3598,13 @@ TEST_CASE("lock", "[.cmdcall]") { } } -TEST_CASE("execcommand", "[.cmdcall]") { +TEST_CASE("execcommand", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("execcommand", {"ls *.txt"}, -1, PUT)); } -TEST_CASE("framecounter", "[.cmdcall]") { +TEST_CASE("framecounter", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3610,7 +3622,7 @@ TEST_CASE("framecounter", "[.cmdcall]") { } } -TEST_CASE("runtime", "[.cmdcall]") { +TEST_CASE("runtime", "[.detectorintegration]") { // TODO! can we test this? Detector det; Caller caller(&det); @@ -3628,7 +3640,7 @@ TEST_CASE("runtime", "[.cmdcall]") { } } -TEST_CASE("frametime", "[.cmdcall]") { +TEST_CASE("frametime", "[.detectorintegration]") { // TODO! can we test this? Detector det; Caller caller(&det); @@ -3646,14 +3658,14 @@ TEST_CASE("frametime", "[.cmdcall]") { } } -TEST_CASE("user", "[.cmdcall]") { +TEST_CASE("user", "[.detectorintegration]") { Detector det; Caller caller(&det); // caller only has help. cmdApp takes care of put and get REQUIRE_NOTHROW(caller.call("user", {}, -1, defs::HELP_ACTION)); } -TEST_CASE("sleep", "[.cmdcall]") { +TEST_CASE("sleep", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("sleep", {"1"}, -1, PUT)); diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp index afffb317d..84b248835 100644 --- a/slsReceiverSoftware/src/Implementation.cpp +++ b/slsReceiverSoftware/src/Implementation.cpp @@ -813,7 +813,8 @@ void Implementation::startReadout() { << "waiting for all packets, previousValue:" << previousValue << " totalPacketsReceived: " << totalPacketsReceived; - /* TODO! Need to find optimal time **/ + /* TODO! Need to find optimal time - xilinx and jungfrau need + * more time */ std::this_thread::sleep_for(std::chrono::milliseconds(5)); previousValue = totalPacketsReceived; totalPacketsReceived = 0; diff --git a/slsReceiverSoftware/tests/test-ArrangeDataBasedOnBitList.cpp b/slsReceiverSoftware/tests/test-ArrangeDataBasedOnBitList.cpp index db278658e..54f60d0cb 100644 --- a/slsReceiverSoftware/tests/test-ArrangeDataBasedOnBitList.cpp +++ b/slsReceiverSoftware/tests/test-ArrangeDataBasedOnBitList.cpp @@ -140,7 +140,7 @@ class DataProcessorTestFixture { }; TEST_CASE_METHOD(DataProcessorTestFixture, "Remove Trailing Bits", - "[.dataprocessor][.bitoffset]") { + "[dataprocessor][bitoffset]") { const size_t num_random_offset_bytes = 3; set_random_offset_bytes(num_random_offset_bytes); @@ -170,7 +170,7 @@ TEST_CASE_METHOD(DataProcessorTestFixture, "Remove Trailing Bits", // parametric test tested with num_samples = 5, num_samples = 10, num_samples = // 8 TEST_CASE_METHOD(DataProcessorTestFixture, "Reorder all", - "[.dataprocessor][.reorder]") { + "[dataprocessor][reorder]") { // parameters: num_samples, expected_num_digital_bytes, // expected_digital_part_for_each_bit auto parameters = GENERATE( @@ -219,7 +219,7 @@ TEST_CASE_METHOD(DataProcessorTestFixture, "Reorder all", TEST_CASE_METHOD(DataProcessorTestFixture, "Reorder all and remove trailing bits", - "[.dataprocessor][.reorder]") { + "[dataprocessor][reorder]") { // set number of samples for test fixture -> create data const size_t num_random_offset_bytes = 3; @@ -261,7 +261,7 @@ TEST_CASE_METHOD(DataProcessorTestFixture, } TEST_CASE_METHOD(DataProcessorTestFixture, "Arrange bitlist with reorder false", - "[.dataprocessor][.retrievebitlist]") { + "[dataprocessor][retrievebitlist]") { // parameters: num_samples, bitlist, expected_num_digital_bytes, // expected_digital_part auto parameters = GENERATE( @@ -315,7 +315,7 @@ TEST_CASE_METHOD(DataProcessorTestFixture, "Arrange bitlist with reorder false", } TEST_CASE_METHOD(DataProcessorTestFixture, "Arrange bitlist with reorder true", - "[.dataprocessor][.retrievebitlist]") { + "[dataprocessor][retrievebitlist]") { // parameters: num_samples, bitlist, expected_num_digital_bytes, // expected_digital_part auto parameters = GENERATE( @@ -369,7 +369,7 @@ TEST_CASE_METHOD(DataProcessorTestFixture, "Arrange bitlist with reorder true", TEST_CASE_METHOD(DataProcessorTestFixture, "Arrange bitlist and remove trailing bits", - "[.dataprocessor][.retrievebitlist]") { + "[dataprocessor][retrievebitlist]") { size_t num_random_offset_bytes = 3; std::vector bitlist{1, 4, 5}; diff --git a/slsSupportLib/tests/test-Timer.cpp b/slsSupportLib/tests/test-Timer.cpp index 6d94f1f7b..a4e768334 100644 --- a/slsSupportLib/tests/test-Timer.cpp +++ b/slsSupportLib/tests/test-Timer.cpp @@ -8,7 +8,7 @@ namespace sls { -TEST_CASE("Time 1s restart then time 2s", "[.timer]") { +TEST_CASE("Time 1s restart then time 2s", "[timer]") { auto sleep_duration = std::chrono::seconds(1); auto t = Timer(); std::this_thread::sleep_for(sleep_duration); @@ -19,7 +19,7 @@ TEST_CASE("Time 1s restart then time 2s", "[.timer]") { REQUIRE(t.elapsed_s() == Approx(2).epsilon(0.01)); } -TEST_CASE("Return ms", "[.timer]") { +TEST_CASE("Return ms", "[timer]") { auto sleep_duration = std::chrono::milliseconds(1300); auto t = Timer(); std::this_thread::sleep_for(sleep_duration); diff --git a/slsSupportLib/tests/test-Version.cpp b/slsSupportLib/tests/test-Version.cpp index 9c1f1d3f8..5870c9b56 100644 --- a/slsSupportLib/tests/test-Version.cpp +++ b/slsSupportLib/tests/test-Version.cpp @@ -5,7 +5,7 @@ namespace sls { -TEST_CASE("check if version is semantic", "[.version]") { +TEST_CASE("check if version is semantic", "[version]") { auto [version_string, has_semantic_version] = GENERATE(std::make_tuple("developer 0x250512", false), diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9f3d1b7c9..84e727629 100755 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -60,7 +60,3 @@ catch_discover_tests(tests) configure_file(scripts/test_simulators.py ${CMAKE_BINARY_DIR}/bin/test_simulators.py COPYONLY) configure_file(scripts/test_frame_synchronizer.py ${CMAKE_BINARY_DIR}/bin/test_frame_synchronizer.py COPYONLY) configure_file(scripts/utils_for_test.py ${CMAKE_BINARY_DIR}/bin/utils_for_test.py COPYONLY) -configure_file(scripts/test_roi.py ${CMAKE_BINARY_DIR}/bin/test_roi.py COPYONLY) -configure_file(scripts/test_free.py ${CMAKE_BINARY_DIR}/bin/test_free.py COPYONLY) -configure_file(scripts/test_commands.py ${CMAKE_BINARY_DIR}/bin/test_commands.py COPYONLY) - diff --git a/tests/scripts/test_commands.py b/tests/scripts/test_commands.py deleted file mode 100644 index 73d28442e..000000000 --- a/tests/scripts/test_commands.py +++ /dev/null @@ -1,100 +0,0 @@ -# SPDX-License-Identifier: LGPL-3.0-or-other -# Copyright (C) 2021 Contributors to the SLS Detector Package -''' -This file is used to start up simulators and test for freeing shm and accessing it from python. -Run this using: pytest -s test_free.py -''' - -from time import time -import pytest, sys, time - -from slsdet import Detector, Ctb, freeSharedMemory -from slsdet.defines import DEFAULT_TCP_RX_PORTNO -from utils_for_test import ( - Log, - LogLevel, - cleanup, - startDetectorVirtualServer, - startProcessInBackground, - loadConfig, - loadBasicSettings -) - -def startReceiver(num_mods, fp): - if num_mods == 1: - cmd = ['slsReceiver'] - else: - cmd = ['slsMultiReceiver', str(DEFAULT_TCP_RX_PORTNO), str(num_mods)] - # in 10.0.0 - #cmd = ['slsMultiReceiver', '-p', str(DEFAULT_TCP_RX_PORTNO), '-n', str(num_mods)] - startProcessInBackground(cmd, fp) - time.sleep(1) - -''' -scope = module =>Once per test file/module -to share expensive setup like startDetectorVirtualServer -''' -@pytest.fixture(scope="module") -def det_config(): - return { - "name": "ctb", - "num_mods": 1 - } - -# autouse is false to pass explictly -@pytest.fixture(scope="module", autouse=False) -def setup_simulator(det_config): - """Fixture to start the detector server once and clean up at the end.""" - fp = sys.stdout - - cleanup(fp) - # server - startDetectorVirtualServer(det_config["name"], det_config["num_mods"], fp) - # receiver - startReceiver(det_config["num_mods"], fp) - # config and basic settings - d = loadConfig(name=det_config["name"], rx_hostname="localhost", settingsdir="", fp=fp, num_mods=det_config["num_mods"]) - loadBasicSettings(name=det_config["name"], d=d, fp=fp) - - yield d # tests run here - - cleanup(fp) - - - -def test_parameters_file(setup_simulator): - d = setup_simulator - Log(LogLevel.INFOBLUE, f'\nRunning test_parameters_file') - - assert isinstance(d, Detector) - - with open("/tmp/params.det", "w") as f: - f.write("frames 2\n") - f.write("fwrite 1\n") - - # this should not throw - d.parameters = "/tmp/params.det" - - assert d.frames == 2 - assert d.fwrite == 1 - - Log(LogLevel.INFOGREEN, f"✅ Test passed. Command: parameters") - - -def test_include_file(setup_simulator): - d = setup_simulator - Log(LogLevel.INFOBLUE, f'\test_include_file test_parameters_file') - - assert isinstance(d, Detector) - - with open("/tmp/params.det", "w") as f: - f.write("frames 3\n") - f.write("fwrite 0\n") - - # this should not throw - d.include = "/tmp/params.det" - - assert d.frames == 3 - assert d.fwrite == 0 - - Log(LogLevel.INFOGREEN, f"✅ Test passed. Command: include") diff --git a/tests/scripts/test_frame_synchronizer.py b/tests/scripts/test_frame_synchronizer.py index 6653c96cb..0f25b02a4 100644 --- a/tests/scripts/test_frame_synchronizer.py +++ b/tests/scripts/test_frame_synchronizer.py @@ -14,44 +14,43 @@ from utils_for_test import ( Log, LogLevel, RuntimeException, - checkIfProcessRunning, - killProcess, cleanup, - cleanSharedmemory, startProcessInBackground, - startProcessInBackgroundWithLogFile, checkLogForErrors, startDetectorVirtualServer, loadConfig, loadBasicSettings, - ParseArguments + ParseArguments, + build_dir, + optional_file ) LOG_PREFIX_FNAME = '/tmp/slsFrameSynchronizer_test' MAIN_LOG_FNAME = LOG_PREFIX_FNAME + '_log.txt' PULL_SOCKET_PREFIX_FNAME = LOG_PREFIX_FNAME + '_pull_socket_' +SYNCHRONIZER_SUFFIX_FNAME = LOG_PREFIX_FNAME + '_synchronizer.txt' -def startFrameSynchronizerPullSocket(name, fp): - fname = PULL_SOCKET_PREFIX_FNAME + name + '.txt' +def startFrameSynchronizerPullSocket(name, fp, quiet_mode=False): cmd = ['python', '-u', 'frameSynchronizerPullSocket.py'] - startProcessInBackgroundWithLogFile(cmd, fp, fname) + fname = PULL_SOCKET_PREFIX_FNAME + name + '.txt' + startProcessInBackground(cmd, fp, fname, quiet_mode) time.sleep(1) checkLogForErrors(fp, fname) -def startFrameSynchronizer(num_mods, fp): - cmd = ['slsFrameSynchronizer', str(DEFAULT_TCP_RX_PORTNO), str(num_mods)] +def startFrameSynchronizer(num_mods, fp, quiet_mode=False): + cmd = [str(build_dir / 'slsFrameSynchronizer'), str(DEFAULT_TCP_RX_PORTNO), str(num_mods)] # in 10.0.0 #cmd = ['slsFrameSynchronizer', '-p', str(DEFAULT_TCP_RX_PORTNO), '-n', str(num_mods)] - startProcessInBackground(cmd, fp) + fname = SYNCHRONIZER_SUFFIX_FNAME + startProcessInBackground(cmd, fp, fname, quiet_mode) time.sleep(1) def acquire(fp, det): - Log(LogLevel.INFO, 'Acquiring') - Log(LogLevel.INFO, 'Acquiring', fp) + Log(LogLevel.INFO, 'Acquiring', fp, True) det.acquire() @@ -60,14 +59,12 @@ def testFramesCaught(name, det, num_frames): if fnum != num_frames: raise RuntimeException(f"{name} caught only {fnum}. Expected {num_frames}") - Log(LogLevel.INFOGREEN, f'Frames caught test passed for {name}') - Log(LogLevel.INFOGREEN, f'Frames caught test passed for {name}', fp) + Log(LogLevel.INFOGREEN, f'Frames caught test passed for {name}', fp, True) def testZmqHeadetTypeCount(name, det, num_mods, num_frames, fp): - Log(LogLevel.INFO, f"Testing Zmq Header type count for {name}") - Log(LogLevel.INFO, f"Testing Zmq Header type count for {name}", fp) + Log(LogLevel.INFO, f"Testing Zmq Header type count for {name}", fp, True) htype_counts = { "header": 0, "series_end": 0, @@ -89,7 +86,6 @@ def testZmqHeadetTypeCount(name, det, num_mods, num_frames, fp): htype_counts[htype] += 1 except json.JSONDecodeError: continue - # test if file contents matches expected counts num_ports_per_module = 1 if name == "gotthard2" else det.numinterfaces total_num_frame_parts = num_ports_per_module * num_mods * num_frames @@ -100,19 +96,17 @@ def testZmqHeadetTypeCount(name, det, num_mods, num_frames, fp): except Exception as e: raise RuntimeException(f'Failed to get zmq header count type. Error:{str(e)}') from e - Log(LogLevel.INFOGREEN, f"Zmq Header type count test passed for {name}") - Log(LogLevel.INFOGREEN, f"Zmq Header type count test passed for {name}", fp) + Log(LogLevel.INFOGREEN, f"Zmq Header type count test passed for {name}", fp, True) def startTestsForAll(args, fp): for server in args.servers: try: - Log(LogLevel.INFOBLUE, f'Synchronizer Tests for {server}') - Log(LogLevel.INFOBLUE, f'Synchronizer Tests for {server}', fp) + Log(LogLevel.INFOBLUE, f'Synchronizer Tests for {server}', fp, True) cleanup(fp) - startDetectorVirtualServer(server, args.num_mods, fp) - startFrameSynchronizerPullSocket(server, fp) - startFrameSynchronizer(args.num_mods, fp) + startDetectorVirtualServer(server, args.num_mods, fp, args.quiet) + startFrameSynchronizerPullSocket(server, fp, args.quiet) + startFrameSynchronizer(args.num_mods, f, args.quiet_modep) d = loadConfig(name=server, rx_hostname=args.rx_hostname, settingsdir=args.settingspath, log_file_fp=fp, num_mods=args.num_mods, num_frames=args.num_frames) loadBasicSettings(name=server, d=d, fp=fp) acquire(fp, d) @@ -128,6 +122,9 @@ def startTestsForAll(args, fp): if __name__ == '__main__': args = ParseArguments(description='Automated tests to test frame synchronizer', default_num_mods=2) + if args.no_log_file: + raise RuntimeException("Cannot run frame synchronizer test without files") + Log(LogLevel.INFOBLUE, '\nLog File: ' + MAIN_LOG_FNAME + '\n') with open(MAIN_LOG_FNAME, 'w') as fp: diff --git a/tests/scripts/test_roi.py b/tests/scripts/test_roi.py deleted file mode 100644 index 17d35c56d..000000000 --- a/tests/scripts/test_roi.py +++ /dev/null @@ -1,82 +0,0 @@ -# SPDX-License-Identifier: LGPL-3.0-or-other -# Copyright (C) 2021 Contributors to the SLS Detector Package -''' -This file is used to start up simulators, receivers and test roi for every detector in many configurations. -''' - -import sys, time -import traceback - -from slsdet import Detector, burstMode -from slsdet.defines import DEFAULT_TCP_RX_PORTNO, DEFAULT_UDP_DST_PORTNO -from datetime import timedelta - - -from utils_for_test import ( - Log, - LogLevel, - RuntimeException, - cleanup, - startProcessInBackground, - startReceiver, - startDetectorVirtualServer, - connectToVirtualServers, - loadBasicSettings, - loadConfig, - runProcessWithLogFile -) - -LOG_PREFIX_FNAME = '/tmp/slsDetectorPackage_virtual_roi_test' -MAIN_LOG_FNAME = LOG_PREFIX_FNAME + '_log.txt' -ROI_TEST_FNAME = LOG_PREFIX_FNAME + '_results_' - -def startTestsForAll(fp): - servers = [ - 'eiger', - 'jungfrau', - 'mythen3', - 'gotthard2', - 'moench', - ] - nmods = 2 - for server in servers: - for ninterfaces in range(1, 2): - if ninterfaces == 2 and server != 'jungfrau' and server != 'moench': - continue - try: - msg = f'Starting Roi Tests for {server}' - if server == 'jungfrau' or server == 'moench': - msg += f' with {ninterfaces} interfaces' - Log(LogLevel.INFOBLUE, msg) - Log(LogLevel.INFOBLUE, msg, fp) - cleanup(fp) - startDetectorVirtualServer(server, nmods, fp) - startReceiver(nmods, fp) - d = loadConfig(name=server, log_file_fp = fp, num_mods=nmods, num_frames=5, num_interfaces=ninterfaces) - loadBasicSettings(name=server, d=d, fp=fp) - - fname = ROI_TEST_FNAME + server + '.txt' - cmd = ['tests', 'rx_roi', '--abort', '-s'] - runProcessWithLogFile('Roi Tests for ' + server, cmd, fp, fname) - Log(LogLevel.INFO, '\n') - except Exception as e: - raise RuntimeException(f'Roi Tests failed') from e - - Log(LogLevel.INFOGREEN, 'Passed all Roi tests for all detectors \n' + str(servers)) - - -if __name__ == '__main__': - Log(LogLevel.INFOBLUE, '\nLog File: ' + MAIN_LOG_FNAME + '\n') - - with open(MAIN_LOG_FNAME, 'w') as fp: - try: - startTestsForAll(fp) - #TODO: check master file as well for both json and hdf5 as well - cleanup(fp) - except Exception as e: - with open(MAIN_LOG_FNAME, 'a') as fp_error: - traceback.print_exc(file=fp_error) - cleanup(fp) - Log(LogLevel.ERROR, f'Tests Failed.') - - diff --git a/tests/scripts/test_simulators.py b/tests/scripts/test_simulators.py index 7aab1d958..a7f211d12 100644 --- a/tests/scripts/test_simulators.py +++ b/tests/scripts/test_simulators.py @@ -2,91 +2,98 @@ # Copyright (C) 2021 Contributors to the SLS Detector Package ''' This file is used to start up simulators, receivers and run all the tests on them and finally kill the simulators and receivers. + +It can be used to run all catch tests with tag [.detectorintegration]. + +Pass --tests to run specific tests only or --tests to run all tests with that specific tag. + +Pass --servers ... to run tests only for specific detector servers. ''' import argparse import sys, subprocess, time, traceback +from contextlib import contextmanager from slsdet import Detector from slsdet.defines import DEFAULT_TCP_RX_PORTNO + from utils_for_test import ( Log, LogLevel, RuntimeException, - checkIfProcessRunning, - killProcess, cleanup, - cleanSharedmemory, - startProcessInBackground, - runProcessWithLogFile, + runProcess, + startReceiver, + runProcess, startDetectorVirtualServer, loadConfig, loadBasicSettings, - ParseArguments + ParseArguments, + build_dir, + optional_file ) - LOG_PREFIX_FNAME = '/tmp/slsDetectorPackage_virtual_test' MAIN_LOG_FNAME = LOG_PREFIX_FNAME + '_log.txt' GENERAL_TESTS_LOG_FNAME = LOG_PREFIX_FNAME + '_results_general.txt' -CMD_TEST_LOG_PREFIX_FNAME = LOG_PREFIX_FNAME + '_results_cmd_' - - -def startReceiver(num_mods, fp): - if num_mods == 1: - cmd = ['slsReceiver'] - else: - cmd = ['slsMultiReceiver', str(DEFAULT_TCP_RX_PORTNO), str(num_mods)] - # in 10.0.0 - #cmd = ['slsMultiReceiver', '-p', str(DEFAULT_TCP_RX_PORTNO), '-n', str(num_mods)] - startProcessInBackground(cmd, fp) - time.sleep(1) def startGeneralTests(fp): fname = GENERAL_TESTS_LOG_FNAME - cmd = ['tests', '--abort', '-s'] + cmd = [str(build_dir / 'tests'), '--abort', '-s'] try: cleanup(fp) - runProcessWithLogFile('General Tests', cmd, fp, fname) + runProcess('General Tests', cmd, fp, fname) except Exception as e: raise RuntimeException(f'General tests failed.') from e +def startTestsForAll(args, fp): + + fname_template = LOG_PREFIX_FNAME + "_{}_{}.txt" + + + test_filter = args.tests + cmd = [str(build_dir / 'tests'), '--abort', test_filter, '-s'] + + num_mods = args.num_mods -def startCmdTestsForAll(args, fp): for server in args.servers: - try: - num_mods = 2 if server == 'eiger' else 1 - fname = CMD_TEST_LOG_PREFIX_FNAME + server + '.txt' - cmd = ['tests', '--abort', args.markers, '-s'] + for curMods in range(1, num_mods + 1): + if curMods == 2 and server in ['ctb', 'xilinx_ctb']: + continue + for ninterfaces in [1,2]: # always test both + if ninterfaces == 2 and server != 'jungfrau' and server != 'moench': + continue - Log(LogLevel.INFOBLUE, f'Starting Cmd Tests for {server}') - cleanup(fp) - startDetectorVirtualServer(name=server, num_mods=num_mods, fp=fp) - startReceiver(num_mods, fp) - d = loadConfig(name=server, rx_hostname=args.rx_hostname, settingsdir=args.settingspath, log_file_fp=fp, num_mods=num_mods) - loadBasicSettings(name=server, d=d, fp=fp) - runProcessWithLogFile('Cmd Tests (' + args.markers + ') for ' + server, cmd, fp, fname) - except Exception as e: - raise RuntimeException(f'Cmd Tests failed for {server}.') from e + if server == "eiger": + curMods *= 2 # top and bottom half module + try: + fname = fname_template.format(args.tests, server) if not args.no_log_file else None + + Log(LogLevel.INFOBLUE, f'Starting {args.tests} Tests for {server}, {ninterfaces} interfaces, {curMods} modules', fp, True) + cleanup(fp) + startDetectorVirtualServer(name=server, num_mods=curMods, fp=fp, no_log_file=args.no_log_file, quiet_mode=args.quiet) + startReceiver(curMods, fp, args.no_log_file, args.quiet) + d = loadConfig(name=server, rx_hostname=args.rx_hostname, settingsdir=args.settingspath, log_file_fp=fp, num_mods=curMods, num_interfaces=ninterfaces) + loadBasicSettings(name=server, d=d, fp=fp) + runProcess('Tests (' + args.tests + ') for ' + server, cmd, fp, fname, args.quiet) + except Exception as e: + raise RuntimeException(f'Tests (' + args.tests + ') failed for ' + server + '.') from e Log(LogLevel.INFOGREEN, 'Passed all tests for all detectors \n' + str(args.servers)) if __name__ == '__main__': - args = ParseArguments(description='Automated tests with the virtual detector servers', default_num_mods=1, markers=True, general_tests_option=True) - if args.num_mods > 1: - raise RuntimeException(f'Cannot support multiple modules at the moment (except Eiger).') + args = ParseArguments(description='Automated tests with the virtual detector servers', default_num_mods=2, specific_tests=True, general_tests_option=True) - Log(LogLevel.INFOBLUE, '\nLog File: ' + MAIN_LOG_FNAME + '\n') - - with open(MAIN_LOG_FNAME, 'w') as fp: + with optional_file(MAIN_LOG_FNAME if not args.no_log_file else None, 'w', args.quiet) as fp: try: if args.general_tests: startGeneralTests(fp) - startCmdTestsForAll(args, fp) + startTestsForAll(args, fp) cleanup(fp) except Exception as e: - with open(MAIN_LOG_FNAME, 'a') as fp_error: - traceback.print_exc(file=fp_error) + traceback.print_exc(file=fp) cleanup(fp) Log(LogLevel.ERROR, f'Tests Failed.') + raise e + diff --git a/tests/scripts/utils_for_test.py b/tests/scripts/utils_for_test.py index bff86f886..66c43fb38 100644 --- a/tests/scripts/utils_for_test.py +++ b/tests/scripts/utils_for_test.py @@ -3,19 +3,24 @@ ''' This file is used for common utils used for integration tests between simulators and receivers. ''' - +import os from pathlib import Path import sys, subprocess, time, argparse from enum import Enum from colorama import Fore, Style, init from datetime import timedelta +from contextlib import contextmanager from slsdet import Detector, Ctb, detectorSettings, burstMode from slsdet.defines import DEFAULT_TCP_RX_PORTNO, DEFAULT_UDP_DST_PORTNO SERVER_START_PORTNO=1900 +LOG_PREFIX_FNAME = "/tmp/slsDetectorPackage_" + init(autoreset=True) +build_dir = Path(__file__).resolve().parents[2] / "build" / "bin" + class LogLevel(Enum): INFO = 0 INFORED = 1 @@ -44,10 +49,13 @@ LOG_COLORS = { } -def Log(level: LogLevel, message: str, stream=sys.stdout): +def Log(level: LogLevel, message: str, stream=sys.stdout, both=False): color = LOG_COLORS.get(level, Fore.WHITE) label = LOG_LABELS.get(level, "") print(f"{color}{label}{message}{Style.RESET_ALL}", file=stream, flush=True) + if both and stream != sys.stdout: + print(f"{color}{label}{message}{Style.RESET_ALL}", file=sys.stdout, flush=True) + class RuntimeException (Exception): @@ -56,9 +64,27 @@ class RuntimeException (Exception): super().__init__(message) +@contextmanager +def optional_file(file_path=None, mode='w', quiet_mode=False): + if file_path: + f = open(file_path, mode) + try: + yield f + finally: + f.close() + else: + if quiet_mode: + f = open(os.devnull, mode) + try: + yield f + finally: + f.close() + else: + yield sys.stdout + + def checkIfProcessRunning(processName): - cmd = f"pgrep -f {processName}" - res = subprocess.getoutput(cmd) + res = subprocess.getoutput(f"pgrep -f {processName}") return res.strip().splitlines() @@ -80,18 +106,13 @@ def killProcess(name, fp): def cleanSharedmemory(fp): Log(LogLevel.INFO, 'Cleaning up shared memory', fp) try: - p = subprocess.run(['sls_detector_get', 'free'], stdout=fp, stderr=fp, check = False) - except FileNotFoundError: - # Binary not available (e.g. on CI) → ignore - Log(LogLevel.INFO, 'sls_detector_get not found, skipping shared memory cleanup', fp) + p = subprocess.run([build_dir / 'sls_detector_get', 'free'], stdout=fp, stderr=fp) except Exception as e: - # Any other cleanup failure should NEVER fail tests - Log(LogLevel.WARN, f'Ignoring shared memory cleanup error: {e}', fp) + raise RuntimeException(f'Could not free shared memory: {str(e)}') def cleanup(fp): - Log(LogLevel.INFO, 'Cleaning up') - Log(LogLevel.INFO, 'Cleaning up', fp) + Log(LogLevel.INFO, 'Cleaning up', fp, True) killProcess('DetectorServer_virtual', fp) killProcess('slsReceiver', fp) killProcess('slsMultiReceiver', fp) @@ -100,20 +121,15 @@ def cleanup(fp): cleanSharedmemory(fp) -def startProcessInBackground(cmd, fp): - Log(LogLevel.INFO, 'Starting up ' + ' '.join(cmd)) - Log(LogLevel.INFO, 'Starting up ' + ' '.join(cmd), fp) - try: - p = subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, restore_signals=False) - except Exception as e: - raise RuntimeException(f'Failed to start {cmd}:{str(e)}') from e +def startProcessInBackground(cmd, fp, log_file_name: str, quiet_mode=False): + info_text = 'Starting up ' + ' '.join(cmd) + if log_file_name: + info_text += '. Log: ' + log_file_name + Log(LogLevel.INFO, f'{info_text}', fp, True) -def startProcessInBackgroundWithLogFile(cmd, fp, log_file_name: str): - Log(LogLevel.INFOBLUE, 'Starting up ' + ' '.join(cmd) + '. Log: ' + log_file_name) - Log(LogLevel.INFOBLUE, 'Starting up ' + ' '.join(cmd) + '. Log: ' + log_file_name, fp) try: - with open(log_file_name, 'w') as log_fp: + with optional_file(log_file_name, 'w', quiet_mode) as log_fp: subprocess.Popen(cmd, stdout=log_fp, stderr=log_fp, text=True) except Exception as e: raise RuntimeException(f'Failed to start {cmd}:{str(e)}') from e @@ -124,8 +140,7 @@ def checkLogForErrors(fp, log_file_path: str): with open(log_file_path, 'r') as log_file: for line in log_file: if 'Error' in line: - Log(LogLevel.ERROR, f"Error found in log: {line.strip()}") - Log(LogLevel.ERROR, f"Error found in log: {line.strip()}", fp) + Log(LogLevel.ERROR, f"Error found in log: {line.strip()}", fp, True) raise RuntimeException("Error found in log file") except FileNotFoundError: print(f"Log file not found: {log_file_path}") @@ -135,33 +150,92 @@ def checkLogForErrors(fp, log_file_path: str): raise -def runProcessWithLogFile(name, cmd, fp, log_file_name): - Log(LogLevel.INFOBLUE, 'Running ' + name + '. Log: ' + log_file_name) - Log(LogLevel.INFOBLUE, 'Running ' + name + '. Log: ' + log_file_name, fp) - Log(LogLevel.INFOBLUE, 'Cmd: ' + ' '.join(cmd), fp) +def checkLogForErrorsOrSummary(fp, lines, source_name=""): + failed = False # if it found "failed" or "FAILED" in file + failed_msg = "" + printing_error = False # print every line in file after failure + printing_summary = False # print summary if no failure + + + for line in lines: + line_stripped = line.rstrip() + + # Detect failure (case-insensitive) + if not failed and (": FAILED:" in line or " failed\nassertions" in line): + failed = True + failed_msg = line_stripped + printing_error = True + Log(LogLevel.ERROR, line_stripped, fp) + if source_name: + Log(LogLevel.ERROR, f"Error log from file: {source_name}") + Log(LogLevel.ERROR, "="*79) + + # After failure, log everything as ERROR + if printing_error: + print(f"{line_stripped}") + continue + + # Summary delimiter + if line_stripped.startswith("====="): + printing_summary = True + + # No failure - print summary lines + if printing_summary: + print(f"{line_stripped}") + + + if failed: + Log(LogLevel.ERROR, "="*79) + raise RuntimeException(f'Test failed: {failed_msg}') + else: + print("="*79) + + + +def runProcess(name, cmd, fp, log_file_name = None, quiet_mode=False): + + info_text = 'Running ' + name + '.' + if log_file_name: + info_text += ' Log: ' + log_file_name + Log(LogLevel.INFOBLUE, info_text, fp, True) + Log(LogLevel.INFOBLUE, 'Cmd: ' + ' '.join(cmd), fp, True) + + error_log = None + try: - with open(log_file_name, 'w') as log_fp: - subprocess.run(cmd, stdout=log_fp, stderr=log_fp, check=True, text=True) + if log_file_name: + with optional_file(log_file_name, 'w', quiet_mode) as log_fp: + subprocess.run(cmd, stdout=log_fp, stderr=log_fp, check=True, text=True) + else: + capture = subprocess.run(cmd, check=True, text=True, capture_output=True) + captured_log = capture.stdout.splitlines() + except subprocess.CalledProcessError as e: - pass + print("error: ", str(e)) + captured_log = e.stdout.splitlines() + pass except Exception as e: + print("something else failed") Log(LogLevel.ERROR, f'Failed to run {name}:{str(e)}', fp) raise RuntimeException(f'Failed to run {name}:{str(e)}') - with open (log_file_name, 'r') as f: - for line in f: - if "FAILED" in line: - raise RuntimeException(f'{line}') + if log_file_name: + with optional_file(log_file_name, 'r') as log_fp: + checkLogForErrorsOrSummary(fp, log_fp, log_file_name) + else: + checkLogForErrorsOrSummary(fp, captured_log) - Log(LogLevel.INFOGREEN, name + ' successful!\n') - Log(LogLevel.INFOGREEN, name + ' successful!\n', fp) + Log(LogLevel.INFOGREEN, name + ' successful!\n', fp, True) -def startDetectorVirtualServer(name :str, num_mods, fp): +def startDetectorVirtualServer(name :str, num_mods, fp, no_log_file = False, quiet_mode=False): for i in range(num_mods): port_no = SERVER_START_PORTNO + (i * 2) - cmd = [name + 'DetectorServer_virtual', '-p', str(port_no)] - startProcessInBackgroundWithLogFile(cmd, fp, "/tmp/virtual_det_" + name + "_" + str(i) + ".txt") + cmd = [str(build_dir / (name + 'DetectorServer_virtual')), '-p', str(port_no)] + fname = LOG_PREFIX_FNAME + "virtual_det_" + name + "_" + str(SERVER_START_PORTNO) + ".txt" + if no_log_file: + fname = None + startProcessInBackground(cmd, fp, fname, quiet_mode) match name: case 'jungfrau': time.sleep(7) @@ -196,20 +270,23 @@ def connectToVirtualServers(name, num_mods, ctb_object=False): return d -def startReceiver(num_mods, fp): +def startReceiver(num_mods, fp, no_log_file = False, quiet_mode=False): if num_mods == 1: - cmd = ['slsReceiver'] + cmd = [str(build_dir / 'slsReceiver')] + fname = LOG_PREFIX_FNAME + "slsReceiver.txt" else: - cmd = ['slsMultiReceiver', str(DEFAULT_TCP_RX_PORTNO), str(num_mods)] + cmd = [str(build_dir / 'slsMultiReceiver'), str(DEFAULT_TCP_RX_PORTNO), str(num_mods)] + fname = LOG_PREFIX_FNAME + "slsMultiReceiver.txt" # in 10.0.0 #cmd = ['slsMultiReceiver', '-p', str(DEFAULT_TCP_RX_PORTNO), '-n', str(num_mods)] - startProcessInBackground(cmd, fp) + + if no_log_file: + fname = None + startProcessInBackground(cmd, fp, fname, quiet_mode) time.sleep(1) - def loadConfig(name, rx_hostname = 'localhost', settingsdir = None, log_file_fp = None, num_mods = 1, num_frames = 1, num_interfaces = 1): - Log(LogLevel.INFO, 'Loading config') - Log(LogLevel.INFO, 'Loading config', log_file_fp) + Log(LogLevel.INFO, 'Loading config', log_file_fp, True) try: d = connectToVirtualServers(name, num_mods) @@ -217,17 +294,15 @@ def loadConfig(name, rx_hostname = 'localhost', settingsdir = None, log_file_fp d.numinterfaces = num_interfaces d.udp_dstport = DEFAULT_UDP_DST_PORTNO - if name == 'eiger' or name == 'jungfrau' or name == 'moench': + if name == 'eiger' or num_interfaces == 2: d.udp_dstport2 = DEFAULT_UDP_DST_PORTNO + 1 d.rx_hostname = rx_hostname - d.udp_dstip = 'auto' - if name != "eiger": d.udp_srcip = 'auto' - if name == "jungfrau" or name == "moench": + if num_interfaces == 2: d.udp_dstip2 = 'auto' if name == "jungfrau" or name == "moench" or name == "xilinx_ctb": @@ -241,6 +316,7 @@ def loadConfig(name, rx_hostname = 'localhost', settingsdir = None, log_file_fp d.trimen = [4500, 5400, 6400] if name == 'eiger' else [4000, 6000, 8000, 12000] d.setThresholdEnergy(4500, detectorSettings.STANDARD) + d.frames = num_frames except Exception as e: @@ -248,10 +324,11 @@ def loadConfig(name, rx_hostname = 'localhost', settingsdir = None, log_file_fp return d + + # for easy acquire def loadBasicSettings(name, d, fp): - Log(LogLevel.INFO, 'Loading basic settings for ' + name) - Log(LogLevel.INFO, 'Loading basic settings for ' + name, fp) + Log(LogLevel.INFO, 'Loading basic settings for ' + name, fp, True) try: # basic settings for easy acquire if name == "jungfrau": @@ -278,7 +355,7 @@ def loadBasicSettings(name, d, fp): except Exception as e: raise RuntimeException(f'Could not load config for {name}. Error: {str(e)}') from e -def ParseArguments(description, default_num_mods=1, markers=False, general_tests_option=False): +def ParseArguments(description, default_num_mods=2, specific_tests=False, general_tests_option=False): parser = argparse.ArgumentParser(description) default_settings_path = Path(__file__).resolve().parents[2] / "settingsdir" @@ -293,16 +370,21 @@ def ParseArguments(description, default_num_mods=1, markers=False, general_tests help='Number of frames to test with') parser.add_argument('-s', '--servers', nargs='*', help='Detector servers to run') - if markers: - parser.add_argument('-m', '--markers', nargs='?', default ='[.cmdcall]', - help = 'Markers to use for cmd tests, default: [.cmdcall]') - + parser.add_argument('-nlf', '--no-log-file', action='store_true', + help='Dont write output to log file') + parser.add_argument('-q', '--quiet', action='store_true', + help='Dont write to stdout when possible.') + if specific_tests: + parser.add_argument('-t', '--tests', nargs='?', default ='[.detectorintegration]', + help = 'Test markers or specific test name to use for tests, default: [.detectorintegration]') + if general_tests_option: - parser.add_argument('-g', '--general_tests', action='store_true', + parser.add_argument('-g', '--general-tests', action='store_true', help = 'Enable general tests (no value needed)') args = parser.parse_args() + # Set default server list if not provided if args.servers is None: args.servers = [ @@ -323,8 +405,19 @@ def ParseArguments(description, default_num_mods=1, markers=False, general_tests f"num_mods: '{args.num_mods}'\n" f"num_frames: '{args.num_frames}'" ) - if markers: - msg += f"\nmarkers: '{args.markers}'" + + if args.no_log_file: + msg += f"\nLog File: Disabled" + else: + msg += f"\nLog File: Enabled" + + if args.quiet: + msg += f"\nQuiet mode: Enabled" + else: + msg += f"\nQuiet mode: Disabled" + + if specific_tests: + msg += f"\ntests: '{args.tests}'" if general_tests_option: msg += f"\ngeneral_tests: '{args.general_tests}'" From fb58fefe57c9441f619dee0dcb08caa50f59a709 Mon Sep 17 00:00:00 2001 From: Martin Mueller Date: Thu, 5 Feb 2026 15:11:31 +0100 Subject: [PATCH 6/7] added RegDefs for 1G support on XCTB --- .../xilinx_ctbDetectorServer/RegisterDefs.h | 50 ++++++++++++++++--- 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/RegisterDefs.h b/slsDetectorServers/xilinx_ctbDetectorServer/RegisterDefs.h index 438355c46..d0a6e8bdb 100644 --- a/slsDetectorServers/xilinx_ctbDetectorServer/RegisterDefs.h +++ b/slsDetectorServers/xilinx_ctbDetectorServer/RegisterDefs.h @@ -131,7 +131,7 @@ /* REG no_Samples_X_Reg */ #define NO_SAMPLES_X_REG 0xa00cUL -#define NO_SAMPLES_X_MSK 0x7FFFFFFFUL +#define NO_SAMPLES_X_MSK 0xffffUL #define NO_SAMPLES_X_OFST 0 /* REG count_Frames_From_Reg_1 */ @@ -150,6 +150,39 @@ #define LOCAL_FRAME_NUMBER_REG_2 0xa01cUL #define LOCAL_FRAME_NUMBER_REG_2_PRESET 0x0UL +/* REG X0_FIFO_read */ +#define X0_FIFO_READ 0xa020UL +#define X0_FIFO_READ_PRESET 0x0UL + +/* REG X1_FIFO_read */ +#define X1_FIFO_READ 0xa024UL +#define X1_FIFO_READ_PRESET 0x0UL + +/* REG X2_FIFO_read */ +#define X2_FIFO_READ 0xa028UL +#define X2_FIFO_READ_PRESET 0x0UL + +/* REG X3_FIFO_read */ +#define X3_FIFO_READ 0xa02cUL +#define X3_FIFO_READ_PRESET 0x0UL + +/* REG D_FIFO_read */ +#define D_FIFO_READ 0xa030UL +#define D_FIFO_READ_PRESET 0x0UL + +/* REG A_FIFO_select */ +#define A_FIFO_SELECT 0xa034UL +#define A_FIFO_SELECT_PRESET 0x0UL + +/* REG A_FIFO_read */ +#define A_FIFO_READ 0xa038UL +#define A_FIFO_READ_PRESET 0x0UL + +/* REG enable_1G */ +#define ENABLE_1G 0xa03cUL +#define ENABLE_1G_MSK 0x1UL +#define ENABLE_1G_OFST 0 + /* REG TransceiverRXCTRL0Reg1 */ #define TRANSCEIVERRXCTRL0REG1 0xc100UL #define TRANSCEIVERRXCTRL0REG1_PRESET 0x0UL @@ -301,21 +334,21 @@ #define RXDATACH3_OFST 0 /* REG PktPacketLengthReg */ -#define PKTPACKETLENGTHREG 0xa020UL +#define PKTPACKETLENGTHREG 0xa100UL #define PACKETLENGTH1G_MSK 0xffffUL #define PACKETLENGTH1G_OFST 0 #define PACKETLENGTH10G_MSK 0xffff0000UL #define PACKETLENGTH10G_OFST 16 /* REG PktNoPacketsReg */ -#define PKTNOPACKETSREG 0xa024UL +#define PKTNOPACKETSREG 0xa104UL #define NOPACKETS1G_MSK 0x3fUL #define NOPACKETS1G_OFST 0 #define NOPACKETS10G_MSK 0x3f0000UL #define NOPACKETS10G_OFST 16 /* REG PktCtrlReg */ -#define PKTCTRLREG 0xa028UL +#define PKTCTRLREG 0xa108UL #define NOSERVERS_MSK 0x3fUL #define NOSERVERS_OFST 0 #define SERVERSTART_MSK 0x1f00UL @@ -325,14 +358,14 @@ #define ETHINTERF_OFST 16 /* REG PktCoordReg1 */ -#define PKTCOORDREG1 0xa02cUL +#define PKTCOORDREG1 0xa10cUL #define COORDX_MSK 0xffffUL #define COORDX_OFST 0 #define COORDY_MSK 0xffff0000UL #define COORDY_OFST 16 /* REG PktCoordReg2 */ -#define PKTCOORDREG2 0xa030UL +#define PKTCOORDREG2 0xa110UL #define COORDZ_MSK 0xffffUL #define COORDZ_OFST 0 @@ -639,6 +672,11 @@ #define MISO_SELECT 0xc018UL #define MISO_SELECT_PRESET 0x0UL +/* REG OBUFDTS_ena */ +#define OBUFDTS_ENA 0xc01cUL +#define OBUFDTS_ENA_MSK 0xffffUL +#define OBUFDTS_ENA_OFST 0 + /* REG A_FIFO_Overflow_Status_Reg */ #define A_FIFO_OVERFLOW_STATUS_REG 0x9000UL #define A_FIFO_OVERFLOW_STATUS_REG_PRESET 0x0UL From 0992c7ae4c904b68c9034104b206e35917e61989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Fr=C3=B6jdh?= Date: Thu, 5 Feb 2026 17:20:47 +0100 Subject: [PATCH 7/7] Read and write SPI for Xilinx CTB (#1381) -readSpi and writeSpi in C++ and Python API --- CMakeLists.txt | 6 + python/src/detector.cpp | 12 + .../include/slsDetectorServer_funcs.h | 2 + .../src/slsDetectorServer_funcs.c | 309 ++++++++++++++++++ .../slsDetectorFunctionList.c | 2 +- .../slsDetectorFunctionList.h | 2 +- slsDetectorSoftware/include/sls/Detector.h | 6 + slsDetectorSoftware/src/Detector.cpp | 15 + slsDetectorSoftware/src/Module.cpp | 41 +++ slsDetectorSoftware/src/Module.h | 4 + .../include/sls/sls_detector_funcs.h | 4 + 11 files changed, 401 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b4ea785fe..daffa4b67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -199,6 +199,7 @@ option(SLS_USE_GUI "GUI" OFF) option(SLS_USE_SIMULATOR "Simulator" OFF) option(SLS_USE_TESTS "TESTS" OFF) option(SLS_USE_SANITIZER "Sanitizers for debugging" OFF) +option(SLS_USE_SANITIZER_IN_SERVER "Sanitizers for debugging" OFF) option(SLS_USE_PYTHON "Python bindings" OFF) option(SLS_INSTALL_PYTHONEXT "Install the python extension in the install tree under CMAKE_INSTALL_PREFIX/python/" OFF) option(SLS_USE_CTBGUI "ctb GUI" OFF) @@ -346,6 +347,11 @@ if (NOT TARGET slsProjectCSettings) target_link_libraries(slsProjectCSettings INTERFACE Threads::Threads ) + + if(SLS_USE_SANITIZER_IN_SERVER) + target_compile_options(slsProjectCSettings INTERFACE -fsanitize=address,undefined -fno-omit-frame-pointer) + target_link_libraries(slsProjectCSettings INTERFACE -fsanitize=address,undefined) + endif() endif() diff --git a/python/src/detector.cpp b/python/src/detector.cpp index 070dac493..d3e6be8b3 100644 --- a/python/src/detector.cpp +++ b/python/src/detector.cpp @@ -2198,5 +2198,17 @@ void init_det(py::module &m) { (Result(Detector::*)(sls::Positions) const) & Detector::getMeasurementTime, py::arg() = Positions{}); + CppDetectorApi.def("readSpi", + (Result>(Detector::*)( + int, int, int, sls::Positions) const) & + Detector::readSpi, + py::arg(), py::arg(), py::arg(), + py::arg() = Positions{}); + CppDetectorApi.def( + "writeSpi", + (void (Detector::*)(int, int, const std::vector &, + sls::Positions)) & + Detector::writeSpi, + py::arg(), py::arg(), py::arg(), py::arg() = Positions{}); ; } diff --git a/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h b/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h index 2c7e60ce9..e43148b83 100644 --- a/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h +++ b/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h @@ -338,3 +338,5 @@ int get_collection_mode(int); int set_collection_mode(int); int get_pattern_wait_interval(int); int set_pattern_wait_interval(int); +int spi_read(int); +int spi_write(int); diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 157daa377..174af28a8 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -7,6 +7,10 @@ #include "sls/sls_detector_funcs.h" #include "slsDetectorFunctionList.h" +#include +#include +#include + #if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD) || \ defined(MYTHEN3D) #include "Pattern.h" @@ -19,6 +23,8 @@ #include #include +#include + // defined in the detector specific Makefile #ifdef EIGERD const enum detectorType myDetectorType = EIGER; @@ -515,6 +521,8 @@ void function_table() { flist[F_SET_COLLECTION_MODE] = &set_collection_mode; flist[F_GET_PATTERN_WAIT_INTERVAL] = &get_pattern_wait_interval; flist[F_SET_PATTERN_WAIT_INTERVAL] = &set_pattern_wait_interval; + flist[F_SPI_READ] = &spi_read; + flist[F_SPI_WRITE] = &spi_write; // check if (NUM_DET_FUNCTIONS >= RECEIVER_ENUM_START) { LOG(logERROR, ("The last detector function enum has reached its " @@ -11095,4 +11103,305 @@ int set_pattern_wait_interval(int file_des) { #endif return Server_SendResult(file_des, INT64, NULL, 0); +} + +/** + * Non destructive read from SPI register. Read n_bytes by shifting in dummy + * data while keeping csn 0 after the operation. Shift the read out data back + * in to restore the register. + */ + +int spi_read(int file_des){ +#if !defined(XILINX_CHIPTESTBOARDD) + functionNotImplemented(); + return sendError(file_des); +#endif + + int chip_id = 0; + if (receiveData(file_des, &chip_id, sizeof(chip_id), INT32) < 0){ + return printSocketReadError(); + } + if(chip_id < 0 || chip_id > 15){ + sprintf(mess, "Invalid chip_id %d. Must be 0-15\n", chip_id); + return sendError(file_des); + } + + int register_id = 0; + if (receiveData(file_des, ®ister_id, sizeof(register_id), INT32) < 0){ + return printSocketReadError(); + } + if(register_id < 0 || register_id > 15){ + sprintf(mess, "Invalid register_id %d. Must be 0-15\n", register_id); + return sendError(file_des); + } + + int n_bytes = 0; + if (receiveData(file_des, &n_bytes, sizeof(n_bytes), INT32) < 0){ + return printSocketReadError(); + } + if(n_bytes < 1 ){ + sprintf(mess, "Invalid n_bytes %d. Must ask for a read of at least 1 byte\n", n_bytes); + return sendError(file_des); + } + + LOG(logINFO, ("SPI Read Requested: chip_id=%d, register_id=%d, n_bytes=%d\n", + chip_id, register_id, n_bytes)); + + +#ifdef VIRTUAL + // For the virtual detector we create a fake register to read from + // and fill it with 0,2,4,6,... This way we can check that copying + // of the data works as expected + uint8_t *fake_register = malloc(n_bytes); + if(fake_register == NULL){ + LOG(logERROR, ("Could not allocate memory for fake register\n")); + exit(EXIT_FAILURE); + } + for (int i = 0; i < n_bytes; i++) { + fake_register[i] = (uint8_t)( (i*2) % 256 ); + } +#else + int spifd = open("/dev/spidev2.0", O_RDWR); + LOG(logINFO, ("SPI Read: opened spidev2.0 with fd=%d\n", spifd)); + if(spifd < 0){ + sprintf(mess, "Could not open /dev/spidev2.0\n"); + return sendError(file_des); + } +#endif + + // Allocate dummy data to shif in, we keep a copy of this + // to double check that we access a register of the correct size + uint8_t *dummy_data = malloc(n_bytes); + if(dummy_data == NULL){ + LOG(logERROR, ("Could not allocate memory for dummy data\n")); + exit(EXIT_FAILURE); + } + for(int i=0; i 15){ + ret = FAIL; + sprintf(mess, "Invalid chip_id %d. Must be 0-15\n", chip_id); + LOG(logERROR, (mess)); + return Server_SendResult(file_des, INT32, NULL, 0); + } + + int register_id = 0; + if (receiveData(file_des, ®ister_id, sizeof(register_id), INT32) < 0){ + return printSocketReadError(); + } + if(register_id < 0 || register_id > 15){ + ret = FAIL; + sprintf(mess, "Invalid register_id %d. Must be 0-15\n", register_id); + LOG(logERROR, (mess)); + return Server_SendResult(file_des, INT32, NULL, 0); + } + + int n_bytes = 0; + if (receiveData(file_des, &n_bytes, sizeof(n_bytes), INT32) < 0){ + return printSocketReadError(); + } + if(n_bytes < 1 ){ + sprintf(mess, "Invalid n_bytes %d. Must ask for a write of at least 1 byte\n", n_bytes); + return sendError(file_des); + } + + LOG(logINFO, ("SPI Write Requested: chip_id=%d, register_id=%d, n_bytes=%d\n", + chip_id, register_id, n_bytes)); + + uint8_t *data = malloc(n_bytes); + if(data == NULL){ + LOG(logERROR, ("Could not allocate memory for SPI write data\n")); + exit(EXIT_FAILURE); + } + memset(data, 0, n_bytes); + if (receiveData(file_des, data, n_bytes, OTHER) < 0){ + free(data); + return printSocketReadError(); + } + + uint8_t* local_tx = malloc(n_bytes+1); + if(local_tx == NULL){ + LOG(logERROR, ("Could not allocate memory for local_tx\n")); + exit(EXIT_FAILURE); + } + uint8_t* local_rx = malloc(n_bytes+1); + if(local_rx == NULL){ + LOG(logERROR, ("Could not allocate memory for local_rx\n")); + exit(EXIT_FAILURE); + } + + struct spi_ioc_transfer send_cmd[1]; + memset(send_cmd, 0, sizeof(send_cmd)); + send_cmd[0].len = n_bytes+1; + send_cmd[0].tx_buf = (unsigned long) local_tx; + send_cmd[0].rx_buf = (unsigned long) local_rx; + + // 0 - Normal operation, 1 - CSn remains zero after operation + send_cmd[0].cs_change = 0; + local_tx[0] = ((chip_id & 0xF) << 4) | (register_id & 0xF); + for (int i=0; i < n_bytes; i++) + local_tx[i+1] = data[i]; + +#ifdef VIRTUAL + // For the virtual detector we have nothing to do +#else + int spifd = open("/dev/spidev2.0", O_RDWR); + LOG(logINFO, ("SPI Read: opened spidev2.0 with fd=%d\n", spifd)); + if(spifd < 0){ + free(data); + free(local_tx); + free(local_rx); + sprintf(mess, "Could not open /dev/spidev2.0\n"); + return sendError(file_des); + } + if(ioctl(spifd, SPI_IOC_MESSAGE(1), &send_cmd)<0){ + close(spifd); + free(data); + free(local_tx); + free(local_rx); + sprintf(mess, "SPI write failed with %d:%s\n", errno, strerror(errno)); + return sendError(file_des); + } + close(spifd); +#endif + + free(data); + free(local_tx); + free(local_rx); + + ret = OK; + LOG(logDEBUG1, ("SPI Write Complete\n")); + return Server_SendResult(file_des, INT32, NULL, 0); } \ No newline at end of file diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c index 7bed0d759..4c98ea216 100644 --- a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c @@ -1884,4 +1884,4 @@ int getFrequency(enum CLKINDEX ind) { clkFrequency[ind] = XILINX_PLL_getFrequency(ind); #endif return clkFrequency[ind]; -} \ No newline at end of file +} diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.h index 1b584109f..8d76bf57b 100644 --- a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.h +++ b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.h @@ -171,4 +171,4 @@ int getTotalNumberOfChannels(); void getNumberOfChannels(int *nchanx, int *nchany); int getNumberOfChips(); int getNumberOfDACs(); -int getNumberOfChannelsPerChip(); \ No newline at end of file +int getNumberOfChannelsPerChip(); diff --git a/slsDetectorSoftware/include/sls/Detector.h b/slsDetectorSoftware/include/sls/Detector.h index a200c99c7..958e64dc5 100644 --- a/slsDetectorSoftware/include/sls/Detector.h +++ b/slsDetectorSoftware/include/sls/Detector.h @@ -2247,6 +2247,12 @@ class Detector { ///@} + Result> readSpi(int chip_id, int register_id, + int n_bytes, Positions pos = {}) const; + + void writeSpi(int chip_id, int register_id, + const std::vector &data, Positions pos = {}); + private: std::vector getValidPortNumbers(uint16_t start_port); void updateRxRateCorrections(); diff --git a/slsDetectorSoftware/src/Detector.cpp b/slsDetectorSoftware/src/Detector.cpp index 30d387f92..1960fd858 100644 --- a/slsDetectorSoftware/src/Detector.cpp +++ b/slsDetectorSoftware/src/Detector.cpp @@ -2954,4 +2954,19 @@ std::vector Detector::getValidPortNumbers(uint16_t start_port) { return res; } +Result> Detector::readSpi(int chip_id, int register_id, + int n_bytes, + Positions pos) const { + return pimpl->Parallel(&Module::readSpi, pos, chip_id, register_id, + n_bytes); +} + +void Detector::writeSpi(int chip_id, int register_id, + const std::vector &data, Positions pos){ + pimpl->Parallel(&Module::writeSpi, pos, chip_id, register_id, data); + } + + + + } // namespace sls diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp index 6167f585d..b0dc43211 100644 --- a/slsDetectorSoftware/src/Module.cpp +++ b/slsDetectorSoftware/src/Module.cpp @@ -4074,4 +4074,45 @@ void Module::simulatingActivityinDetector(const std::string &functionType, } printf("\n"); } + +std::vector Module::readSpi(int chip_id, int register_id, + int n_bytes) const{ + auto client = DetectorSocket(shm()->hostname, shm()->controlPort); + client.Send(F_SPI_READ); + client.setFnum(F_SPI_READ); + client.Send(chip_id); + client.Send(register_id); + client.Send(n_bytes); + + if (client.Receive() == FAIL) { + std::ostringstream os; + os << "Module " << moduleIndex << " (" << shm()->hostname << ")" + << " returned error: " << client.readErrorMessage(); + throw DetectorError(os.str()); + } + + std::vector data(n_bytes); + client.Receive(data); + return data; + +} + +void Module::writeSpi(int chip_id, int register_id, + const std::vector &data){ + auto client = DetectorSocket(shm()->hostname, shm()->controlPort); + client.Send(F_SPI_WRITE); + client.setFnum(F_SPI_WRITE); + client.Send(chip_id); + client.Send(register_id); + client.Send(static_cast(data.size())); + client.Send(data); + + if (client.Receive() == FAIL) { + std::ostringstream os; + os << "Module " << moduleIndex << " (" << shm()->hostname << ")" + << " returned error: " << client.readErrorMessage(); + throw DetectorError(os.str()); + } +} + } // namespace sls diff --git a/slsDetectorSoftware/src/Module.h b/slsDetectorSoftware/src/Module.h index d23cc095e..2e4fb5684 100644 --- a/slsDetectorSoftware/src/Module.h +++ b/slsDetectorSoftware/src/Module.h @@ -607,6 +607,10 @@ class Module : public virtual slsDetectorDefs { int64_t getNumberOfFramesFromStart() const; int64_t getActualTime() const; int64_t getMeasurementTime() const; + std::vector readSpi(int chip_id, int register_id, + int n_bytes) const; + + void writeSpi(int chip_id, int register_id, const std::vector &data); private: std::string getReceiverLongVersion() const; diff --git a/slsSupportLib/include/sls/sls_detector_funcs.h b/slsSupportLib/include/sls/sls_detector_funcs.h index 6d49fee7e..9296547de 100755 --- a/slsSupportLib/include/sls/sls_detector_funcs.h +++ b/slsSupportLib/include/sls/sls_detector_funcs.h @@ -299,6 +299,8 @@ enum detFuncs { F_SET_COLLECTION_MODE, F_GET_PATTERN_WAIT_INTERVAL, F_SET_PATTERN_WAIT_INTERVAL, + F_SPI_READ, + F_SPI_WRITE, NUM_DET_FUNCTIONS, RECEIVER_ENUM_START = 512, /**< detector function should not exceed this @@ -709,6 +711,8 @@ const char* getFunctionNameFromEnum(enum detFuncs func) { case F_SET_COLLECTION_MODE: return "F_SET_COLLECTION_MODE"; case F_GET_PATTERN_WAIT_INTERVAL: return "F_GET_PATTERN_WAIT_INTERVAL"; case F_SET_PATTERN_WAIT_INTERVAL: return "F_SET_PATTERN_WAIT_INTERVAL"; + case F_SPI_READ: return "F_SPI_READ"; + case F_SPI_WRITE: return "F_SPI_WRITE"; case NUM_DET_FUNCTIONS: return "NUM_DET_FUNCTIONS"; case RECEIVER_ENUM_START: return "RECEIVER_ENUM_START";