From 01797a70336353f856cf8a20cfe0904731a9bee5 Mon Sep 17 00:00:00 2001 From: Simon Torres Date: Fri, 12 Oct 2018 10:52:07 -0300 Subject: [PATCH 1/5] added soar logo to docs, the image is a place holder until I have a proper formatted SOAR Logo. --- docs/conf.py | 2 ++ docs/img/soar_logo.png | Bin 0 -> 12055 bytes 2 files changed, 2 insertions(+) create mode 100644 docs/img/soar_logo.png diff --git a/docs/conf.py b/docs/conf.py index 6d95558b..423fbc93 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -111,6 +111,8 @@ html_theme = 'sphinx_rtd_theme' +html_logo = 'img/soar_logo.png' + html_context = {'license': 'BSD 3-Clause License'} # Theme options are theme-specific and customize the look and feel of a theme diff --git a/docs/img/soar_logo.png b/docs/img/soar_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..e460387a9ca9f9f40c7248b79cc0f93b403fa427 GIT binary patch literal 12055 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¨ji9pY zV+sTU>GFa*N_te+g!o}@_BTbt$m|}F8&Pw~@|ZpI-g=NLX#Vzkd#j@xj28q&lk~u< z9V{3BT2tX5;ewH;OAb5kS=}ZgDoA_lLbfThO0I~aU@bq*YuplH|Lr?;x?&pw34Y=_ zWnoM+#)U^QqW$MZF_emuZ(bM!ufQ+YpH5cw;*=Zy6YawKEl~!J&C8W*rK4&8S7r?n z>GnqDbW(-jj@x$WdmwmAw6c8>i|%EkzsB^>V;ru@p#^ zsvCm9San0;6=KBL4G8T#^0LDp`uc0?V{1R^(@TBZh)?VIjlSB1w;q1xv#fR``m)^y z66}E=ajxjIfa$5=Jn7NtU~~2(rLL+`4hfKkG=CP7H}6!HLbw0noO)u@Qq1u{{zB9g eWEEDo;tcbG9f?r(Rq&VYfP$=wOofzj(EkCVxc`y> literal 0 HcmV?d00001 From d65f218064f0d63efc4e391fd12051d62e5082a2 Mon Sep 17 00:00:00 2001 From: Simon Torres Date: Tue, 16 Oct 2018 15:18:06 -0300 Subject: [PATCH 2/5] - renamed folder docs/img to docs/_static - Created proper soar logo. - activated soar logo --- docs/{img => _static}/cvso166_400m2_gg455_2.png | Bin .../cvso2016_Ha_auto_wl_solution2.png | Bin .../cvso2016_Ha_auto_wl_solution_1.png | Bin .../cvso2016_Ha_auto_wl_solution_3.png | Bin docs/{img => _static}/eg21_1200M5_GG455.png | Bin docs/{img => _static}/lamp1D_example.png | Bin docs/{img => _static}/lst | 0 docs/{img => _static}/realvnc.png | Bin docs/{img => _static}/realvnc1.png | Bin docs/{img => _static}/realvnc_login.png | Bin docs/{img => _static}/reminavnc.png | Bin docs/{img => _static}/screenshot_1.png | Bin docs/_static/soar_logo.png | Bin 0 -> 26011 bytes docs/{img => _static}/soardata3-terminal.png | Bin ...v_Ha_automated_solution_GSPEC_2018-03-22.png | Bin docs/conf.py | 2 +- docs/img/soar_logo.png | Bin 12055 -> 0 bytes 17 files changed, 1 insertion(+), 1 deletion(-) rename docs/{img => _static}/cvso166_400m2_gg455_2.png (100%) rename docs/{img => _static}/cvso2016_Ha_auto_wl_solution2.png (100%) rename docs/{img => _static}/cvso2016_Ha_auto_wl_solution_1.png (100%) rename docs/{img => _static}/cvso2016_Ha_auto_wl_solution_3.png (100%) rename docs/{img => _static}/eg21_1200M5_GG455.png (100%) rename docs/{img => _static}/lamp1D_example.png (100%) rename docs/{img => _static}/lst (100%) rename docs/{img => _static}/realvnc.png (100%) rename docs/{img => _static}/realvnc1.png (100%) rename docs/{img => _static}/realvnc_login.png (100%) rename docs/{img => _static}/reminavnc.png (100%) rename docs/{img => _static}/screenshot_1.png (100%) create mode 100644 docs/_static/soar_logo.png rename docs/{img => _static}/soardata3-terminal.png (100%) rename docs/{img => _static}/std_dev_Ha_automated_solution_GSPEC_2018-03-22.png (100%) delete mode 100644 docs/img/soar_logo.png diff --git a/docs/img/cvso166_400m2_gg455_2.png b/docs/_static/cvso166_400m2_gg455_2.png similarity index 100% rename from docs/img/cvso166_400m2_gg455_2.png rename to docs/_static/cvso166_400m2_gg455_2.png diff --git a/docs/img/cvso2016_Ha_auto_wl_solution2.png b/docs/_static/cvso2016_Ha_auto_wl_solution2.png similarity index 100% rename from docs/img/cvso2016_Ha_auto_wl_solution2.png rename to docs/_static/cvso2016_Ha_auto_wl_solution2.png diff --git a/docs/img/cvso2016_Ha_auto_wl_solution_1.png b/docs/_static/cvso2016_Ha_auto_wl_solution_1.png similarity index 100% rename from docs/img/cvso2016_Ha_auto_wl_solution_1.png rename to docs/_static/cvso2016_Ha_auto_wl_solution_1.png diff --git a/docs/img/cvso2016_Ha_auto_wl_solution_3.png b/docs/_static/cvso2016_Ha_auto_wl_solution_3.png similarity index 100% rename from docs/img/cvso2016_Ha_auto_wl_solution_3.png rename to docs/_static/cvso2016_Ha_auto_wl_solution_3.png diff --git a/docs/img/eg21_1200M5_GG455.png b/docs/_static/eg21_1200M5_GG455.png similarity index 100% rename from docs/img/eg21_1200M5_GG455.png rename to docs/_static/eg21_1200M5_GG455.png diff --git a/docs/img/lamp1D_example.png b/docs/_static/lamp1D_example.png similarity index 100% rename from docs/img/lamp1D_example.png rename to docs/_static/lamp1D_example.png diff --git a/docs/img/lst b/docs/_static/lst similarity index 100% rename from docs/img/lst rename to docs/_static/lst diff --git a/docs/img/realvnc.png b/docs/_static/realvnc.png similarity index 100% rename from docs/img/realvnc.png rename to docs/_static/realvnc.png diff --git a/docs/img/realvnc1.png b/docs/_static/realvnc1.png similarity index 100% rename from docs/img/realvnc1.png rename to docs/_static/realvnc1.png diff --git a/docs/img/realvnc_login.png b/docs/_static/realvnc_login.png similarity index 100% rename from docs/img/realvnc_login.png rename to docs/_static/realvnc_login.png diff --git a/docs/img/reminavnc.png b/docs/_static/reminavnc.png similarity index 100% rename from docs/img/reminavnc.png rename to docs/_static/reminavnc.png diff --git a/docs/img/screenshot_1.png b/docs/_static/screenshot_1.png similarity index 100% rename from docs/img/screenshot_1.png rename to docs/_static/screenshot_1.png diff --git a/docs/_static/soar_logo.png b/docs/_static/soar_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..a5fe2923dd4a4d4cf986c798d3aa7aeadc9929f3 GIT binary patch literal 26011 zcmV)dK&QWnP)on6a~aAVgf-#1c?F?1j(?lEG*0BG`kbKzCUKVySlr&XJ*0cy}$3C=b7E^ zil?gHI_K1>>TZJn|A?dy8r~`+&T(}@N^%$2>@B?_Z5W_5&L;+9eExt31z$)i4Rc13yF{?Z!n%JaQ?9K@VC;@{oa zeRfqctHx<{ZgIpX_H_jUEz8~RWS`$J002n1=4<1rd2*_xv0JTylvrm; zj3AtJS5|GwDJor9{PPcoYSV`Q7WzL2rqp4>GMgl)KI}+H7*y`|Hm|6uiP3|Gfa+Ra z+pbUpj8J_TXz)J48RJQEI8OK~D^}%Jl)X~8YE^zMEB%k8{}W(pFl0#ECiOF)@Y-yH z3Mwk=s&xws9HRQixlvP8f{Ai2gBLo0Q3`<&)JcdhviW@LatqEqnfK$5N6bq9Z=nBL zFeQx`kqvYssrT-2v zjUR8xB9=$3aq)K)xT@;~10@MW)PP~G^-_i)H8CE0-+lvMZrY3o-(SMy;ZcNo&InXg zYfmwNV)KN6rIuI}^^=kcQBnT#?_YlQl5yq#IrN_mrvCk{T^lxf)?=~VS>|@f0TMtW z0T5qGO&ZV-FHXM+F1H6=?!F(D9=AG8)WoVTb(juhJZS`|rIr?0lp-}Qw!-f9ys_)k zkDtVUFsLklHvAP8V}7y&O{x&}Z<=vEUBC4Y_2=co#Z{hIf@Y*y0_9sFna z@7wmbj7k{#kCRO8#*80rPfVIuR9#)4tICLx1X4>PIiDOvkP;t{eQ&-3t0m}W`u%t| zMn3brh6BdFGK}HHLM3^WFse$RHNIJC1hDoK`(G`o>L(`V)6$ZgcYVF=2R##iAN|LG zso9`W8TFdh|Ncx>RZo$E0gfL1@fTFtp&OoPTO`_(dvc`@3 z7B9uhU3(2uXzd}hIKC@@HL|5ZMe=C>hg=W_ph}2w_|gdGZuxNWlaaUbuc5ycOwEQ5 zZ<1Co^Oti~Rn7Ha2?rv*WRhA#34v7*aNE!!cx22d*esEmhJWUs!Hjnn;#6T#WDSsv zWnH*hwduiS3@j1?i#e!RLp^xiFfs0UQ9=Ho>=i3cN5=fcr@zerzx2kbvwd;#-;~t2 z)2Yg64H?WFL)z2`7u5Mh5bQX90viq-#N};TBQ-wGl%HkWc3|2&3sF>Ar7QdHVMFMS z6WPSj_-2f0B@7^3;~c8=vhmINPvrDU9(DTQ9|EA#>rIVKNW806R>z7n`~KK|!2?ta z`u9twZryCXI(J`px~i&=D6znFvRdMVfFj?s;Zl02?!ly$^2Ivr_~xPe(79=2E=%kF zJct|KoFBSVcZomZ2ea zXb=~>)m2qC;J~tFUT%Z`A`wA_kp&p5)WDz z2?cQ0OSS*A{I* z>Fei%jNn{lWty0p{Kw@JCr$i!jq$$)OueSgc>O%Z!b-2ls;D&r3Vml9&q99Zs%NMm z4;nkL120kB0TnfF+`i}|jC%EL9L+y3hhNj9t6thjKLX}jNuvXopmCN8f-$(5|3Qhw z0}5wCvE_j6AFY%kD66Tl=YxFG`=)6x{5!_^F9%c4sWVpRRJ&*SM3HD4s~rquqni&R z2!t~Ldf*MZq#XcY^U>qz`}7O=YUdvOcH$)ZKl?JC{`LoW{eBGVbO~Y|j$oPEasdV~ zO1xU#v4g7j!0W+a#5-U5@Fty_M`CmQOf8AXPF5Buu@hIV+K=RZAsxQFs1(lp)D7wJjiiU zkQ^u{lM+G6uTG}UM}ZQLr(M>imkr3>v-`t~H^^!t;gdv99mbEh+v5`V6jZz0tAGNi zfg{hR5Gy38`m}>3ujW*P!CT2GgCVU7+c#_gtHpwSxo4SHE6tWHCqWRS6w#Oe70bu9J91MGPo?epkd`(rRI9`?>s#VUDE_L*NQJOA z)WN)b>^qaE#OsXTplu@pIC$>7s-Cp?c)3}radFVuNRryqt^x&~dJeY|Rm!-mO)K0w zc!05#*4dh&GNCU|+uu2rmEA6zF>^2e0zq_l@uQ*&)(GdSdC4@lqC>-n9h#U@Fwuu7>v8NM^_B( zoP`8uY}h_i1IT2;GWWTau8x<_n7R9+jy*0in0lN#vn{{I-QE~TLWICl&qO1mRcEjY z>N0~yI{#RTN|I=dXenK4T&&!-B&QP=i$znu*7#=X5!Bbl5=rgWuv#n_(WMg{HXE+$ z(vjO2+V0d>04)w$oy+ty#q@xN$b>O1qcFVEK0^wa^#s8KqgX=W;T9l?T& zb7slJ7!Rr+O&tQycO*$H0qF^fniB{?a$GD&0uebq%Uf7ifG#|kzHj@sa=l}Ebd%eq zpF|P#tzka~?~j*P^zT3O)@2t91J;XCNdIXwp3bgxjpqVM+Zez&p4qcfiEn7bAm;;& zj-^P3yZlFqhm>ErlTBzQEIBq7ETzQ9qo}$jl!1hjGj=Q?jPXqXNRK&?Pz?ki!Sgk# zaZV(}ID+*!od``8+|=iCxwwAq+h9n?OHf)}4X@7^GO8(DZV!&1I}a)~fd;Ffi10oX zMhTEz=^A(C%v+yZyYSsdae;KfU>bPSw27zv^ie;hdWoY0l5`IPpfT|(Floa8X?6i@ zSx~2yAHUnX0goDi`kjU@4C07szF@Y*SVJ;QPv1gdS%2W2wcG4R9y$o_4=&ia4g1cV!@`>;pk9*kX7tj{+wkZYU&HJ7 zD}6!LtW)NmB2*uHFEay0MIxw-OR8P=%=&fL1IPs6H)Ogv;XTp($}BLWgzr*Cy`I$ogB0)fs(+R7f?w+)`SUKM4_=y^v#yn{G zmcVqnq!ib_^8tE3_bT4_`B#XPBF1LJfVOSSrFf(gN=j=q;R!);mCK&mtX0&HQAGu& z{?lhXpIuhgLY@JD3Mht%=f#-;M>B)NtG;ksEqWm8RV2IOBS_XrB>+f?byB%J=4_Kz z+UO;h7CdTxGgFe$zJ3P2*!2f`zcde9vvc6_2k_L&H5fa85zdyCV`x_Uu>Hydl+pNT z1%R?R3fjBJN=n*ab@MGz`JN&MQ_DVm>J$^}y=DxkW`q&Q%%qp$Jfk_)A3LrVwsXL;P8tVil(&?d485)mwFu!yyIS|=6 zCACD~>^~4%)~k5{2neO9^my^?s0KeOxGbA3M-lVPM!Yb$iVKpl8^8!;%oro+d#ZFg=Y+$GDVPRLo&HpA zS!uEkBr+qKMwx(3hj>jIoy61TGqWQ!08)d9{qZCQ$InCvQk;g8iSi^77rcU&PyNb~ zHz`c-IsGd2Jy#oO(g2dGHyTrIc(AM!Ma6YT-E!N*wFXnQBld11w5r040AmO^C5=jT z8mU1QkOa-WKD|E7z*(quG%|jsbdCWIC@VUhpGoHm;7cnb)vN`4Sc$~xZ-AMk&;mv2 zZ#}?xV@q^lHBRUKW_U3K(|{>cAIjlMC7ym|Kp~?)62M7d33UVq7~z1U1Desm2*zqo zFJ%OzI%Bv`Zz#Sd!m+m^+lMoq1U$86s^U0ONIN;D{xz_rj6kOy^CRaAGp?C-^R%eJ z-VVs6(mzz4kv9n8Rh$c>ISQ@k0${z@Gn}lZoD_~OqW~AoQLXwGpdO$7V zv~}=oBJPBV2vAa&>-&;w(`d?3#*b)z+A&q%2Sf@nHT54xnBjt{@AwI$PM4Ks7$Gz~ zx)ml^^~UOIKH!*+VS&ZOy*_$41WC&9W-JFRDhZ@{Pl2rBG=rUHu$oJC#%O?P^r|1D zRT_VL$VlSqZ6*aEdYe!IflA$}z{<;SG_LwIhYJc?4jVtQU&LUFsbBvI%5FQ$WOUC7 zGnyG%<~4xhf-FQ$(^7DCyVkh0Nv822Xa<(2#&jT1y?I1Hyu%KM!Eq4XmI`|cLEr&P z|2PttcktS+1pt(^T%af*(1R?3F^gcVt36&~Yt--=Uf<}!RHsh-naZk8(yh6*4{)Ut zo5pCS7^p?vs*dTbah=+O5MW%#_F+$I8c6`fhSJ6{Dvps#+fL`D5LG{g#)}17q+`UDPR3(>x}xgRjEoH3+tYMl8a8J9 zOJ&v7*6@gq1mW6-8-XXpsKJbr(v9ud9sqD{hc>W=o?$bb)w;puZMAS*1%iMyW+k`z z^jVTqUPaEissRA$&KT9o&Di+Xs$3y5UO7@so*+7)@cUE_k9eFA)qP<_h3$$l<8&tq zbYQBsTCWXPsPRlt8m3yMX+dHXZqPB55Om0>i*|L>0R*=?`ZjM8!Qkkh3f2#@K0cXQ z$rbuVP>Tg6HL_&Vfkq2X9;gg?js;Bhf-)2md2cA zDyVV8FH)4aJtPPwN3d-6fldRJsRgxak-?KXytY6KF0;Obs!S~a_+bY3nsT-3FuSy@ zS&zPb8ySMBNvk%q1ELsV#p*c9-0NmZRB2d1C>?a|CF43HsjdKk?Si{SXBqp49eu>@9XLtF5(1`#x9pRN=Rx()2U7t=@p8lRawIDw-6}o5B zR$FXW1GrPFNgk!l4joc+OUvu?fdXYf%^%_SFk+p zaTBQ*lmRe%j*UIYrjT^}gs6sH>NTlWC7k^$r2&X42Q(?6Fr>QY1CV`Mm;yLiQkt2b zo}N%tR8$EtYA);YEAFrKxQVI|`Pv9L=8`K~Nwq0E2mR+Q#&0=iP#Zc@T#Ei5eZv6~ zqlRQvV!WM_<_x|ApwjDuN2Cw|Xe1Lgw1>2I56=$b#H%KluD>os>YLxI)o0{m4geK3 zHNq96$KEQ%$Y3G~i6i(K*~%1VxGF9JX3X_HaIT^fBi{cM&;PPT_e~Qs`s~l6=(A)w z4i%M}te&*1IsQol2~5RqkKC?ej{>Gtr-Nf7F`xod7dX5~eV_q_kt4Tu_NcbMO~!@; zIE5EBA9VMz>2{9OiRK(o%o3Ssy0Q1KTM^fl* zAv~(_`*GizjreH)5$Ih3JjWnY7o?fVP6mRM7zYJ{(ntbLsmDvCX31MBjCxbsNt%1@ zNlB@fD5HM#dJZ~u!wrk@o)SjYX?Y|}KFvL0^O2BEr{pX3dM=T22>{TpSFa}LE2?63 zQb*SiJ*uhpS_KyN+8E_VzNeLkk0ZCd0%la@_2H90kLv3K4@hch#NAU92V)dz~~=c-6ZB^nGzbl1C2K*BvawB%k(LVF{D~xy7Za&6+jK z0777D-XUwcpNi&%s2UKu=K;rrDI*cBBvqH0nVf_Ub?d;4>cl$Ht$tl7og6A(Bki<% zSZbiD_v=y}b^t(;$1A5Taw}j;jd5_@3Mv-?jBF;RFNpTX_NP&p!95pb>=+nq(eC5z7KnP5Zq~u=anZcJjVe)8aRM?Kulry|d3%>N%(C}7GHQrry`G)7E zIbjZ~6>%X~M6t&wOX*^-0;V*lLzP#(O4Rt0py7olt)QM<;a0xfKIcvB(6vr`u=#Y? zOg>_kPPw)wCk+5XU~&Zlt#t*01yCg5VLKpn9~OK@DlS;Yur@7JX@5O+2A3}U6ki@V zstO<8vWYx9wLkTu0lGog8t1H!so3q6(|ajJRmh)}8skvq;i*iO#~2K67b1xaBoANJ zG1nZ`rY(av{tDabRi8GGkJ6Sv2uwv)RdsbG$oz!|kBs=R;0ZIsnEY`LJFaM&2>@{W z{di*C7L5Aj8yqMo#`N#jV)8d@ZGA*Qlc6#22vWtb@W@XhL$84MN7 zVP0FgZkDhBGGUkkxTSaLzAbd zqEhHJ_^RI4gtR*CX;BG3u}L9OkqSWka=&j%6(L0XJmPF>>l5eU*rNkMj8##$|iv035vD{t#l_OP@RjbBK;1)_>$_td!W zH_#4CD30j!uzn-%HVO${>-OaML_rZ>zuu*SCC1s@G^Lim2&9Tmgc_tblUzp%)c`lw z=>&&M$~ng~v^JCyZ{*x$ZKh(cPXVVuRKBLP7>C}ErMlME1&x$sdF8dq#6adq9$tPG z>BcSsGL=$l3fS#!g@8aZ!zE-)m8ckrDlMl&jaM7`!7yI_hL=<|xl2GmS8NV+$LW+DlRztOtUbT>1U_opyJtXgUiPsnMeuv5s)RHNv4$aGoM)DXE zC%IvNM+>MZ`7j%2FBRhje}LLe(nLSt7nqjI@Lw|P)RI7wE~yTCaFf^LmDL+UYOvU= z7~E+wwx~A2xst~q{RK(yXeZo7B2lCrNxRT(> z0RSQQ0F$p)cIAHzMbc;CiV*CAFCa$r_PGB%`fElm)e)Rq#U3vKh3YHg>}oFEVJ^`B ze)aJq4jas?9FvDe-s#k%CeYaTb9f^ss_o3>Kc|um$~yq5KMu5rWwy zJ<*11zxf-*HHmtn)siR`gs>eRK|OLA(elJeZ^%#BvN?mrNFLn)v8W5(r#h6UV2a!x zfQkU6LBDk9!^x$g6k);&{f$(>fF1YfG&=EwJNV<$f@@VgQQbher3%Lb=(8B~F$rMZ; zyp|q$QrS!lAk9^t`kp|Oj&hRKVnXW5HA!!*291MwBoHDBR*NOzr}a>Gz?o_Pfe zAwIKmwPbEcnuuFNaIocu=?v{`21oL62Spi3^$JWK$EvR4YB$tsjv{C?DNpvMIvBf& za_WGAJ!K-f#Fo>0zZNgxPR1G(j zJi$E1voiw8qr0cj0+?vxNC-5N_gkbCC2mj9H6V%zuI5BQq$sXYz?9~&foQ9v=Z63Q zAOJ~3K~&09z+=QqxG<@ioc01HQdv`mhAyh);;?5Gh)b}5lp7|D2Bjw8&|Y)>D7;S9 zaBV7iLc|WH(W*@csL;K%$y?_2As_~V0HUm#6Xmy|03r8)B)v3JPG^^?csJlz)h1}t zuzhU?K$Co`GMM~`M4g2ZI03QD3NcWq1QM{>7{injQ8i2+s%mjRfc@(nveMg0wlF~ilz@fb+JcbSPXo0|%5pEWm&0NX}Q|eS3 z-JHSZ*iF)r-D03Cxly61o|BByYO+(pH^g=72w_*NibBoD%XgS}>uZqhI_fGM5KHh?!Pd1)vEYz}Cc z!D9zi0*?Z?AaGKogK;$;Ih@jv8%}asR@caUq&n;>&=AIc;?>FiCbn;d%QNetNm2q| z!Wy>UD2w{{rluBil5kV#4opZIh zHwsh2^+va5Kp8-h5J=P@ph&XYU=8h57S_0f2Dd0OX@mD=ZVv*X{z!{)1VPEEQx9G> z$j7v84gz3w+ZGYEkvl=7lw7Rg9I?Hm(I7<21Aw&ncz0!GWsv{?$xdf!IH1S~HfoqE zkNQ3`$)ingG&@7#+>U3`nW#0b-2_Ti-tVFs#>W&oB>*v)UK9gCw*i2(7&~RlkR+ap z7Y>km)~|~eDM)N+e#p(Nr6E013UEi4XvGMq5$5|yrsF}nIQd(?mArN{z+$ji$ z)xa=8sg_Bq9at$@ZSRf3G~p_68K^k!y<*!C1~BaNaz)i{CT+-QlCBwFQ<~GE0;nPd z8T*OD!}xYB<+?g$)Irfyq-*zBxD`NGk|8zA8&ctCLjc+V+W4E zD@adqatcy2t}w`*L8eS`?jw{$`b|{Mpz#2ux@TPhqO7_=sp@&TlA0Q#=S2Zaadiy= zfRq?Vumg?C=kUyOFPE*ZM-515@&XQ<4TrXE z`y2?phA?l}=F^=!-BMjxRTZlw4DT!q!jH;#6iTIPM_IoeHEr|{P&Z3S!h^kgqNKVS{y+d#9X}2AFqRro}o>6joMdu`lOk2UZ@n2ta0j&xEOF7eB2G8tIxU z=~Qu)@&UylO}V5{U>p2jhkcb!bxrUv97xc43CRBewR<4lVMBRM4L~XKtEzEp=XSXN z($1P$9G;#W*vl}kxVi?ne)%2zfq+I*DH1tysT4U-RM(8;VpUwa(|JfrA|C*^`+dKf zRls_(`LjWbda6m!&IZcN21QaSb@9YJRq$+}#*CNf>eUv{c9I;HBBdy)u7RT3MBO#( zxMYoRe;|M-Hf+a)uYW{2vxj#fwDnXjdcXNTem-(S(`UxEq>)rot1sU8L?*ddd{|sn zYou!#Oo#XFec5KUYBEHN;t0aHwg3khEYP$aA;q!z7_o1*WugU@w4#$<*IefIAP`_T zc|*L*t2r^K21Aq*uSB4w2Sq17A!#>XU5Wd#Q)_mrZzx?1KxEyk{^2b3bWtQ=Q;^fl)1{DT7(bE5jTGI11da`sl7dC^U?e5#aMCRFt-onKGIEOO&{yVgFk^yH;ltzAdb=vEbl5X zm7dO>YY_zSB@Z+xjYc|!W(~uTehI88OG+0GP+_O` zW#gMNdvgE_FqN8P3~)2>UfHs#If_DbW$WhpwnE=`>Nu0_C8m$n<7MCwg|V}l9qVT4 zX?Z)>tU18)u6vv}Ruq4h@<#1t)rRXB)q{*{bVmXxRcA2+2rYP6&$MDAv2k%0D`Kp{ zFGCf%s-aSG95q*3U4wx1WN%2#Y0G3KWBc?}v`9@33nTy-)>gAu#|4KvPPJkK?^Hzu zW2LJHa$R!43^@aVAGBdQFr7Jd;vY7PMH%g=q!VR=j0RtG8jzPR5gf9D@9#bFi-F&1_CH`hqhE=W0bN*QO66R6hm7#(+!5lAHeRj=XBvcn`9!@ z8N;7E2C5&rIOry-I-T)&>g*{k_y8n0onrQmZBJ@>*MaHCPd}Z^OiVm1)fJg^(u8w# zxS_g(eg=jEl=+qkn?}E1##4VRn2KE0iY+CEen7}B5@mo$c2jz+lj^~%2KjK!%kd8t z6k*W2OEGZ%hq(9K)u?7(B4!l?3~AF+-~O)(-g{u@&it@o z0)VQLf+r;=^yuY<0op;+iB?U6bm<}m6f1#r@oJT(2bEUM1%D|q$_JiHRBBG?bR~ai zMHljd*NKZ&8S+{QSSL0H-5b`IyJ*3-UFi4DV(ib$2Skb`JNBUe+aF-h8AVDBZP!W- zejZp1RUI!5avQYiSil*LD=U=*LQs`=<~bg2xM14*)mO{vCd8L0h4Go;d$Sp4xOtc~ zCbP^CP=)~GJ12GFq7ojw)~Gp`i>Q1|5@;pW7y1>sstFMMT$qJWxh%Ghpo(h_i$IWD zR)MP*eTqj`u7%gs8w%P*Hl3?=}u)YL4|R&I(~`8t?H1sa~z;mn}O0mNDMtJ3hcO!R&rsT}ruDMeK- zsElvPX{j;FB{e4yg4CE8C{mBDL&VTFE%5E1hjGPQi?Ag-N4Fr5`1c0_czyk544d}> z^2;mHt65_{a5!LzY{jQlZ{Pwk+?YH4zITl|}4?jxtwuOpqx^CYiFE zuiDMjZ{D)I`Gi2ycKkS|9ja3Rx_b)3nDA^El|vOi6>bR=r<4Iu)L}k7Um}4?+a8ud zN>#q5Iyeud7L81SBvM7+`^6 zrUu#GGg=vHk8C$gNv>S;-uyW*AVbNt>%I4UX@c;jIy6kB>`dUy6s?LgwVBNBRr$j? zCqv;P-}r_|Q8zvarr;)TwW8u=-x4(UH0VMIQJQRo>o=4)9?w=w00YU%@?Pz6W9P}! zCJtE^NSZikfTaUa7;U0S%TgMlivWmGg9!jmXCJ#YIW9K12G)W>128>b9mHU|sIy2yC!3iKEDY0txy9*vL!;2}HPHouWP7>)y>Pn=#IiN9;Tny-R z`Q$SB9ck_gP)h=>)FHb3dWRyRBI?A(Q2;1$aePcNpG^58MR6qqrZ^{;CvzV7lG1!) z7)>%Bkb+@+wH1mpP=i{d8vs(ozZPCh9Ia2W!(BO-G~ ziecilWrW)@p(C}NzO0jhNZt~E#tB5Zk%EmVUoGvMYvauTqln=+L7cnI+7plEJ#M*60kBg%aDFG-t zH>{5jZ@OM=oRW-cuNP0O{D~~uvLo07lsT+V+5e2)2r74$8YIw9PBx!>uZ`zSWTQos zhT>yl0>wGm*Xtq-DB_oZA6W7A&IYlLuayu3W_74HkvJw2h(JH1^)uOQ%Ov=7+N@YM zb27cAQwItFgb>_xSvUID_)(Nl5q0AfA5%_oiAriIg92R`6$3b35_}N4PDssVCM9Co z&6C8&DZvv0v35IN9&Go<2Yy#59Sn?sC`U4HOD-hd8)XC06_~dgfZht2ii(MPD@7_7Tw5xqI5@9TVx9PS>I6EdZ7T`@?`+si z?)qdI89)C6!Q=OX5Q4WRj-mZpx1^Gx&X=Tow?cx$5wzb6_JvJr=NeS_Yu{%)WszO;+HRof?kguiuga{bf zqbr@(zYp!+ycz7FLu-|8H-7%}5LvQm8@3%k5yY>w!jwOY8f;R6GY0b}T}Ov^463$+ zdFL?jg*S!L>S|B|Ot`c=T{>g3st0pRO3~`krv2-o{1m-)ag14%G@w07$P}Zab1wTHY!tE)MOQHlb}BH$uBcjnKMLCT-Iw z6N$00sthi-2ip!GA-^6th%E;Xlf!4vfr82avs-N#+$oFRd-X8du}LG-%8%t2VDYA{ z?|rg*|3O`UIPErUntd<2KmC$4{xS)KV8yIk>6Pu#boeMKbyWkPuv;u>->^PLb?Hc_^zKEInEgU6 z1w;|w?)aU&z3L}&=*$@g7(k5Oik_`n(taJIoqcfiVdgMjMat_|(oss+~UKS*|-%3*RUbvSJ{Z2ZT4=<(ExOuT}s7^@AF zdiA97F%EpPbq6V|tW?kT(DeHM?CXHu|(&~%CUC;pX9{3 z^GJ=4L*Mr8Xs4!)RcXpxE*v?V2Lgh)7zbK4sL$<-Na&-_KHvV-8?O&NzI}T|ZSvO| zOaO5G_1Cw1?6JpIWo2bG27qdh2ifP&;Z**4QczZg3Rg7(p&j^!>FF5Ur87-WGXILJ z$LGU>H9wPAzWad`RD{|Tl3tC|({c0Q0d(4czO+taf?*li1%-HF<&R|Prfo!|R91g- zSrX}hNpwBpwA--p9}l3%zn)h|P~Ao7Ru3de4P~Y#DwA{CE-|1(bd1mOcWy_A37HmQn1SSA@@WBU1(k9Km+<4$%%)y+~2(bPbjg4fn zSkR+w8w~H+gLZA%91fd}#>T{;vbu&8RaRoxiEMnnaVyCyEe&$U*i)>1~$NB?@$o3N_5d@K15-ET(xaN@4ZpX&Q9z>5P=RyY@mQ=O} zRfCPH|EI;r;i`^Vw0rX=sFxH}$0b!R{F!?OYya3svhxeT+CFk#X+Z;EKvoAjvU@kQ zsGotP*jQ>2EU2h{qu{;ZWbhC>#bxJkPKu9t@ z{t$XR!8@r+HTa^;Ki)O(zXCGt>z~zWq@OkoXC($IG&eyM zbWy%sxc{?{M>a}H;Xen>Yn0S*)|Vr1h-zk%&WXs`hm)4t+W(a5j)AD_;<()$P;wi>6PQIKl}t1Cm7$0z=xie&b>Q35a4l zB@EGH`DZSRam4)uppQN_G+RJ)KlRp$oB^PW6ru?2Ad^sds7zVvP^P5N$x2F;JW|~% z`$?MRlEk8_>Lm%~^ZI?&UhfHrw23AGr;P^p8rw-Hh1fJ4wWf;GNhFw_Z88E902&bK z^d-+cwbUp#g?s50sW3yVf`yNz`GfgWGsGw3WA`k?Kph^gNz~!_8xGIWO zX<8CA7h!BAi7bTpn$@kFFnvIu2)7j|gEi6QT%s04nsA89r35@FKq`|`2)aoingK|r zdZ{T}{(0jK9}(Rmr1o_2zyx5^TW=LEI(L3)VOi-*Z!B9L22hgC1QiIBFzJsb4PzHk zE!dc{0ZG6Zbrw^+r(!ZQ6QW|S0wT3GQ1ljtNA7@&Z&3CyOYs(k9Qs5;C9 zOoAZbvB{Gv6Jz5aCy{=*GD5njU;=?B4acrxq_wH%)Bd2?xL!=a9oy z;L!Z15g6KfaPa^IUHp(s+GEqf!!QDgQn)&vn5w$qH8BK?fhwe-DWo&rO;uWuA42fb z9k-oJj!(EJGcEaoR&G4H=wJeXHudT)Jf2?=BM{3Ia~3T&29&(iW#8Bov~Q&0SEP^D zE>aWwtslyi!z)uA9%6$l!B_wo>MLb{*?d|_#Y!L+csglfY)`2GBlTSb(g+B8>))7l z_xYY}+s(>MOa96JKWF#|rcm}zuSPqB`C0b;fYUZe`&-ZB4_V&!Q z8pP?5C0AHSE;$gjQ&IVI#W_JV?{sBsi->TI(}e3a&z+xb4Go~))N8Z_ug@t9SNFe_vS$6`>1RJ!>hpNLG$4wq-|5_3df?zeT2NT13NI-wr5k_y zOI)9|)-Gs;;S_tAE`{=Y8^dV9ln@ z)a~)8;y3@ki%xlJZceA`Cv#61UXYrbd|TZI-kR?Xh$5|WxoDs3CO%x7Vn#ml&sDDK zYF+=<=2uo;PJi3Ao4)tsxUvu|gGI{y~_&3z$4(u?uPpt< zHSEq=Uo{^vcr5Jpwpl|*P91vJeV;w>+M9)yRaM+Zdc0oRbHb!&qhg>zgV?Jdn7wJ` zubV_|dFKiW=zTA~a;o2?sV~MfZQ2w75<7HgIpEeiKc4^9*KTe4HCwicgYSA^B>)Rs z1*P=9+V;=j2mY~@1@Gi1pI%?9f?ir0*JH*VuTT2d+};0p=iRbXXU;|hoF6xD4J`QL ztEzWD|I&Txbgp5#lexL{zE|HY?K<_gnYC@}1yQ$IkIY@ST@R#(-*~&YMc=+g$0e=f z@4WlRoU?hle5Z19XrsOZMnzhG>+utN-~HliC0a=n5JkFr(-z-VlcqcmgW1;Ms;fIa z{r=)AZNAd-a(easj~qd_ZZ=-NXsE%2DP0zQyCT4r|IhjF*ZxiO3|%+-@g3oSbo|sQ z+P2T&v7s!EOFDHLGUd@He%pWSxM804+jok6?znIM#o#ewikoY;qs51K6B~mymM;FuyGSbY;1!_>hCh`)`@R_zD!qtKose^-?saPOt^7+xH3AA zyZ)MWzirn^w92X~di8^|4@Sa=8C^5`p9i&N|FGfLKze$5{R=I-@AO;ehXd2=AAM2@ zjg$p|tL~V!ys)Ii7*IQQik)tmb=QUR7%}ym_3&z*jr7EVg%KNxcisOaX& zS8v{;18R-iP5V!t_DpTdm1yWKcPm8W?Uc;!1M3E zziQQoi|6w4^61cxt#1_+7V5$qH)w!qgZfWsFkwoUNXufWXN#8ehV;5zHyC!i9Zg%e z9#oq$SxQJtHGk>?Kz>1i(GlFh>Ad`{W_j-&cWr$8X}8XfhNs$rY5aIg%e2%aUQ~?L z60y6X?9{2U&HMJtpV%n#`i!>b0RVL`y)Op` zMXnmXh+wEszrnvgeaEfwytvY`GOXD0+XtnkrKW)7Q1$7e5<_Wv)1U#Z>yNlLn(ZLc zt8J@)b!p$uFhRep4oM9=b!r_AlUhnih|e&K-@0oz-M4o27e?{!%F?h;pk$;ZM`hd9 z4oq%OT1GNgFyW?=BVq?nna+K+FOT-FTld|PAJu#6b6Ah0V66zSpBU6!3*eN^&ypm@?^}E60q9bcs(lpUByMJo_XH3JZ7g64W0!u*t;!eQs--naPU= z0PH?|WD@{?gmtPJ5Cf)fL~Gl$$t4jMW$WMRk~=c%n@?zq#e!xnoA-{CKP@G9=#q7L zhjyj|T~JYFD&><>)6CDB0dUp0UE$KORJ-kz)yoQV$6p-)XW0n=*9`3MsBybLuOa06 z&C8ds2v^+3SDw3a%+Z4rO7n8R>FKq4Y8C*Rcf4eLClfUa0EMNcIcD*x z4H|}>Ao+!b$D`q^)~mV0=ZlOtZ2?ReKGb>lEw?QnFl}Ze%XE5R#kZg3?b@YNH?4+` zz4WFl2X-|(tGsIG?t&AW*YAp;9xhoe7E>_QO-{6;V@K0t$VpjQDI+fJJ}y2!9z~^P zcw^CrkC&7in zKQu=ZfF4)Vp1qj%G=YWoP5amd*2`Dpx~^4x8~? zA^;@E#{q;Ic7F4|SGF48zt2Fc)rvol9jBYt{d^Yy{BiP>k<$=_5HxGn?; z!TUY2;DhQ8(`QDs(wqLmYq{adoBH(gdoP6lHhl(Pb2`^}H$5PV^ruamDF$8Bo|nJv zu+jZiZQLvdM3H{;%ddeBS6waJB8i!qso(tkOTehyL&uKMmRDUBm18jTvflmwJapKU z-@9IUQ!<=m+jZ$Nc*vBS-<EzqW2$LYt{tl_R=dDN^;o3U+LwKPpLeqg^QO+Wm&IxQjI-mhzCOOwWp z4byJhy$7GJ-&DNs@X;?efAG$|0JysWkqOy<=Og4%11Lnc1*IxTjik3yUZcq5D{0 z&+8{mnKgcFYXJCs^_sx%+cr+orpYTUKLCIWCID#Gs9{ulfAt$S>R{x!m8f^8ENkyh zS*GLg&hqc7*8jfiw?Fp%G55sk6&K|w@kM)vW6uW*7QOlPcN1Uu@Z*TSx!%8fH}d?{ z8*lA@_x*44;xp4yhPG_p%(RT3w(sxas2BSp1Ja30SUOM4+H`GmcIYhyDPuDeAdgam5E~bM|3Xl(g}}FyzY*kGw-@v z8&@Yitx-6Mak{ju7`60zOVl7aDeNXQXwkKXAC| zW^uH1QNaWNIm?&t`RJo1%_l!L=cLOO-WxyYvYzC+K9|2-f8an>!&2kp!@Bz`UDX$K zYO!924()qg(mvKKjohyU4uI+19-TD15>kaLn!9BYR9Xn<%jIiE_=%RxO z0Lu68Fa7+5XIkI*=o1@q&V+SE;oci3*n9Qp^(`A_wOCA->j2=dsn&mfI|{nw^1ib! z>)ORs{C)q+dU4n`iu$&}x-MMc>FaOlvXW6OVD&)w?;f_|<(9oqCoW~Ql+EgJgE9uEiLU-8y!13Vu0 zk{9orH6^P}Yvb2L5P~s%dUag8eN@Ye4c|w+ALOm9xF9e!Z{F;RaK`Kpzwga0*|$&L zeNRbANgCR>_l=ZRIK2ahU-NCBYsS0mgt%*}tE>U9SFi|zB`rC{l9HHUOR`x_ z53=>`&_3jYC~7eyzTYv`}XUOu(Cg&-%tDAaj$&-X4(s{9uDVY8aZR; zg*<6%ePPjuHD=|X%*~})Q)Z|>jWz17Su1(Rl`rJy@p@_hX)|9B$MB5jUfge1&aOZ9 z(S}_wy-bzo>E})R@xE8yD8og1#3?#8H)oE3jvWn`xkj{R;evY~e{24{?9;i%j0gf6 zXEu}%p_RF+!=5E~RYqWx8Bq6Y#>|*JVyNl%&TC(MUA%wk2l6|co3v@uZ2VP2hFGmu zc)ebnK7AUcrKPH0!2C1|m#kJRnl*3UKU}(c$;qY;vGsfRdC%_Nu2OBgckg~NJIC;t z81B7(TvE@;Gir4XOiNLzx%9lUVRIgOWaTf1j^%v)+?=M-KHGKj-NV(-wq#p4a~boE*~}K zqZ>vHvjM;>AAjchc+L7-eBNrS&*h3qiH~zQ9WgclsHrHAr#4$mVnRZkU=gU*5##e# zR$jT`lMg!?tx#Lk%V-JZoryehHc96nm6j;4w7d+OuT}2(=F3G3`t^O`#e44HE@(0v z)JNy`ZSURzyvU3H%c#>0(_Zy>z4U|S-vl5%`yCxQ{`uBB1x6zGv4x9kq=Ze!O}aHZ z=d`JM=sjXY*sn8ksZO2vw?F%W`6QH)e)Pn{rg|`)0VCNfGAS8$3utQb>Bxu z#q+3P|3OzDI(p2ozI_J|(KdYt4m8T&xc8u|k7Z|@_Q#D+&HbI1_ll`A=Nmov8W2Ug z>(2wU)0puQe+tZqqEd5-Nr`o=Rx8F287%Z1am|CZsL!+Ex9#uO)YNbz**Saa(4NI# z{IbDNXHZH(Vq#5?ju_FPaTDfEzjl=2!L?6*_)*+;@ZfkhtXuy=-nD{EP=C-`E}q zf_TH;z3XuPe6;qO?^JPVu~~xVO`8}VmaE^Of$6qSVPPS1PvsardS0{X&jY59Hcc5e zq)q1m1FkSj6ON(+Q;a=E*4dq#H*JTEjEJ`Z7^)~JE$4cz%PK32*!zRWk1al%uiFxn zDK0fF?6YH98aQRfbN5Ub&$T`Len0Mf^{r#;-+7(&W;^=!ANX{uW=#nIe6e~>VE4vt zw?|tq0OXgJnZ7EhL!$SU#sq5@N#(;+)KZXGw;F=*_Bs5e>Dn>TOWsdWpTL(=2%;Lnq%HnCy57B77E zg^xck(x#QDK}Ow35BdWDnl)>dG5V@2Z%;Dt)y#V7wc_u;U#@zrY5a^CFF!c#Ci(Qj z%I!P%O@}m!NVT!)vc>eUcdI~ z7oK0&tkfQ3rJMddc>50X_>mP2T{dd;SGP|X&y}VRz4lh+nk~O} z!;vGEQdm}2R`YSA$4!;aTbGrU;rO0iwSK8XPG0`1)49g(k+iflw9UFix5wAD?|`ev z4(w;TBT(*khkXui&;I?d<(x4Vj>G%+we}c%6?fzPqSL)^&d<}X1U^~yW6j{P*IgG$ z{*;uIq!$)_Sg9=|?|cF6b?5zyjq+V__X7)e9XP04h4=#jI{Nw z&T;DX`RJX`zf#_K?8FY*JTo8p$2vCc(r>@_05CkI7?u(e(wDDUYq}!)=(`o}x^?TS zj^$3A_28G`9G~~R_V%d=I3N$d`A&&hIlu1M>Fe36*X6ZtW2E%xg7>+MtlhfJH+0I> zS70vbtT#M3`wySrugdH8c<8kcKXw#hys*9ReR%n=zwgr3y=Bi{vCrfgW>3IaM&5Gg zlHCUn>40>;sECf6{mHKkd7lpO}O*fxj9;2N0rM(uX}9Hd0aZo z{3CQB>OSj{S6}<|3*9l;ExY%MP(Z?l9)Y9#iK$^XI|iC%6OsulGKv7(M%+>)KA7dN&??Fzf=vF@93ZKDXZW-tBW= zJbLU@j_Dvuznrsq^wwuyI6CED&u#x?^%_%u82ekcX07Mur=Q=|`{vusFFhwT9aLFW zMHhbcweO$rzF+dlI|~b*`(R1+@l&UC%x>8EJ00=xW51(i%cy)s8Mn;3blelqoY}N% zw@&44+`dD6Y4Osk=RWwba>+N}`AbSmb!nD-zfv6e*uVa4IB^PBl;7~&i+@HkaA))L z>8O7^xhEXIQ|7*0eX;lQ!u{MH51sVf%Z87-L>AYw9f#y$vOr?Ub10 z_&AHt=fkw8=I;LfwHGf1fHqf-7~Q&4*3`!J8+2}xo|-YNXE)3AG1poFq-YB`fBrna z*|166dE(^Bod*v+e&Ew3pGQ%Du#ETK*!~rex%ce3o4Yk>IJqr`=|? z62#gaG1M9e*c>r25Pcp?fKo9oK2h|8gauQ@sqFk$7Jn3xTMQvGFY(k@noDS~UY)T1Le?#lHquFmDwN9f3R@yH)F4keU+3bF= z*J86;Ep~&qj^yX%xmL}8vp-&aKehkqV@vA9JJTF7F{0oP*!@%#1)I(9sdoELcmkjA ze&y-+cx80D_mNi`I_&Kd?6w$ziWUH{Tdj7B#bVL&2mpEc=T5DD=PlNYFLb-(zPDO8 zYB(w_K0YxZik`|U*LhTw9&{!oG$;?ynlGPxl=}sRx>sG@sa2~sPo$@&Hi@wi8?o7Z z#RUat^Nt=}abVSV-}SrezGq>xpZfK+7Ytv9W*dKVx4IVpaJ$uNEAnAiWxLE3m@|j} zbjzGMLYtkt`&qr-gqq5-1c%jH9VjR$JbLu#UT_`{2Y~JmKk6uiiU5!SDCukl7&CVyGeDhtzs!!-%&<{A+jGm)b;aHVM) zYxfxs(Tj-HP=G(SpExD0k<`CX(v-=_sEFQ!S1*4* zJ!jF6p?>{{#oKmVy9O8rQ;#0pfUw9z!JZx?Inp|QtxWzLBuNYTyp^m@mh{bKE7Nc1 zJQ~|@`HZ0&$LT$*P@4Sh>-lpmNsiVs) z>A+#Rq`saWGk;MU05bsgmr}1YYY_*|o>u}u*tqDadr$u<(@+%cJ$?280Pyni>XUXa zlUYfwtg52Be>g#Z*WD;$+9#*WtE%Y@2ag!A3D)oVp+tYpBW}-69g;SA3?4qYTrY)2 z;*FacJ3Bj(_Pi({Ks0{Y=Xs4X8NGPt4@~ZmAxl=AYm~|8l(gGa4?n-&+RwcQ4DgOW zc0#J5D0*@HE`wll8#L5)(RbS<3Z;@(Yc%x4*p&|eFm&K<1EYGa-o9I`eU|1K3WOmc z_7m5vtCZB$(I+lmRt1ikz-aw@3?A0|oBfCC6-p(&EPhv`=%ZPo&425pA;U;*NB`89331DXckhLTnvDrnUubgv}vuUg{ibo zrf(}<^!$aUqN0Kcf@kUJ&z_~H_wjOf6Du_uW)s=l-E|<3$3vq+PL~%IF+1?Nsj0cY zIlIjBad-P!u2vgRh5HW(PTl(1A~OIudiK2La?-`Y02n*!{FF=C36g4mD+}|iMUy`= zZcr%nGf5Fc2S)sT;LA80063m->0;WMUm0Je2Z-_OSzLw&qv-UJo_&@?tk4Me5Ibqz0}XPJHP zYVt*mLKWGooBLgbhUze>y+f>l{1>HEYR>&5XvQzrLZQ|$50ZNPaQxc+hhDujHD_c< z4QdV3;?zl{kQ6`Fl9b4vE7qnVC53hK!Gnc&a_<|wD7A(%U?!^7>Xs>*&A?+5Z2e%8 ztJIYC*@I@z9XlZI>tq0mSJuL)$9sopz1e24NuDIbF62f>xT|aX0;Mb@B zN-B9(#{{(d)VYgR#zZqD|CvLWE{U@Vuj0U%`hryGYm*ajfqlz4dZ_=T&*^{vi6C?n4X4ibalUreeF5P5p6#FfarG8sfm5eYs+z7R@cqhI z=h#(o8G}Ea|1)0KQ}U+ukr!AV1GLwByErd)@2Y#`(ibHya>=NPOkDXFc;JZAT`vs>LmX!#xhT={N8*ri){TjixUM~8w*a{1KL zw$7`Y1ykLnOSKq3o{4^1@4ShzF&ylzEPaQK84)vL*g`8aoo`jcnIi^cB9+Q8m=w*r znASiLgu#Tdvy~+YKo~h~=I%uwj`HEKS=!%C<9Y(q(%dV2a#!D+YkbsT_KA&OP5X4y zmTIq<8BLtBjEo>X9b6c10wtw+)!5kbHe4sGPF?^|Tw03c+`RMJ`^%LwgQSfDHk&0B3QZ?2 zT6%rc+*wv!J!NV`!l@1oEr7RG^a=!|J|9^_QEg@&)<5sy;DC=8FHH#S>BSB0*B3jF z{|b~pX>o}{rEV5X%8msSNs?UsmT6d6D0|D{W98G{AI>&6GsD^RJ1u@+V#?nmV%Bdc zIJkPbwU#4pVQ!Ayu}ds3-%3CEtx%YJee1@-Aez!GTW~pyC_$xCftE^IWjelr;9>5b z4qcd+)~Hmq+Um+xN+wz?EG%GaZtkt6Y&K{#5}8cKh=r<3OP!qi`498-3z#z|q`$|O zBgZx8vh)5*-M*R0rKgaq4C-}!aG;a#uDvfm`Ct@_#bSX&5^rT2@OHsuWhLP2>Jel+ zb|uv7T-QKT8itJQ?3@Ov)H%SrXPew0HDx&XQ+BXr;&3=T{g&zXlvHI#L1BvW%wHkP zr%Z0$s3Idta#Hfl@ugIjy!eBWK|}iMa-T#71;E?QB|K)?$}1_rKmcHqBy*m_;eZ3O z;|vIM3sXKNedX`* zTd!A(#Sc7OTwG!A-eSu}HLqj3V|mvF0)fH8YC&0<`uJC04)N&Ir!$+yDo{~xF3vG1 zEL0?J+ZbH_{P~D8sWf%u1rup(+;O#x zw5+&HET-{#;h0U5t-cEmhs`WCR901?to9|N+BIUc%>)9S2El~K*_L|bz;3jG=0E;X zWsUgM*I$M`89312-ooORnx_A`EE#X>f?_N%;&BXusm;q-djDXGqM)pos{kl&+{v1E zCo@YIAbtCCdQJayi}q06tozh&37UZuJbU2_#KpS<0H4n{(8Q5wD)%@uvn=_}-3v;k zk{K9vnecHp{{^w@0KjMFyeh5Y=KgQT&h1;h!hZ6qHJgu|Phh%*VS)aHQ&-#J08sH# z!bq10f`ENjH}5tpLLXPJ)?_^^W~d!z0=@}ac^?8Uk5SY7l9Zw@d{Mh!d(0(Z(v~N9 zOQ2x*r7dxp$ga(e2(kS;iL zLJR=BW}-MFj&4BtcWM2S8~Fv=tO@M!?%i&5v$Gio0K@zC5)S$xdaqtlI_2jdm+#uW zb8y1VGztJJ#kG(s)D-}bSM=nNz7)&F(V;)u+M*ga!_r~gBqrc)@~qZ*vFeI z^7VhOg;FeAGgBeZG%icZ%uUztwzw?9i2J&`WV6{I33j{rPB?6yLCeiz>E7S1vf72& zC8d7>fJ;P#(?>oosdj9l#oWcs@m9fPYb@}zvC*~YTo&1;_asMecEIQJAu!fW;T|6U zc?`yn*F;R4we`EXpM*4OXhvlr2Wjw^v1eKefk1#df*lB;D*)GksHj=fzF3#J zBkuDhUT&_a7K@8sUrN-~*Bk5$SsC#i0aySq?(FRBJAA>CKUU3|vp=+7UqUREG1F&3 zr%nd;vfaBnvpYLE1*3`m=@J?}am~Dqn~M*Bz1EMSD3q2wxd{Li4SHepIPTaf({Be3 z8NwtO42zD58$BRMkoE8pt`ixm8l{YrbnR&QUT&ucqKi|L_`Ld$E&-itl9u^gsVD5ymp#!5QGTEMbgbnUJI&yHF zg_#+aZjG0mP0I+!?b`;DCOd0u1F4s}y?wiTX|_V4hyHP(o5K3ufq&@B<2GTkZ&!1(gqWxZ>&W2#gm(HZkw~!X*a_ve z%9;}yJGU~ruimrf9rd#^AHRI&bPfQRn3#agW+Oj8A2oILlo6Lhx`;$DH*Xpes8lM9 zj$O6oc6Z+mQRPLs%f^nj7j@|ZHk%DoQ&ZH}*CX*(x(1*LcSi@(+sg||r4qRXh1hUD z>BiMf>p}t-#wN}Q3mO#Y<4uwz$=o|9?;%}KTtYe7*^oUwJqhig^;X6`j2}1FMJ|y% zUH-#qK98{rp}GBrG` z`>@au$mMbzOSr5S*Vj`)-95N+l?p$cO}PD6;)QVJ^Eoe<{(e^8C|$+vxiTg z)+jZ!+LX(-v2+rtZ$HXUPCk2jGM+p!q|Y9`U^X)CV%B^8`gP$@6rm&tI{o3}dlx*1 zMPf#9i)_}wc}ufnM?`viySo~^`^N=^^!>s@+TO~F@Njh@NRmW@T7%O`S5&*!tm2_{ zcNPZ!Yz}xJg^%3S{?;#woQ+r{pQ}=tC}>*2GBs;_DwB&bCMFxv;YG~#yH2{{&eiT5 zakYh$wNL;6@|qeGQ-OeM{CYabR;y%$MmJS`{xttk>6}ecaFsof_-AKZxzxtQ$cUwq zN_m7*&J&uN8OWz!DOHkZX4XZT{zK9+B|?l7iQRGgW|z(t#Ug=#PpV}ywpuFXTbUU1 zIqWyHH>u=uSwN_|HdaNpZV* a=>8jT?0L*g6UE^NWjVdaux7_g^wZ8iid84v&UL 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¨ji9pY zV+sTU>GFa*N_te+g!o}@_BTbt$m|}F8&Pw~@|ZpI-g=NLX#Vzkd#j@xj28q&lk~u< z9V{3BT2tX5;ewH;OAb5kS=}ZgDoA_lLbfThO0I~aU@bq*YuplH|Lr?;x?&pw34Y=_ zWnoM+#)U^QqW$MZF_emuZ(bM!ufQ+YpH5cw;*=Zy6YawKEl~!J&C8W*rK4&8S7r?n z>GnqDbW(-jj@x$WdmwmAw6c8>i|%EkzsB^>V;ru@p#^ zsvCm9San0;6=KBL4G8T#^0LDp`uc0?V{1R^(@TBZh)?VIjlSB1w;q1xv#fR``m)^y z66}E=ajxjIfa$5=Jn7NtU~~2(rLL+`4hfKkG=CP7H}6!HLbw0noO)u@Qq1u{{zB9g eWEEDo;tcbG9f?r(Rq&VYfP$=wOofzj(EkCVxc`y> From 8b2a848e9e24b07a5a9624f29f13befabbded4d6 Mon Sep 17 00:00:00 2001 From: Simon Torres Date: Tue, 16 Oct 2018 16:07:56 -0300 Subject: [PATCH 3/5] edited _working_with_virtualenv.rst --- docs/_working_with_virtualenv.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/_working_with_virtualenv.rst b/docs/_working_with_virtualenv.rst index 0260151b..0961797e 100644 --- a/docs/_working_with_virtualenv.rst +++ b/docs/_working_with_virtualenv.rst @@ -11,16 +11,18 @@ If you know nothing about them we recommend you to start in the `Conda site `_ for information. +Here is a quick overview of the basic operations with virtual environments. + Discover what environments exist in your system. ``conda env list`` Will print a list where the first column is the name. -Activate (enter) the virtual Environment. +Activate the virtual Environment. ``source activate `` Where ```` is the name of your virtual environment. Your shell's @@ -29,7 +31,7 @@ Activate (enter) the virtual Environment. ``() [user@hostname folder-name]$`` -Deactivate (leave) the virtual environment. +Deactivate the virtual environment. ``source deactivate`` This time the prompt will change again to: From f387aa45bedd55316b35164d82a0feb61cf0fbdd Mon Sep 17 00:00:00 2001 From: Simon Torres Date: Tue, 16 Oct 2018 16:13:53 -0300 Subject: [PATCH 4/5] moved dcr installation to an independent file --- docs/_install_dcr.rst | 92 ++++++++++++++++++++++++++++++++++++++++++ docs/install.rst | 93 +------------------------------------------ 2 files changed, 93 insertions(+), 92 deletions(-) create mode 100644 docs/_install_dcr.rst diff --git a/docs/_install_dcr.rst b/docs/_install_dcr.rst new file mode 100644 index 00000000..c6b9f9c0 --- /dev/null +++ b/docs/_install_dcr.rst @@ -0,0 +1,92 @@ +.. _dcr: + +Installing DCR +************** + +.. admonition:: Acknowledgement Note + + Please cite: Pych, W., 2004, PASP, 116, 148 + +In terms of cosmic ray rejection we shifted to a non-python package because the +results were much better compared to LACosmic's implementation in Astropy. +LACosmic was not designed to work with spectroscopy. Though since version +:ref:`1.1.0 ` we shifted from Astropy to Astroscrappy's implementation +of LACosmic. + +The latest version of the Goodman Spectroscopic Pipeline uses a modified version +of ``dcr`` to help with the pipeline's workflow. It is included under + + ``/goodman_pipeline/goodman_pipeline/data/dcr-source/dcr/`` + +``goodman`` is the folder that will be created once you untar or unzip the latest +release of the |pipeline name|. + +.. important:: + + The changes we made to DCR include deletion of all ``HISTORY`` and ``COMMENT`` keywords, + which we don't use in the pipeline. And addition of a couple of custom + keywords, such as: ``GSP_FNAM``, which stores the name of the file being + created. ``GSP_DCRR`` which stores the reference to the paper to cite. + + +You are still encouraged to visit the official +`Link `_. We remind again that users of the +Goodman Pipeline should cite the DCR paper with the reference indicated above. + +Compiling DCR +^^^^^^^^^^^^^ + +Compiling ``dcr`` is actually very simple. + + ``cd /goodman_pipeline/goodman_pipeline/data/dcr-source/dcr/`` + +Then simply type: + + ``make`` + +This will compile `dcr` and also it will create other files. The executable +binary here is ``dcr``. + +We have successfully compiled *dcr* right out the box in several platforms, such as: + +- Ubuntu 16.04 +- Centos 7.1, 7.4 +- MacOS Sierra +- Solaris 11 + + +Installing the DCR binary +^^^^^^^^^^^^^^^^^^^^^^^^^ + +This is a suggested method. If you are not so sure what you are doing, we +recommend you follow the steps shown below. If you are a more advanced user and +you want to do it your own way, all you have to achieve is to have the ``dcr`` +executable binary in your ``$PATH`` variable. + +1. Open a terminal +2. In your home directory create a hidden directory ``.bin`` (Home directory + should be the default when you open a new terminal window) + + ``mkdir ~/.bin`` + +3. Move the binary of your choice and rename it ``dcr``. If you compiled it, + most likely it's already called ``dcr`` so you can ignore the renaming part of + this step. + + ``mv dcr.Ubuntu16.04 ~/.bin/dcr`` + + Or + + ``mv dcr ~/.bin/dcr`` + +4. Add your ``$HOME/.bin`` directory to your ``$PATH`` variable. Open the file + ``.bashrc`` and add the following line. + + ``export PATH=$PATH:/home/myusername/.bin`` + + Where ``/home/myusername`` is of course your home directory. + +5. Close and reopen the terminal or load the ``.bashrc`` file. + + ``source ~/.bashrc`` + diff --git a/docs/install.rst b/docs/install.rst index 9b27b7ee..04fdcb27 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -105,97 +105,6 @@ on with the installation. you can add the ``--user`` option to install only for your user and avoid needing root access. -.. _dcr: - -Installing DCR -************** - -.. admonition:: Acknowledgement Note - - Please cite: Pych, W., 2004, PASP, 116, 148 - -In terms of cosmic ray rejection we shifted to a non-python package because the -results were much better compared to LACosmic's implementation in Astropy. -LACosmic was not designed to work with spectroscopy. Though since version -:ref:`1.1.0 ` we shifted from Astropy to Astroscrappy's implementation -of LACosmic. - -The latest version of the Goodman Spectroscopic Pipeline uses a modified version -of ``dcr`` to help with the pipeline's workflow. It is included under - - ``/goodman/pipeline/data/dcr-source/dcr/`` - -``goodman`` is the folder that will be created once you untar or unzip the latest -release of the |pipeline name|. - -.. important:: - - The changes we made to DCR include deletion of all ``HISTORY`` and ``COMMENT`` keywords, - which we don't use in the pipeline. And addition of a couple of custom - keywords, such as: ``GSP_FNAM``, which stores the name of the file being - created. ``GSP_DCRR`` which stores the reference to the paper to cite. - - -You are still encouraged to visit the official -`Link `_. We remind again that users of the -Goodman Pipeline should cite the DCR paper with the reference indicated above. - -Compiling DCR -^^^^^^^^^^^^^ - -Compiling ``dcr`` is actually very simple. - - ``cd /goodman/pipeline/data/dcr-source/dcr/`` - -Then simply type: - - ``make`` - -This will compile `dcr` and also it will create other files. The executable -binary here is ``dcr``. - -We have successfully compiled *dcr* right out the box in several platforms, such as: - -- Ubuntu 16.04 -- Centos 7.1, 7.4 -- MacOS Sierra -- Solaris 11 - - -Installing the DCR binary -^^^^^^^^^^^^^^^^^^^^^^^^^ - -This is a suggested method. If you are not so sure what you are doing, we -recommend you follow the steps shown below. If you are a more advanced user and -you want to do it your own way, all you have to achieve is to have the ``dcr`` -executable binary in your ``$PATH`` variable. - -1. Open a terminal -2. In your home directory create a hidden directory ``.bin`` (Home directory - should be the default when you open a new terminal window) - - ``mkdir ~/.bin`` - -3. Move the binary of your choice and rename it ``dcr``. If you compiled it, - most likely it's already called ``dcr`` so you can ignore the renaming part of - this step. - - ``mv dcr.Ubuntu16.04 ~/.bin/dcr`` - - Or - - ``mv dcr ~/.bin/dcr`` - -4. Add your ``$HOME/.bin`` directory to your ``$PATH`` variable. Open the file - ``.bashrc`` and add the following line. - - ``export PATH=$PATH:/home/myusername/.bin`` - - Where ``/home/myusername`` is of course your home directory. - -5. Close and reopen the terminal or load the ``.bashrc`` file. - - ``source ~/.bashrc`` - +.. include:: _install_dcr.rst .. include:: _shortcuts.rst \ No newline at end of file From a96ccacb107ec4bbd5da95b3ba10410d9ff101fa Mon Sep 17 00:00:00 2001 From: Simon Torres Date: Tue, 16 Oct 2018 18:06:07 -0300 Subject: [PATCH 5/5] Updated install instruction, corrected github link --- README.md | 4 +- docs/_install_dcr.rst | 3 +- docs/install.rst | 143 ++++++++++++------------- docs/overview.rst | 2 +- goodman_pipeline/images/goodman_ccd.py | 2 +- 5 files changed, 74 insertions(+), 80 deletions(-) diff --git a/README.md b/README.md index 143098d2..1a17c2d3 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,8 @@ If you wish to know more about the instrument please check the If you are having trouble operating the Goodman Pipeline we suggest the following procedure. -* Check [existing issues](https://github.com/soar-telescope/goodman/issues) or -open a [new Issue](https://github.com/soar-telescope/goodman/issues/new) on GitHub. +* Check [existing issues](https://github.com/soar-telescope/goodman_pipeline/issues) or +open a [new Issue](https://github.com/soar-telescope/goodman_pipeline/issues/new) on GitHub. ## Development Team diff --git a/docs/_install_dcr.rst b/docs/_install_dcr.rst index c6b9f9c0..c29d1e80 100644 --- a/docs/_install_dcr.rst +++ b/docs/_install_dcr.rst @@ -18,7 +18,7 @@ of ``dcr`` to help with the pipeline's workflow. It is included under ``/goodman_pipeline/goodman_pipeline/data/dcr-source/dcr/`` -``goodman`` is the folder that will be created once you untar or unzip the latest +``goodman_pipeline-`` is the folder that will be created once you untar or unzip the latest release of the |pipeline name|. .. important:: @@ -90,3 +90,4 @@ executable binary in your ``$PATH`` variable. ``source ~/.bashrc`` +.. include:: _shortcuts.rst \ No newline at end of file diff --git a/docs/install.rst b/docs/install.rst index 04fdcb27..9694d9bc 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -2,109 +2,102 @@ Install ####### -Using the pipeline remotely is the recommended method, in which case you don't need -to worry about software requirements. -However, for users who wish to go ahead with a local installation, we provide -simple instructions in the current section. +We do not have the resources to provide installation support, thus we provide +a server with the latest and older versions installed that users with access rights +can use, however, the installation process is simple. -Requirements -************ - -The |pipeline name| is completely written in Python 3.x and relies on several -libraries like: - -* NumPy -* SciPy -* MatPlotLib -* Pandas -* AstroPy -* AstroPy/ccdproc -* AstroPy/astroplan -* DCR - -Using Conda -*********** +Installation Overview +********************* -We **do not** recommend the installation of these libraries or the -|pipeline name| in your system since updates and upgrades may ruin it. We rather -recommend the use of Virtual Environments. If you are not familiar with this -term, please check the official documentation by visiting the links below: +The required steps for a successful installation may vary, but here is a general +list. - https://docs.python.org/3/tutorial/venv.html +Install *astroconda*. + Visit `AstroConda site `_ and use + their instructions on how to install and basic setup. Make sure you add + the `astroconda channel `_ - or +Create a *virtual environment*. + This will depend on the method of installation but here is the official + documentation on `virtual environment management `_. - http://docs.python-guide.org/en/latest/dev/virtualenvs/ +Install all requirements. + This can be done along with the virtual environment creation, but it might be + necessary to manually install dependencies. -Another option is to install **Conda**, a Virtual Environment Manager, or -**AstroConda**, the same but for astronomers. Everything you need to know -about installing both can be found in the link below: +Run test code. + This is optional only possible if you are installing from source code. - https://astroconda.readthedocs.io/ +Install the goodman pipeline. + The most important step (of course). +Getting the code +**************** -.. include:: _working_with_virtualenv.rst +There are several ways to get the goodman pipeline code on your computer. -Using PIP -********* +1. Clone the repository: Cloning the `repository `_ will + get you the latest version of the code, this could be a very unstable version, + so is not recommended. Also is very likely that you will download things you don't need. -.. warning:: +2. Get a release: A release is like a snapshot of a very special stage of development. + Though is not easy to guarantee that the code will not break a released version should + be stable in the sense that no experimental code should exist. Also, is a + special packaging of the necessary parts for operation. The releases are listed + `here `_. make sure + it has a green tag that says **Latest Release**. - You may find that `ccdproc` and `astroplan` do not come with Astroconda. - They are not available on any Conda channel either. That means that you will - have to install them separately. You can do so by downloading the source files - and installing them by hand, or simply - `activate your Virtual Environment `_ and - then install these two packages using pip with +3. Using pip: Since version :ref:`1.1.2 ` the goodman pipeline can be installed using + pip: ``pip install goodman-pipeline`` however this does not install astroconda + neither creates the virtual environment. - ``pip install ccdproc astroplan`` +Dependencies +************ +We have made an enormous effort to maintain dependencies under control, with +one exception, but don't worry that we have :ref:`detailed instruccions ` for +dealing with it. -Setup for local installation -**************************** -System installation is not recommended because it can mess things up specially in -Linux and Mac OS. Before you proceed, make sure that your system has all -the required libraries, as described in `Requirements`_. +For the ordinary dependencies we make use of the great tools provided by astroconda. +With one step we can create a virtual environment with all the dependencies on it. +This does not work for the pip installation, but either by cloning the repository or +by downloading a release you get a file called `environment.yml` that can be used by +conda in the following way: -Once you have Python running and all the libraries installed either using -Conda/AstroConda or not, you may download the last version available in the -following address: + ``conda env create -f environment.yml`` - https://github.com/soar-telescope/goodman/releases/latest +This will create a virtual environment called ``goodman_pipeline`` that you can start +using by running. -Before continuing, make sure that your Virtual Environment is active if this is -the case. There are several ways of doing this but normally the command below -should work: + ``source activate goodman_pipeline`` - ``$ source activate `` +.. include:: _install_dcr.rst -Where ```` is the name of your Virtual Environment (e.g. -astroconda). +Running tests +************* -Now you can finally install the |pipeline name|. Download the file, decompress -it, and enter the directory created during the file decompression. Test the -installation by typing: +*Test code is code to test the code*, yes, that's right, and the |pipeline full name| +comes with a lot of it. Ideally the 100% of the code should be covered, we are not +there yet but we are getting closer. Running the test code is not a requirement +but it helps a lot to identify problems. Go to the extraction folder +(where the file ``setup.py`` exist) and execute the following instruction: - ``$ python setup.py test`` + ``python setup.py test`` -If you have any errors, check the traceback. If you find difficulties carring -on at this poing, you may contact us by `opening a new issue `_ or using the e-mail -`goodman-pipeline@ctio.noao.edu`. +This will detect the test code and execute it. Failure or success will be informed. -If no error messages start popping up in your screen, you are good to carry -on with the installation. +Installation +************ - ``$ python setup.py install`` +If the previous steps ended successfully this should be easy. Go to the extraction +folder and execute the following instruction: -.. note:: + ``python setup.py install`` - This will install the pipeline in the currently active Python version. - If you have Virtual Environments, make sure that it is active. If not, - you can add the ``--user`` option to install only for your user and avoid - needing root access. -.. include:: _install_dcr.rst +Alternatively, after the creation of the virtual environment you can install the pipeline +using pip. -.. include:: _shortcuts.rst \ No newline at end of file + ``pip install goodman-pipeline`` \ No newline at end of file diff --git a/docs/overview.rst b/docs/overview.rst index 5fdec44c..2a5657c0 100644 --- a/docs/overview.rst +++ b/docs/overview.rst @@ -12,7 +12,7 @@ spectra can be produced shortly after the shutter closes. The pipeline is primarily intended to be run on a data reduction dedicated computer though it is available for local installation. The |pipeline full name| project is hosted at GitHub at -`it's GitHub Repository `_. +`it's GitHub Repository `_. Instructions for running the software are provided in the :ref:`usage` section of this guide. How to access the the data reduction server is on diff --git a/goodman_pipeline/images/goodman_ccd.py b/goodman_pipeline/images/goodman_ccd.py index 8f6145c3..58a3262e 100755 --- a/goodman_pipeline/images/goodman_ccd.py +++ b/goodman_pipeline/images/goodman_ccd.py @@ -216,7 +216,7 @@ def __call__(self, args=None): "not found inside headers. This keyword contains what " "is the Goodman Wavelength Configuration that was used" " for this observation. Please add it manually (see " - "https://github.com/soar-telescope/goodman/blob/development/goodman_modes.md) " + "https://github.com/soar-telescope/goodman_pipeline/blob/development/goodman_modes.md) " "and run again. Leaving the program now.") sys.exit(1)