From 79f537702eaa568e93008cae042f2585a28eeeab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20M=2E=20Horschig?= Date: Tue, 30 Mar 2021 10:23:10 +0200 Subject: [PATCH] fix #1720 - added semicolon to variable j, and stratified private funcs (#1727) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix - correcting distance calculation of Rx-Tx combinations * cos - removing unused variables * fix - correcting definition of Rx and Tx in sens.tra and correcting related wavelength readout * fix #1720 - added semicolon to variable j, and stratified private funcs * fixed merge conflicts * changed sens into opto Co-authored-by: Jörn Horschig Co-authored-by: Robert Oostenveld Co-authored-by: Jan-Mathijs Schoffelen <1517611+schoffelen@users.noreply.github.com> --- .../ft_nirs_prepare_ODtransformation.m | 2 +- external/artinis/private/arrangeoxy3optodes.p | Bin 4664 -> 4705 bytes .../artinis/private/merge_oxyproj_header.p | Bin 145 -> 145 bytes external/artinis/private/metainfotohdr.p | Bin 1268 -> 1265 bytes external/artinis/private/parseoxy3header.p | Bin 1968 -> 2301 bytes external/artinis/private/parseoxyproj.p | Bin 1782 -> 1782 bytes external/artinis/private/read_oxy3_data.p | Bin 589 -> 603 bytes external/artinis/private/read_oxy3_header.p | Bin 718 -> 735 bytes external/artinis/private/read_oxy4_data.p | Bin 262 -> 274 bytes external/artinis/private/read_oxy4_header.p | Bin 513 -> 529 bytes .../artinis/private/read_oxyproj_header.p | Bin 472 -> 472 bytes external/artinis/private/readoxy3block.p | Bin 323 -> 323 bytes external/artinis/private/readoxy4file.p | Bin 2434 -> 3673 bytes 13 files changed, 1 insertion(+), 1 deletion(-) diff --git a/external/artinis/ft_nirs_prepare_ODtransformation.m b/external/artinis/ft_nirs_prepare_ODtransformation.m index 05e056c65e..d74c2a2317 100644 --- a/external/artinis/ft_nirs_prepare_ODtransformation.m +++ b/external/artinis/ft_nirs_prepare_ODtransformation.m @@ -191,7 +191,7 @@ optodeidx = (transmitteridx | receiveridx)'; % transpose to get back to tra order % extract the wavelengths -wavelengths = opto.wavelength(tratra(transmitteridx)); +wavelengths = opto.wavelength(tratra(transmitteridx)); wlidx = bsxfun(@minus, coefs(:, 1), wavelengths); % find the relevant channel combinations diff --git a/external/artinis/private/arrangeoxy3optodes.p b/external/artinis/private/arrangeoxy3optodes.p index b9b3e82a0e0e21f6f566de23fd1ebbe91fd68bb5..aa908ceb0a4935ccee79a5ada373994c68fe4d7f 100644 GIT binary patch literal 4705 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 literal 4664 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 diff --git a/external/artinis/private/merge_oxyproj_header.p b/external/artinis/private/merge_oxyproj_header.p index f3ec9809572bbf8f83767c4602df07cb72f997f3..203ac740877bd5fc4868bb9f07ad498f1bb17f01 100644 GIT binary patch literal 145 zcmV;C0B-+wFflGLFm^C7E-)|v55OD~T7R(s001=r0040S006hxnO6hzc|hVS)nuuB z5Bh+$RD~VFX?+pT$)hZNv&4$aBd8J&h|8|Rq%pRlxv?U1I2rCLxPNLfeK+J~oFF|j zThL#Hs(sLDLq%w5B0iDg)7IRS4!7w^A+oO}E{q*w0`se`zEn_KG6K<=3QA=>=r%l+ literal 145 zcmXRjFw`?JC^Iksk_`M4WQ6_dH!?6Vm;!Mj5O2?spPzMJ*I)0K`5V2}{l_jWJiW>) zvgAmhO4>@pGWlgaGbe9;{B+m6(!DQ@iyNM-sfn58wlqC=^#YDNH-=sa5cX?X@^w!F2C@ zK`b)$o`WOm1w_Phwj#_7NQR6;#`WHdyY}1m7Z%6)B+aRB1PBU(#Z zym8bf*612>6S>i6uSYyZL$j$Sfx%MY!}q@JZZ(j^V0(DV$f%_ z8tUm&osVK(9#ZY8Fwx0I<+5_$rXZ-6iBgWf5gHs}dX;GO+QdmoIG5SQhoh9gx|_{= zqoI<$sKLBSe$qlu<}dUL`bP#-yS|pk*E*E9)g_}aK+hH~>rHcID5*{;fsdWTpD=r4 zz?3NVP-3Cz*U)|}yqSLf+66lLB7aT-`ZiznJ3GF~qDz~I=2OOSs3J$POqB`h;{Whs zX@N_`K6Q^~n|;X^A1H~^bPF^ChaiVR2Wxyp?TH0CIbiPA{wHv8A)z~uU#ws67aM%( zTzu|d{%6Xa)r{Hd{n0y1uE;wPq_G}*ioQDX)Gl=V=!brC%QiQou#Pg`&iM*Gi@~@6eE}!C8$e}Yy zBne%|H{B~~f-8+5+{4@YMGM})__kb^TMb1O$+PIaWB|xNUbeo{V@S+^Mt7ZtdFF8o(JI{^g>(b6f zXq5r*`TRY?T3n_&*m_H+RC6D064V-ID4)v}omBj0dwGTO&b8tB0eBLkAz3?_rtR?x b;LZ_URvkE5dCgGt;8~;R;&nT2P(zbv{m^eW literal 1268 zcmV+v=5o*`Q~d=_M{qIHYNx%R1Gb5o~f zquDoi(3*Pvt@#-*FgPkM+bt944ne|{9_WRh1G=g|vH zpb>wiXyCp#99Kk`yl8lVkz|rA-ysVJ=hVB_1zIL&U$7q}Ymfr$rx^7H8ZQ!vnubC= zmU;S@Ie6051RMQAYF%uvcySsl|Jg9)nKIwqdagFAl0TU+RomFimIxbMF)ufbC}&&1 zPsu5Xw-(b}B(v{yH}0b1p?(?Y15-hXuz)ZpevNCYY3uu`k~=xM%gdu?>U^Hqu82mvgbC3^{yr8 z;Dd6}rUqEizj+2Q1>V`N+V7zfWZ_>(2|S|6PVI^jU$U8^)r$wM_w2ahBY`O0@A)xB{$fZY3~}bacuRAw)d(u0logS%jf|K zpg-$8-QOnI*sq>*UzxzO{Tc`Jz>>M0Z>k~1TO{v@pdMwCW6YnvA@vb#5@`2kT}(3ivKslws|4YNjf8oR@{%H5x59rqxThKB+M5i>uQ{ zcM_JfsQxi%3N1%4ul@t5-HfH{dKRtVw1 z1v5XBj`rSm)v*_|{=;$LdPz=jE%#NGZT(P+v21UC_d||V{Lb+91qqZ{hL$-+8%ocl zMr(~HRK$eaW%RFP{Q@?4Z`Pl8|KLuQdA%vrkGa^Ha^3j6SPDKkuZ{)}iJykS%~j5J zk`9lN_81>qPb4y6d>qqXD}PoPOcCLS(WlaQN4eG?nbcI85((d{OqcM=&zAnPERP=X zS;v6^LGNv|O$391gt;H{?3&Kdvp{c#EEeosy{JHimrDP<&*7N}BR)bb&Y@fM3>t14 z;$7TA%wx*p6vf2@emx3Da98ZJQTvCMchg@Xpf4TY6*7b94UkF2WZq^~$$)R2bX*=I zHQTFB%Vw=UVW7^3(NkOM5-TZed?yYLG8NWJoI(w0;HI9^$l%z<`LEY zepQT9wE>hS^uyP7xPo8_vO~ebCu{Y_Dj~@qY>8dsdH6{dh`|hZwU= eW3x$jp2?L}2f*)r-&;WP_p-X*%+NLlxA~p>G;Q$! diff --git a/external/artinis/private/parseoxy3header.p b/external/artinis/private/parseoxy3header.p index a90aa2157cbe143a4eb9b74d9ab80ea769e67571..0f6a507475888a6f28469fe8eb5d01ff46412c6e 100644 GIT binary patch literal 2301 zcmV*i z>J~Iy>T^M<$L);ENGl!pSWC1~=%+6stN=H}_72E;SN`)*l|QYLy*B!)i<F;Vt^pKAOVpDtnTh3!Ws6l;eE8>*6Otr*ks%AT zo)E2w|C3$Uzs29^PL6Ad;`68E2{4)wa zJ+62!pW_DR?&YCf?ic~NXyo|PqKG7Ixq;|=I7x|q#L+MBft9ds=T;M2C{?|o=N^k@3u=}K=;(0WA@exR1~St# z@=c}Y+!-lGz=H>gFMh5-I&#C0P2=mvF1=O6~ro_Ui{H1ly+$sooO z!0D|6DYSzCCiuwyTQprDLX6RKU*-7xKVH;wTb7_A)q7v~YAk6R zbdU7NKX{5@66b7f;y7S(V>9z3na5)fs$;PXrFmM}`KpQn8}q7_Of9OK!WJ#ctmI7l zBWo%zyNVN%i{cyv?-E4agtGs)Cn8#ETtq1N!C#!Bw*_QiL&(&EmNQ_zg0hF`98V_n zaNi%tq{YLxGu&{_xXR`PZ)1%iTG9#w0MmOYSH}7SEu$Z^SZtF~x(3YV|0=G+ZG3aC zWLv&x-hU%W4j2$~cgaaBa)JRAlbJ!4r6^(vZ)RW(W~XtlSwU%k(@{2k1IH+yz6>F` zGvdc;Kl@XYPw8PJJoL=D$za!St30Bg1ob^eF*_R76^nSUPHlr#nqOr7UKX;Np;C2pt-qhSm~J9KxQ0$h))il>3WBB=z=+SfM{l|IcP-0F(Ex-XO2efPvg;j zDQQh=q5Ia0%5KmTcp@&f?Xx6hcO9)hkOPbqC@Pu6lG6 zo|kJ-tgL^8)WI9Tor+m?E3m=S1 z3-F9vxe5*y%@+Bfeyqp0gg3>WfQ}~ciAoqJFQP*~mldyx7)KbQ=G72$>eo1K-*PZd zbA@6|H~sD#U%vg@stSPo@7^*&tpgO#xBPwFSX*QXazrQgpkshAOShw1BS7y0w=~p61sC`Q&JXkoM(d5yq(^t8Wb|wpCeTJBT>j?)AarW@M z9!t`8?eWe_(6R#SqouJGy?h3J+B~0C3MB(kcPx>poc(>aW-9{H_0~x}7*z!Ql){XZ zM+{6ePhHCEpRk3}G~ZbFZ|zrGKHA)9h2gpA+CNx6-PIBxHZ|nD;>bm@-fQoh5I-wb z1;~c}RbNQ<3O->t^7iz#g@=ErJ*6dM>z5OYcLy`A9e706H=vxv|3xmK%o`MN7W%U~ zgIG-;sJ(D8Pr2pkfhSBLCJ(_c`n68DS02?=oTrYt&;po#Ih`&M1wYvX3Ti#^^?JpF zgKXfAzXuejT~lNv{P%cGG75Pbg9(edBrVihF5R}b)M4M|vTDfCAR89oTViv{6m$ij zN}3EPzacAyVU}nT0kYE}ZaXl6;v4KfT&enaRs3OG|KvVSoQ1!J-Q3yyGj{3uN`K?dM5tRVT1l1mh(*^Xmovcg zj1k^n4fdh%<~HmKU%Lb8Q;}ax{j6C4 z5SFDT+7L@`m0%nbiR)kuf&kxQM#A+Jd*4!yav*l_Nnw9R!Z6K5$GtQMQ9|tY=?Y{V zu`gCKJ)$r)zYlNURi6AP?kHEhJ;!aWg7wMiQ51*9e#yidpL}d=_p+SR*S8>~a))u5 XRvO*=GtcK}mu?F>r#v|S<6oof558qP literal 1968 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 YkFY_-yzSoOccTh2?N;Y&Ial-m=WQi^JOBUy literal 1782 zcmVcU}v^a7%7? zH4os0irJ|(0VF(b<1~-2YVr_C?>BEx6^C-oM*c=n1;tN0xB7aG*hlIv9bncOK=_mW zXyTs6>T>k-j4+0>0!kg~1V zl>HZm{{Ki|a5alp!mu?RG_;H5F{Fg?nav{Q(VnQCPX*zqll3V((ocUECCj*ITA`z` zPdXkYQ)IJMZUV*)4i{EkcU$hWYf+N~sVTaWc#AD|gWZdBu%5?d9KoL|{vqm5vqUak z)~cc0{-4>BUilG*5Br851G}$UyH|_si0jx9@Gg{J6f>t-J?oXw*XRJMPvOKo3pATi zA{{{V%D}YT;7IXE-x4y-NmR#jm_#I(Qp4*IzPOYcnd~7UIP*-$;axw+bq_&q^2{%#FIWW(VM_| zUMpSc{GOPhvZMsf^3d&v2Num$w6g-u0UKzE>l2uK2mE!J+-BS{=qZj8N6y3d0EK1B z2C|%MxDQB&6=)x3Ywmz6Fo;WE55iOqVNY*8Q$j(&Ucq+$DXQ!<+ky4CV1%7SixaZd z12-VHt)^9bL1bLxtzESw(^=2_JrpdbJ_zk=SY<_XRL#&P+QbuVhzJx=iKY(d`?J|= z;KnA?t}wN&IFugjf0`t*sL%w;ifFODBR)d}6b5}o8ld?~WCL;Q7=qpQ^Cz`ORK|ff@1lbXHg}HQ)J0u5Q}_v=EsJKDSDn=ea{-lU zmQuhey*<$wvxKAvg;;c!k~?*)$~lt`YHkNs5xku1sz0=b6F~1#C?nHOk(%q~DwxYA z&gkuePs3?P`Cl*cbj##4KN{hcQfSdF83uQ5cz^ZEaJ9yk9KrXVJWMMEfCy$XfVfUY zlyZ!-YYzwH3n#Wqs=&+>3Ri6B(mn0W>sbK!3FxrBsM8b^9sura@jRmqgoij(f%=29 zj?F^&f%a|{#mCwb(D&v5A$K+?P`V*I2{O-+b*tZV+lVY`Iyo9MUND$M)+j z_T~Va|37DM(wuDiWsMaJ&_nzkynPjAZ(U4Kg!r8}hbEbXy#ee#_YV9eU>AcizCtHv zk-i$xNh^naG|Qp>dTp-S9s*2q65kd|nOoM_M)F;8LX2tu20XGLd70L5O7lgx32#vAORovCm}(CqluAf7j0XcRpu|;taA2oC8mFH;And6wkm8W%GrLuKquHx zVfNxoygxhVggM$%3-TnsS_Docv^R~gt6T+~C1<&nx!;BqOsepggaa z4)OoKO_kRY;v3jiXsp!J!INz?j_G&qC!}m$%ReAyfjGkBv)04J6$U-8I1Q|h4%{%* z94Ex27budLMHM)U7nOf64X2wde&OJ}tgrf$rzBZ-KE2M{FpWx@_K0d{qViPhIfqTP za@OySFfbU7YFwu1drsA~5Pmbr`?e>e$;;l}P!I%)#V)fd6tn3P*PX_45etaJ)wT6m!FIJ2eO9vBrTwl8+vKpH=EbGzi@~wNxY*g>Uq2|cb*hv@cyeJSg3#cBn z*;3D-cyX6S%uivV(-f(Jos83X-$!5~k?w5;Z)Mpym`}=#9=vyJ2ikNRn@M`n+G0H* zMFGJ6WmoEJwS-7Lbcr2!p~oVG&MX Y0#?D0;L}>S&h}h{$!CtV;=_3W=ea6)KmY&$ diff --git a/external/artinis/private/read_oxy3_data.p b/external/artinis/private/read_oxy3_data.p index d91dc9b95dca4a0dd8f1a46341727b3d38bbaa13..a0808692cb3b33bcf8291fc6c482cb5a0ec0101c 100644 GIT binary patch literal 603 zcmV-h0;K(RFflGLFm^C7E-)|v41gTA3Lmim00B<`00KJz00Ui?VtLm?AxwHqp!?vi zUP&+@jwP7H*e&uNZ6U^qQj_)iZXJL%;u+klR=CY)8k3aj2FIg#+7%c(2@_zfF>Us9 zBnOIWxv>YWwYe4fJG)xo@HK&kp%)FNF##SLhdfS56bZ-S^S^Ov!u#SK#Ppdl2RxAG zpui@%{I}y#R{ed3lCV5PkK9%(Z@1EvX@c8zh=wgEnb=U_J3~obltF&*L@ANbJ0%u2R81)> zpPEj|FN&m*TQLnp5<0m?FE43hAsi0Gv3s&m8=gf55ZX%FvIVsNBVX%i2^RKTXMv#m zwl^Z*6Z6v%iD#3(A6aU7c_yRoW00hDTt2&rur!(n)d&OXgVgY@pcy&&lTcVZyU$r& p1eDC4V`&XQaS?&o+!k)cP#2R*{~PBE-CU_oVS|1*&h<94G)9mG7y|$R literal 589 zcmV-T0T#$AHQke|1au1mcY0sZabI;RtR8G+_}rY1iKG` z^EXiW!p3Qi!z35Wu(ibHUJLi)*vO87z<*KM6qevu4;;>h>3h9pzpjbHusw^1V9*S$ ziPoQF^U~%pp@gow@uozkOxwQAhKR}IUn#)LZxNcDFnrP4l5I;Ea1u$7H$9r+1p0R& z+LI61Cnb`_9v!U!9`tP55^`Wz6XikF=#4$+fCS2;DdC|sO(rm{_Gqml&~tpMz7r4q zPyXCM!*kGTLeTkMWG`s>@OpH<{xv-wH5(!-ds$%tqj{}MJ-R_-#CIG6PST`O=YF&W zkMk1~Di5`5yC%i)+=%QC$*slJu(nXt^P<>)mQG(?u<)UCzJH6t? zQjP4+6C)rsXiN2-AWEJR4%(0MXYjr-38Q^YaaSqs2`=3+Acg$Hs>1d>Ac5r=LT--t bwU4{MA%lpsflDl}$&<6jr{lU;8_x3zYe*_E diff --git a/external/artinis/private/read_oxy3_header.p b/external/artinis/private/read_oxy3_header.p index 5143f0a49e37238c122d8934321ac0911b0f8748..c40bc8d4ead783af12b6bb50837c92e9402c16b8 100644 GIT binary patch literal 735 zcmV<50wDc%FflGLFm^C7E-)|v0?-_rAK$S600Gqi00O@N00gphxxvFb``7_*bxrOS z`M>_@%OE}X3sE}3M%DyEsxju^i~;4e8t4ntAd}4BvIr!%9!68UGon$+5)gE;xUN=y zQVoyC9Rvmi))!iW>yAt<heT&8xN#;)9BzX)_sWBz++`d@VCjDtxQgGBU<(UylwJ zQ%D+eQmBK6$Cy=2?`FqIN;)NTmE4|wIXwp~OvJz;sm(&9YXJl@=#FQqiMnGsP#@dt zSbplyapdcNWFchu0HuyV;M)~zdTYtOwGT!du-M7qx{ACvCuF5Y8nGOC{=cgUQkxz| zDGs1^0p_-=j6OjS?yf#uQfeOavKV_)v)m_tJ*|D`ytF|@>K%D@3!cqqre~Z7y-M;` zP~xhT&8t!UjUKbjy}_t?X5uCNGBR`Z|7VOp{XU}^D4|KB*+!T~-m<*jWTNEZioCdX z5=(nI=!U9ggRW&*0@D8G(3ul78?>bq0`^I3me`67M;>iP)$IX5uow|n9TeaH&O87t z8EFbv;rTUIC8@thM%*TkN}nQJaZN*)LWQSo_eL?I_-hQbS{|}|7Y_+fz(cm!c)=_T z^Rlhk`ejB;h$_J0(`A3MGz;Q+FWBHXGE89MnLg#Ng#=Fxhmv_Q_0@P1i6;EV$piew z8PbL-3>PH%`W%rEQ>2L745V9o`Ew#i)@Y0p(=wn8rOi){oeyOvLGmxDL6XfgO;z(7 ze6AIl+7W}NOv&~uSRAZ98~%}o$$X;nz2X6%u_4 zn5A19226rJkoK2>IVFq1IkG}G{e21X!pL52*mU9Uqg^AsuS*5$Q%KuZ7NojCXZ{;m3Rj**9-}?NZp9C7a(2FTo!-=Hc-cFda z_?3844H{-Xc_S%1u$Ktq!E{d`0_+9BP%c zg})%!K2!@-Us9Qu<}>W-M(=gwX}%I=!^zkzX*krN%f;i3x!7uX!Au$$)UWjH;M5k$ z42$Jc(?BC?lcXF$~W>gpTS73AP@3)I}gz{Z_|cAO|l6(ms=A*%r7)d-G7M&i}cu zY$@cYtR12^KT)5aXbiw)b`g^z%IsVs+tQf`jI2^$$!hcQDrEu8NXmqFP1bU^;31Y< zz63=EW0}!z(=IL_FGxNp$Y(L@P5O`-VdOtO%5f9kp)d<)fun;CI+ceoN}ta0k5mrJ zdV>dZ%&}mZc*w;5bI#D{X}9-2tU@Cc9cp|TFH0rSxbSd5tDTb?3z=G#A<4-Bh3UY53EC%}WP_@(>A$r)q_C2UQy>A#{T64}wZkl5xK-v^!I^1_qB; At^fc4 diff --git a/external/artinis/private/read_oxy4_data.p b/external/artinis/private/read_oxy4_data.p index 844775af529b160ed093729338aada062c890280..da67aa03ed76e56ef96d99134c9ec87261f5d0dc 100644 GIT binary patch literal 274 zcmV+t0qy>FFflGLFm^C7E-)|v50D(^&VR80003+N008m;00CHRABl%#r|hoxfReuH z(#dcfhP!eDzYVlHB^Lv)8#V!UHOe52#nx#S9E132A>6duvclU04`;>>Hg8?At5WoEOFZtCiaDHZkYjP7j$C0tvUeNuv>RW+Osk+1V$WnrZY$EnlvU`h)kQ$y6;vU4n0ie0DAz Y*}=X+`_qB^W{O>u0iYz``yL2n zh6bMG25TXhz0MMGeU_qa66>^q$33$&J_iBrIl4e@by(B8;L#_GrA2| zV+)4;jyyv!1EpXRpCzr}Dt8Ll7Q#QQi4%TBoS~7jl8zuM6)+UvTQI2^68du`2N|Bj MQ)Qab+w#0_C$s!?m;e9( diff --git a/external/artinis/private/read_oxy4_header.p b/external/artinis/private/read_oxy4_header.p index cadc1c8f19604f704a50403ac0814ca7c80a9023..a758ffbed736b925acff58268b6eb372aac47b1c 100644 GIT binary patch literal 529 zcmV+s0`C2GFflGLFm^C7E-)|v1h5<=#~-l(00L7000Hp;00ckKs!#Y#WAmY{k#_el zY%h`b1i*PJDQOjGwNkc#u0a*7=t$!+IS_Y%=cTz#mMD$E1a%UAd!5IxLOTM2ZK>N@ z`!?VlG=}Y71!E}pD8{|$-t-qKrEtcP6rH`a3?3d%b(As3RXJ8=hA_c{TiSo3SXEqK zXhqWUxo&+eLWz~>ou?S<1?UBj4^D6-7C`xO9zi030<8dXt_K6QuLEL$n-wlb!7}5n z+pH1YH}q+3J|1z&{&&HS4OH`}`MuqZ9EB6i_v0kletU{DgE6G`x3+Z)pUSSR@>+m} zpd610B~bK+@KT{makelM1a)boCLIvDxbgcAzXz6gNz7IxXcv$Cfj%+wX%9%}C1aTe;6RHejeCG__UIfgXd2Pi4`r|O_)EoEJm)B?fJsZ zr`2xJt&G%^e5z$Xmc9AkzZRiL!JfvF@@?bb3QTW+*pj?KDX-<)Q_x;(7(d@U9d^?S-+?7jh@F3?`i(j-Yeny_EC0_wTQ2V+d-Jd(UJQ zzT6a+q*DYqWR+A9b>XhX8Inr$AVQINV_o|%h+m|f30*Y;o+C~MwTgJ&8-B|ugkyt# znh=c!)yUDuVYJ;8IhYq!M1RM^wcb8m2DA;fU#r{IJZIo@_vQn0oMXj>#BcFovB&cu z%U%x|3)A8$l3OYl!hdRB1%MM)Q3M~^F^@vy%K}xuSleEQETqwN2X@3l??zO}lst=z zDA20m{TN%Bs30tWgkP`f^KpCQC3owy6v1wXWrBtrGNX8?v%j$b00BY(00FoF00R=BmvYC{R<>yY-xnhR zHJ$Q(+4MDUjxvDX>*qm9YS;3Bwp9!Zh{qxRHOuSiBEvaCa;y94B`@sB_*d!D}e zd2G=eue29=5>sC2A+#Com)7#gG9&5ZrYybtXUoP4xWf&99X9cEYOy!bd=#2`e zrhk$<$$29UIJ!sfYl1*Acq{7!cwkkyw@26K#dc?lAm%3n?mN;rsE#9|3P{wIb-3%Y zYEUvpHE^YsM?GI4X$LWE>LQ=KS7cgSZv!d6@p>>?gz2C^TYgBGvnHayWn25~Ok6v$ zXFt9S^32+Qweo196A4;@-SYn|#JKSuN6H`L9Wp?4P)NnUy*Ko~B9uZpH21Bfh6AFS zD(!lfGt(1E&CkDsn+`8!X}PJY#w8|P;o6kChNZv~%Y+gcqklxsNE6N2z>_tg*fDNb z2-BC6q5>L|#mPijJeQLRWJDY?eRzI7dwweNf<4IV#J)0ku`b!N<_!*ZnG_P=A?dt~ OCGb7v#Xbh+fJkG-T-^l# literal 472 zcmV;}0Vn=;FflGLFm^C7E-)|v4v-uqj$g3=00BY(00FoF00R;(O;qA?Kby1|MzxE3 z>__iIqb^h3>$A$F&OOb&(_#^#!9Z=X;Tb|E3|jdgATAUO2{F;9;xWlNNK}$;%h+9Q za2gA5z%N$$?D1rc!~WvXFr;76i#m1YoqMv0fVD%DA#%mW!#)643J`{uhv0ZgX^&O< z`Begp&3qKey>8auvh;X-7R63HPH2dQ1y~m9h@#BVrw2Ry8v``NriS!L4S(gNjD{1m zEk`aUFLW(dp^>aVulCa1#NoO~*V@dXllkv^q+*DaCX^EkNk!n0UZVAXT4$*cF(eC` zk3DODHtjI`lZu$Y6vk50-(1qj0|`cgorq3+AjoZCxlBD-F6K{d+2It2k27QCjwTm<3)H3RCW2fX)Z*o4J?;SWT2 zV5bizzJn%J$!@VxBr85E!nY4TNfd|T-tXIL#W)xn-Oonq`p3JH%&K&7 O18ja2*FKu9Axj#FIN>e; diff --git a/external/artinis/private/readoxy3block.p b/external/artinis/private/readoxy3block.p index f5228c65448d7f23378e63409de62453d35df010..77b9026ba7b3a7bf5269c1c56a826d35a0d0ba61 100644 GIT binary patch literal 323 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 A^Z)<=