diff --git a/bin/make_template.py b/bin/make_template.py index 916b827..834fbd2 100644 --- a/bin/make_template.py +++ b/bin/make_template.py @@ -25,7 +25,7 @@ def xi_to_pk(r, xi, ell=0, extrap=False): return InterpolatedUnivariateSpline(kk, Pk) -def main(ini, out, fid_H0, fid_Ok, fid_wl, z_ref): +def main(ini, out, fid_H0, fid_Ok, fid_wl, z_ref, no_extrap): minkh = 1.e-4 maxkh = 1.1525e3 npoints = 814 @@ -114,7 +114,8 @@ def f_xiSB(r, am3, am2, am1, a0, a1): ww = (r >= sb1_rmin) & (r < sb2_rmax) xiSB[ww] = model[ww] - pkSB = xi_to_pk(r, xiSB) + extrap = not no_extrap + pkSB = xi_to_pk(r, xiSB, extrap=extrap) pkSB = pkSB(k) pkSB *= pk[-1] / pkSB[-1] @@ -145,6 +146,9 @@ def f_xiSB(r, am3, am2, am1, a0, a1): parser.add_argument('--z-ref', type=float, default=None, required=False, help='Power-spectrum redshift, default use the one from the config file') + parser.add_argument('--no-extrap', default=False, required=False, action='store_true', + help='Turn off extrapolation in xi to pk') + args = parser.parse_args() - main(args.ini, args.out, args.fid_H0, args.fid_Ok, args.fid_wl, args.z_ref) + main(args.ini, args.out, args.fid_H0, args.fid_Ok, args.fid_wl, args.z_ref, args.no_extrap) diff --git a/vega/models/Planck18/Planck18_z_2.33.fits b/vega/models/Planck18/DESI-2024_z_2.33.fits similarity index 100% rename from vega/models/Planck18/Planck18_z_2.33.fits rename to vega/models/Planck18/DESI-2024_z_2.33.fits diff --git a/vega/models/Planck18/Planck18_z_2.34.fits b/vega/models/Planck18/Planck18_z_2.34.fits deleted file mode 100644 index 9b47ea2..0000000 --- a/vega/models/Planck18/Planck18_z_2.34.fits +++ /dev/null @@ -1,71 +0,0 @@ -SIMPLE = T / file does conform to FITS standard BITPIX = 16 / number of bits per data pixel NAXIS = 0 / number of data axes EXTEND = T / FITS dataset may contain extensions COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H END XTENSION= 'BINTABLE' / binary table extension BITPIX = 8 / 8-bit bytes NAXIS = 2 / 2-dimensional binary table NAXIS1 = 24 / width of table in bytes NAXIS2 = 814 / number of rows in table PCOUNT = 0 / size of special data area GCOUNT = 1 / one data group (required keyword) TFIELDS = 3 / number of fields in each row TTYPE1 = 'K ' / label for field 1 TFORM1 = 'D ' / data format of field: 8-byte DOUBLE TTYPE2 = 'PK ' / label for field 2 TFORM2 = 'D ' / data format of field: 8-byte DOUBLE TTYPE3 = 'PKSB ' / label for field 3 TFORM3 = 'D ' / data format of field: 8-byte DOUBLE EXTNAME = 'PK ' / name of this binary table extension H0 = 67.36 OMBH2 = 0.02237 OMCH2 = 0.12 OMNUH2 = 0.0006 OK = 0. OL = 0.684825913083526 ORPHOTON= 5.44985776336301E-05 ORNEUTRI= 2.5133613689346E-05 OR = 7.9632191322976E-05 OM = 0.315094454725487 W = -1. TCMB = 2.7255 NS = 0.9649 ZREF = 2.34 HIERARCH SIGMA8_ZREF = 0.306123051302648 HIERARCH SIGMA8_Z0 = 0.811902857033757 F_ZREF = 0.970611603162227 F_Z0 = 0.527969237585475 ZDRAG = 1060.01226416468 RDRAG = 147.088029481216 DH = 850.151275859591 DM = 3891.16230869269 DHORD = 8.58058311875132 DMORD = 39.2735299779804 END ?6C-@M4@Px&?t!@NXar&?Hl<\@Nuq]\?~q@O3D NE?eG,~<@P)Jz!Y?+q@Pcjxl?Br2@PX@ -?'[վ+@Q7V|f?&}V@Y -u%C P@\D[$r -„Q?*e -e@]: CGY`?*ˋ@]˚$}?+xI:@^_{|~뇢X4?,'~@^:穹~xF8?, 1s@_iE??~L)R?-+ם@`J$t~ie^?-‹`Xn@`geHx~:QGf?.\s(@` o~ \TÊ?.vQc@a J`> -}5^a+?/Xl[@aa#,W}Hwl$?02V-#@a%}xMT#?0q`@b싼}F ?0`@bi!pň}?1;v@bDE|ޥ`?1v9@@c"?UB|W?1Ї?x@cA|s4ߧ?2,Bj`@cn|=E?2f'@dE|ñp?2A~@d+{aLd?3L\s@eF{%f?3* @ez։{Y '?4F@e俍={.o?4}ۈ@fQzyU?43&@frTzzO?5S@g1z4zgCw?5>mux@g|Wz(䟾v?625x'?8o y@j뭧\ex?9N&@k Z:.xS2t?9\L$@kOx x?: x<@l\Jw 0x?:~Z7@lѾwy0ɋ?;8U@m3" @w.#o?;+@mWwIv[?<88`@nW}vSR4?<( g@n4sqvED?=_ tQ@o.i&}uh6 ?=p@p>tu_b?>@pa}uQ00??/S@p B^tp2??I@qMn_tuK`@?@:"@qX O tPuŁ?@`@q?s.?@{z@-@rՑ##xsl?A;ü@r^zsBԳ?ALp@rzarD?Aeְ@sqrWϭ?BL n@ssèr&8c-?BJeA@soqAqm8?C ])@t5oqaz Dp?CnWVj@t~~pEck ?C|@tr>{upSi?D9X{@ueQ˿Jp,s\%?D\p@u4%o)e>>-?E %f@v:SgsYnl?Ey2ؠ@vG6 Mm {?E&@wy>lZ?FYڸg@w:bl -X?Fq8h@wQNk"QD?GC^<4@xpP}iE_]?H6igI0@ybr\&hPM;?HЉ0@y6gWv?I3_L@z\MfZZL/?Ih@zLt1eXBY[?J:@{`Z{ dRa"?JN@toB@bй?Wu@!@d?Xa -@SG@fPm(Io?X@rr@hg$Q?Y_bt@8~U@i&(cW?Y@Sx@k]?ZhQ`@%c~>@mik6?Zk]GN@ @o\?[|@ZBR@p#?\ -Ʃ@8@qH?\X@6k2@r'R?]/ -@R+}T@sFE?]$Ը@ndH@tςT2=?^`$@pw@ue?^@U '(@e?pR@ jF@IQ?q;@z)Ob@f0)R?qyJ@Cq[@؁Z?rOJuo@Ltr-5@g?z(hY@u*@bA?{P x@շz}@ܞ?{-T@i@`d?|m!@@@u?La@IYQm @& p?\ -g@~R@c~?xE:@/:mE@ ?={,3@-Z@::?o: @&|3@Xd?ބK@\,|x@V6(o?0"ͳ>@@?^r @d?4*E>@v@ƿUa?aT{@ɲ@Qk?e1:@ه)!@-?bg)3@)@MhȺ?-LK@񴹲s@ ?#-2l@@"=?v@@kfh0@(%?s/mD@.R}@;򸨞?"t@@ME?{@+@0C@[!q -?ը@P:J@g1?1;[A@q,@qu?@䅅 -K@xр?控@Հ @}1x?Qg#@W8@~pl?՚ -@@~zy?f -@s&T+@zY'"?X@yS}@t+ޮL?Z@Z@k 0{:?ZQ!@8E@_H@1?Ȃ@ C#@PZQ]?9)p@|=H@>p^?w@l0@*LY?!W3\@5Ԑ{@W?e92@[0`@نh0"?A@%Ƌ;@࠿y?a@֭@gJ?2T@u+@{q?~@qk$@t8ҭ;?L,@/p@L7k:A?*R@1/^w@!2??$:3 @l8@MN+?# -@YA]@ćr@0P@ ?c8@egg[@4?Xb7@ -@p%f?@au`@y1@+8? qD@T-@tQ?NZ-&@2+@]Z?Q=@ȄB@Uga?q@Dk n@ a?SB @bG@E')?smk@7dH@w夣?؉@8E vp@+08??+1@t6@? E@;=\@?r@8rQq@FH Xp?{@ο@#գ?@1=|@N?`J1e@r@b6?y:@.D]@?Jc@zpv @Q^?‚iE@q뭱]@!\#7?=b8@r0]@thџ?z@7@i ?:xA@hJ@R?O@t'=@ON ?B6@gTTDP@3k|c?"ݯ@;y@Xm;g?T#@Z@Sݛ?俙@x7@Is?r0+@ȴZ@],,?2qj)@ ͺ@uN?F@k '@S?4c@:@ft?ИZ@\@`[b?oH@|.ΥGW@fd]V+? DY@@*n0@X(5L?\25R@@@eN#q?q@ܹN@-Z|?|D@+w3Pz@l?_.@fd;@]?:@rF@yx?#?6@@ s^]Q@_st(?r.@rs@2?ѓCU@1l@vD?2@ ¿A@(X?/}@<&"@(FH?zv@L]/j@*G:?bżs6@/L{zJ@BfIX??+Z@#F@1p?7ʯXC@Sɉ@c.?py@Ŭu@Xe1?zQ@mo&|@H:B?@@@N4O:7?4'G@T@-^?sS@,r@U ?WU!@sn%9@@P?h0A@pZJ@@h?H`@{y^n^@?g Pz1@V4@D?l0L:c@lӎg\@=?prs@]KI@b227D?-<@P5?@i ?SR<@dn@A!v?91 ^@)`à@Y=[4R?,"@?j@`E -?8Jά@C-@J@_8A?gҨ@K損@pzg?i @74@AG7?7Թ@4#%@?jq?NO@Æ@4?%^ -@_U@X -?yy@$9$@4s?1rb@.X?u@k?%v'@A$@Ϡ?}<6\@M8?@p&?94T@+돂h@~@%??4Ȅ@${@}_8yC?’ @}kk@}vԮ?Գ@|@|b?T_@{[K2@{7,DŽ?ø]Zw@z?{@zWAQR?x@xέN@y|xw?Ćd"Z@w:G@F@x ?i} -5@v:"@wsl, ?])g8@v$z^@w גX?˥v_r@u`@vH]X?<\W8@t @Wl@uWn7?Ư[?@tCzn@tTDs?$L-!@sPyY9@t$T?ǜ\ f@s_;@sl0?vȹJ@r0@r`D?ȓ @ryK -@rW ?bxh@qSϛ@q~1?ɓ -U@qa @pV&W? 7J@@p7tȅ@pKy?gb?ʞt^@p ΈSS@oq.I"?(|@nv~8@nU -Y?˵l@m=Zp@mB 1p ?Dj!Lx@kR@l7 @?֙B"@jn@k5'ȳV%?k""F@i}bRgK@j:2?Pԍ@h %@iG"~ի?ΟL@gݯ?p@h\?=y@g-@gyCH ? RC-@f>@fmH?AV1@ep{*z@eNj#?Ж@e;ˉ(@d[C ?0o>@d_c@d2Yk?CJ:RA@cIC9@cqsD?ќB@b u7w@bS7N?g@bR$K@b^Q?Tg@a5i@aT䞀[n?ҳ\>!@`yjN@`1> ?T@_y@` -Bܧ?v*J@^Pv@^*ė?e @]yqlχ@]x6p?BG@\Y -L?@\D?Ԫ4TT@[!o@[nۻ? Am@Z%w6@Z^\8(?Ղuad@Yxpw@YW/?`~@Xc]U9@XY]?cDP@WTXgp@Wen1ѫ1?LF@@VVVK@VzSUĥ?MkE@UnED@U`i?-8@T7:T@T?q?@rj@S @S"b?ؾMg1=@S %@SwA?>C@RaX?@RZ 1i?τH@Ql3@Q7*?Ez/@PԣkN@PL|?jR@P,x,@P8Y!|?X|V.@NK4db@O!Tl ?RX@@MVRx@MݹO)c?v/D@LNn@Lf*y?? _Ͽe@Kqf,@Kye/|e@>=9fȫ>?/@aoZ@5I6H??k̈́@4R(X@4]I?vrlg@3pGCEf;@3z23?}T@2!`"@2$K?k@1C[X@1I?Qh@0u5@1|?j~ѝ@0@K(Z@0HY ?'H5 $@/UԚ)@/!F?t@+@-HhV@--b?>@,cͷQ@,qKr?눢zL0@+!v2@+/?'/@)Zx?@)IP?Kˍ6@(ޮՔ@(Ӈ -?< -@'@'-?Ӳ&U@&\7~@&ŪN?m@%d߈@%V? P@K@$ I\@$|?ܡ*@#@# v?'nU@"Kls@"2vj?{`G,@!L+@@"dW?МʲԒ@!+eoC@!4Ẅ@?'RD@ eK:@ mY@ID9e?,{L@'S @2O7!w?̻e@8~@'o?H{hW@AB@)l鏹?n`@,- @6M{?og6@Ey&@NіT?6"@hI@qhh?BN@j𱖹@領?AE?"?gA? $=?xK?+)@DEAj?lt?l9@d??Q͙=?_1x|@75Rg?Q^&-?umT2@Em???r@?/!?V,@;D.H?yEK?p@W3B?f:?q@ o_?`@J0?e#2?pP5@ A2?hc?qz@ Ą[_?vCg?ty@ -I)%?>>?X@ -Ѻ@c?ഴ?'m@ \l)V?Z?>?C@ y2?:>b?IR@ zGe?ܿo?A_@ ,:?W\nN?e,=`@ İ?Ryt? r!@=~F>?ع?G$;@wS >?ׂ?׎ݓw@yjl?[&?fp3t@ x}z?AƱ;?LZH7@`)d]?5??°'@??6"?@gL @ ?DgP?MJR@d/=?]3|5?em@ nX?Ёj"?Љߦ@F?aKk?p@w~?t?⊰aU@#.Cd?Y*b5E?g[^@8ml?P|i?@|?ɛc?ɧW:@<+I?Uoi8V?aU@h-5?ĤJ?+qW@?{b8R?Yr4"5@$Ypv?K?ExO@%cPd#]?G2"6D?Tr@%h?J?贈^Q@&BN?w?g%b@&ƿ?N`.?ZGO@'+Vu?E3?(q[c@'(M?z?}@(fB?\))?j !@(˼y?.m?츗g~@)WЌ2$?=c?J@)$?[?wB%@*#B? w -B ?(pw@*/5 ?h?Dp[h@+0}?=1?4@+?&(4?ߘ@,L;,;*?$y6?*tY@,Kz?T7KQ?}h^@-t6I!O?~dN?I$@. 2j?H{_?S~L@.;:?">:?-9@@/Fy=? gW?t)@/7"^?? 5Ւ@0F~?,}?Gk~@0șS?:0g?!Rx8@0?6f~r.?>>@1HB3+;?~h?~73:@1JJBL?}(Y7?}6:!@1?{ y?{zˣK@2Yܓ?z6iPW?zD*@2Z?xr?x=w@3sh?w-{?w9Ÿ@3|WS(?vW.Gn?vc;qs@3lWW?u/"?u9d l@4G밁e?tV;0O?t{`@46?s -*T?sp$@5ή?r Բ?r3'@5=s?qg ?q% 4ͬ@5W`}?p8qb?p@,@6ie?n{!k\?n1S@6>?m&dv?m5؜@7T!ƨ?k{J?koS@7m?j0Fc?j=Hf@8G g?h!?hrl@8m|?g=1?g [8z@9E(?fL3?fX@9:B?e"??e-197@:M<˖?d"?d !@:ՖB?b-?c5@;`]?ag~}Jo?b}@;3d?a _싃?aEJM@<~a?`'AK?`0Dn'@=Ɩe?^g\?^Y,H@=Yp?]>?]CNZh/@>Ap -?[~*pOQ?[ 1@>Q-?Z [Y?Z!گ`@?}3?X"?Xu}@@2UT?Wc:?Wo -s@@cD:w?V(=!?V3Jh@@v?Ti?U =©@A{*?S?S@Af`?R?7&+Y?Rï~R@AQ `?Qd B?Qil@B}_\=?Pʼll?PUv0@Bz'8@EGW?Dĝ4?D^@@Fc]@?C|Ń?Ck@FlH?B#PD?BSRo@G"Dr^?A?A,F@G}4:V?@Z±=?@w~@GM??[??"/@Hr b?=Dw?>wo@H -8) -??3h`c@MD8.>?2V p?2_vH@MI=?1\~?1eܰB@Nvm?0p\?0xUbl\@OA5?/^ؙ?//JE♐@Oɟb?-vǎ;A?-϶@P,z ?+ocBn?+ƾ@PB5?*g^ȍ?*t @Pt0?(vVF?) ԟ@Q,_G?'(~?' @QS)h?&d_?&p@{@QM?%2a)m?%=tN@R<`j3!?$?$0y@RvÊ?"!?# -g@R'?!ǿԍA?"V_@S] v?!=ޫC?! - @S1[? <? +g@T'[28?wva?{@T{]?՚31?cJ @T!.?Htl6?V9K @Ufd¹?&Oz$?.HY@Ul*?mh?z"@VE?^.1?) |P;=@V(S??3@W.}5}?Gm?@W2Z?5?m@X s??QE?Wo@XyS?N?yM@Y?jMh-?Ǜ @Y~Ee/?\@yw@?l@Z#SӜ6? )WH{N? !(b@Z`? B;E? kF#(@[4g™? -Rs? -b%wh@[mn? -? &׭pE@\P(\??ɴ,*tB@\Ӵb?shU??^^f@]xsom?;3Q8?F}`@^N?Z&?{OJ@^Y\?O?VD@_JQ`?*0J?8!8@_n?b۩?RJ!@`Hc? ̀P?h@`,؋>Y$R>hq @`!P#>{>=rjs@aJ4(>8Ս,>,#@a-&l>Dv]6>0R@ahOڧ>;G@b\|,e>)>(y-@bpmk>E>_nS@cPڶ>uRf>3w@c%9>UF -->_FhAG@ck>D. Y(>M}@dJ>CS>K}S@dȂAK>O*>WaȏN@e؝>@S>٘@egbr> )ڹ>+Wo@eze>jsq>FC@fm/ſ>u>sH@f*W/>vR> @gW}}ی>+SW>6/@g4 G>&t>' w@hKZ >>>Q7'h@h|b>ひ$6>㋀M?M@iI,Kj^>jh - >s˧,4 @imj>b>kU @jQY 2>i:>qMH)@js0\>JZ> إ:$@kdN"r>JpFV@k|>ۖԀ>ۤsX"nn@l{ބ>">]@m$m\>؏Z٤>؛)@mWD>+SĆ>6Pb@nE=)>ܭC>O@nZj@0>Ԝ^>ԧ:'q4@oXp>pv >z1( @pSv>TI:>]d%y@pe>He(>Q_@pl>K{n+>S+K6@qĉ>>ηcO>ƹk9(@qi1P>C2>gL@q< w5>H@c:u>U}޶@rȄ>ɴGl>K\@r|-(4>82}>D@@rl*)>Ч>ow@s=>}5Ve>Ň>=@sy|G~>F;3@tnN>Ob>©j@tn>ck>:@t;>|F -P> w"@uDI>ʥj!l>Z}^@ubփ>u0>wD@v"5&Jc>4@vS7>|]=>[@w saȈ>q->X@w[~O>nNJ>yHu@w!tAȖ>G>f@xv!_Id>r.m}> m@x >ymq>'+ -_@yu3!>N6GWJ>W@y[7.>4Ձ>*V#7>2(Bg@{y+>`M>n÷@{\>W! ->~S`t@|#*G >>:@|X>+T"BOm>7ZI~@}I!>9>y]Õ@}+U'>0S >: -.@~{>T3 ->)ɚ@>>1@:du>Y1/I>aփz@.Ξ>7)Ƽ>?@]!_>'6/>/Dw-`@Qe>PUCJ>^Fo@.->o"e>|lw@ٚ>c@>Ո@8>Ъ>>9A -Q@?l>vtT">|.@]:Ch>`l> @R@m.>.>^e_@_ךX>Y+>a`)P@ >$!>,mq@*AGS>u&6> -C`@E>?g>b``@ >[r>s{@iyn~> F->Mщ|@5)>Ivu>Ti$@I-p>YGo>fХ@n/~3>># K@2ذ>z>͑Ś@>Oa*{>V Z@$X6y> -gH>ћǟ@2r >N5u>'."@ R¡>(8>Ç{1;@N r>eGly>o0rI@'g>}p+>}yɝe@WPv>{*}l>{ M@8Rz>y?M,>yB@|Q>xFZ>xM[D@TeH>vh.{\>vʅW@8lװ>uZ l!>u_3*@|x>tS&X>t GEX@0Yj#>r7t>rTk@s{>qЃ>qWw(N;@O{4>ptU2>p.AT@gJu>nWU>oo;@KL`>m$>mY&@ĈM>kF>kI0@`>i>i|@M=.滻>hfkCBJ>hsN@9l>ff9>f @>e!2>e!2 \ No newline at end of file