From 389f356a3abb5381548b251b98277746e6743dd1 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Thu, 10 Aug 2017 11:09:44 +0200 Subject: [PATCH] high voltage reflects the master only, if 2 masters reflects -1 --- ....0.16.4 => eigerDetectorServerv3.0.0.16.5} | Bin 288566 -> 288605 bytes .../eigerDetectorServer/gitInfo.txt | 8 ++--- .../eigerDetectorServer/gitInfoEiger.h | 8 ++--- .../slsDetectorFunctionList.c | 28 +++++++++++++----- .../slsDetectorServer_defs.h | 2 ++ slsDetectorSoftware/gitInfo.txt | 8 ++--- .../multiSlsDetector/multiSlsDetector.cpp | 16 +++++++--- slsDetectorSoftware/slsDetector/gitInfoLib.h | 8 ++--- .../slsDetectorServer_funcs.c | 2 +- 9 files changed, 51 insertions(+), 29 deletions(-) rename slsDetectorSoftware/eigerDetectorServer/bin/{eigerDetectorServerv3.0.0.16.4 => eigerDetectorServerv3.0.0.16.5} (61%) diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.4 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.5 similarity index 61% rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.4 rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.5 index 420f70f0635972c70c9becbec95c0fe878117642..19f1ac075adc72fd9f06ee9893f600ccd3d98e7a 100755 GIT binary patch delta 47642 zcmceEqM@Q`VS-!|H!Ljh zr4AMfHXU?2Cb7o$b_doNx`k7bp?_A$6l;rmdONv5BLP_NuUAta>mp|`0leeAZ*=b6( za~^4UFUsWsLK@#oaQ(z7uR)RqJt*Oy-s$5;Ns1Ei*&s0HuS-&p2H%vVU=6+_N&PjrU6Mise9l>t3>?nWJDu~8qybunwaHb@U z(%=n}WYpjsNs83q0!bRJ!9|iZMuT@r(pU{HlcaGPd`ObUYjC9`MGJW1xoSy@(K2c! z=^+h1D@hYHxKWZ~HMm)l;xzb*a@J#%Zlg&eE+%=>d8OTBbpP2&Ca0Q$T?4GGId1Zs zO1`9@WYIep6DhPX=;J0O$#axXbKc+kWli|I)ta}xEk3?XikM*ixLGOo98Q{)TF)PY zmlfwpZk71CsNw%O$L{$-`1&rq+E(U=ldA(CITS(1P~x$^m(_s7snoiK=crZp7&sXhd|0ua1GF)E$zp`_jU3sHEN<`mLBuPo@n~47_`i{r{t$l~Cya#4H z(4dDZPEsleH<+A`xpXCb%)gT`qkHV0DBo&ws=CC>3r5w(d6`SdJE>$nI4G|wM<;u; zuH+Ag5;8rI9#(NWr#BzAI2$<5{IEADUxWBtMLG=Wi%2(#v=QmkNY{yUJkrOIt`cbz z(g%?)7ioy`ScwVtsaPOVfyhSzi%3HmkF7&GOQbW9UW&9?q&FZv7wKe?wjezj>3ESY zL^={_qevGcJpgHgNS7k*WqJVCRUpcNAWFISpx|1lhTi1#&N4O%Inv0i9Et3TGw7XT zRyH&$t=?mxsNOz*@HvQlw=Ve=eaFct=F#twe(#XqDDhrpKk71Iez$WGTBfQ^#Z{#( zFkU$nw3wXV8T{1XTE<57%7#id_e@T2odWaDMsq_Me_I+VO->at?-d94*0~gzoDQHr zLl%>5O8bzlWaWF7p&`yL6(*;>_mxA#$GbEDI<2$v8S=)7O#n_+k3`slTi{oYG|X*PYK;T?>?SZNL28eceacPa(AhVb zk+Gk=%3P++d{*q2{1^eFc`jJrwUiOY(B4&vKH_KJuyRc?N6rauG&w1^m^nhp0+Zx= zTcz;G72q!^jgc!{ZU9=TM30`JyQA{5^BgrlNPOtNEhNO*B>jFFt$T??DOEl$A^Rl{ zlT?)tS}<+LmZ&YyW6A~-bRNS$W}N#xri;uXl_^PM`n%6FiDad+Va)q|=Ou$peW!d% zT$I?TKvJ!wMvWmGl%l9Xq(rHTnwQt!b&95{INK>I&8vW=%4CcfrFka+t20HKcNTDp zz_$QqY_KwIfMZoS1)XtHXNr^(1~^pUlQ2b{R9Qe`Hp~#0N)UB zIp8Y-t_0j9U@#}26>uZq69T>hxKhA30he<)PfBS=VwajR-ve-=fP(<%2-pZXOTe*! z(*klFY!m~|jZz(s(=1Y8C1Wen1~h_knk26tOsraMh~QR z0jB|O6YvJW*98obN-Y9D1h`SaCji$87|co40&WFdA>cL>T<9`2kqVKD^+HPZ23#QU z5rDG=91A#8z{!Bk0!{~1lU8sHx%P{ zzREk%dQ988XkY*8ID=k_37^ueIxLbi%E16!s8-rKa}&x%E~BF68e%%?n(9O@leU_h z+?kscA##H{axI;?$q6EtF|O9F>dbv4O5{d#DK~ZWQGc?D2U^&x#B-A~uAcOc(ehdwlv0foHmGQ+`>iz^B;b zS6Bo-)gHf6^(ym*OKA=n?V@!X@iVCgv_&>G_ z{B?W$hfxB5!yf;UCb^sT__{W=d>&siY=)p-)6zTk70wlj2JYJ9KhcJ)-5!6wRV_~> zd;En2fp_NkJazhE2tE^rg|BTk4E@O>DtOov`tx0Z*W2SSJSM*R9G7NxU_(JRk4GC!ObEpNciwqP}2EbWVO>`81rjs=dp->MV*{4Iyw zv5D1-G%VW1X)$NFcJfqRc}FTMbFr5L&F3#D8>Wl`TZg8s(ACCi9VzWE8= z?%MN_e-C^Z5HnE4h3+Y-Q>P-XS2lGDkrziOtqB3{i^Z5AGkJ?yNuT!O!#(vk?=s`N zYk%|Dt}p`acv}u&+b6wom2ESyPYE(ffALphr+)&zoo77nzBsCb@!}bQWTRr(+fO+& zBb>}uZqA@6RA73}eQ|0>q4pC2eK+6l(ut^L&fI`u>r1+)v3_qC8YdoM zG}<3oEisj#1pKNJn;PG7$>`2eXp# zqU3#1(kM!1*_MpcG{He+tDy-b3KXIcmxzY3@L+Sv@{tr|`BF0QFrswumU4E%B(DL2 zZk1|2R|hNJscVB%wcrQKjWj&Q=4D5pl=4*H0X+;>X2)PDO{p`8r{cG8C?YKJ3qw2` zqsyIcAXep+Xgz&W$y~UcDN^&o(e7q-X=C$Dzi5U}q@4jTlk|z!zg|`{7d_O^?A=wT z%-%}vqRo*^r@Ap5t2U|KbDZWYPb(RVpCWUW=EXxvxYEAZj=c}>E3G@dmDse!x+|!! zDtUR@leS&>aFe265~8~srwv@?j(~s_$GdNC#VKY5wJmx}&wW$_2Kq)m~8IXZCkrn%vP`#Dai;<+|>hTkgf1``{LD?t^oV&3&*J%_S}!RgEs45XOTbdR*KDwbxj>@6)z7M z_vAgnyn`W3Cyo}#hR`(L*2$ASw{>!#()QsK?oa4JT^qPa<@ke-zxFxA&6$0(?bT#W*vuom;<0Hi(P---=>tOuh5<7Ago^&IQFWb>mcXH zzv)@d?}tOqLxcDAEav0+s+ikBTr2|16K(r=d_Y&x2Kq1QzK@SB# zZb7nUHl#2{Pj(Kie)&|NFwTLU7~b2?bMt zV}Ysy4LxY2AT*t8&qnHMC4S=|o!CWUVE~P#4qaKW8=}3->^^891X<-JmT1J(-Z`l) z*T4r07{R|Pey)Y`30N47m_&u*RFEWEPyVc2Up)#gsrQ;uWSWwI|9zAVYw{v*pbb;k z1^v-e-7D0iE=uUyS)+UMO&*=xeYN@9mGZSAWTsNLcKY)4Aaz9N`{z%Ra5BgaN4djL zXp;8NWc^_-$K?G)Vn?1hrIbuk*$A6O8>cL6gOzfcm1U=k+Gym4%ibyj>1HJ}D{w@9 z_w1xFf3yfa&sH6v{n&TxJE>G>4JA92D_P^c931@=^m^UUxNU4aRNinbm?z;NZr(cJ zf^2X>z%2oe9~r{sV&y!5o2eM~j8baW`H}fb)4HK#gmQPC-7@%%-zf9Mu#Z7nH$NcF*mYV-=JfdUPrbu`FD~?zQ*UqZ%wac9i~PdNU*7a=~dxK zBAic+-<)1^=CYVKXt1e)>GhVw6rHn9x$8K+ra4TnhuKbm9s2lz2Bz0r+}Hrd^m_A@ zm{Rbb-x?rbOs}_Ml(Ww~A-{27343%^e{Wr|<>oCXJ zi}NEUzbXkhraTC7gwmeCdiw zdi`3?%0Q-3dcNV<2g@bSCDnS%OswBFiVe9WMs}gu3!*nU&Dx|?J@@cK%b4{JwY6xN z5PED4yww{9vyODB&#TY8twe90K@KaH&4IRS{efJic#p60(PnRW)cP42ivF~#`?7Kn zQKgf-B~~#U8>}47=|A99R|y?o#x#g&tVt?gsNBryAF#{>4!hYSnhq4bYLuVJY? zYA1)+jw@Mt!^w7d*K?HDw)*L!JGjWoT%bH@88f{nHJIj)qTP6Z32Z+V%k#|3Q%p_? z$4pYmNySp&>ln037!30{Uiq@%0eSCbrLDk@v%SZZtb{R2-qt8xrpD9Grxqv^p6{8Z zsXZ)IQ`pL&v4ndIQ!bmN;v?O$G-Y-NOQpn-C3?AorA|$0t28Oj1><@Y)8viaizyy% zO$SdWOiq(MP0}k%y5lK6U#TdVLB=|=v&WOO^ZC?JW$iW(To}mNHi5tkiSH-x#&Wc6 zOOFfsq@~^SG!ZiSUC4-SSl#@%%6zFWW4xTkMerxTa|0a(7;2H%H0>A za9^R169z)5qyciwcE$42l+i1aAd+t43^DwMh*5G31jdY2Dqfu>zx<7(!Fu@=H<@`w z-ncfQpD{;yHqA@9Q{<~FU^3%D%<{A-#k6CTt-M}#;hU-zWu3h32=o{8)UoaHGnLjI zA!P8*m+eeJ(R~;xUuDwE-sB>7Re{Rdmox3c94SilE51H45GadyVu4|Eo70k0Y*sf9Pow%|2-M12TUNINH zf-rJhv9CYBVgpyjLoJ&T6{n4*p(N1%f{JyN*O*I6O36@M7|JObb4sZy37ow_ zt824RMA|PDV}$YULU91=1NUvp*!+HRu;RCKhNI^^8duwP&Tv`H1g;p)`PvS6Ap%1? z**-+C*bU+fx0GmQIKh1=#Ho`06rzku8m0U?Rp*KQ@ybrOq&zJ}G42WpW`pVAmh8Kx zF1m7tQgwQIkF&&hUlo?)EHO?~uJ3wo^h!1#x>=`U0maby!bkD0!QMY-Ln{=+d6ygze1DioV&^ePsixcN>%_ zQ0LFeD{-1WRMH;j&j{!(W%H-hPV~>;$E?XxN=y5=uTt&0g#Bq%={%opU8THtgyOe1 z#Aj~ToYH$r(%zmYQ$!E`!0@F?!`?^pRz>9JN!~(=L2>AAbOxlDFfTiI86-IblH_+q zhxagBhA}_bWIy9pW%3a*gO=Ul%ka1^qoI0}!?r1hUY$cC9c`OM$8Fn~*SyKqjzL*< zsAEuYnBrj*gv(PV%?xp0Ro5{l$z_55`?|ErJiT9gWS(=ZSvG z=LfvWMX!fM7WL3d56;&>IA5rBsQX$2dpIr_a9@ddV@5cO zs59xYGcV?Xg)+ZK9Rk}R_OsiSvNu8oFt16^N+ep>sg4)F(S4>^<$wJ&<;oi?T&^+2 zrfs*$1SM~UUcpt}0XC!g3?stg2HIVFtol1PDouyR`0&7}Lk^7F;W0j!yVfbfARitz zV0Sk;2gS033v18pP^u0O_2DsXd&))F1%k3mH}$=gs5eLXobH2Wl_oDh`>-{S|(3Q7ljxhvqPaHg3ultLJqs*fNi1-TWwim zj829Fou#78e{IU7^D@0VzH$hNQwkeK<#B6@`wr=G+}=6bvcUO_MA!Qe0s9a*NHa;R zct{E}#RW6P!z5*#gd8>7!)A|I0-ow_<3BF<$sx8MUIg?I84SSQ;P-RLF~#(UA?}%- zt3TVe*8QQ^0Ea+3x#Z)W$5_>@38sZ7(Eg)&KNzS;S1 zq;mP4ad3AX0!*uJDaG#&lUJR_R%w;;^4p#^F<>>gG{I*Cr0M}`;zJZRZ!DLTtYbYh z_Mmp!=`d^$#@I8Kd3@))D;&Mf46K~*GOtrVBTl*Z?*Dl4?%J=M6paGgC-gPvi+@ZQgMCiGxb(Uot(6((1b!H3e6d zB^)dOV(pu}Q{OhFQK?eotjT11X z&u6i+`Lq&r&Te;L-mA2o86un4b;Lo}1fe>SGb2vtIWrqkwJeCG4TW7)c=0i=v1{WsW_H#E`iq#3Gk~<{@iuIv-T+!r+ZdZC+5a=Gh>|C4GBx9qM8r} zfTGShV{nWK%LqZ9nL(B~YH2Fuab_rP=jdl>r|N4v%{|-2oO-gio7y@qeKpok@L{JS z4(4?Y{GGECd(>Cb!-_5KQ;N=puo!;VAht9gJN)VLqdG^9=U=nswYo#J%=)*T8^*4t z1${h$-yL$`@~O+e#ieZR-gB3Kh3Ecp2sz#jm-4SJoXdG99l4xW0==H2e4pp*zP586 z(3a1nh7j&HIxx8MoMLI1*wgYUx8Lqo3*>gTN<~8p#PT^6t7aF0%I!o6J3j;6a5xZ{ zy92wsIGS5e`YOL<2V=cod!s|B`u};ZU-JE~1HJ;g@Bf+jXb%g${NIb+bNXL@xM&tN zFUuMB#E}2E6v`|O3;E4y2AE1~T$2-gl`7VM`jWfd8zJm>gw!LEJB@7KZxM2?u z-g)6^-65XA_O^!RM@LUylJnxAY<4hL0_#}vxE2A=ssj&x=v|O~@BTAbX?c$U28{s?4oe?=R;;CehYpzhn9T@4F~6m60w`w#r$l> zzX*$qI7Z^}Zt5&iZhYQj;7R^D7cF-+I`W-!N_x{Xqt{80Sl4Z~e22R~UEFi|4tD1k z*))o{IC|o`1U5t<;1?I)8TZ54qen-?O1?9#`}Y5}0~ZQMDW6{SLtw%o8amTo@%Ym) z*>p>UL+9y=I>g6LX0QCo?$p7A*mWxdqVOvC~-(>4|rAYX@AvD_BNo0;zK(9E>k{A%F(_>Oj% zIk|dih;3WbHmPl;bhMRo6m9)*y!*C(P_H8<;68)>9w1>IU%?U(b^gm*U2#W~%$+R$ z>ja-uV#?U~*o&4at$*!t4U=zm?}x}YSpd>z4T~A9WVMWssbup93etUGSiVKn4mm8z z@=bPiWV$^0zT@1Qd`U^ZJRF||Gqe2ZWj~vFrS>UEiT~TUhkCMT-^X;{-go)n-e{7> zZ|ctGem57~j8`7`LQh;A?e3(jJgWBNo-yw0JLkA?*KNJuNjxgLzCBJ;(&Q^WMMdQs zYE*QhV^nnFLhKF3DAp@!UgfHh{O38fLmN_+%&QX!&O)z_9Jn!FWQvX2M)k)EX!woxbBk*hL{wTI4lBvphOJVV19>`>pc^?~5^@ z$#_XBnMCv@kBjd{&CjrzjZiFak0^#~zIhALo`(tbc#ia}Tg)WlXG4!in3!gu9pu@3 zE-hadZpO3B>y~&ZSN@t=^v>wgerscAKc4kKG(~UUk3L_qy_z$-&1KP@X;#i&%L~RY zR^TI3+-Kt~nVT0t>-IBz9xtHO-0QgB@6lP28X6sM6(RE=8{Bna#t8 z$G7&+W|-t_J518qgCcD~Iu|#)E`x1%lia#gsl6Vl%)IVD%-6>xnOL#^l_RC-dO*LK zvpZX8y`)n6@)W2|%4@|?xG_RT>C6>z0LkF%fLUG? z_{WokZXH2_lplwB#V1t!5Cr3L@q>| zCej=tt>ov0)EHBdVaSO8^ z)Y67ua@hVcc|d9XuAltXT&4A9h?h`@O<8DSnMo=ftAu^O)}PyUrdTHVGP{2%m@bS| zs=g2OJj=)mn{igL1V$+yHy_WdLs_`xQnKhQi)CWcY=Rf%P-SRE) z23}5jE~2xuE$h^usnEXYe=f}?Z+@pB3gbEjp?r7Ki_|LZH^=0``EQvoT4a_?Yq1>o zxb9p0>p8VWsX=hl*xBM=xsA-91o5jPuCwWXErx+$7O*pU8Sl_h7Uk_*V@aKI{ni9e zetiXU#FFwCcoGRC*!IXPF!9n6OsHOLr=o}sS3+sqU+J3xKRMMgRNlKp|gMGTy6(#=1SNm*c zp92`cd8mm5?of(v_m?N0q;;O8U!O}lo2;2ED`4VAZS&H(QQ8jUv7OiKH{)oRY~p`Z zDQ)X7Z%$Bdwgt$6o}9Ma9EW6}|K%>_rS02s*#Vp6+x`1&PVZzOAe{3SH(%xL&xbp+ z{J-J6#d&o@>?DYdW!e3v&+L*-{AMccw?l|U3Hm97+)`qH3Pijk^{3$-^1@+2=iE}t z9|%+Gep=vJ(Wx?j!qw$}J<~TQ!qVU77hvRzh`au4pxn=2Y5G_HemUyVG0Xy=OWXaz zO!CFSiu0W@h|Wjf*&4io51rhEc}WUX70D4^SJT}0T2OB8Ma@*gvV?Uk!P0V$XBGl0 z7+cj~<8t`*YLoogw`_u<2W;wV)A$B!Du1aYDe+$iDhCz@E4%(ZQO@#tule7wvp*|s z|5;3KC`oq*jkv+6MH+H$^4hAN-RNjpZrp22l{RIQ(ejxaO4HpjUhO8iG2bS)n%4b| zM61h(l*?_KI#oW!#hZKhA(;1a?!8IebE8!;oW~L7FC*pL6eaDKp|~+x@XL%~Hp^pG zhH?urVWK-3IX_vs@kl#LHe z5Yw1)T)pMTZX#W5k`D0$dy%#X1`dJILXA<&N2Jgsf6PwC3Yi>u8SX(odiFeX_OuKv zIaasdj z*`b{hz$Jd4`b}h{Vd9or+rpZNO>+G`j#s^4Fu_+0-T;W=SeY^1?!SkS8qXVy z6;(~^z35p&hI=;HRBoW{gska{-xTO5c4i6Yo22Lm523HiWFuKh{hY{)*Y^#qM@7 z8p)zQYihM<>IUe4%Vezm8XA-aGqdg%@E42oM)DuCaWa}M(WsomWRP)0s?nuRG1t<(6z(>r6g$|A>j#$ykSUfeZOOZvan9mQo=k z_^ISVf~`Y3UrfQ|G9@7x5*{G^`hygjYr{k~rXoNj{YeY6et7V4-YnX{>S zUQHT|iQh=89w33Fi8ek!9&vv@R&B8QXib=&d`w0@pJkFZ^6#27MK{UsUNlK-xuzM- z&sUh__Xgkt6E>C-HLoC1G`TPF4L^%=u#D?bWxqRe4h+?R|VxYb#0 z_+1_7Xt%{6psh(N{@87rb&?FCA1x;Vy``;OY$o~G5gPFz8Rm{(s^M}v2C+RzCi&DN ztAsHmG!i>KjB@pZWT>Y)Ty9R;7Pm7k^u~i^-q@Bn19WBO$1N#3{X@CKXL++wN6AY3 zil;#$nyA>GfWunVEN>FxV~65o!qLznZ?e_D*(6u7&R~J$I)e^xg%khI&othLEQq!O`vuZh`jHbZEhhQsw=~I@ zOmW?20DO?{@+Bi(w_%@ibTw`0fMaUfeMv9p5!{S2Kc2;t60H|_6e&fDADNILU|4Q*$U8CLi8cQxr;ik(xXMNg`yXihUzkV66km<3uh$&d~Uj zgJHjRCUTOURFp7pTe4IgYUK;Kyc8T?DWf6l_@6quwnN0aE!G2p_&n%;@MQWqP zUz5Q!ZYJqNU;2@F#@pxDb3Xy2r?nN$@-cFnPjE-14PrZWmpYFmqo&1T(D^rgIr#b8 z6v_H4rU2^(27cQKrX(?G%1Png3`iGpC9_t&Jo@Be`42ZBl2oT_(BYbobSEo~GWTQLQ6x z5N}^?We?R>!tW2J+eed!Nih56$HDaeXwo+lJN=ylG$Vz*iJ47TVIhOm5&K<}7%?|+ zwVTF|A-*eZT&I$Cm`;9b(HFRg)YYqGA;XQSdx1sl-E3zD_q8F)MCDH-fo zme!3S{rkSaj)m-K(6%uopl|W{F8H7*R-VULZQGfDSXiAY6{B`+a$b}Si#*WIyX0$x$$cq(HYnTk}Unra=#^Mc0nyyWp**9ymzfzw|| zU~Y1v^@qv!UE9GwrD2j~kp&@|Y*F@zec7UKXxn)5lt1^l6Ro#O9I}_zY=|bkNrwXq zEqiGuEs7z5J}vn$tHI%j;bIA4_g!P2f+?zvAp_+XFVWT*;ya=((qOehZXW6a{BY%rJ`&@L6Km38h$(Rvr{kJu((bO%Dgg^zt)R!p^DsYDu#F3$1Z4js4PTgwb z;3EAFE>avfSnY9SVBhUwU5Xhek}>{>kZ~u09XH!k$(hKiu{mjvubN0kyKcM9>QRG{ z1X61#=}r4gB03kWxxe#Q46_g(98Dgi$$iL!1KPNp_OU%$hbN#d?`=l-q1e-h(eg>0 z)w7dS?Vp71wbew$W1e_c3kv|paceG3olM4f-V`W5pyFuhWGsi6Ig`myylzg$D%nDl zrf^D@DadQ1mF(3*Thvt5G!i&CqLW7cksgJRFqIR{oXUwdPGv;*B-qkSMJgNtH>@i# z6Hx2;$@{D)5a8Xw6vHUJs5-a@uzi&+;j}UVzGe$;NZ@qa5;)!DX`I=DX`C=;Pg|)_ zYs>u}*=w7|$@op@WU{AoGL_Ri$auDQ_A>XC>wpD=)%mt#8)erS#Xwfp7k-(@KQ1LHla}%XcPI!txj!WGyQZm8CQe#y}zvE zjF{w2>u75dByg8n63KqK$eS9F9E@Ky<{J{DO0S4%U6AI^V*?RplC$C2CXt8Ti-hN! z9ZXLo!7Or0L+HTSqamxj zhwRv;qBrnaiE(58vY2EaH;TL+dy?6%M5K<3>1a?zu;UK)x%$rTZ@^GOQqzQ_NRnFY zWwwbzZ(lar6t%x^uEq&jnJCeeCv8ZEU$%n<71%g4(=UQDtXPg(?CDb~M{)BT$7@zf5Y13RXuwyjV zU#9JIVQNp%phw6<^14g*f?vOcWpI*MHiBcW%EWUO#1+|e;n<|H_TU0-vOrmSg5-%E^LLMa1G%1D5fI-=n zLRR&CC5)A0a}%`CxwQy9%qM^9^GdS7N0{U_Sl{QveR*XUgwip`fImrt9_2dEul~@)l5c zQh6Q2LQ?P9BDevEtH8}dGDKc=oF?a!LCS$Zf7%p1B20Y}&2o4u#)37v%Vj0a!BXe9Tk+Y7TO(Vl~!W^x*O7EtT{_Z8* zPc+FZj#I-Dvd6U~4DcpeyM#RCUJ|bgdikY2k3lIql1FMH9)r723^kdLlRrBX1C387 zqa5~JIq77o1FA8dJmOjckJ{`-LziLmZNE!PUDl;W#WGRj@v(cBld0iq^kR~MZ-!K> zrf#(CE!$%=Y36balpEXf4WL)O$OCysbIBo-{1}UTbu73-ue8NDgXI~`pBwO#B(?`T z5jOY>Ia>m=ZPK^6Ls*A3L=uNErIh3OdR**KGus3PjXmSSmvrZ`TVuUSLlFdHR zEIa`{w0Ey-S8~O=zLJb~-ziMMB8=85xC1RTdKIE2JJZyGTC`NyvF0vRidK;^0}hE| zENsW(5SA{*T2V~Lw-hFMA?CnSg!aHz!&98Cwx?M8f~{1z4s7KjY^AjCMM5THU+|ea zpIS0G`=yzkY^4&h?&Wl;eG|nrwiXLn6Si~Ep1uJ!mN%j!?7 zyfF1X*Za__Eb>5Pm|3UZ6c8KZFvyK96WTr>e@vv;Gd#_MY4u^WEeo6AFltzb`4>hr z){&4H9xM>MX=92`I%87-*ON#D>oK&^4OT8$%R_7;jMkxg@NZV9?d#w|gwf3PB=CPJ znT#T$tYrWkFh9qC2<_)CZ$lY9Z)ID_aT$S$b z6UaX-`tEImE1~);Sb)l(CcRnrH@S?V1-iyU};B3aYfo0mrMk@d{NV>Lv1o9`T@qf&?c%+>o4SP$qRxQ2j<2Bz4M0GY(I3AnQ2x{DfjqQxhBnaN1*#b8_ zaf#}syc7KZeSb3vr?0HVRha6{#Ba}YWQ|-e(X8hX>1mELu;2ue=1quH&%%iu^KDRz z6={8rtbhZ-OSX%W2DRkOxi%%?W4ug;(l0lY$K@GEX?zZOPJY#o*5<%_opFtIW=!3y zX4;+u#%5sQ$|Z}*Mw*>Vei-+Yazlx~a^rIbrj^*LO+}xSu zY1f3@vUoY^HSTkP2BMJD;78_>kwadKQrD1aJ49Jw3SY|>?O_^ETc^^#@DlN3VZPq9 zERXcgTY~+Chgv&fDcf499eAx&b;GCeA6n`R#wD<;oao?d)rr=B4dxz4NANO%cRtea zS`*5M;8A@<=SU`;7Ikq%d6!>c$gA(m{#+E>_9h%=nMSG1nGI=(SFT7JXr|wmvJ>S$y0aG;vzC!`Fyk&EyyPU0cC|imZ&n3t3XkkabfgC zJ_&Kbe4o0IUSVJpz_ELtCy9COCV9#?q7K_uA#nf6-57+fRCB`*D}ZY-0Vm9ihU4X& zL^)oU!B{<+j`KRUd4jH3dDNxDC@}@@M_ZrA?%O0v^F>9Jb`dxam14bt8n%*AURqIs z{^Tw-Z^ePUp7$9%U`|EkhVw|ZHZoBTX`_~AeG{$l`l4l5fn)lLzSQ%+YuD{^XU@xZ z=p)L}e{Ut>y1P81uE9jZ3P^v~eXzyx-|~^7U;cym1R2fyVu3oyWX}9f*ob6SCDQOo zDy=BM;8d_xtMh&vZ7U!T_@vs5NwnJbCl%Ct8yO#&s2kBP8j#STBz#H0qD(%ZDbztpdP;?@8MPVJMxpfub5W9Kt{^3x9Rm4$oRn`(hz%$F$|Z9 zU5I0hbHNDLDvZV#k})n}DN?WJX!#7{O^XW2Q<|GS;nMrt$#cYgf4s`TLvxwaIGn!o zBH8M`e}jsQ+1trg_Df`xu3X>;Ge>crCyyVfwlx}dpol!qofee!z z9Rqo)_P~6g0O@cD2lnOwc0bX<)Ncowpc6eB565%|?BpGl%6Lq+9c0#&avLo=WA2>K z<8EVEwDm??DuZ<5d&lN%dV`$kcnv&?Duwb&Qh7DU^^Mx3O4uV!;O}sJK$PkMNe5#Yqn3~23oT#97n$TJ&@6`Uy^vjN z37{iOh!?4#@g;EjDyX>x=DmV8l#qXsikjM;WU-87+iPSPowA$w0GGO(P*)W<2CvXE z@(&};m7c5OL{M)xYpIVVl!8h93<&L;@aq z!*6@IYNq!N$2Jpo#E3ti1b&=i!n@7eujSFKL*#q^b*u^wF81T?-KqN_3+aZ#(Bcua z{4i9*r{=_A@-i9t1`BfX(14{kf}Gl)hLeLgLS%4q-iV-vFNn`nIhgJK86sY=)s;$76tM3796~PUIc3VYt~Q9}%4j zGJ*cJg6Nl|psY6jDQJUq9w-OpvJqjr!ON&Rk#18y9kT0K3E}N!u)G+9wsO{QpjBUy z@W@Rjt~@Otx}$vD#w z`#nk2-Bo980F1=%$-sa^K_)q%MCI^M6t`9f*rn@$;F=S^Cu@lNA(L9c5Av=g-^qt? zawW#+6>Q+Uba6eoi(o1RiF*1a{T1859RVwbmgEZd}85Tm*VNN@>=d}{${8WLw$zxC| zJ+HacQU#m6|2=Y$xX}1&9G;55vwUv`_yM0O@E)v@M(p=>!;~CqOll^J_z)`Pd?JR>p7bi z){v3z6`^WPPh{7So$eJv_8wRzPr$rZ%ESqy7jtH-TFINFLWE#2NIi zG2zh88-K*vs_qC%YR+5&W(U#Im}Uty>;p2g-x0n6P(`d;$G=37b@yoI2T;{&kaLPY zf24udeL#i}ZV}0w>}S9dt>3Z;i#F*yTh`a&>Kk9(m^TQovTMW1wTQzv(`uBA?T>~k^gri)S1;QSg{Npq3%xNPa#6oOw&#wH2izjf2sSukrtdnEWDXkIG~$O zA$0!xSjQ%4JHxx4>VgmZ5VIzMrhEvepqbWwh$GeCYs%vWwSbT6f#ifwtV=`L4JhDZ=@B-ANYq2qJ9MO*{pCi zny=y7uM@jR!23>boI}SlsK>`Rpv|C}ACu?v?q6kt#Wo-)g%#xwyKoq!*Gz?p{OXDA zF}tP7w#FVNa(|z2M)+qTtWKoi52Y|KHg)cc&8M^>A9X~T6DVWGqL@g19P?Z%(e61iU4zWn0CRTa)O71UkPH2wr`>d4P?&j zaK`U&7JuBQdfMQ(&Ys`)V4<+K{9ftG?=K^0YXg+Fwv*j<&l<4%pzNOs4%j^}7LH@% zt{IUG8v7|+!VH?OzKT92&+0Pp(^JlOm?{ChLdPOl0MXWTu{c>HsnPz^D zK{wOl&&ewH${?mACUWOujdK(Equi%5UMP*9iTtFajejEj`&6cN;%?)Z>Q7h}DhuM6 z-Tbz)lp6m`0$nOh~x=LdB#Lz>R(85t~m9-!4)m*tmoCrc$t$)D`UjjEHh^GCO1l1V-O12Q! zqtPaE6Nd{eWctLT$rx;Got^j@Y)8O`e1BSq0UCXjFU*)XP>S!_>VXZ~(IUY2SyaVH z%~_(N2-2P%ySl}F zu3;evX5vRcVIune04A3=Cn>!ht*XmcaCpAL;b=!XpH}IiFj-%bkO9T4A2Egwx4Xb0 zT~33(#(kNXZoK(2R#fc%$}}gOmVQNs2CExEF28yUU#7G_EJChbpjW;kqv+zVi3cg9 z1z(fIxdmd-*dS|;OM%LKD|3=rR9IXht!H}{zm9zdxu)xevjS?kj(JhA=RR3UZXX? z|AVP2J@F4R@u9a>E#~*b>&rV=w5uJ93dm(La*^h@(=}%Eht=m$<3Ayy9Gd)3GISaH z0~~DktX+cFhOivN#0+-IkBxW zLk-somCj-0@|O!7NLqT;7jfJWdmN4bmW0e?8+m8eGK!V+Rc@bjljGEBz($W?^jg&B z-|^si7<(p84y%51IjsP>7&{cZb;ng+Cwn_`l|Qt;h*wv8Qo83msJI=5MtnzxkIltU zM)9`I?=TJFl0n<$ww3L+$K-FgCi)$jv6^>h@;-6wtEwyS4seVVwBsFh#;e^?Ns4mz zBrl6=OhnI{MVAo-SGg7CY5ezO%!oQoclo^-a(OOOF+`|77M6llht+)Nx`|xgP0PP0 z{T`~40B;iIrr4LOf+fAo)s*3}N{RYa@xbGh7WD^Kr2-CD>$`mDP=5pRJZa_{+~pY+ zLEKr9&Q(kmDCVIvXWU5aaa<|#=bQkH3 zwC)EidBtLq#$%G=8wgx|Czrx$`w!$Jl1*!WM37P)PF0I@=-nT&LCT@UvOLd)#g>Bb zDU$5B$4PdjueOmmwAj){Cb}NOXf*rNpxY>2RAagg^9y?EKjAW{J-rrZnHiG1&hi+% zB3$Gr8Fd%=S$`h6O2Jo#FfEXV>>X#oO0W{f$KWb&qRZ}(;C{#0eR01|JJK{c(fZR& zTKgX~TTE~K2fL*L>UWnsMj!bZx0_07=Fc!6$D-+pyJVp2=fSvDKA5)NCH?8&ekSL@ zVfnwi^!UoZ;UMHt{eReNk4~ORcl?J0_dUk;Yc@?^z!iPRW}iii#dleY7T%)#Dg4sA zdIz{CDcf|G-)NFPYPA797(5lBe_P z)H4`$g|S)APcW6RNmo0h8`ZS4_~53#ilv1Ctg>IY&#&udrL9%V=fUjh>T4tILwXGk zjU94mtjVUaCWppcx@oM^rhKJcTMrDcudvB1q)F{?E2_mLwskA2Rkz}k^Q?IOqz<>@ z1RKmwx1xbx>SKc7WMQYUxZ?DIxfRuLD=4Y$Y5{6#?R_X*Exmca!_81_LoN0DmFMt{ zdn50w{l>jxt+Tk-H>w-=T3Y%m*-R?AA7W=}Drvlx_)cTmW9xPtvROmRG;uh%9Ze2y zMYXvDZ5;x5R6Hf>QkKExJw>N4($$;rw*=-GrS^hUx+nQ zweV{1)CI0~cdA52!Kg)1X=(5M|bf5ygtr#ribV!20YV za_uR4qL=*2;3`PwSCkFqTZb~fvxWC{jBi9SheJ)Ib|uYplkw-r?0Ue>N`q=v8s68* zn>}z_F~>)Kz=e3%6a~m%JV;_|GDga4baJnznwIf${e#%#mL&2wu--p+-Qn>TX=l8v1svs2#<5Nc@;Bf~|6j^E)XVGAxI=;e zr}<~QFqdcF`{phM?DPL`m@D`V8oM0x{2UOWB7Lal${e}IZ9tgy{*@>^@pzK(q~b}( zlZ7V-PvKj|sWPdlUMTl>$@{s~djH?Z{kceeGx-0n=jTJ#ko!MZq48Qg4R|2SpIhlz4C@OTYnu|?C?0^9Mk_>dB^;o)4kNjn`_Qy$Y=UKw7$jq z>(g!4UpJ;$e|FTVNYgRmD7@Y1NxY)Q_l4>5_BKwcY^Rrr)Mc^s6 zTGLz9_wpQ@G|R)oa4dhhTj#T^&T3uNX0@)oqCTs#kj@rQA>LY=!3>Y|Q?Z@Tss?Rr51cnKCw0^(2H#2fqe<)L_|S*pbvowOZFF;eE$yeHwIRH>-7X3*JVnbu02^NTeVv8bFcN z%3OW9+-iLZgynX8u~jWePN7!oE(6}tc(>x6WVP-t!`p1N?%73y-jfIU#7ekofrtHL z?+EbjK~vt7hx$ZGl1n*I>>pZ@GOX66XKC?!@`Ug@ByZwj|InZW&X<+qeS;zJ58jT1 zUM$a|cixl7%tdV%@WcPHj(c0JYg&*pt0+c-gjua?nQ-E5aIp|bGSUzd|Htx^A)IKM zT@44MoR(M1Gs2624H6|7rDm%&f0qp|74QwK_4#tDKQ1rEO`go-^3eH(sFB%OOSV|8 z#jQx!+2D3rttFr?)!N`Htk#{7jC9uqR||Rjp_SH}+s9>#Zcm-;>)EcC-;KqSgQu2; z*2yE~*%36QP9Bf5l%hKM`H4>_=;fzPc#`lW<4M7jipPv615Xy74R}D}=>j}Ocy{3_ z#Zy+3bXs0R@TJEGXXO5}dn)~cy?aaamowO171F?ZyzbBm^}y;A=wg<gyNws-S^qks0bnC$RTm6J5;SLlWrbv&e3uud(DfH~Im4j}N6^uy=Gk z{e`_JdeFdgC{{%$oI`R(5M9iYSLkN;Dy6TnS26v7y|U;RtW1(K{pFnevOGJDzVxv? zP}inMcOc!NH9t1XpUO1dY3zT$g1Z1X8E#< z3e)p{lb6UIMjG~oT?_CT$&anno;0^=z%?$jGgXIkTk%14ov9gCbww12?QvRdMbv+wD zW2^kW%MA{G-zxt!sGnXh_hTw}gVjAt@H=DDAxZL2mL5Qc5l{4E6<>bRCcYu}ig|hh;(Rp9VGhO}S^|GItzW$XQ>+WyRLsujTR|70}gnXDW zkVkZO5P}%MI~XJ((~o|6L!RRr4Dkj>(W_S3mnMEIk6`0HsDkEx3&E;j^mlUG!bXr$ zN3(x1YmSd*{~U(pqd72*fqXPWjI013&HmRJ$Van3R{}noh89+qk7oZin*Y5V>;fy% z-DLrYl!F3zEP26Ax@VHDKKG0eisa&Zm~ zqFetZzpI0I#zBUI1~~Au=V#f&rI}^cc>OE~64z1C)loq;qyH^ii0haz_QOo{#DC-u zUB^MHuxUAW<%sqqO!TOE<-Qz5Tna#J7p?kL{>Xg-TAyHq#@=Jf7)Wp+qJfO3m#y-T zt`ouQ^s3#TIb9TB&0*pcKo*|xLif3$nRo-BD$9v=49jJiP|QFs%Sr950GH*Y4GiS6 zoMdDmSIsGztSp!1Bny7D%ISSwl^)hxl16Q3`Z$Yjxh?mimtCB4^}RbZb2=|Wk2^b^ zcb@@$n{fq7@~VCL7hKgGy4=<2JKYt%Y%0ZX*8JOEL=`SPgGRWaOsQU;Sq#me#mc-+ z`+GROppPV>Y&Lwtsh6~w8A~f83pR#-u#!MfPrRuIrSEMYh3Jbn(CUAi~_~84_@)wsvZc28(_hY{yTLB>ZUFX# z>R2ZpSa14oi1#_6iR5N;#jAwFB)y`bww_@UXLN{{nEo`0(+h}2E8`iG z)U147%;Hw9x5gS@l>)gY74n+dS4^(VVpScnC&{Wg>hh$@jjA;I*65w?;sJ; zA)jR2PqJu2jYI8MwAdmKzf8s{J$uv2+^VxAW0%QeO#ht3B4X^|T&zwZDe9rNUgcz% znQo*>a*|h9KvhVEGE9H>?;&Cbcy$QljVmTr?;^3Q1oRQh#Oed6y#de(E}()}Bd{UN zc_k!+lF`gs!w+z$WT@r>+mp1^+{pTF0sT-My^r$6-AJp0y>=>+-);fJ zAPc~2Ppul*fZ88HRd9Tri|}(0Y_`~kB-iTTbXa0*P#uF4Y7t_&+WjdWt|jqYAFQ!E zYpx*q)gcwkG%Mt!3TI-ye#cZ@c+bm1YV0Cf^BKwZ7T_UE&00S>)-0*6(kRWES4ExOyYMv$onD2my_uJ1r*o?n0N!p!#c-7X6ParI16km z{2|GWK49D6f5&zM41gbwCH{=$BPRhHSpFFjclJa7G~<^^UJQGyi19l@?aVUsa%UjJ zHeFr>K}VQ_;;JH9+@$)l%!(^?z5-S(TnEW`R=Z}i;bh;cG0)X?56M63HQ=;Nxp4Z3 zT~3Fs7U+7I#FM6S`O$bEOoQAM^TEa09>|%D-y->MHK22OC9NWHW2*}LQFUV&X0MaB zBXT+w`e=(Dn6yjxK&at}6rUC1r_m0W@~KLRmc^T}IC&grn#Gyf$BBlzw3Bws<|RbabkB!@{>5%78D z?;-g!9WS0x^8I9ZPJ!VI1;4_&A~m0FR#f$@45ttor>C*}^hp-ICuJS%>OgQ_Qu0U~ zimKWiOh>0LWSL9ZVckr{St}hWUnBWa81!DI?$ySMYW$;a*i2mI@CaN z3SxFEr7KB(rxRkFExMV+YbD?xU^U(Fa~^c|lkOzrm0^8!V14(K7)9Fb-GF`y{^dCS z33A+^uk3bUXo|$sK{znU23{xeHtO7w#`sf`|D`87XJNN)%SToey3_Pl54>mv+U=u+ zH)mBe7n>v07&SbM%`tUpWuER3%Bc}zHLUhJlHYU+v4+dVjd_2l<2}T5EWda09o#(g zYgMS)gp;iHIg&5Kdt-swaFKrf7{oZuZZzwFPc7z|byZ$i@?r{urusy#BmQtE1KeN7elf?5#wY?%!kCJ>^JIxi9`XiVDw!KSzoaAYZ z!z@3660HUd^wz?bea#w*s7Y5%P3IO&6G3yUURu zgWFx&VeGz`vyo#dOT+RWY=GP`##k>YgTP~q$52K&!0cSwD{#IUm@|_0C*T%f2kO|1 zpAvbOL==-Z+FAYs+AL#^alx#^cj(9TLgApU%OG(rg6f~!LbEOxlSaA6 z`sO+XJ33dK(sfUgyo;2t2yCM(!|7{CHgzFZC6-uvA<3(UR96vF1h2%n6`k~E5=RG6 zj>K&Htc$*Li0R)&?>z>74sm)P$=4Aj*~I+!lRVK6%u!4~0q=6a&rwN#f#k2Fpr2uW zq;UHOJ@DT4>pkn)kle-wKcNJ)13Wjk+QEA4*!yP@6{n?O{Z<&5P~l>n8xmcrs~E?K zJ~e>1?qy7)nYn(fpLPNdT3XjXiftEe*xT;<-{|KKzz3NA9M;7QFb8%08zi*bSp2b| zuYZrkT__$AwXheto0|ZxW=uFIJbnOfZsUPW5`UV+yuFM|;kJ$=8}M!>`5~rhaA|ul zA@LF%w!4M5iR7Cu@N?X}*OOS*6X4y!do#&M7w|IcKZ>7_KYAPk?6LPGmh?0*pNzcY zB!+rn-(&%F&E49;LB_KrUqoWznOncoie{fx0*l&O3Hvm#edlq0d>ayV83%#q&E2HdX>1Y%dSzJR$k??0VFB-dM7 zGV#s3XUA69GgC=CfN!Hgs|+e%8IGk#K;=5gM4LS|uR>*@PN^|XS zW=A`GqzP=i7JaW`Et%6xxAS6*7dSqYfx1TaS?E1ksg4mA!lxxu*M zOG$nMX5>lBY}So<$cgxDhLF1kzlXSvXb4RCveKxfd*o)Z@-h|9eNUM#$Sf^)&Os~sQf!|DMH~J9CQCwsDc+ZnmHa5 zk+rWP9d zoUvL!=boS4fuov^IM-S>_KYn#z#OXV2N3aI-~*PqY+S(J2DJCd>}N?nk5JoPA^RmV z)FwgRPzNfosrwK~Ug0@# z?o1lk7AlH@-W+5bq;zg{yZGh zhfjh&&iKpNhwIgJC2lwK$UDz2?>>@=Ef8yEwn02%>0B|BH;%JGK^&gbpEdxuSaq0( zTgyUNg{n{i=P^8OsmU)QxlWg7JLAnHZqI=?lZ^3kgMNZ57c4dTSCe=T{0UrO`MdCJ zV+iuRX7g_$+0}p`H?TbROWy?OA;wSONHafxfkqxc7Pid*b4lgTW4#;)=Jk^QE^vDs z{+PtX5)5=$@&#*1{C*h@_A|h)k})oeMc}u0u7b;i+Plg0R82#N&2!NDEYWPV zCRuQZ63*2_2D|d-|AXV$ZP*LYxHp+~yU$>hT`M?^qbe#v46vy`<6?+d*_kc)46awM z@E793_DC-i&5N ztOQx>9VE*Z!Nmn%{3DW&jX+5w(?>|wA=>ussTk*mK4_H_O#cH(eayAHO!5Db{CGN! z{tsMR7l66oOFX0wZ$Z5cK!yWUQbXeA9xNiR*%Ey-?~J44O8KiAHNFK~_^g`Wg3WhE zxh}xlgsQy&Q5{7xj#>VcmXh2F-Ljc69y`2%Y|3iJ*N})^Ww?cx;&^a61Y3MgD!mEK z^!$qL(jF4m&jQ>0_kgZ3`(FAW8QrI<;|6fh8a@Jg4I9Lv;E5(UaF+3FBpyV-?8j)O zf5BvDR^$T?bRZo-PEY`8e`^kyt1Ey7{jZI{9IQYEZ5C|{7~nby)Sxc9ppfe<@D-Bp zG=R<#3S5O-)spJ_5(3wc;TFrU!1pmRB;KA_;9-(~(B;I53;Y!Sj=jK-SKw*z591#k zh`=j&GOh!^jrHMk;+#s*ZTa`n2??0vQkF!H?$z5MK$bvRx%B}WA{~2xUsg-TOD91u zuuhz1+aVl#Sq_w4N#YU&%04NSwPIUb1TJ8Gx9Ja&fw@nV;rm1WnUx8b_2bB#)f^|F zXCHg9fu~4*D~bWmL>Wr`((}NhY~Xzo^@GSH2R@iU!l!50Y0-lo64l6@G0PYadd`L6 zfQ#{_Zfx{ufCjJVAdVmNn1LK%hO410_5#K$*iND{1cSDMn@Ij0DZpkFyQKtgC*hjb zoWN_r-;2`H9fngB#Ak%32IFwsL%3Dw9N9B?3=B1K47e7Zs*S_w=tmJkJBJ&cpl@5D xZ^ZPktOn-AvJol82Y%5D&3gmsZF~2$-F$s#d)vY5+wmPd{t8~?XsbEw_fSQP~Vb5T@CP*l`aFj1*cG1o#x#X>{Vgmy_REG+Cn zM{j6U*2TiYQnAuP!7hH%!kgXnrZ+6TQEA~#yL!|1_nvv?f!zhVpWpBI`hI=A9-lKa zXU?2CbLPyMGxIFxKlMHEsc-pH9{bxQd4JpHvT%~Lxn{aP#~{DMpLgBJTRJ(tP1)yW zCH3#dyZ0uf@!eF9zv!&>k~HuR3I7bbj~gW^Ucilhl0^K~{Kim8k~KI&l5`pzD@kq| z94|@k8k{6a9vYk~Nj)?;U6MRCI8&1JfUT_I#%xLQ(h71U$y0UGQlNf8a(k|afIaH=HTsln-z6sy6Rk~GAsC9);yE)C9+q@fy| zCrKs^E|8=+4K9?VVH#W_Ny9a`Op-=uaD^m|)Zj`<8l}OzBq>3_V~*8GQleI{Pm=D| z;6su$T7w%UDM^D*NK&!}pH>>Zhw7J`CE{+D$Ier3c@GOqZ!zoY3M=~CTM9kp*Og+) zFxF;pD<@J!Y3RpIO1jTb{}a}K^vxgr54+vEu`MN~Qi>gI|M-Mb?h`|rXlLQX~sgG zZjD*DZlUmFilcZV^K`nnnFEzlO$WwLvz;@MIi0Yu-|=6DexU`O$FCd zLcJsv_TahOArJ!uV&Fa4sR?A72{n$HC0%8ES*4U=*1eO+ddqmS^@KjzB)4%pr3A*; z@cL<~C=cT0;J~Iw8=TK~hOj(q!!K(J-8^`sK1yt#p(Itw?vsZ9tNV3ckpo`Q6SNc$n3h;)ib zhaw$~v`M5RkPbrHDAKV=>&?AkVns$gWO7rf@*CK1A5;TM{q{UI3Wd^L`GpdxNH!YW z5|=bJDlLA)p{RcTZ~AXXxo4;H>OLc7pn3P5+4rrRe}M6BO<(HXe_EGwQJQ{ERh#NB zl(vu*+V(W*sk|MUL5{r8Z`q)IjF*HZO}p3xH0%DnA3bn0S(+;N+t#$ptgDWDx4d6Z zy?dZpw-cQjJeL$Hw+62#3*NOwhP$~ZnRVN*E4yMwxn~1`oDZgtyIjQ&!oke_=+@b5qb>;HV$z+St z(l~GYXVLrUAVwZo;mFs@+z$ zD3?u<(+ZiTah}1-6sFRAYV4E(83B`J23W6{%?M+BZwR6_&J8PP6-(UoeipM%xx{P| zFiXsm2cIk^%glV_pHxo7E!GzTS^!!SwbYSt8a{;h`CwAaELAys;V^Bsl7Y%g!~DoJ zT9r>s)KW!y_VYGNwM<=M==M%jS(w>~Hw@BoD8ulPUNcXt$)*Y=eR!DH%yS~SODPzB zpwG;U;MdS0sPfxNQhW%hQL^HP6HlcqejwSX)W*-UmUo`8S!$l+gq3C`!EWU-MoiMI zbinGok!EE9&J_81fXxDiG;~P=;1*y>g)<=u z`I>-@fLjF|5192C3}vPOZWb_@lbNJgz6J0>0p|m*5wHz#6^E@-W;qf})meoqz@-AN z1zafLM!@+3ZU&qq;B$bp1dI;I=>kRvE2Snmqq?Iz%2r<0eo7(V3afo_%z@{0&W3ZD_}56b_v)DPSqvBB;98K zT&5P>7XjENU~ozb1e^poSHKy7vjq&MNrr&)0jCO>F`Xdb3c#@f-UZm0Bw3l*@7srj zpD18G@Dwn5Al(vh8{jq-z8|wfx+q|XR5~Nz1i&W*oDR5Nz+g_=C*T6W)dDUt!>g_o z35Zmz9@72QfJ;PvJ>WG0ZU&qu;ERAQ0=@w_Q-!k(fXxDC%q0of1lT0t6u=P-4mC+x zjMG3-kOSCTz=hPZf<$1(pR7^p69R&2l8pu_F?#%I)qRoNfTxzWb(E%7iBd*IEj1># z*EQFRQYLM+G^3+5Jyw*4wwKyEN;6VLDPvr%Tia1OGhUR&wwJaf23Q5pvnxeuyjGgb z`;wg{@|lWonri+729eK%=a4`DkjPJQ&bRCn`KiwN)&(`9fQ^U)p@-5%e!6phPP52o zy6k|zuu0^zQFh2*oGbFPobz)p^L%TJln{)mKv&b)T z$hU&fhBi@9>QI3Er?j4xIp=TW{^RBtJ{cVt+L$BgR5;_8HH!Rg&iT)k6!x?-KcCNV z2SQ4Ps8HoxVXMZ_F6aDhnvzyK=fB8(cF?bJ&ab>B=+`D;AK=jN4vo`&&K0V(9v^hc zuNH(3Ip^>47Wwtg`PKO%zfsG#CL0Y9b&W=-Nh?tE-^vsfPB`b+Y7%O8&VNUf&}rxV z{dt1U8Rz^1R&DIhITswsy4q)G0wbAJ6972nF242L0T z(6scLbA@9CqJbOE`G3)d?3Q!>@g^0YNY42uV@19j&$p`64@2;&Ff4p+b71JNxuSx% zGojC0M83f}|BD=v@8_KVr9tEeI_8HaMxU(_1)+`wiP2xJQA)?M-Ezy=0baBBB^$9H ziDtfKN=T6E#!9mq7I% zV@kpJpOsHA< zVvmwE=`ZMu+vF#`<}_)YQOYNWkmZVPU0>zsz#TQKP4vF&_&IuE;YBPeVCi=EUR@pl&a}r%KKBMFkYvw*XL@ql=7*JRpT>Yb?P+i z<_u{eapl;J_$6DQDa(#GcEnE}7t~#~WbJvS{!jkOkWamob!i1?p)KtNuenWN1v3Yd zFH8T5Oi^;D4H!1}OxKjxj8OS@rTkbCr+jMK6QG)L&pN%Bb|BjP;zP(wm>#2#YVS+l z^pK#U;yq)LS9W!KtA#T{ zqKmsG@#w}*BO)As6F z1NA0QP(>a!XSmWM(?rshgv>M|DJ7W$`aaOiH;)K<6-UC)<&)}xX5~=kFB4PPcDeI_ z=lcqlT&Bb$EEMBukr1yz3`E_I%Pq>adnb+TZgxGgp=(kPpTzblN6Ei0WTIZoD{Kqo zB*qX3_d;xq#pW0sm$Fm30XUx9B5C(34Ig<4oQX==O=-C=Jb4Yn>fD`&Pl0V)@mMJV zF@WE#8xbzrDKT3G>oTt~*(gkE^XZ^S-ExMTB5-dDTqa-OKH%nvJ65+`=$xzeF5iyL zkqI>7VL=mMLA=>qvVA0l+P;>IJo+fTd`UTd|5)E3K{-{mv&#o55m}G)%h19ltTfK} z0GpTX{ZeYP0)qOh^;}!dTcWgPO(ugB)9grcTgjRo?$el1rE5iKOP6Lpa!M(gy@)Bz z<=Ml$=5GTHO=~9mPjRyFm69RN{^eDrWX|1v=T~>upZV3w={f7-nErHOFqUd6?V>+R zPARsz%g7St^4v%=PRUUGSVTF2^8q{F!Rbf-N=o)4`uuhdQxPLV}K=3R^T>T3&pT8AAE+UZsBeVEOPyCFMCkrDa}EM}mjvDTb-TmFMpn z?PWR9-g5o}_d6mTx}>&xvAtEOO^9xh7)aN47xm}u9&%SQ=0_qr)}%kk~LvG?aG*$X23o$9`=_x3AQ3m)`ZunWXhRjX=9Qd%DBp-g|!(^0JN-OI(g z;GiQ@!4Gz$M-OgR>K_aztCW@pBgwR`gnF>QI+nloQ_No)l-k7}UJGuxFyW+4b%&K( z4~6T!o!YltMU^hJ$#PT4$_dACuE`1SzmRnwLSn8$7pi<iM|3IE{ntb~c zyBdoJmUk_S2Uc+n-#44jtbK7^jmAEx|Kden4|b?Q{o*vo;eYpKNI%TWY4}5ezUaEe z?DL9cYuNaAj-adT$b>CK1nWg8tgRmgA&U99Y4!t&4g(X_xts44E9K@iHYiHiLOs@1 zOyp6zxu-;ePcYDhO!pRH(nTuvC5yct?9jvfrAzy~bA&Bt znUdjdbqSdBnsRyRKu3pX+1xl6Yc?B;r_PA3hr%62TuMD=>Yy?EiqiV%K)u>&=7}|T zLBk)*Z7yhdgGL78*Zio;fyM}>s$if#l?#s1fJ^VnN7g(nbhV&i0F6wjLEEfiS4vsp{ zmJGOsGUJ2I7RJn^Ra=+GguQ2>Vi|rY01cQQI~1a$m3`5LWOV$JI!CY z_}KlkZESE^xWhs3$2sY}F1;Ijo&E>*`c>6lzw!t6`W0cX*9>Rwa{St1UOA2J`jNkO zzW?_Sfx~${)7XQXm5Xa1xVt+ulGe>Gdg^%$$2qg~$|j}o@vysc&aqBAXf(u;HV$of z;fGA!s5Cu(&)qq6-#C1c%W#kw`raV>sni&DQX22Q$R za;{?e(!*)~7zDkNU94FZpt5c&do>UBP-6_BLGWR4uDjx2&uwz${viyE! zoo)ET-3|7{=&nVcx&nip#LFxTTg|%EBW7tc_aGq=?#N(k8rn_W5lY+NC&}BdDoN{| zINg3+F>SbCnf|4oJGzS`)K|Uj=4JOQv!3jp%?aHsZR6RZA=q35Ge7=&vs8XBoAv*l z&GGX%o7-ULo!O*Uo!RVAtMWI~l<<=7*&NqR5FrI?Sv#BQX5F}cX6bqT|BlTR=v2vM z>>gaW+=|WfhKKaU!VVggl=nlG{Hnh4mJLeth5#&UDH}$^YxGuzJ~gUapJD8ZuE%i9 zd&;(_!Uyf>+Dok1z{HC_`I)6>i_Uq{seCHf zs*LNpU4@%qwA%s~+If0Nn?|teFyjQ8X;hn7RKR=*u4OR%W?j-H)D>F0sKll0IKwOS z(yg&63)l5gUM)3}%}QhGK*tIG!UE-5>30rWll-M|%FS*4`))4oY-y^amGo!A{n;HF z7YqF7>x%7}2f7`UyKiC<8}{56imfb$?1ovLuKZROr4M9s;c?RDW$}t-(@;l&JlBt#u*If! zmNMoAhm8``)wR)4v%#ddVl)TexhYwwKU-zlkeM*#UF?1~VI_Yq1~+;PQ$v)epUZQJ zwPZXW;6DSD3}W!vg+VNFuiR7$pYPsN9_gzJ#ntl~FQydI3$+%>)Uv&x$C=i~TpLpT_g4!3%pk63M(M~78&aZ|E3u84F54?nMFy9#mm zB_(fjB-x=1mAmGRf%N_gRD zuiOp~g@wz^72$jcUFOIR3}MAR-OiCXA5}W8Luk5JxmEG_uv|7Bx>&hQ3%ag0bhlEy z<^Dut@mMJkHT{xP;M**PLzjaKnuBmZjNghJda9e+L0C#gDUWP55X>HDpP*!q@Cp1# zv0`~~k=K%J5K$*oH-U{3by6+KPuBFI@Y&$tA>B->A=t(sWVk+AsXgE{FzYdOwmsps zq^7++)mjbk-_hA5ZJ(%^wuk#K>7v9}$=TlhT#D_+gNRw7v~0i6x}?6?D)|Yqh9;xu z3Aqq!>Z~`bx|8|GW@oo-slWS^HL-oW8?!1ki5$fy7s>T_YZfj>FYL3aQ(sMmQjXcKINvwt1WoI`8&`FxT zXm8i+XVG@$(2fVZmR7gZW?@dt&H(>$oyT4IUMbr-bVvoq<<~YN`DI>V$Rc>YdaYA7 z*=C+L>jqy{T6Ye-moHDa09v75svJB7Bj~anUV11Qs;zAvI3<40J9szXE;bN@t}2$7 zCP(iPTxt#|TQk(<$!TA=4mRqg7z8{_8?uzls^LK=JMfw+*qw0ooZ)c{N7W*)rRO*U z5@JV&muLAi_t9lJ!F9(qFNgd0@1o?mQuFd8Yj^JTz)M~CXCP!k%+O+lDRg#hJe=f% z(QjjAofn#cUGL4Tx&eH#h_fv7)~1^C_H)2tMle%y8^gSwH2X5wol%AJ6kBHOhJh}f zw@kBcz&teUjd;?pBA(>Zqh$$Q6C7}?YY7eTQ4D26l}BF2h@;Z%E0~3LV__+q{%E<{*Ol{>Yp*UQHe*o>b162#K)yEIpWT0VsZ$2+cx`BZrkt)N@2PuDxyCH5PE?v+ zi}ZKgLy0!aRw!<-5BKlaMSXaXuMhP<+qvY~OG^3cWBoUDQG(q)O5(aGNmdg6Jl6kw z=aOeI)ltHtTP{6#29^^gBf2OVr^Hte^mm!;p%l2U63Q=X|#)@QKMP<_Yhhpd}m zsc<2J~xOt*SR4XIz$>5Khva^*V$wnsF9s z7*iwQier^>1QH`;aY1@d5ZdZMD9Z(Bi@<4epp)x@vqIqf#{nmYLvymjIG9-(-Ew;ygArwS%(Kv{^s=l&KoaX5JG+0X9~-($qL&0 zLd|G`U3HCc#kCE4wNPHD)zPnYXvE z|3r+Wi$83;qLl9Ko;N?zHE(xJapo;=0eFj3ro1z% z-4A^E8U|K#+gZ)1TkIdjQ%>vd;u(DG@=B7mu`Ayf(r-i8j2SjTVBSjAq~JRjtq|tr zzw8AUO;Nn}kCYeT63|pXC2RkKUU_UL3Ip?%le4yPgUZXrc3!d%gamaHVC;27DL)WS zUUPNJau8h=C+*8)+gr-0d&JQ#eCP^qX}P(*rSg5j!9M+g--RdR6U`O&As<(TeejZ! ze=r6y#rpcZD3i3jOe5zoXe9VDnX>!gg?O2*LurRV!b*ZXokaS-$VSZH<2QKt!S*{gUq43;e$+XJ-AYtdGR zvfDnG;D5cdqOabeocW;pjh}vR*9?2&tozUa>+F{=NdFCk}tqW9sKI}(k@YCSwABN7(@1mzJrw$%kGcKpZ9_(nv>26}j34Qi; zeoCCp)T*0P;%uy6xGwSVK6FAG&rZ?pxySjuc=)u&ro!fhn}|obE^6-Xd|u4?-gREg zIl{x+a}e#Xf5a&mm8p~+3F|w@r?U#>?^o)NbZ;wlEY#P<+|;oky`K)Qs`ABxJsbR6hEz_!o@$4qt#fH)S*jbK?Wq){_IFU$DGM*gS z?OuX(;|@r02PCuOF5Af?ktR*!0~!9`!uHZa^xSi(a{cea5XtB*-`C%@clX}p{W3d@ zIy+{G@KnW#9>#w>y5E$}JzRG6f73(R-sR@PEdP$V^+!ESUGTr^q5QkQa}Q^oa_!-) z-I!g|73&61eo9f^&_kcw-rM}8Q`N@yYnW(dA5F23D}+kLU~AS#DmIsTBUt;IJ9~od;zxzret6H$v_1 z>yG#TTMlf83SyPwpA>2;c3yoR2!+ zqLy#2=(?GkYn3yf#E^xG+let@kKEwKR=(-3wZ}e5WWgk}H1?!oIpI244duao~hLb0UblhXHN(kf%<~>!7+XI zRNr)hfzf<+u^)VJw{qgMaQ~BCl&pH8x!Xvbe0@{bBE0s6QrNtDW_|?}t#eF4zQ+B# zPFE4-YeR4WghkraP4G^s1Tb4Oym?$lN?D+!o*FhL{|p-o6a^-ybi_@`} z+cjsu?7%h9p~|mBkG_|AV_tY-&1>WWkUSEu`q<}G}+ zS&@)z6#Its&qIQ`HuUmU-0%E6oa}e?_a<)={@xI!_OCtkYuX!gi3Co@{KFl8*VZQK+r7&br`wxi$7kMub2=xUxLIwkwY|BFzqQ{W zb#3k^^#*C`Ue|>*6^7-XD^$_^QHlaSP;k8b$*Sz!b7*#vwrw|#L;fE zYm_THCR+ZNnM&5*M|SshiTvY~t{eYhGrD3jOQQxsI$B_aZLCAP!CwGoCzF1zW_c_E z%U>;anEB1ldzG;WET0S4mnUngn|&ZCL~iXmh%C3NLF6%=g2-dkAoBCS`YKW9(|qGq zTlw7=DzlGXR!Yu~#*t?I`MU-boEC**N4rY>y$boeDG3&MxAJ$V6vIDa`m49SL1SpZDPJaVVG{s=qjx0 z2n{E~&LrCW%u2!61LPiqlx<%>M52{jU(e?kIuKi4oo$xCy}-r*u@xSDKx1~87*Df& zF%cFC?@J31C^E3d2+S<-k;Vw|~hlUxYwfX3g7^Xao}}lC*g&F>IbM zJ|DKMW+p)6z?aPtM2`55NO0f{&XzEn2u{R=SY4SomIOMq5Uu222=N!b&FV^a0LU$< z{OwJp>O$~<)m0#BaAx-#wo}#On9a($3s&nw7FokBr&P|8Wp#B2YZp$btVw1u5==N? z>6>VkwQpx|Txs>?#IcgOgSBtIXF|moWU=z$^{d-dVSclnjgf|HZN$%lxZj1yhWxEB zBx^>2!GVa-)76(ddiKp`#q-;N{rh1|%#1X~cvJK6<7-|M<}srT*LC`=+o+wM} zk3mH2h)^=$RGVN;wp>!le|-|<q^HFs9X*FZ^kl67J_FcWz%77T7~2!yae1?w zQDB&9t=6$KqO*Q#3y;O3g&7z;uJ!0t2GZk{luIH07^#;24kcAc`zrY;X)?=SUv(&H zL;8Z!d}+8(AfVmgHwAA5fc_Z*pDXsCA&FD?bQSkJ)o=ffG96}k{8FEG2UL_*p-e)V z@4L2tK19exTGfk$DE99{{mo|iJo|wSro^oOSS#05DW=w7c}=yF-Wq~He{SnzBu8m! z9Zr&!=3fJpnC~s5Rw?^F+@El=QosiGR^r(i*U2=PCy@dA06n4IH`A2%z_Ka7zt+*S-fhWPL65Y$>X zkXU7wp1z=@{P@T?Zd=(fndP(W2C6qVr_$5snXnv&$qlQXw-8Ld!%)^MZ9gj3Ow@)K z-F|2vs1EE}4BuI{6~$*jk_=&K`54ACH<8brAP8@5eMk4s6stcQqW!SK+BSzWwy_gk zfBO3l4wc{^{gr?#CM$YzW}#@04UTB<@p$A<>$<%!zfjwgnp9pMw{*1kCAVGZd7$X| zA%~tHgml;?cy`@D#yeuDP5JoB2y#fdb!D^_>GRngT4TLIhlZ|zP&!*?@+KA1;I&&yP$+&+js$` z)`{0Um6Cw#g*&l%DdN{1W1$4v9gmA_(BdrX*ttCS1NpTlucPtK_W7^3+spZnG#!mE z)RVuds{WL|Ly@G4Vx{O`VeO*FS%kxcs{NPMC#gd_{)%wnFRS~ktG9(Y{Pd1|YLn9V z%K+K`n9}-7Sl@LQS%oCnLw=OEF)+$3pBkZrUK@^6-HdDN`+0IMTMb z7rfgByea&iC##NyC#rq9k{0oNHb*-gxk7%o+$?{36Elv0duCEKvwKm=`}GO=kt6S3 z{xyW)$A&y_%q16_d#Sb}YFAHnF)E8S0OP zsIc5DpJ0B2hE_{!Vd@f)g9%<(BgBU3@X1+>AK!_MQ-2bTnHEnm!D^u^-f4FGLYmT( z41D*ao9l>I;R#hl|Kp>i{&tsK*s2u#7KtrSjutf*9px;<4cs#FSYPm+sjl|$@>uSS2z>x`1l zUYC`M-{)GT&R40PQ1is^0hy&fK1`Efc9_~!;ePRMhjclEc8JY>fGL;Z z4X-N7w}q3^P~3GylLqT?nVnRs_MS|-qO{n<$%YCNLPl%}B`KL0lt5OW-zVP5f6#>u zlx7L5K~o!Q&38!xZ@6?d^)U0rKwH~xGd_L?A9-79Nx+OuUQ^XEt!6ySGg*#So24}V zt$?#uKOvm@M)oszw?WBKtE-jT2_u!km;LAgLYDhvbZA<`Dr%BRj8CHjuZ=WUCJ*;{ zBEJLe=n=MjDuzLWX)hgFMfTGY9U0u`325|DzTF>Q|3qV&{d^J3nICP|k)GD$NMfH) zJj-7q%;~`duwrRG>Z`)Ms=Gt0&7wa!Y4(3C6gRbR3CU)3)H!mB!NcpV8Nf?s%A)<2 z9Gob)VMk^lA6vM)#E<`2tXN2o>~J8!y%LLbVFR>~2}w4!SWnYZH!@kjsy%tejZE@7 zGKiEetw0~9Vp(^=%RWs>Ey z@4*f_X5%t4JOC0i7U?2v7bH4xK55Siv{AHP4OfH`#CgmctksC7~$e6D(SH*)ii&LSw3`~HJoU~eh7`@7ZguZqaIVK znI`GUzk1mUI{5uy2~F}MqkL*OtDuML9W~VEMegt449(^}a3Iv|fYwZ_B1tT*@glwJ zhW8|MW!Y9n%Y8_I51SMDz+|#H!?Va)dcuc9>LXaoX1Q)Rz2!q<-0?F?wiRqymg^SK z)L!J%;Nmjgf;t~f9fNUTEu86Cn$?@UG^mM9W-itk^~aS&FHdMyi(`&9(NF_=e1awz z$V@N%NDgmzzi(ZIfqYB`7oRaptGEZQskB*s7v94o%Q@SYC!t^OZlJb4WL7k`1Mdzo zODpx9yegtYVg@mfPG_<_X$Fp--s(e!4R|t7ZR?%o7*+n8cN|B0a-Yb*muB2S#&|t> zMx=e{wmZn3UQgaq(|gZS{M4L3J-?U?WZN&0UmszX_g)7%&BMnI=i_E-^dpfz>WFw^ z;5;$RnSNxJ{&cbtqrU_gwSFYr=QN186>1pgkmc``#j&G-ZSW`SgObd0E#sU;5ZLIm z=F^cko7VV~`>ht0$+x%jB58e@NV7Sl8DK6PxS-jhdaYT08z$=Zer7@-I2P$i5%tf( zhTX1k9z=O5q#reelYqML{v?o)J!8fq5F0n=-Drcva3Nw*SNZ0C3DV z(nc|1+i3n>WGE1;?jj-4MmCbzMPTY}<*|s4VQ(-wuoh1*-bF_Hv}Q`ik*fA>eUHWt zB?DpKGKP{-c$E$%%pNuk1@&fnL(MdqcxJu{D6O>GLs<@Fj<*R555#8|m4b5ixg(7MgMgm9?jT%NGgE}0I4lFFPFAP$#22mTsTHXaMU~N80 z>lv++^vp1_j1;q_kur@W z!|}=)iMfYGOii60NhTl_IEt60kK$#eYUP;l$>hZ&k8!=#o0M>o9c>1KLuG>Ps>U z$)aOU<#b;%RO>QrOD2&+*g!g!YPHks-<@<;il^Zqjo~&fcMKWOr?lL)Dyc(OOrPg4TROg|!GZ%j+-D#&Kl0Po~JiK4ksN)NMSLH`E7!Gh^+a!h#vq;YDB%An&oO1R=PWjM8PPuKO#!!flwnTxHb%DlD_9R}b zWD>7+aT2c;IJu)%PDd}ENThj_$%pqnQ^WGia?uJfp?wc6Z0|Gm9r#5o4jsW5s59_t+NU}oQ_rFHqTyECfxE>_lim3;Cz1Es8%VsT8a_Mlsv|ur;oy*iILnS z9Ew#zqAv5gFjAYcvC}kk^uFLG7t}-{D3UJFxWG)(rfm+W#V*kdt*J`E$_g4kgA7f+ z%C_}dz(fS(Ah%5y1zLZVBl(Ofw@1fesQuKkNB7XG8L*>UX#ETl7N%8s^suN>;DGub zy)}c3^m>$qdLjNt$I+yj4)T9AndZ&}DI+bNN$!?cCOV6H*uCPaNnWD8NRM6FpQ zT-z+J^rz*s$b<3G^98TW{-@Tc}-p}0%yn^YI_mdzPy2|@8W#Ovc&+*#s*YJYr zgIT1%S|^z9%;Lxgv&f&3Wtq+El+7j$J}H75aJUTI%prs2WkIy+5=o-AroA(5*Ct~9_8?YEvsnx zLhOl6jteqvT-d3G-y%_C{&t$Th)js)+nD09#w5%<^;=~xbqnOY9erRAJ+p|6rr}`_ zO-dgU7;Ca@#wpJO{A7lQ)b&UCDhg3(t7tBxX|jA4Nb?tyfJFF?ADt|GB7|)ics9~k z_*!3&6+sf;>HPsoxtirUml;khjb1A@;i zMDCY!?z32~U@Oa)RxBs0<@*z<_rqkc#|sr^`Tmo9oupsiA_M7D50hxvzuJe%QjZr- znC1H}QR5?Ir`HQ-)b8JVo;E##eU_2N=Of@^5Vl+W!H5h633hY;nv}^^LoUCH1{Si5(Fhx4* zP!>fEE3vv8Y3xc8Zgp(46DD{%%_NBFYk38=2yyUl=Xt&=WX~MEW3-V+RuB+S zPMhT!yJ>a-f-nrFJ>VjOFF>h4_-@7ubfi#_)GR$(ueic7>ixCy{LK-4?$MQ0+Q^P7UVG6p+|Ng@NrmHEP`Pq^WQp>^5 zHfkv#0ld5IO48BYEj2(xELAioR(dyOEdoAl6vf{uFH&xI{CVf`smTU~vLSF)x!m*$3 z4%|#uo@msx&tq<;N^cDcv0K1Y{NP}U>alG$O;`Kq#5Hw5E_eE^oKds3J15 zk9i{N#_;;>P4Ip3do7;~;RhLJEO|v_E)F~{7LlI@Y;R@VPrwh_n&nByoE7;`QD%9v zFN^lGKP=-*qpW1;Aa3MbOrl?i_8HxImPLrrCcP)@terPLlDf1I5xa-O065r{s0!+@J`gTLX-4jUb4e@_DQ`UvbTwBbtF>XqnB-P znT<567!kZET2PGL#*18~%<_b*wCyDlL%%L2F=JkALk2%1!PdSO)U;V;%#?a?p9e9! zO^h2hjbQ=;d5e}xO!*0isrg9~?w$Y;4&jp|&6)#niYiwAM_v$u|4UmU!dVVS3dn0p zL7p%o{Fp(*(+NB`&I#r-;__Txtd3)upeszWx_p=!8A*uStVrnkT%XreN#$83+{nR%xARucQFdE+vBFG!)dJ}e#x-?mAjDV&c=W_ zwJfSFD&Nf$ z%&YQ*YCXpuW?aN7Rl^K4;wdtVxY0FFk$3TmeVY7BuDn5wrQ|L-8L^F0P%){slHvN5 za+j;76lMt?U@2LzIp;}P9VPq_a8c*J(@rEIm0QJ9aL$kg#KIcUsL zOUKk7b+5zHBOH*I;9QSlY%r}s(=Sycy@|FwOd^!pgkE)TJV#7KeyNF`dmg*m9n`a& zJSo3)hSrvozP(1UOGD~9C{=~Bya3JF!=)qGdZtNRZR^wj*L(>Q3`f46JiINsK;I z9kRh&sNp3X9CcSouT{!>se95-f3IO3dI?9>FLN22En})SpS!t zs-o2|V?{vZ=w+<3fi&e665x)#a!Df1e-#=te*;=#)KpR0ULl_cq4>$O+Gq$LS}o3d zl|-`I>#wrf0rc%x$(MJ(V%r$48ujfl>W4ZwYq=Zk>k^~8EMsdKFQfIla3uVSjh@>@ zehm78*(n@>?8MuzW0Hg)rY*0Ln4ry~IM1bcZC%9cHLC$;Jsq%jh_XYXEYG2=Sd{Tiv}mc>p?rZTzbNY7?NBDX zfLBJ`5QRG(3ZvDEud+{Hv@V=>DAy~do3XUK4tDKCHR(Ao2l((N-Nb6ukj~O#>yVBP zk&ff&&OTUe^N7qB;`A&b_xvSaaa1UBUjlBTz)lR5Y>ZGD3b2!6H1EC*i~jdL#$Yl1iO zit8fYBo7m>S8LS@L5TL%kRRk%aqDUi%->bIZx4AOc$Zcu(<}#Uz!(W*5fDUU-y;8H z=zebl9nq7w$#WjN_L=3rarE@tWUJS%W|gvk94)9N4|?sotfu`CC#ofN`aqF%r&W8| zv{jRLY-go|>9BXmTCFpEz|1@3&R(w-G8}bL>w^X69kM9wHDO`;un#%KBJ`SQxz7li z|1Oy`__bRd^?XkPFHjZ8>#+{`uu$)k56BW)vk!ZT99p}djG#gLNwoZWAxq4mJNFZV z{Q5SQSSr81PsNyVfQ;z%I(G@cSgBd=jgZj+M3CIn{`7)deSl2%H^Z$C)btv0VvIpA zoH^9t{6!3z&t7`1j@;$-=Q6dX&srvl5IVh%^rSNnl02_JA5u%a5mY(|>-y)5BE6f| zzlT6^-}lIJ?KH<5@znQV+_P1bo|hQP3trViTs;v1ejjRejN0BO!5-C3X1V7=TJ=7B z=OlXheKKF4lx#G3Bt~C2K{G!f1H!y~nC7W7zaa@)PP8;8P7SypjkIIL6{U;6CotR6iCj)&_(Tt`E z*)*@744sjkY^;~q752^Q_W@dQ4mY1+hP!zca9g~jL9Nby<A00O7o79u$gbzL^%w!lw^G!@hY$8IP>=Z?jGqtbInbT+2A|nb-6)i^pL}H=5G!v4zm6wU z+EGEPpnFcxjYYkMypH7pc+s8Yuymn{W_}DAS?HRNap-KJXFeuRT7TzfGHkCTsNBN2 zm_aj6X7W4xH5hh%WE(i~Mp|=F`R5|6PMq;g2?ouf&TX-ymI{hdN8lKN+w4PS#@#iho>)M2aMVmH zr?<}2TF{urx9>45g11B66o6rNnb(2gTg5`-9T`sT%eoq)<(=#3NPGxsdCN!V@JDCW`x(_WvF zI6c=@Gx_&CYW|eGKqAppJ#ThC2Y5PEg*v-|1O7CHYL|C_v z>)DiH3jstE$Ui}IoIUJLA2`c*oP#bcr88jck&r_ z?aVoMLk6LSb7WxMU%ny%QD9Vk4V@{cjd=MpI_y)1Oec(6s7%W1B3kgmZIJW}xCE>%q7dE1A#}|JGOGV| zzFv}VlOYc^T)e|x20~0;1wb1?n=g<_1NN*DDrYp4Z~5#J;g|x38)w|JjV63U2HgGa z6ed>$+t?+D9^439@Yfi~H|(!QX!*U7FWk93RjU4c3(pGmy|nZ<@M*pwqxGe%PfRv6 z|63ACXYIx%Tk_2gy6;;u)R(pGAh?Ed8u~4XN#@GazUZi11J)&NYf$Fm$1|5eE3?tI zZ%NvcLgu@RD8IJe2~BTd9=BUDE*mhv1rAavdKTEeGa(n2cd;`mWcEl%tbK_^FtCv3 z-G*E0bBWwZDrmwbjFF9V!}og)6*T7(8R}laR$zKAm&70t9Yig5atHnS67eQw)Mh8) zBh)JD>RKlB){Xs^ewzK)_b|SGX7aT=Bb$iZeuC?An(u zgLxjBc*^;nMzy=z33)lYL#QzgdElcW{`nJ@#y#943RkE`<^uWtr<#NNWzwE;$>BPi2I0Gtk7#!HF*z_mn2BHYGvr5 zN?PE#kk+m{7&tzpfH|mgE%2Qr!piC4AISjUC}I7Wla7Hsiw)(EID<kwWB6Qq^Zqm2EiAB?E`hbp~Z?S&`7-x=g!KlvsAKQl9 zE94;`Ro1H370{Lw@Mj8W+Z9}3D5S=pu-7i7SwA7lWzytlCSUqH$ev^Q(b}K*YIgc3 zGQmH~O#b%016LNL&(heR5xp!e9xL`km3Dl9fqfqNf{DbyKkK9hSzb@_Y4g8GUpl4@ zcXQtSCv0Q^ZIx14hOQFp1F=YTD4VMe;VNz5h*yYOS09&6_P$ zU$y@xi~7`_aBkxyz8<&%_8l8}fPQlW*Tu@|tsAVRR4n8r8RH8p865 zJ3NM3HhLW%LlfTwx;QK~4y#nEMiVo*hItHh(7x^_I7d~D**+TeJ5+8T&HBCFuh2?L zP%;BVy4=|}a)CJS>>Z7PTHbkQzmK}v$vU!&dnH!K8oQjmlJg@}ujClhHAkpnTf$^tI`>=RW8y~E*=MPA@mVTiaH3TIr132CPeT2; zAk_h{baYSH=FV$ygE{~hXZ%Td$zgm{PSx?>x8;^R-0@4_hI-XT)~hzMMzxW(^bnE1 zB-N_rdPA0jTTU$fU)@2f>rUS#KdhHMlj>3va*nNSA+*>+v1xG&$HKtsehh{*R_jotU#a_dcZ)f^)fxq`G4ESlb`akX*|GoimP=i?pH6 zoFUhF(t)$(+Y$ELUsvF%!c&9iAf84%&3Mk?X~lD`&NxR7bGQELX21O_3a;N!-wgi0 z_89E+!hAW{nu9j;@f6}I#RKMl1@pgx`Cq~OuVDV)et3hofBP+7SYRBNI>EST!IHd% zIbM*^Z`pWk|KA_$|DVeLuj?AYXe^!tJgImx>^*M(mJ6Vu?wm#bw1+h+%Km%gMd!yg z&o%wu@LkLQAl-vE9u-w*S|T6qbN8dM_TLLq?Z2<8w*UTES;w=wqyu)$*Wgvgy4XT_ zyc|}H?zld-8_4s-gZtNt986z-Lhf7F`h*-X+?tAC_Q=9>2#=fkUR3RnW@UJI9?BQR zcRUL(+wIFj?e?Xf;;F=Ymw5K!t)&^v@{wMa+wm;DhTpQVp0?Yc2*iWJCtB3EHPa!@ z%JA?!lv}GDo*KKobQ_)o^?Al%w{HaV{6VAbX}~OxrJpYEcs7<2Ylv<%f)fYv^tIof zQ-gQ2-99@4?~8W(yaEI@z3ujg0`WGY=NWis+wF^!@Xoi}bEEJsL63k>4%+ScXYf8@ zx3in!1kA2ngZDMN{ZY`7A*Dh$yiIoddX&p+?DmpO29(+D8yEt5_ACg?w-8EfktAJ& z-CmK7H+r|l8}D?yoA9>S?OW^VzIWw;{-?nw!>B$?Dox&k%XH3AG#%1AP>}~Lk@Y>cKZt!q;ELn z9fG`5(Mn5Q@d4SYr{xFa?OW^R0G}L#ymuF#iw60f2pUl@-zBHl)69B#6qqlom!BN7 z@{B=Vc@9qt9-ysk#d8_YH9WTr@}q8eJnP_e#JU%#I+PRW#%n&{FB>V@OV_ zrE^&_pRQxCSo$J+MbHn}%Z+};aMHHX-;T-8$?0wM*^lJ``Vs@W0})5o{d`*fM5e{Z z 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 JwwuQs{}0T`eyjih diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt index 0986ac158..5314965df 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repsitory UUID: d3b24894af8a588e6945240c3b80c2b7024608c4 -Revision: 295 +Repsitory UUID: 2dfbd9016b501eca6ee2c00a08e49a3f7e7990d8 +Revision: 296 Branch: 3.0-rc Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 1448 -Last Changed Date: 2017-07-25 13:53:46.000000002 +0200 ./Beb.c +Last Changed Rev: 1457 +Last Changed Date: 2017-08-08 15:23:10.000000002 +0200 ./Makefile diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h index a5accdc4f..c01ec39e8 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" //#define SVNREPPATH "" -#define SVNREPUUID "d3b24894af8a588e6945240c3b80c2b7024608c4" -//#define SVNREV 0x1448 +#define SVNREPUUID "2dfbd9016b501eca6ee2c00a08e49a3f7e7990d8" +//#define SVNREV 0x1457 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x1448 -#define SVNDATE 0x20170725 +#define SVNREV 0x1457 +#define SVNDATE 0x20170808 // diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c index 9d5b17a27..2bfa2ae5e 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c @@ -30,6 +30,7 @@ dacs_t *detectorDacs=NULL; dacs_t *detectorAdcs=NULL; int eiger_highvoltage = 0; +int eiger_theo_highvoltage = 0; int eiger_iodelay = 0; int eiger_photonenergy = 0; int eiger_dynamicrange = 0; @@ -745,22 +746,33 @@ int getADC(enum ADCINDEX ind, int imod){ int setHighVoltage(int val){ - if(val!=-1){ - eiger_highvoltage = val; - if(master){ + if (master) { + + // set + if(val!=-1){ + eiger_theo_highvoltage = val; int ret = Feb_Control_SetHighVoltage(val); if(!ret) //could not set return -2; else if (ret == -1) //outside range return -1; } + + // get + if (!Feb_Control_GetHighVoltage(&eiger_highvoltage)) { + cprintf(RED,"Warning: Could not read high voltage\n"); + return -3; + } + + // tolerance of 5 + if (abs(eiger_theo_highvoltage-eiger_highvoltage) > HIGH_VOLTAGE_TOLERANCE) { + cprintf(BLUE, "High voltage still ramping: %d\n", eiger_highvoltage); + return eiger_highvoltage; + } + return eiger_theo_highvoltage; } - if(master && !Feb_Control_GetHighVoltage(&eiger_highvoltage)){ - cprintf(RED,"Warning: Could not read high voltage\n"); - return -3; - } - return eiger_highvoltage; + return SLAVE_HIGH_VOLTAGE_READ_VAL; } diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h index 1847b84d0..836c3aa9a 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h @@ -84,6 +84,8 @@ enum NETWORKINDEX {TXN_LEFT, TXN_RIGHT, TXN_FRAME,FLOWCTRL_10G}; #define MAX_SUBFRAME_EXPOSURE_VAL_IN_10NS (0x1FFFFFFF) /** 29 bit register for max subframe exposure value */ +#define SLAVE_HIGH_VOLTAGE_READ_VAL (-999) +#define HIGH_VOLTAGE_TOLERANCE (5) #endif /* SLSDETECTORSERVER_DEFS_H_ */ diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index d89dcf565..f80b69fa5 100644 --- a/slsDetectorSoftware/gitInfo.txt +++ b/slsDetectorSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repsitory UUID: ef36cb7a54e1ae34ad1e85a46da6c121902108e6 -Revision: 1451 +Repsitory UUID: 2dfbd9016b501eca6ee2c00a08e49a3f7e7990d8 +Revision: 1452 Branch: 3.0-rc Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 1456 -Last Changed Date: 2017-08-08 18:21:02.000000002 +0200 ./multiSlsDetector/multiSlsDetector.cpp +Last Changed Rev: 1457 +Last Changed Date: 2017-08-09 11:36:51.000000002 +0200 ./multiSlsDetector/multiSlsDetector.cpp diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index b0d06c481..f4a4cc5ec 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -3009,16 +3009,24 @@ dacs_t multiSlsDetector::setDAC(dacs_t val, dacIndex idac, int mV, int imod) { for(int idet=posmin; idetgetErrorMask()) setErrorMask(getErrorMask()|(1<