From 992dbab8030e80dc27ef5b56f91aa057195247b7 Mon Sep 17 00:00:00 2001
From: lynnschmittwilken <l.schmittwilken@tu-berlin.de>
Date: Fri, 13 Jan 2023 18:08:33 +0100
Subject: [PATCH] added tests for modelfest and updated many component-masks
 for that; updated RHS-json with new bullseyes

---
 stimuli/components/circular.py      |   2 +-
 stimuli/components/edges.py         |   4 +-
 stimuli/components/gaussians.py     |   2 +
 stimuli/components/lines.py         |   1 +
 stimuli/papers/__init__.py          |   2 +-
 stimuli/papers/carney1999.py        | 115 ++++++++++++------
 stimuli/papers/carney1999_noise.tif | Bin 0 -> 56498 bytes
 tests/papers/RHS2007.json           |   8 ++
 tests/papers/carney1999.json        | 174 ++++++++++++++++++++++++++++
 tests/papers/test_carney1999.py     |  20 ++++
 10 files changed, 286 insertions(+), 42 deletions(-)
 create mode 100644 stimuli/papers/carney1999_noise.tif
 create mode 100644 tests/papers/carney1999.json
 create mode 100644 tests/papers/test_carney1999.py

diff --git a/stimuli/components/circular.py b/stimuli/components/circular.py
index c03717c5..ee8b16bf 100644
--- a/stimuli/components/circular.py
+++ b/stimuli/components/circular.py
@@ -510,7 +510,7 @@ def bessel(
 
     stim = {
         "img": img,
-        "mask": None,
+        "mask": np.zeros(shape).astype(int),
         "visual_size": base["visual_size"],
         "ppd": base["ppd"],
         "shape": base["shape"],
diff --git a/stimuli/components/edges.py b/stimuli/components/edges.py
index 5b306bf3..d004d43e 100644
--- a/stimuli/components/edges.py
+++ b/stimuli/components/edges.py
@@ -52,7 +52,7 @@ def step_edge(
     img = np.where(base["rotated"] < base["rotated"].mean(), img, intensity_edges[1])
     mask = np.ones(shape)
     mask = np.where(base["rotated"] < base["rotated"].mean(), mask, 2)
-    
+
     stim = {
         "img": img,
         "mask": mask.astype(int),
@@ -117,9 +117,7 @@ def gaussian_edge(
     
     img = stim["img"] - intensity_background
     img = img * window["img"] + intensity_background
-    mask = stim["mask"] * window["img"]
     stim["img"] = img
-    stim["mask"] = mask.astype(int)
     stim["sigma"] = sigma
     stim["intensity_background"] = intensity_background
     return stim
diff --git a/stimuli/components/gaussians.py b/stimuli/components/gaussians.py
index ebc0bc64..98bb5177 100644
--- a/stimuli/components/gaussians.py
+++ b/stimuli/components/gaussians.py
@@ -1,5 +1,6 @@
 import numpy as np
 from stimuli.components import image_base
+from stimuli.components.shapes import disc
 
 
 __all__ = [
@@ -71,6 +72,7 @@ def gaussian(
     
     stim = {
         "img": gaussian,
+        "mask": np.zeros(shape).astype(int),
         "sigma": sigma,
         "rotation": rotation,
         "visual_size": base["visual_size"],
diff --git a/stimuli/components/lines.py b/stimuli/components/lines.py
index 91972baa..2eae3ee0 100644
--- a/stimuli/components/lines.py
+++ b/stimuli/components/lines.py
@@ -200,6 +200,7 @@ def dipole(
         )
     
     stim1["img"] = stim1["img"] + stim2["img"]
+    stim1["mask"] = (stim1["mask"] + stim2["mask"]*2).astype(int)
     
     return stim1
 
diff --git a/stimuli/papers/__init__.py b/stimuli/papers/__init__.py
index 4dd65144..22e6e8c9 100644
--- a/stimuli/papers/__init__.py
+++ b/stimuli/papers/__init__.py
@@ -1 +1 @@
-__all__ = ["RHS2007", "domijan2015", "murray2020"]
+__all__ = ["RHS2007", "domijan2015", "murray2020", "carney1999"]
diff --git a/stimuli/papers/carney1999.py b/stimuli/papers/carney1999.py
index 7231f6b3..3dbd0762 100644
--- a/stimuli/papers/carney1999.py
+++ b/stimuli/papers/carney1999.py
@@ -32,6 +32,7 @@
 
 import numpy as np
 import pandas as pd
+from pathlib import Path
 
 from stimuli.components import grating, gaussians, shapes, checkerboard, lines
 from stimuli.components.edges import gaussian_edge
@@ -91,7 +92,7 @@
 
 mean_lum = 0.5
 
-df = pd.read_csv("carney1999_data.csv", header=None)
+df = pd.read_csv(Path(__file__).parents[0] / "carney1999_data.csv", header=None)
 participants = df[0]
 
 
@@ -1140,14 +1141,13 @@ def Subthreshold22(ppd=PPD):
     stim1 = grating.gabor(**params, frequency=2)
     stim2 = grating.gabor(**params, frequency=2*np.sqrt(2))
     
-    stim1 = {
-        "img": stim1["img"]/2 + stim2["img"]/2,
-        "mask2": stim2["mask"],
-        "edges2": stim2["edges"],
-        "frequency2": stim2["frequency"],
-        "bar_width2": stim2["bar_width"],
-        "n_bars2": stim2["n_bars"],
-        }
+    stim1["img"] = stim1["img"]/2 + stim2["img"]/2
+    stim1["mask"] = stim1["mask"].astype(int)
+    stim1["mask2"] = stim2["mask"].astype(int)
+    stim1["edges2"] = stim2["edges"]
+    stim1["frequency2"] = stim2["frequency"]
+    stim1["bar_width2"] = stim2["bar_width"]
+    stim1["n_bars2"] = stim2["n_bars"]
 
     v = 85
     experimental_data = {
@@ -1196,14 +1196,12 @@ def Subthreshold23(ppd=PPD):
     stim1 = grating.gabor(**params, frequency=2)
     stim2 = grating.gabor(**params, frequency=4)
     
-    stim1 = {
-        "img": stim1["img"]/2 + stim2["img"]/2,
-        "mask2": stim2["mask"],
-        "edges2": stim2["edges"],
-        "frequency2": stim2["frequency"],
-        "bar_width2": stim2["bar_width"],
-        "n_bars2": stim2["n_bars"],
-        }
+    stim1["img"] = stim1["img"]/2 + stim2["img"]/2
+    stim1["mask2"] = stim2["mask"].astype(int)
+    stim1["edges2"] = stim2["edges"]
+    stim1["frequency2"] = stim2["frequency"]
+    stim1["bar_width2"] = stim2["bar_width"]
+    stim1["n_bars2"] = stim2["n_bars"]
 
     v = 89
     experimental_data = {
@@ -1252,14 +1250,12 @@ def Subthreshold24(ppd=PPD):
     stim1 = grating.gabor(**params, frequency=4)
     stim2 = grating.gabor(**params, frequency=4*np.sqrt(2))
     
-    stim1 = {
-        "img": stim1["img"]/2 + stim2["img"]/2,
-        "mask2": stim2["mask"],
-        "edges2": stim2["edges"],
-        "frequency2": stim2["frequency"],
-        "bar_width2": stim2["bar_width"],
-        "n_bars2": stim2["n_bars"],
-        }
+    stim1["img"] = stim1["img"]/2 + stim2["img"]/2
+    stim1["mask2"] = stim2["mask"].astype(int)
+    stim1["edges2"] = stim2["edges"]
+    stim1["frequency2"] = stim2["frequency"]
+    stim1["bar_width2"] = stim2["bar_width"]
+    stim1["n_bars2"] = stim2["n_bars"]
 
     v = 93
     experimental_data = {
@@ -1308,14 +1304,12 @@ def Subthreshold25(ppd=PPD):
     stim1 = grating.gabor(**params, frequency=4)
     stim2 = grating.gabor(**params, frequency=8)
     
-    stim1 = {
-        "img": stim1["img"]/2 + stim2["img"]/2,
-        "mask2": stim2["mask"],
-        "edges2": stim2["edges"],
-        "frequency2": stim2["frequency"],
-        "bar_width2": stim2["bar_width"],
-        "n_bars2": stim2["n_bars"],
-        }
+    stim1["img"] = stim1["img"]/2 + stim2["img"]/2
+    stim1["mask2"] = stim2["mask"].astype(int)
+    stim1["edges2"] = stim2["edges"]
+    stim1["frequency2"] = stim2["frequency"]
+    stim1["bar_width2"] = stim2["bar_width"]
+    stim1["n_bars2"] = stim2["n_bars"]
 
     v = 97
     experimental_data = {
@@ -1759,7 +1753,7 @@ def GaborString34(ppd=PPD):
     return {**stim1, "experimental_data": experimental_data}
 
 
-def Noise35(ppd=PPD):
+def Noise35_random(ppd=PPD):
     """Noise35 - binary noise x Gaussian, Carney et al (1999)
     Gaussian window: sy=sx=0.5 deg
 
@@ -1800,6 +1794,52 @@ def Noise35(ppd=PPD):
     return {**stim, "experimental_data": experimental_data}
 
 
+def Noise35(ppd=PPD):
+    """Noise35 - binary noise x Gaussian, Carney et al (1999)
+    Gaussian window: sy=sx=0.5 deg
+
+    Parameters
+    ----------
+    ppd : Sequence[Number, Number], Number, or None
+        pixels per degree [vertical, horizontal]
+
+    Returns
+    -------
+    dict[str, Any]
+        dict with the stimulus (key: "img") and additional keys containing
+        stimulus parameters
+
+    References
+    -----------
+    Carney, T., Klein, S. A., Tyler, C. W., Silverstein, A. D., Beutter, B., Levi, D.,
+        ... & Eckstein, M. P. (1999). Development of an image/threshold database
+        for designing and testing human vision models. Proceedings of SPIE, 3644,
+        542-551. https://doi.org/10.1117/12.348473
+    """
+    # Read natural image from Modelfest
+    img = read_tif(Path(__file__).parents[0] / "carney1999_noise.tif")
+    img = img / img.max()
+    
+    stim = {
+        "img": img,
+        "mask": np.zeros(img.shape).astype(int),
+        "visual_size": (256/PPD, 256/PPD),
+        "shape": img.shape,
+        "ppd": PPD,
+        "intensity_range": (img.min(), img.max()),
+        }
+    
+    v = 169
+    experimental_data = {
+        "participants": participants,
+        "thresholds1": df[v],
+        "thresholds2": df[v+1],
+        "thresholds3": df[v+2],
+        "thresholds4": df[v+3],
+        }
+    return {**stim, "experimental_data": experimental_data}
+
+
 def Orientation36(ppd=PPD):
     """Orientation36 - oriented Gabor, Carney et al (1999)
     Frequency: 4 cpd
@@ -2157,11 +2197,12 @@ def NaturalScene43(ppd=PPD):
     """
     
     # Read natural image from Modelfest
-    img = read_tif("carney1999_natural_scene.tif")
+    img = read_tif(Path(__file__).parents[0] / "carney1999_natural_scene.tif")
     img = img / img.max()
 
     stim = {
         "img": img,
+        "mask": np.zeros(img.shape).astype(int),
         "visual_size": (256/PPD, 256/PPD),
         "shape": img.shape,
         "ppd": PPD,
@@ -2203,7 +2244,7 @@ def compare(o1, s1, filename):
 def compare_all():
     for stim_name in __all__:
         func = globals()[stim_name]
-        o1 = read_tif("./modelfest/" + stim_name + ".tif")
+        o1 = read_tif(str(Path(__file__).parents[0]) + "/modelfest/" + stim_name + ".tif")
         s1 = func()["img"]
         compare(o1, s1, stim_name + ".png")
 
@@ -2212,5 +2253,5 @@ def compare_all():
     from stimuli.utils import plot_stimuli
 
     stims = gen_all(skip=True)
-    plot_stimuli(stims, mask=False)
+    plot_stimuli(stims, mask=True)
     # compare_all()
diff --git a/stimuli/papers/carney1999_noise.tif b/stimuli/papers/carney1999_noise.tif
new file mode 100644
index 0000000000000000000000000000000000000000..e5d3c5d515558b7da6be0212be80e63be225ec63
GIT binary patch
literal 56498
zcmeI5dA!|4vF#5iPACWp3Me25C?Em>6l9*~KokfvDD#joqYx7C-b|oO0mEd%JkJ6l
z47msd5J3S&l$k4{f`FiMW8D5M`>k)SU+;b5eg8j_{p7RF$;ml;|GHOK)v8t1-P>%l
z^1#&R2L{T2mhW`NHYb&_abg*lukmF};WeR*jtOx>nOIIJqneY;DdqS$CB7TSmG6~r
z=j+t?RylRnvE{UKOq?Fal+$PF)j6i<JHdB(=_h!Fe}mutZs?u#ZllV{y!;9Jq|xo?
z>a#m~mU3c@EqbobN##3p$y0u(b5e|rlS)24vl-)~&f~;5A#%j+=rt4VoSfQxt8?t^
z)5|gC=*}7C=r|*eF8OE4KbhO+m~vWktY@-(%fHtgS567dqu&*jVq#}>XAGa)j0<7f
zj1{);wkJwVOZ!xvaXri<S6fWX@#I?52y@lMx8l@tY@Ak@qkJ`*CC$!J<;+g|3jH}~
z)|j!=S%nR&?|boW)*UN2S23%ORXwp8T_(hsV6|(#HRIa#Hnz+iPkGX;YPDKt8U;2q
zp=hNwqZp}H$8qspM&DYYE%KP=^x`#kRCA{0@W?W$92xDanKb*zj=r1odj>YGIcFX<
zi=dJ7czkn;W^fcM4j)lQm;8LqA3g+MqE~r$Kb`DD{>4vxBD2T(>zu&2n&Y)rSTC)Y
zOaH~(c{W&ktTw$G&6;NKh~}&~;+?a~5usO^6wKzCtVm`t+8LA&96X0YC*=Q{?kdFR
z&Q71F=XzH^T?gwpF{*#_3eZ|$JghpcxoWwmHi`|ohSHa5y&b7JJECa5I%k)|%h}Ps
z%Hgy5d(L5_Ic?5tj&6=2ipcs|dGeP{oiVIdYpxkXyh?A|+UvXb$?$l3`Dqmw@OyZl
zjII+M3GJO&d5l<|i})$;PaI(8ViN1Cb9j8e9M--jmyu<1jO1?}zRP@Sc3FkFGLMS%
ziuRhCO|8M4O+Eu(sMU@qY-GbkjvBezr=825IK9rej;tA5!Y`$Dr7yH6)H*UBku}S=
z5kt<1qqN?%9!svra#&$5N5<qbqMTDkgkJnv&WRDTM*3fyv(wVkZ{h_qUTc+We)HYs
zZ}Gc$U|B>*J~FvfV&0wM6XT@0?s>;%jO?x6jG<+eMk!|4^O$j}X2P)=|97UmA)b->
z{eB$AdM)R4MwCO#xs6_NXrou08zY)?n#ue`XnxZZ$crix$q&FK^{&JpvqwIYIM?Hh
zW{l$$d*+I##DijQF-~?z1f7u4)SQ^ejSt1|!JQfX>EeZFDzdcm$V!ymYh`xMjq}PO
z#jo?r!Et^ZT+VL}Y0lG}9?DPHKj3YvXOLH5<)1E2$%@T+ZF053iuCdmjcLZ?<@KC%
z*VAfV#enT&lMi`~%HI*y9h=~VL>F-(%?0aB-c{ZcFFLZdd9BWJUNE;gujQcTf^yJo
zz2bt-`N6;N6ZR1D#PR(&T=?L5(<{isv>A|mu0I)GE1%H%T<2Niop-Ss=Dw$HBbt5N
zm}G;=KU;qQ^G<IdAIY2?DL>0P)GTM@8lg3MUUP6<5C_G9<p*(KOeqJHDa`@#gQCBe
z13MS6n&Xhjd5+0l?;!6RuvD>p%`&Ul{8auy>=!n|8cuGXS*>H+yZ$-Fp|vVvOf$Nf
z*k;JYX>)>h&Ei`%pD@r#afH?!bIB@XHEOkL#<W5`f6bI;|IXC1|Lm!;e{(={U>sC5
zqs*r~!$@XRh#Z;gpSes=n|Y>YQyFSzmkoJRvaNUb(_uk)Q*lEw6Sz$`Dv?3T+7<J~
z%dyb(ql0HoUX+z~5UVbxG*iokv0u5cb5Ys1b5ZQe*JZz=S&S)Kr3Yz_<#FTCoOk#a
z(d`I$zfd7>YAru~>v87#)wjZ3+q^epz+CstJasA?8cEeP+Etq4HFG6mkzEqYwML2h
zTAzn%-ZamJb%?d^U#4naFAU9dT-@waE-BwEmxNyWbDyH`#J=UCxG<&`JOf@KSFlz&
z9s&M~FF9PRxMd6W2+0<b<;okFrz8vO&igzuhKzCD^`2^)6uQKK=msYxS7p81@21xk
zmnE*9U+g28S5UaHxu{&MIsax{QZ6mu;1%6h@ONXgPZ1(|?PpuSpUCSt5`u@&NTvZl
zPM*>FmDWd_8B0%0rlA!yp&2h8ghk8?BaxqMMh{Z4tRkf6&Wr>9V4H9hoGd?ls65HR
zT{Psa<3i0aSTN(Da9Qj<d#|{>?A6h$>>ZbtONEI3H7?dq$}^>XU>z3-*F$7yWG!OT
zi3S!pNuLWE`1s_~QgX0aGtSHb8*<XQ`stPVp+;ylsEDZ5tt}+a6YGUP!|{|gr#FH%
zYv#o^4$utlCognyd{gtiw`P2=vS)Ke*`r(;d(74=u82K_z-5~KOJyPZR2z_AvR4u#
z6q4sCbHpEM#xwUu{WwkDC>fxh2=>?VYx2~&?ul6=t!kmMz-Lh_Sl`xX&&UYa##hbs
z<QSpVh|d>q)=b&sUnp;{)vYzWcU&HOHdi)RmEFtLv3qlMqd&{n%T;<^$?TUaisv1l
z#Cpf`5Dk8i?}+bF?ug$>?IXF2IDL1WC*wEoCRPyzGWyN~qYx5QPsDSaFOtWhl%p6W
zJ2cDDdPL1QSNRHYcMt}6dwG#>$e&yuS7@at3PR$VGQ3<9yOnD@yLGN@h6@qUxvK0D
zd+I0mZesyhTp0Tc3!<`ErPe=4C=cp-oR(GAc+85y=ZM`}!<*YjfWMTtL2I{SECj51
z*2rs*V~!3#KR7w&l;k~W1zOj#0<H5sa@8}}!{gerTiLZ-S9a~}(p+D5310ktH~q^s
zu{&7kH;4v`1+ojG@_vfra3nD#+1q&;1(Y#mG=>A91*Topd@0owJmo}L!@M(+WO}s<
zB3#I2<ezL8LG(R4vwR{ip6MX1U+~ypGq|tfu41ktz+PJGLL_7jn)B;~!q>_Tabx*v
z(JO9@uQq&rL-|_lQm!x8flJ!SRkEW!iPCzPOZ0BUXZY0tL}yuG;-V-)&Ty7cNtTou
zgS=?QiL?=US8RK9s~)yBow<HAWaaY1$vYUQt;YOFeoHZPl4hmGXktf3==56Rs9k(6
z(+n#zC_dn`t|{2db+VEhz^573xw-r>c8VXCo6FAm8dh#9!-U=qLhHKxX}ntN(ORr*
zLlr5rTKpMUp{oz(P_Ar$kLaQ-6Bfm&CZuvUFON^Tb>>s>m{YQbjlUz;kUrVP4t8bi
z$TA#p%xS+VZ?(7lR@xSx4nLQ;VNExImQWj7Zi%5~$8u}vm4E6xWoYb_Xb!^yWsUNQ
z@{zj<{oRG+m3mLSp{-7lNmgf;fG<P|B{#w5Dvr+5(UnmJlOw2N&?h6TF)P^{2%?0V
zHKczObIZ)6%Ng*E@C9WfnrHC)dc{w%=>}l}dOMXLf)uDVx0UV7w9fX;v}T96HHM}&
z-jvAQFbKJ?>z%|Z5;<~y{3TJ$F$~<Quax4K5zN{O)mbw9*7~$A6S;YBT*>j2&6r<g
z?1o`jw{~WKSk|lTD-Y7DcO)Z!#M<zbd$eA1SIs;=Qr=L0aVOc-t>v~dt!&?H*KAv+
zH`_GR%eG~^a=TtaPydDm-Xc_Yj+=xrR)_x_uJ<!;W`ostPHAHtnGo7c%LJuYl6Ml{
zKrA)zd3RhjGZOEpY!F87$R_R~Ph{IVIGM-(TJaZY<%@~S4$K4bjMvJ$*{(neuef8`
zp-hYIgwXVIN7<&?I<|_tieAl~{9WJOHjy)K_{*Dxv!Y&NhM%;x?Uh~<Ta%`l%%ny;
zWv|^l>gZ%8Ss}7&Q{&vcJw7t3tll1nZ&dXSTa#*&HDYopbWB)DwKQXAuLvK3jqEBr
z`I_u(n2@_gxZNh?wwFz9E0pdmTgP2-ciE!MC|fi$I{bNe*|G>p{!K_u*H2E19n$i4
zlC3)0Io5&T6|(8Q<%=@|%Q&a}E14xxPF5%VfhyD)diJc3Xe8+?HL`hobn4&{Gl5r9
z4+1^n8rqjN3F9ZlE#sO!CHTSkVI^0J6@uS&t(PRC4aMrfF2L?CAtmf$^KwtwtlZOV
zT7J}Q8u~i^tIQCpca=K>1aH^x>>%uIgJcTTZ<?v#Hy!P;z=QNW<j-a)bFfW~fu6r)
zC~1LxFh)gju}kS0=-9PJTM?u_OXg-Zqh<w}vk5`+f#I6#UDE!*?-tq74#IDG+TK>e
z4~yGenEj~STQ<>a<8oi*EADIV)ptQwXzJ&-lud4(p7nOUM;i$<4w6SWhk(71?Nxu8
zYDl7)YDmUFSz}f!+gc^HHCL$mW0cC0zNb|TmPA6c7O8{jODmEGWPZ0#n;~40NMeb*
zB)7adStVYy;&?YG3MpA&xmWmYRPJwP#sjfIc_20{Gvj`66}~^xPu!!QtZ3dLFTB0b
z+)?kiv%Kq#^40iOq9dM_9Kw92Rkm8sY930x^eByj?lgDw(M#1<8|U>=qN-=MB;Tsh
zS3Id{P*Fu$AEDVIHj?#KUgOw!m3*u5gnyDJ?3jLay1Xh@IYTzLnb6uqsBIJ*3d!~3
zq4JgT(Cn|ogXMv;L77=LETDRCB8r8kzZIUaRjhL-Mcl8p92Fhewn?Of>-6%$5n6jx
zs(L#8X|8*>Os8MQnKg1&ZC5u2N$W4x$3T(_p|d~hF8J8WPNlTSj>z@46?55Ih*TW$
ztM?1D2g-x-Q2aR7EnhA_DPNAC#FzE;dgaFjbl2Cv&y?-nCsgsgn<uJwrqA78?>jUj
zDDl%adX+G(?B}AcuGZC_TUAXKD)x#>L!Ox3cqkV3LwzvTp0);muXZ}g+Gkp6<v?J&
zpZpz}J$XIYN=wsx->B^2hq9{M#AR%wcenm_lZtB*uI1sx^-JZES&zm#<<as;`BHx8
z;l%hW1>2pe-vD3YYPH$h_0Bscy5yD8w)M$ISBkct$hiqRfYGfwfR*gbC+P^xI%ZW8
z`(U(+Htu1onzp^KZFWR5TQoO#(M4@eiCS~@9H^2>!iey^*z2Z3=f1Sn^<|ao6>Rm9
zc(nYq{H&~1e%5)c8B*4YpOv)>2!rpsX}{~sD{q*#yJ<2ev0uF_TxmzGot@>2tKB+l
zQ4LR?gh~Z!ILKCxWPP=EA(`<W-%n$0)o`k*t)eQPVT&cMl69WftyPe-pzWX*T%COP
zdd)RD0bKX?WV(1_*pZ^CkR61p5EQO4q&!~MY}P10kJZZ)u|}*}9xFqH_u6U0J%sI@
zv0dUVN`tvDYAmsK*W|%uHI)UE(NKqS4az+s&PdIh)UB6xi~8R`<E;u_^~b3ybfYck
zlF?Lud`V`cSBk@2lWKy!F-pSiZJdQI5o3w4w%JFFtZ;n1tWlmQtCwHI7t3nRlg(=7
zi{%%3t)AasQ#h}cw)}|fcs>301FaR`lm40LyPZDiR;{O<lOJEFr=aHO$ZOw>)`tb3
zYs~>JC2o%{dAcHwJ2KgIReN9@h5BRE?lUGDp+NN1KQrWWHE;j!qse!uhB({7jzJp5
z;cj69E3Q`juvpY1>6srZYYNZRh3jhN$?}C*wLBHSYE~($##8#+lP%tlYdv7qkEGXr
zNS*+T-b9|^zr?!Ho3@kBxK;kz+?k5XRhbE0s`!Doo+@hw>$bk%R#DtfBvm&VR{xE-
z8-<0iHA1{KaoE24e8so}G<PuPZz!v@ueP={OtXDU*HdrVB7DE1>4UPzhZSMh5oSY#
z?-R0HVOxG#o+`g8E61<n>E`q0>GFBLF2Xwh?MeOA8v1FFUPnk1ogdV@f%A{V+Q8X1
zJyf53Q>#W@omDfGD3nBZ)li{EhjM+IS{d3seb(mE{W)s(QCiEVN@o3{YKhKvQSo8X
zWJp(v$)Z7hEjjcpvSgHBawA*v{jJ9q$C6#Hl_>vQHv9#lxk?ej<#XlPvXWlU#fs&*
zvSNO{lD-S>zt%bc_0?qgPsr2b$sdtVuphsF5aKYg+qBMz(=co*09WeyE|XnfoGk3$
z?HY9hAMV_Vy&-))@|KIaHd-|ftB(g~UTo_obGjlU^|j(dH)_7A)sPY2Da(UhlQC_e
zIQwJaw2plD5LxTbWwT$9Rj*Q37OKybXNC3iWrgzDc%k`hc_E$`?#~JNXN0;j|7GjZ
zhv*&FkvCsY`E$?4;bz-PQMomBt*<JQ(365Ezg+$Y1;iEcnopsBR5h#aqe#5_aMY*-
zj@7pBs)2yDJA|-rdV{JTr$6h4tnb{KNN+9We}?o6kbXe8kQF~F+k8wm`bBy0Rb{om
z7S1ars?V1f%JSvKSgyR(e5Sk<%f*ZOjuC%0@m@tMg9yHc-eIjodtJTj1A6yO^eJ1U
zE<HU}FXA@VeQjDdES&ySaxAR-{PgDTeIUo`SvM7uejGJwmpQn(sAKlztm+Z7sS5Qn
zXIL3XlU<>6ZKpU2(wlW{dcCyiwd9FG`j<i)d;Xkk_xbW!Vf<40Oj)-4CSESfl$V3o
zvgN<aOJ%w8qW*mat%qmQtBbQ`6vv~_Y2BM8-rHo}g*SIa7u!Y)qvOT4ePCNfq6X;h
zGIKO_APeb!95p*A+3V}7!&z<Zom{K(Z^vvZe`uO!->6>Gq+@I?@4dPB(|yX0;AKBa
zi+-HEN;u=UKbQ85Ex#m8e*?nhxAE!bmCmQjZ}V@<3jO8u?=NH&e@4IaEB)>-<ozqo
zKNch3P<h;s6e+gs`fw}RyQC^crv>$1TQ$mwYlSFcZC)MZTrjl$8gDAsVk_(~H2Ze9
zGxgmIT1&oI7J{<*_2gtXw6%xZl94$&qkOI3#%9>q&(n@qkstn?P+LKEY8zfgn7$I9
zD!(sFmEXr7%98w9meO}VU6vNwze&4ZUcd2NM(tn8qQ9tjTQgbtPm+_*)M~0oPfvCR
z()jP;dP3??m5oyswn7HZ)GAzgG8gaPk$blR8CQ>q*NQM1mvv9-`Bpv6$jrj;805QA
zP1a2Y{+Ocd7lqZYGCn^iTYXVh`y1Kv(n9uk!g|SgwfSVcR+cEQ7UTZA@=97b_D$?w
zQEdHb`2;xH6XJJ2)jL0&5t|&$9^A^=Es7*JCOf-26_v|m+4L)-nbj_i>c5?Rp{Dff
zsC`lc)_s<&fQoUCk?ki&M%^Fn1eMHu4CZa$4fEbuz7?Fmq$~;6jpqjEXNA~j)2^}V
zL|OK{M0u@zqWm#lFN=3x=PUhv2_e3eRsndwEDK*wXg{al|9p$~8ZFxE>T_o5^EOq?
zxLdJfx?%___)T5w#*1U!^rl+>Mp3C=+|10{SwD{2dx!@22cUX;?~p5y?vQh&rq`S9
zD(V<8vMt1l?`{3KnKw2K)=!g13+v^CouadlTuO)<>BY+%WwGYX_;|b-i<QNN_-nFo
z{Q9TTy5VV`)o-sf2<^(w9@NUZSD!jVTpVt8TdS;)chMb5)`exWE5k}@?PaYz+@8ED
zgjN--_4mW5dmfygNbeJal^vkm<zjJK?E353GXN{QIrTCsR;VbOW|s9(DrH3M)uo0!
zm3$2E{ZcZqSA?{2{-cn6qkO#lseCLJZQhDS<74{UV&(O;Z#??%<N;pRZ-F*^d}Xot
z)smzAOnw~8en46pN*Y=AbgepiNATjcYFRZEdJGOqRs0-{s`i_siKC#oo6vEqUq(&8
zc2!X5EqC{;ySK=+%+IWU?<!x3HcC!?N7g3EsAneoMk~XEe^J={I`gX+(x#V@Xa2n~
zd{t;JE>u5WK33i;Z<j^l&+*atbNOhzT^7~%KCU&exPE4dv~Tc+nPc6b)B8Q8$l$pB
zB{6*%IkruneMf34HOn?jyIg*pey^#mANOwb+P8;(cC7yE*Kwm4!_Fq98cxinwsnCl
zd#dKF=f$aZd{uT-xtaCR`%)=;SUK>|lq0R)`tX&MO)oFRUY4aUB?LbyU;TR8^jl?-
z^3n3=Sh)PPEL8p)3&mgfyH>zkviOhdr||0dbYl)bw?F@a-rZT)!)f97wXvIuNYzcT
zaCGwO&8cnnyg3%08hL<te~!Di%ByPT{%CXYeFu5+-K36wRn}d#(W;lNpSktgQo7cV
z=Jk}U@fmsH<rS~tW}gyvugPxTC~wM&-%g|#ig(IK;(yAA`BSJbT>g@X|4BddhVcHR
z`~eXh8-Fn^+#dZ2ea26v%uyYoBZZpw)~TAp)U27ZFYJoc$ZOA-dvklLiua-P>$r2b
zm-21+N{wNMDCQj~>!y>)jGSz{=gp~PqMFf-FjKbnu%ar~jRH=dy`rM_a#G2b7Han7
z#Op=Vvi~Bxen(i(Dhrlbv0%*7*YD_iSotEdaU%IAGA{%1-=t4pG5H#L8oBqEGJ>0%
z&(L$g*62JMCJssW0(m$4XkFK)f7hK0b^i(~n(ezPhW#||9%rG)vvyz87fAF5Zz^8&
z7h&DhKH%h3yEadrwt=ke%kt*LZnLy!Q&YjZ@#RYhy~Sm>#Oyx{*N+t0wUGW>`B3>_
z%+5a-j1TMke@(;})z9M7Uscq9MHc?w@)RqG<744ZDuzF%&q8b2pv%~{PIhj_c73ap
zJA%W`$;4dq9GNN${+vFfejRu17R0{mUM2b!*dx8KGMY<MS)of1Wd&7yTC1hek7BMy
zwhb$<)=l=ctgQ2Q>C0cQp1egHtUp-(9v=w3%Ix@%Z2iNs@r4p^nA_rt0I>9>^)Al8
zKd;Qr@tf*rkFlYkQWqJjC$m4N=1KInO77_GofhBE`j_+W{v35LhT+j*YTj?{-feO)
zdIwR)ug`27UOru%m~0zm<ty^6>!@Bqm%=YI|5{P;_A_bOzfVT~hGVv{d<Uy8ApHSh
z{r;v?-d{R=t?yLC|0)l#h*+CFI`+Mc?3)Pwj93A>`5N-)k1BpVq))#uv+ujK`nGSC
z7PB?<a#S_PZ>y*^_wHGD%}M%g<f!FmD0<_~t(K!UIPYc`;$@n>TJ=I<*-_q{T#QP{
z#>vg8VN=(HtD&x}(8lhbb-yJX7fw%Z#D#ZxU-^e#P4kb$9n}A(i2gtNsfG2^#PP+u
zyp1SsmX1%S21-SY`lr=%6qoIkB|3&z?c6nz3+1VPpnT)JR$Jpd(IbNh-k;;9|E$+Z
zTI-zd5H?$@wGnb}YMih&a<O|;Wua%`r$PXY1vSlD8hP076}#c(u=0gv;U5;B>B&nc
z{t->{&sZQaf4^*ew*CdL4sXN4-_UQq+U8_r;VbH$R}t1f*C(yr#%~xpH8HDeL-llD
z>+-d#q|%#a)qHS&IC@Kej@o%Q%pA3xeR61O^!Q(#ksGY9QMJjDn_gk6obFqAP^{@o
z@~>;Aa%zpmSs1MRHQ6Ve{G&qf9oenenY?$Wyf2#a-uP$p-ty1Vlm%qt;Ei>|(_!h=
zwwF`{CnH<F)m*5Rtf}bnNakZ3Wj=;-PCugAn)^;&<=&^On^XOCHb(yn@w@5`{WtE~
zTMFLZRSq+UsiCV;19M%Q{slS?=|gk(0yR%M4Z-^t*|lI^{+rCX|IoE;I60B~Lqhfa
zvgaoL8ByNT=v9pQ`!bFb!~dtt*|6^=mCeD}UX*rYe(rpX${1a!bh0@AHr{lTqqbN(
zcgGUhnD>9wnwatK&v9Ebr_x>V_MQOisPv(ciMfvfykX{dCf@Wg(3SM4@J2&LWm!ov
z_9fx-N@ihy6zj4l|A_F$y8kX*{~?P8?|;So@vi{!Mivfl!=uB}t3M|rTT1VRicaia
zS)V~Ibgh=JQTawuMQ?$h_w;l4Idw6*Sm;^u35GTMb`5l}U#mOQ4$KS`zc#Oq8^4Cq
zVy?!x(aq^lawfJ{*S_gGWIyG$sk6|tGE;cN)N0;M?-?q~%fbk5P8POk^0ap{Ze!iz
zXF?du7TTTp^Q-r21;E)pkSzTjMS48?n~Da`z?Tu;FQlScx!R-pT=+RXE$A)aeQS&N
zwQ1jb$v45zsg1Gs9sS(>h?SrB>$q#DlItYw6!4yqnt9v4QCip|KsHu&HM$PzP=cAS
zmZ};|?Iqz2Q~P8$dM_l#4NtQ-mvtNMC}lpZJiR(m92<wTp|yQfD+ML}wJu|$2L818
z;A;A`$MmVN^9{O)*V;E3I2AHHI=cx5BTnVJcC`?}|NqF(&J6tAtd+P6(YrFKczb7v
zJJVe6#>VMkaW+Q(IDHLtHMmMbjf4sbjLi{zwh$$P|5G+D3m4iY<|`#J=X?K1%s-e}
z8QKd<o0XSOXC6+Mi&^^W!W@;2x+oc$RaJVAcbY?WVJD}16X`@9TqWy8aeFtkhkhHm
z<9Ki6wLWHr4Mmm8x9cSp^Nls*w(}uvMh50DWUb_tIas<eH%DJU=wj#p66&&Z+q%Av
zTnh`NcL(<mi@*IjZQZ#z`pakZ?#7)R2Sd`<!QI}SOdR#axMS<=F!*=xUTxj|$8|>(
zET%t4Ut@Zn%$hOX9WI<bY0f^lR_3lXY9|$YvhgS7<3FF-xb?Qd_D(K7D;XU24)ziA
zchbWP_4g#|czE*i%G!zPc=#n-)eR3%j}v_mbLuayiWAd!>h?geH?UfJFQ!)y?>=NQ
z@@nn$d({1o#I|{N+`T@R!`szPOt+eTNpe^E6wTSOb#u5aR6D`e?caxFOh<ijrHr13
zrP`SOmOM4;s$)8gy}{O-e<_}0>)1SYZr=WP#q<TUmeR9xSo_OeT^$w1Rg^F5(;d@6
zyzVw|?_#xcb_lX_%>JF-+`XQcejd5ir@_446_kr|t$UAH&C@F8GZaZ(AEkrMJZ@EC
z{;Xp9a`MDI-j2SC3WK`ZX62cs%`emy*TvpzriK;+;^b+ltk^ibon8odJ6)@;n+<6r
zdaq7u-cGlw^Kv{pHcr*7BF;`h?;~;@rC-Ng^V7qX$MkyHd~OQ)DLRbfIe9s}{Z8e=
zn+fllms3R{FJD=hJTGjVm($gR!n%m^E-EO0lgEa|Wu_*STfD{P@aovO)wd6&vi=t-
zvs6>iTB)WitM?^0r{BrB`8ulLd?j<W+6%G0p3gh`d(55lkf@ZpGG05|>R!SA9lKR#
zVw(5;T5qKj0{smhSG!ev9gNoB?$w+>sJX9tE4zlk{Y7C!o%9c?a4#n8TobSQo77fi
z<BI1faAfED(;6HZ`rnnIQ&FLc_O{jxxTCrLR`2;@SCgqd5fAJ0H*9;;(PRd9Jdv?^
zCqnIULzAhyg2BBi?EO3TUKi&`%?&y`xL?@f?w)jXb~+-csi3n{A>SzXnmi(1>~Y!P
z7i5d<GO^B11+AC0Rh@mdkWHOE$kN(Z)>g>Tsh(PCcNOh*y#w7(bVk(PC-$Mx34_wU
zzMg;`2~^7ITDB5b`(WViz1@TKMYyiw^I42~e~uhB<9!IOo6_aRenEFV`81Z^9wT?b
z+@U(!=E9skq14gnadW0_CWkuXsE+#jCwck5WE~B)9sTwFL3QPy@!nV<@a#q##{O5u
z16RuFXmxL+J0r-@&Dp7=t*1{0Z|Z2?e=>B?j)W_6M*@|VIqPWdWOYRE$5G?gT_Y!+
z`&2vc4fR=B?oFqT#(pxCIBKR_X_jGd?DX!{$X8VsMfWNZo&Gi~oPMWXB@MJ?<AIH%
zw^JwohyI4f?y8DaS2Q^1<@V{sa`vInt8NvpDl+Urxl4F&r+lKG_fY%X*hlEyM)Wn(
z7vYoej?{>4-~Bmq`n_CLn)4*XDXN{q+QGc`xzQKF9#PbGvpBjM*A;8;^}^7@`l5Vr
zwQ%A&Jg)Y*Er^W=?A@I(?-$~KAA~vmZp85(f3phbZkUzT4a4qmsw+JPH#kolmaLsT
z4J$``-7nR4_7ocRws*Phb?eu$)6Z({nSM7E8LBMqR<EkNcM{fpDBfRox2jp2B#T>5
zEN<=WRj>VS?q+rGGV%P)^z9&@T~LwsF08@ZFQPbVJN+;fchpy6dF^{+uYz}-(YL;~
zK9xS^4HaMRQJkUgZJMGveQ$I*x@+BM__%AGvjBYZ<yqOa?tKdVJo;+$X0g^H4@oBH
z%+0D)RcFZDI01lDJ?L%SD5HAqZRL!ImF4MI5SK%dt5sEN@NcII|4xX>3;n;v2g~fn
z{ZF;ik^KtZt*}Jq=k9#N!;`Jy;jO){r}%Qe;*570vQuGjE!CBlT05_ut&^q7)LseB
zcBz<?xAfPjYbVrU@_}S)?w0UQQqK0Moo_d#?p{xOAgb4Wr0$o%(yhENr;7K|nX%Ey
z%>E<#*6Dvkm7|w=!6tjxOYLH&f@-wsb7Vi#zjv;?Gsb(*$j*B;7DsgN821SfbV3d8
zT&K6yJI{_3U#*?Yy>6&}8aZ9P=C3~G!<m{-=3<{X=ef`k<ywntsy_L_Ju=SK;O$mm
z*?IPiys+as{++(4x;I6r2mGBqDePGA?i4!S=x|&_(f>`Y4|b=Jl`ow&HTOc%D`5*a
zXJ>Z`Ihwm;+}(-_hgav+4|W^YJ>$Od(WfjrO9S)%9XZ~u>N1tR*RJMzvI}|~UcGj(
zdlxaeTJ3RlUo&Sx)IG%Z>##ZY4}1R^JCYWaEqnjjLg5`~3kSSyQN?^BID5$d&?>Ip
ztFV$ZSGw2h86Z9<fO;A}-QA8pCBVBC&|-T1>%D$vc)PV2pU~E?<Mxgu_8WSKO6`-W
zJ5<o&d_EUvve~n<ztp?N&Ee>Lq|22~cJD9s`2g^DcB!x{iG3=IC6{|E-WJB7&Q8Nc
zx@f;4u7^hlZ`V%I*x6yq?i3VP_Mfp|;X(E1c=tH_kz7IbxqRelbUeBviXEmP&YiBk
z{VCp$RL_a+zmfOOZvu0)SKl{AG-vNZ-9PR#=PPe__oKO6J*CU~E7jDxtC(5~C;6~{
zd`Y3si4d<#gNMUw|9HGrczrCbn?2<0E_DnCarUQpPqBUa>Z!YV2igW=j6RK#liJ{I
zJ_&@LNA{rAle>KH0NUFKjm#%G)kxmYBWJgYvs9wF_a^x!9(PVqMYd<B(t@S$q*>;?
zT<=&xbMKw=<1=4iahwIhsR8uOpuPWIxGy0O|3{&_n2`T?^Jc>?L-vmwZB7KCx7Fu?
z_=E_2Iy+RJkj_d!6uDXLarJ(M+w?rxxZ`-Om{ULXSwG&f&^wpU+->j~vi&#iUZ&!+
zbDf*x**R|$)z!OIti-u~UQh0#g6=&^_U-jV5TC+Fj!vG&89$#Ap4j>)1I#)5W%2M?
zAoc8*inY&vas2j4Kjh&=aQa)(-8gHNOq>&S?a|HCeXmG8P1oH}ur_jWE3H2Jg;m~v
zqxR`9R1)jH;(E`PJvvH^&vfe5QPJ3~yRsjR6OuO&4(u(iXZ<)!<IKguXFB28iRd7{
z1m`-%t6`jdY8z)dEuUT-b=9YM5xLoE=#v6AQtbZUXFAm?Irjn4_r^}719NvuFDC<Q
zqBp03_)Mp|4~=dpax?FqpLa*i8Ff}5dV9!w_r}l%<z2<x$3-@dWuv!(c0Je0`8fMk
z=#(HMuV?ack}4-JE}z!Dtn6E7wh8Y~HA^+^d2O=xdYY3@=VO1uisEQgPN<aCQz7O&
zv5lQ6+v*v(Wu|wgQ}1-u+67bhoz)tOxf*Bb_UE`cW7KD3RF$=N^OJXxqrNy3ue(*a
zO|&ZP-brr69lcT6A6NF|Guz0>eZrH^>8qzOzS4YJ$bULsDND!8;$@uW#EF|eQ<oEU
zeGVf#ki26YEw!EjVl~x1yw~y6<7joKLOm0`RaB#%&ewlq=9cX_&xRmkqp`8Ow6}Yl
zvyy#Yo6pC#7x!sD)W_@T*i_IsBZ96N&PnF<Tq@;xc5di2uQ1ZfbY2eGaTr}J+2^Tp
zMmB8h@h%^uYqfWNF4fT5^T6$V^<*FSu42vXETr$@-z(sp$EUM4`)#~=TJYd~@~)GS
zZF4>VyK!pf<?~d1Msl^}dfSY9Abk2F+BxUk!^~Dw2KIkBBRNk;{*2J}iMgDlx<dH;
zJ<h-9lw@{=|NAM)j?Z_syNz~~H{rAoPDy5eS?@empWxK1jP$ZCPW-@Y`;_GV8+YE#
z61_<6UPkBH_4IS!L*sj+xHq$&=Ty(n^%)>O{roFZJ&4xUQXQ}B>E}A{UYM>>p6}@N
zbDe<B396iWPfX^-+*PyM`EyzG5dA*cmCru+Y4_YIRZsD$IW>0_*Yi}}y;kknw;Q-;
zG53~*Z}RKI@ydhESqt(R5Z+~0yP3?p>0_hc0iRt@?82gbcLiNd^rq9}0{e!Mal-v-
z!p-+qJYAj%-DwcdH7hpH>TBI!k=FYK*)R7P5QS03=vZMV(VWO~;}BIY-zU|($Dp2x
z?32#vP^%}MyY^ul_6;T6CfYBfZSTL$o9?`mu4Wg$_sw_uU6j3QKI4N5h)+=UeSYLs
zKL48A3qTjPO}`@NeQ<Y_eKt3f$Zt2lmZg5a;eLvzV`ar^dFJ?~uq8+41{(SlP{DjJ
z2|N3_f5!JodA~O&>{Sm<&w@{6s(1YP46fRN=!}^>Sw1?r-8k?2?U(U}ZehvQ>^g^a
z@5-uuw-B+Iv)8C#n{T<=VfDLrM;LW%I2Y&kaGFcKlf-vO!Lgr|73*e_cq&$jUzJrt
zw+xkE#%hYXzJJ7bNpZUnxiOj-*>Tl5eU_fPkX*sKCjGKc<nir7RpIs-Exm4X=^+{=
zcgFYGcy()5y=O<fBdm(ddAeS`eH^8mJ7@MtPR(t(z6Xw*!l+(zUMhE0Zz3&hW_G68
ziiyKNlU=SEPsmT}p0GwZ2Uv4wnC}Vm%~3z?S}uN>UA^qvclUwsjsjiZ6Gj&)_k>vi
z@reynvVKwT32XZhG$w4fy+OC{#(TW()d685Qmxch-OK$L^{zkf?B`59-{Q!rdek$x
z+1j@_`qotxFm{MlOXe0SVzKXV93rH3+h5-Ex4Lfpd!nonkB9FC<Gv_v`y=j>0dvDH
zH?hu8Z1+uY+z#g3{&vx)6MfB~zoGcy^NoFmnrl?9ShPBqxD|I#FxoyGb1-H{rqiPC
z<*%IxK5MJ?pLkyonwK>Y&Q9#1%nhu*VTKAdxBhLYh`hcKYwzk*R2I^WB6B<zpv_H=
zy1BEg9o)!@Z~k%O%U!J8wd?yjw-Um>B?_g3YLp|ey9Vo?Z8U3qG%?usb=Gbo`bDi}
zGD_X{*M}qajo9^mFz<1!bsBmJ=@R#TKWE28<l1ur;{s*&byKP0w2r&7yUaIXbLSs-
z!ug(E-JUECg-wHY`-*kqk@!h6D{cU*_bGF~-)32ja1QJ{{&q@?IYr5xBvvoEADjDv
zyr;`&A<`9Gck-pL4sPv~6-S?qw~SJBk{w6hl_V?fbyE4PcJ_X_?(CjH$747b9VTQ<
zj>za-^cE45x$WF{*Y|G8#+r@uy5%R0?#d3VcHLMn@XOqOet&DZ;EH$VPCxeOS(ElH
zZy?J}_H+<jCRNp^RFnI%cgyD<){{282Y;~r9<Q<X>3E69TI01FxYj0M)!b=MM=*Co
z!KzWK_tyOOZp(&sp>y3LJKkQrtJ*Or-_v^RjRIT7Yd_csY0&m79t^zlhT_fKZC`Ie
z-%?d;`UGyz?vPuunurq3J?QQiFv7%O`uVGet|uMR3wCC901Dx1y*+&UWxV0_+~d=|
zGcWC>-SLe|%^AkrK0sc~jh(JQIWwkHY?!>~(Dc-F{$s~miCu4@JeGTw6_?|_*r;q6
zGn)rug9awGQGh7_#?880$Y#NG8+n0g^7prDz1*yK<&>0qyFE7m?X6FzgV*&#P8;Vu
zVziCH-5}Vl7_|J-ap|E>?w^sCljWuGRoo!`?NsB*ld5N~U4M9HqsksFql(?q3&std
zyQ&kzH@l&E_-^It>J|alEkn45qHx2_=o|BzeP6?Es+$SR&4atJiL7@BOM0+()H_rL
zwTrwyEZKK2`lQ0%t>^WI)j<(9v!T<-b>le2*HQEQ_$KBUL9ok@?RkU#Y%9&aC!*dQ
zzzK%+CS4Q_`ZrOWsSevRT_K(ZiwbfgY;()B&dnR!Cw91L{HVDnHcwjw!8-$M#K+Q)
z1wXo}%YugsLzF06Bq}mD_mIz8jq=?+RY}fhs(i=y<Z|=%@v_MN8R-dwFg-4m+iEV{
z#{#0xddO{I#AsAh`W;O#$!N;%D(ZsQrd`6C(5h}JJH~DDmfIzB+B$6$hJ1HthA^BF
zTQoCbOX0Yc5a(`su*A3SAd7UR{zfsd>$OgH%ZdQ^)Yltu!LwHFea0XjmNTgwJH>m!
zQ)3~2g$3ew`emFGHPY74hO9L8MmmgpYE<1PS36b)BkC*%RqATZyR~Ji`ZvqQs<)jM
z+r@O*>YZTM+|_JV?g~)cCUM+0Y?X?VfoB~iyL9F<Jo(QaX_-`O9V=b2?Ri&_bTv;M
zH(?I+?Ti>8iH|)&);aHwF-I9E*UVfvx|TWTzFwc}UoDe;?C@OlW7I|0bFUGO*U6T!
z&0&dU+NXHT4uRj@uG}s>x0Oe|L;PrZzVtnPe|y;^DpHM-Hzn)o*(H7!yCha}H#K_|
z>z=i=%&6zRT35=>NO4+fv)|Rov`*s$<JlJ@9i3y<8je%M7<3n;{FE}&pcA~+9>Ur~
zkJS=A>5w&^SSA%cd)pg?X^o;kjG+M++Ci^rAQ#&UT@cLg#jSx~#UhE6UsL?OULKoz
zD~t!Lyj-7wU6OmU=hT^rIBe8?r|x;A`g(fL!)h!i3&nYQY$1<ho-W*AuC<5%DCKJ1
zI*#Varwcge9BhsBK*D}tu(rotS{7^kb`J0(YRcMpiPhY~OW)tQ3=7=^AMjJ|1}BTG
zcyX?e@q*!W5mWB#ydznT*qOT7gqST)>|2<@aquyt=i#wUD5IN+F)EJFNGO#c)m*ac
z*52fw>K&wHk(}OGl>&N{_X^leVis6jVkRu`qQhe6xLFZyClCs(O5YuX({72>RprX4
z9@0peyVR^-`JtYn-N_G5dcvAfWV8dFGC}{%Gb0Im3gx}ZnbHelPl?P?VO&se2Impf
zy{8Hra*1wq>tZ9O5-=6e*+qVhICo=5FQIW`L+^nimaJ!2VK_X}di1-4y&d@haSOGL
z-Z6Ctc2Sw6&Svf6NL)^ZQz~wa!sBTi6Xv0@jBk1#JZnCYwQ7x9`FV@WVdB}=U8If&
z>S^VU`&3+lJRO_4D(va5ExR?;H^JumW|zo6<GQkIgD=}%-s~#<wDPquBA3XYnMtHa
z)2F}<YmEwZn;p^hykYpEtC465gBjxJm{8`~F@?Qa=4-MZ_vxNt9uf4T<JZtpe51De
zINMx2%qAR>V2I5B)u0u_o81&)c5ANHpTpxC*~;!AY-BBa1$`ZtWVCVhA9U#7IXJMF
zR4;=Z3}gl?)ZLhq%8$5DbApf=ZEWU&af~VBH5!d5<EZ(%a1qNrP1(!Qsf-+<neiDF
zFa)bxaD)TG@y6D3so2-vX+L{5S8Cp2dRI5QcZ7oeyejs{SaNyGx4$7Y_&sOCiAGp+
zJXAcy{ZvH%NqPc%FJ;7HFEtxhT#?0((SLLG^9Rq*dYT{(D!-hojJ#i!&CHo{cdb$A
zDpaXwXx&QBh#Fgn`_dZYn{jC*3X0o!vOQ*B*%8}n_7pOEm&<~ACwJwiFAPPEsH`i`
zS_|ugN9ePT?CSV*#86NFws?rtvj)CQ>=<9h%<a#gW6%nU39{v?@48EZyYAs!K7mU+
zghJhH;eIE3r}Gm5)O$tuu-3azkiE(l8u%Bh{qkn74u4)2QrLygB_T~O;88k<Uifi_
zsiXEe@_Hln3Frrk67q+sAn+Vo`_}fX1x?Jgulb+rpMM-HsF_eEYE3b=w180EvsDa^
zp%01pO<WMGIVYT>c<oPVnH8rhXhmygFOdZ>%ZWj0|BOo;^80<ltA76=*GTV=rmA-w
zp>_ZL*8htyMdh)|^r=28GAC!!Q{pRg*2~=c<R_MKWxVD+{Z6Z2IIE|wk?TIxv#OaV
z7JA(?_am75ps#@2eGZH%F*WvU@H%*M<@s9s-}Fr9-|c0z*7b8!;=s5-zuV4shzZG_
zSmT`k)mD|9;R*dyno*fKBn#4$jw^HFGsn0l*LE{eib<^pva(MNGCB4o9Ti8))}<KY
zS7Jn<Qd4_CsXj<Ec0e;#v$x-Dt?uya!e+mQ^{e>@hd4hpqf%XnnARROt1XMkJ{cj2
zA7drA3{!sY1bI85-x*&{oI9Sf8K+o-ze}#7taz}mrV9ukX<wc5D&F9E6>rhJo~v2P
zIn}&k`O1~UIT@aNs(1|ExcAb(HaWjS;rxKVCo2(3R(F|W^F-F}>5-Lg;v;I3d_`ux
zq4|vy=iVo0ZRq7Flk;xPMYfsUIE`4MRGIY9nhj-|aaNoy%U1R)4tHpm!5^#@jnB}l
zIS|G&Yf48bi0|<os#-b2V&T-bypqp$MI<Iw55XKub4)Eg^`DcQiHaL=knud{T=ul%
z0*`iLdI)E(ihuSJO?qK5F5TrG>cb84S22P(Tyr}zGg!@3u4!>`&EG-HWL(h6Kl3|>
zG<4mZ+vI%WYunkJbJe1#)w*Guf9eS|ug-AVIL8W}yPozWuLaGo{BMkbT@d9MTlNaN
ze&6!DwimXIcA+(#vxPVHN=A#+T*jfZ$b8NZX8aKO1XitbN5#ZLo77uE3_`z+9kAP)
z{x$Yxf?{`;mA{}}o}7HgydS@omZs;Oo1c7a8P_?nT{Fq(>YV48zuVYHlT{M?%q>u-
zj*!<lT%Pr?X0p~RK0q_tId@jhtoWY4H!>zShsD_qc?mh8-hp?r=Y<_NIj@Sf;tUO5
zVO(>f=JTZTE`6>To8EPtVg$Zb5jiz_t<Z9O<G#N(rZqWNVhWSQn7lfvfwDq1E4<>I
zW<<lx={0Ml?EU*<%ZE2-$!};aszZg!m8;4<J)>7!mZl*KF&nhEPsY`Zi?QXTx#T&=
zMj~ym+8NUsjfD}5o8z-qg`z<X5~Y^@fHN9ZKH|vctWKTF!(_i{@fm|AhyKnS>rcF=
zax%?6zmbeJ-$m~x*6}UHL9M=Kl-8c+P?;p$THZaMMKh=s_^y7sh9{KgX<7D(oy-gr
z1DL_g3zPvJM^2WS#A$JCb4;VCRL*R$Um{bxDrYlKhtKkSWk*At#m_WU2J8>ne<7b3
z^f%B$rd(TWqSd7JiT}$dvIfi8x#1amPZ?m(DoABPoHgT*{Gl^k^{XqZ{4O)loGN}!
z6&0^|hAfrpjw?K{c)i}1&13gz`$x={?~5}V@>AzbV)x=j-MN$(WX<>N8Ktu3Pav$h
zOiSs`=)3<}y#jdZ4m@vsXN+vD&MC2URL9-n?&{K<dX43rX0*YBDkirpHdif{ob#(W
zK1w#tNmr~<BXLYaM-?99ds#C%PM;tJAQ|WA#1(9-ji>$CSJwG`_djWz)X1_LF^}2f
z@s`rHD?d7=p|0h4EuWcMK+cP}D08H_{EJ?W!Z~Y4&py35P4k}f)mSk>HOcj!*^qoA
zaZYS(JUoHf>Wo!vc^5oI`Oox!V>{S}=0mTHf}IK2k?MRWcQhlp64Z^~(DfjjorNw4
z3n985{ikFjjcl?xwxbx^c>f^#7LM;YACz_^X3||ZivIbDteF4zPq6U7z<lo+m~TM;
z)Bnvk=<E60uRoxFdQbcH0{<~E@V@qIerKWi<{$X5{@nG2fq_Nld+z{0yRW`pbkNT%
zHt6fc+pm|^&wZl(`LX)>CFffppW!lny;S@4b^7{KgMRmO?bq|`clqCrM;vm@0YlbV
z?bt&O%+DRZ*ucOCRv#Gnj~(?oY+&HN(*_1sy?$U|@{b1wcGAE7aLIvz<CoSiE;BH&
Yv0fwf^}$Q&cl2-i-}-tnr2O;$0JqPQmjD0&

literal 0
HcmV?d00001

diff --git a/tests/papers/RHS2007.json b/tests/papers/RHS2007.json
index ccb8e753..dc24f0ae 100644
--- a/tests/papers/RHS2007.json
+++ b/tests/papers/RHS2007.json
@@ -110,5 +110,13 @@
     "todorovic_benary1_2_3_4": {
         "img": "5796edd6dc6153a2a47f6b9a06ed698d",
         "mask": "763e018b2d95aa97394c4d19214ac9f6"
+    },
+    "bullseye_thin": {
+        "img": "e784faee64ccbf1f2b90fad8fb653bc4",
+        "mask": "e6b7638c7de948a3d4f1ad743f5d144a"
+    },
+    "bullseye_thick": {
+        "img": "8e9a74ed64b1189b8aa5ad99166f243e",
+        "mask": "fd836e38f48a08311ba4603c672d109d"
     }
 }
\ No newline at end of file
diff --git a/tests/papers/carney1999.json b/tests/papers/carney1999.json
new file mode 100644
index 00000000..b894fcf6
--- /dev/null
+++ b/tests/papers/carney1999.json
@@ -0,0 +1,174 @@
+{
+    "GaborPatch1": {
+        "img": "0d02dc37a45fdd024cb7633f8906c38f",
+        "mask": "b7bae4e2ad2ff2ed934c59c1ce02e448"
+    },
+    "GaborPatch2": {
+        "img": "4b399050ad720285f295830a20f6b6f4",
+        "mask": "8030340e91d8c0f74c3c1ffb506c9db5"
+    },
+    "GaborPatch3": {
+        "img": "bc3fdc1baf7112621566f2211411f1cc",
+        "mask": "4ec575da3bfa8274f3b74777cde12689"
+    },
+    "GaborPatch4": {
+        "img": "dfd196b58f3871092798c8bf9b7b8bf1",
+        "mask": "fd3ab2a466bfb3b4c77416c6120bb245"
+    },
+    "GaborPatch5": {
+        "img": "77af317adf9f4a338dc302315ef1b4a5",
+        "mask": "9f30fda16dfba1f9001c9804d78fa733"
+    },
+    "GaborPatch6": {
+        "img": "2e13200e31897b4fba4b5fa50d2a15e9",
+        "mask": "858891cb23d9ac018f95ba7b25121d64"
+    },
+    "GaborPatch7": {
+        "img": "3039e31ba0836cb60f67785c991daa71",
+        "mask": "32f94f022e8c8cadc50b5820240a9988"
+    },
+    "GaborPatch8": {
+        "img": "06d5a55d9a0fcc6692cd64113d4bf266",
+        "mask": "b849be44d496c3fc3b583bf0e2b1369b"
+    },
+    "GaborPatch9": {
+        "img": "6dd216e249d0591bc85734ea6f204f65",
+        "mask": "d23a567cf9ba5d0d9b1de98f2cbad443"
+    },
+    "GaborPatch10": {
+        "img": "8fa87569b8968811f08b21cc9b92a5d6",
+        "mask": "73aa8359e0549d67a7c14addec070383"
+    },
+    "GaborPatch11": {
+        "img": "fb9666997ecfaf86e25ce9996a79508f",
+        "mask": "8030340e91d8c0f74c3c1ffb506c9db5"
+    },
+    "GaborPatch12": {
+        "img": "c573bfb66d65e34240ea9570681ed724",
+        "mask": "fd3ab2a466bfb3b4c77416c6120bb245"
+    },
+    "GaborPatch13": {
+        "img": "d8ec9ed5a981c034832fcbf5eb579204",
+        "mask": "858891cb23d9ac018f95ba7b25121d64"
+    },
+    "GaborPatch14": {
+        "img": "8e86c18972a6defbe4ad747889c580f0",
+        "mask": "b849be44d496c3fc3b583bf0e2b1369b"
+    },
+    "ElongatedGabor15": {
+        "img": "59ee24110d6c724f99eec1e982f3ada5",
+        "mask": "fd3ab2a466bfb3b4c77416c6120bb245"
+    },
+    "ElongatedGabor16": {
+        "img": "f6c1427def123f777bddfc29e6c40514",
+        "mask": "858891cb23d9ac018f95ba7b25121d64"
+    },
+    "ElongatedGabor17": {
+        "img": "eb0be54016ee73284a4da087311761c6",
+        "mask": "b849be44d496c3fc3b583bf0e2b1369b"
+    },
+    "Baguette18": {
+        "img": "89d72391be70357389cac13e43df5d59",
+        "mask": "fd3ab2a466bfb3b4c77416c6120bb245"
+    },
+    "Baguette19": {
+        "img": "3b89c4d4f828e6508cd3fdd1760d7fb4",
+        "mask": "fd3ab2a466bfb3b4c77416c6120bb245"
+    },
+    "Baguette20": {
+        "img": "47c85f70d391e15376e8037b4a151b7d",
+        "mask": "fd3ab2a466bfb3b4c77416c6120bb245"
+    },
+    "Baguette21": {
+        "img": "e0f3844bd7841829d7982b20536dd3da",
+        "mask": "fd3ab2a466bfb3b4c77416c6120bb245"
+    },
+    "Subthreshold22": {
+        "img": "ee6d32647a448387877402e833ac7068",
+        "mask": "6b3459b999203075f8d8368ae390fdab"
+    },
+    "Subthreshold23": {
+        "img": "53f0b3e1510d8a1ea1d77c4093f42609",
+        "mask": "6b3459b999203075f8d8368ae390fdab"
+    },
+    "Subthreshold24": {
+        "img": "33e746225d2ffcf01f5a3b614f269293",
+        "mask": "aadc906bc69ee00286b82f5aead84293"
+    },
+    "Subthreshold25": {
+        "img": "72010520f2a4ea67ece2f2e062415ecf",
+        "mask": "aadc906bc69ee00286b82f5aead84293"
+    },
+    "Gaussians26": {
+        "img": "03bbb5a7261c8641b4f900b1d1b0923a",
+        "mask": "7dea362b3fac8e00956a4952a3d4f474"
+    },
+    "Gaussians27": {
+        "img": "d059e79823462c910dc12c9341e955ba",
+        "mask": "7dea362b3fac8e00956a4952a3d4f474"
+    },
+    "Gaussians28": {
+        "img": "4cf8102a654bef453c716ccff06df5ab",
+        "mask": "7dea362b3fac8e00956a4952a3d4f474"
+    },
+    "Gaussians29": {
+        "img": "72444c0e829d015a28af4b6c3c28bcfc",
+        "mask": "7dea362b3fac8e00956a4952a3d4f474"
+    },
+    "Edge30": {
+        "img": "8888f3dc43de6ff561501914a4bd6cf3",
+        "mask": "9eeb417981c12ec22d3466eca100f136"
+    },
+    "Line31": {
+        "img": "cd585c714f8587493913aa157ab08540",
+        "mask": "c5d29c96c5f29d534aa665474327bcf4"
+    },
+    "Dipole32": {
+        "img": "b869f421ff0bea683907c4e468d88242",
+        "mask": "9502dbb1d34c7057c670891ff362e6f8"
+    },
+    "GaborString33": {
+        "img": "da3e31877651f828968646f522fc1fad",
+        "mask": "8176335a8c174cf09b2d9f606aa49be9"
+    },
+    "GaborString34": {
+        "img": "4da1beb8d5e14624e07f272e32736612",
+        "mask": "e0344ef2ce8ffc74f914fffa12cfff0f"
+    },
+    "Noise35": {
+        "img": "ea1f4e0fcb7664891389b35f5540fe86",
+        "mask": "59071590099d21dd439896592338bf95"
+    },
+    "Orientation36": {
+        "img": "34e6f3b2637a7df1c4d6afb11d013afe",
+        "mask": "37063cdae1e282ffcd35568ef112a6dc"
+    },
+    "Orientation37": {
+        "img": "e11936fc6f86a8ab78bf8a7fbef6516a",
+        "mask": "6ae5fa1f188d315ec867d2d8807b1e1a"
+    },
+    "Plaids38": {
+        "img": "4379d50cbf9eeafdb72eb49ab478223b",
+        "mask": "24fc09771a05c926b580c21b5484647e"
+    },
+    "Plaids39": {
+        "img": "b67cf95d24bb5abafcb6362d2f205e79",
+        "mask": "76cf48db449229b3cfbb3efebe95279d"
+    },
+    "Disk40": {
+        "img": "fc5672879d59b22076ff1a79887df0c5",
+        "mask": "d774d1e22f9c1e5606e86cfad05391ed"
+    },
+    "Bessel41": {
+        "img": "908a1444191241ff50e2d7e19b2f704a",
+        "mask": "7dea362b3fac8e00956a4952a3d4f474"
+    },
+    "Checkerboard42": {
+        "img": "653795317b1afb5d5906a14a449a7b70",
+        "mask": "a53777f6dcc9e06833fd60492291f2b0"
+    },
+    "NaturalScene43": {
+        "img": "529d6172a7ca35d0c2a2508f3f133408",
+        "mask": "59071590099d21dd439896592338bf95"
+    }
+}
\ No newline at end of file
diff --git a/tests/papers/test_carney1999.py b/tests/papers/test_carney1999.py
new file mode 100644
index 00000000..4fae9ece
--- /dev/null
+++ b/tests/papers/test_carney1999.py
@@ -0,0 +1,20 @@
+import json
+import os.path
+
+import pytest
+
+import stimuli.papers.carney1999
+from stimuli.papers.carney1999 import __all__ as stimlist
+from stimuli.utils import export
+
+data_dir = os.path.dirname(__file__)
+jsonfile = os.path.join(data_dir, "carney1999.json")
+loaded = json.load(open(jsonfile, "r"))
+
+
+@pytest.mark.parametrize("stim_name", stimlist)
+def test_stim(stim_name):
+    func = getattr(stimuli.papers.carney1999, stim_name)
+    stim = export.arrs_to_checksum(func(), keys=["img", "mask"])
+    assert stim["img"] == loaded[stim_name]["img"], "imgs are different"
+    assert stim["mask"] == loaded[stim_name]["mask"], "masks are different"