https://pfspipe.ipmu.jp/jira This file is an XML representation of an issue en-us 8.3.4 803005 13-09-2019 https://pfspipe.ipmu.jp/jira/browse/PIPE2D-828 DRP 2-D Pipeline <p>A command like:</p> <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-java"> butler.get(<span class="code-quote">'raw'</span>, visit=45777, arm=<span class="code-quote">'r'</span>, filter=<span class="code-quote">'r'</span>) </pre> </div></div> <p>fails as the type if the <tt>W_PFDSGN</tt> keyword changes when we patch the header to insert the correct values.</p> <p>Please pull the fix from the LSST side of things. If this is not practical, I have a horrible hack in pfsMapper.py which we could commit.</p> PIPE2D-828

Port LSST DM-29117 ticket for handling 32/64 bit keywords

Story Normal Done Done price rhl Fri, 30 Apr 2021 18:27:55 +0000 Tue, 8 Jun 2021 14:03:20 +0000 Tue, 8 Jun 2021 14:03:20 +0000 0 2 <p>I told you it was horrible. I don't see a better way than save/maybe restore.</p> <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-java"> diff --git a/python/lsst/obs/pfs/pfsMapper.py b/python/lsst/obs/pfs/pfsMapper.py index dd33d4d..05995e7 100644 --- a/python/lsst/obs/pfs/pfsMapper.py +++ b/python/lsst/obs/pfs/pfsMapper.py @@ -58,6 +58,22 @@ <span class="code-keyword">class </span>PfsRawVisitInfo(MakeRawVisitInfo): <span class="code-keyword">return</span> self.offsetDate(dateObs, 0.5*exposureTime) +def fix_header_safe(md, translator_class=PfsTranslator): + <span class="code-quote">"""A version of fix_header that works around DM-29117"</span>"" + dangerousKeys = [<span class="code-quote">"W_PFDSGN"</span>] # keys that can trigger DM-29117 + saved = {} + <span class="code-keyword">for</span> k in dangerousKeys: + <span class="code-keyword">if</span> k in md: + saved[k] = md.get(k) + md.remove(k) + + fix_header(md, translator_class=PfsTranslator) + + <span class="code-keyword">for</span> k in dangerousKeys: + <span class="code-keyword">if</span> k not in md and k in saved: + md[k] = saved[k] + + <span class="code-keyword">class </span>PfsMapper(CameraMapper): <span class="code-quote">"""Provides <span class="code-keyword">abstract</span>-physical mapping <span class="code-keyword">for</span> PFS data"</span>"" packageName = <span class="code-quote">"obs_pfs"</span> @@ -219,7 +235,9 @@ <span class="code-keyword">class </span>PfsMapper(CameraMapper): exp = <span class="code-keyword">super</span>(PfsMapper, self).std_raw(item, dataId) md = exp.getMetadata() - fix_header(md, translator_class=PfsTranslator) + + fix_header_safe(md, translator_class=PfsTranslator) + <span class="code-keyword">try</span>: dataVersion = <span class="code-object">int</span>(md.get(<span class="code-quote">'W_VERSIONS_FPGA'</span>), 16) except Exception: @@ -248,7 +266,7 @@ <span class="code-keyword">class </span>PfsMapper(CameraMapper): item : `lsst.daf.base.PropertyList` The modified raw metadata. """ - fix_header(item, translator_class=PfsTranslator) + fix_header_safe(item, translator_class=PfsTranslator) <span class="code-keyword">return</span> item def std_fiberProfiles(self, item, dataId): </pre> </div></div> <p>Link to LSST DM-29117 ticket: <a href="https://jira.lsstcorp.org/browse/DM-29117" class="external-link" rel="nofollow">https://jira.lsstcorp.org/browse/DM-29117</a></p> <p>Brought in code from LSST.</p> <p>And it works:</p> <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-java"> &gt;&gt;&gt; exp = butler.get(<span class="code-quote">"raw"</span>, visit=45777, arm=<span class="code-quote">"r"</span>, filter=<span class="code-quote">"r"</span>) &gt;&gt;&gt; exp.getMetadata().get(<span class="code-quote">"W_PFDSGN"</span>) 3735928559 </pre> </div></div> <p>Changes look fine to me. Only minor comments.</p> <p>Also checked with</p> <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-java"> python -c <span class="code-quote">"<span class="code-keyword">import</span> lsst.obs.pfs.dm29117; <span class="code-keyword">import</span> lsst.daf.base as dafBase; md = dafBase.PropertyList(); md[<span class="code-quote">'aa'</span>] = 1; md[<span class="code-quote">'aa'</span>] = 3735928559"</span> </pre> </div></div> <p>which passed successfully.</p> <p>Merged.</p> <p>I also added a commit that allows you to leave off the <tt>filter="r"</tt> in the <tt>buter.get</tt> call.</p> <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-java"> &gt;&gt;&gt; from lsst.daf.persistence <span class="code-keyword">import</span> Butler &gt;&gt;&gt; butler = Butler(<span class="code-quote">"/projects/HSC/PFS/Subaru"</span>) CameraMapper INFO: Loading exposure registry from /projects/HSC/PFS/Subaru/registry.sqlite3 &gt;&gt;&gt; butler.get(<span class="code-quote">"raw"</span>, visit=45777, arm=<span class="code-quote">"r"</span>) &lt;lsst.afw.image.exposure.exposure.ExposureU object at 0x2b4a13f32618&gt; </pre> </div></div> Blocks PIPE2D-850 Development Rank 0|02qpt6:508yl0chzzy0000026o Reviewers hassan Sprint 2DDRP-2021 A 4 2DDRP-2021 A5 Story Points 1.0