|
3 | 3 | <head>
|
4 | 4 | <meta charset="utf-8" />
|
5 | 5 | <meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
6 |
| - <title>galsim.config.gsobject — GalSim 2.5.2 documentation</title> |
| 6 | + <title>galsim.config.gsobject — GalSim 2.5.3 documentation</title> |
7 | 7 | <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
|
8 | 8 | <link rel="stylesheet" href="../../../_static/css/theme.css" type="text/css" />
|
9 | 9 | <!--[if lt IE 9]>
|
@@ -286,11 +286,29 @@ <h1>Source code for galsim.config.gsobject</h1><div class="highlight"><pre>
|
286 | 286 | <span class="n">gsobject</span><span class="p">,</span> <span class="n">safe</span> <span class="o">=</span> <span class="n">build_func</span><span class="p">(</span><span class="n">param</span><span class="p">,</span> <span class="n">base</span><span class="p">,</span> <span class="n">ignore</span><span class="p">,</span> <span class="n">gsparams</span><span class="p">,</span> <span class="n">logger</span><span class="p">)</span>
|
287 | 287 |
|
288 | 288 | <span class="c1"># Apply any SED and redshift that might be present.</span>
|
| 289 | + <span class="k">if</span> <span class="s1">'redshift'</span> <span class="ow">in</span> <span class="n">param</span><span class="p">:</span> |
| 290 | + <span class="k">if</span> <span class="s1">'sed'</span> <span class="ow">in</span> <span class="n">param</span><span class="p">:</span> |
| 291 | + <span class="kn">from</span> <span class="nn">..deprecated</span> <span class="kn">import</span> <span class="n">depr</span> |
| 292 | + <span class="n">depr</span><span class="p">(</span><span class="s1">'gal.redshift'</span><span class="p">,</span> <span class="s1">'2.5.3'</span><span class="p">,</span> <span class="s1">'gal.sed.redshift'</span><span class="p">,</span> |
| 293 | + <span class="s1">'For chromatic objects, the redshift parameter should be given in the '</span> |
| 294 | + <span class="s1">'sed field.'</span><span class="p">)</span> |
| 295 | + <span class="n">param</span><span class="p">[</span><span class="s1">'sed'</span><span class="p">][</span><span class="s1">'redshift'</span><span class="p">]</span> <span class="o">=</span> <span class="n">param</span><span class="o">.</span><span class="n">pop</span><span class="p">(</span><span class="s1">'redshift'</span><span class="p">)</span> |
| 296 | + |
289 | 297 | <span class="n">gsobject</span><span class="p">,</span> <span class="n">safe1</span> <span class="o">=</span> <span class="n">ApplySED</span><span class="p">(</span><span class="n">gsobject</span><span class="p">,</span> <span class="n">param</span><span class="p">,</span> <span class="n">base</span><span class="p">,</span> <span class="n">logger</span><span class="p">)</span>
|
290 | 298 | <span class="n">safe</span> <span class="o">=</span> <span class="n">safe</span> <span class="ow">and</span> <span class="n">safe1</span>
|
291 | 299 |
|
292 |
| - <span class="n">gsobject</span><span class="p">,</span> <span class="n">safe1</span> <span class="o">=</span> <span class="n">ApplyRedshift</span><span class="p">(</span><span class="n">gsobject</span><span class="p">,</span> <span class="n">param</span><span class="p">,</span> <span class="n">base</span><span class="p">,</span> <span class="n">logger</span><span class="p">)</span> |
293 |
| - <span class="n">safe</span> <span class="o">=</span> <span class="n">safe</span> <span class="ow">and</span> <span class="n">safe1</span> |
| 300 | + <span class="k">if</span> <span class="s1">'redshift'</span> <span class="ow">in</span> <span class="n">param</span><span class="p">:</span> |
| 301 | + <span class="n">redshift</span><span class="p">,</span> <span class="n">safe1</span> <span class="o">=</span> <span class="n">ParseValue</span><span class="p">(</span><span class="n">param</span><span class="p">,</span> <span class="s1">'redshift'</span><span class="p">,</span> <span class="n">base</span><span class="p">,</span> <span class="nb">float</span><span class="p">)</span> |
| 302 | + <span class="n">safe</span> <span class="o">=</span> <span class="n">safe</span> <span class="ow">and</span> <span class="n">safe1</span> |
| 303 | + <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">gsobject</span><span class="p">,</span> <span class="n">ChromaticObject</span><span class="p">):</span> |
| 304 | + <span class="kn">from</span> <span class="nn">..deprecated</span> <span class="kn">import</span> <span class="n">depr</span> |
| 305 | + <span class="n">depr</span><span class="p">(</span><span class="s1">'gal.redshift'</span><span class="p">,</span> <span class="s1">'2.5.3'</span><span class="p">,</span> <span class="s1">'gal.sed.redshift'</span><span class="p">,</span> |
| 306 | + <span class="s1">'For chromatic objects, the redshift parameter should be given in the '</span> |
| 307 | + <span class="s1">'sed field.'</span><span class="p">)</span> |
| 308 | + <span class="n">gsobject</span> <span class="o">=</span> <span class="n">gsobject</span><span class="o">.</span><span class="n">_atRedshift</span><span class="p">(</span><span class="n">redshift</span><span class="p">)</span> |
| 309 | + <span class="k">else</span><span class="p">:</span> |
| 310 | + <span class="c1"># If not chromatic, then redshift is just an attribute for reference.</span> |
| 311 | + <span class="n">gsobject</span><span class="o">.</span><span class="n">redshift</span> <span class="o">=</span> <span class="n">redshift</span> |
294 | 312 |
|
295 | 313 | <span class="k">if</span> <span class="s1">'flux'</span> <span class="ow">in</span> <span class="n">param</span><span class="p">:</span>
|
296 | 314 | <span class="n">flux</span><span class="p">,</span> <span class="n">safe1</span> <span class="o">=</span> <span class="n">ParseValue</span><span class="p">(</span><span class="n">param</span><span class="p">,</span> <span class="s1">'flux'</span><span class="p">,</span> <span class="n">base</span><span class="p">,</span> <span class="nb">float</span><span class="p">)</span>
|
@@ -355,13 +373,6 @@ <h1>Source code for galsim.config.gsobject</h1><div class="highlight"><pre>
|
355 | 373 | <span class="k">else</span><span class="p">:</span>
|
356 | 374 | <span class="k">return</span> <span class="n">gsobject</span><span class="p">,</span> <span class="kc">True</span>
|
357 | 375 |
|
358 |
| -<span class="k">def</span> <span class="nf">ApplyRedshift</span><span class="p">(</span><span class="n">gsobject</span><span class="p">,</span> <span class="n">config</span><span class="p">,</span> <span class="n">base</span><span class="p">,</span> <span class="n">logger</span><span class="p">):</span> |
359 |
| - <span class="k">if</span> <span class="s1">'redshift'</span> <span class="ow">in</span> <span class="n">config</span><span class="p">:</span> |
360 |
| - <span class="n">redshift</span><span class="p">,</span> <span class="n">safe</span> <span class="o">=</span> <span class="n">ParseValue</span><span class="p">(</span><span class="n">config</span><span class="p">,</span> <span class="s1">'redshift'</span><span class="p">,</span> <span class="n">base</span><span class="p">,</span> <span class="nb">float</span><span class="p">)</span> |
361 |
| - <span class="k">return</span> <span class="n">gsobject</span><span class="o">.</span><span class="n">atRedshift</span><span class="p">(</span><span class="n">redshift</span><span class="p">),</span> <span class="n">safe</span> |
362 |
| - <span class="k">else</span><span class="p">:</span> |
363 |
| - <span class="k">return</span> <span class="n">gsobject</span><span class="p">,</span> <span class="kc">True</span> |
364 |
| - |
365 | 376 | <span class="c1">#</span>
|
366 | 377 | <span class="c1"># The following are private functions to implement the simpler GSObject types.</span>
|
367 | 378 | <span class="c1"># These are not imported into galsim.config namespace.</span>
|
|
0 commit comments