Developments related to LSST requests

Python/ades/maketexfiles

@@ -4,5 +4,5 @@
 #
 setenv SRC $argv[1]
 foreach table ( elementstable simpletypestable grouptypestable ades )
-${SRC}/Python/bin/applyxslt ${SRC}/xml/adesmaster.xml ${SRC}/xslt/latex//doc{$table}.xslt > {$table}.tex
+${SRC}/Python/ades/applyxslt ${SRC}/xml/adesmaster.xml ${SRC}/xslt/latex//doc{$table}.xslt > {$table}.tex
 end

Python/ades/valutility.py

@@ -4,14 +4,9 @@
 from __future__ import unicode_literals
 
 import traceback
-import sys
-import argparse
 import re
 
 from ades import adesutility
-from ades import convertutility
-import io
-
 
 def validate_schema(schema_name, schema, candidate, out):
     #

README.txt

@@ -1,3 +1,7 @@
+22-Dec-2025 - Changed the length of the obssubID field from 25 to 35 chars 
+       # Allow submission of old-style provIDs (e.g. A988 CA)
+       # Some clean-up
+
 06-Oct-2025 - Moved python code from Python/bin to Python/ades; release iau-ades package
        # All python code has been moved from Python/bin to Python/ades to support code packaging
        # Existing scripts that utilize ADES-Master by modifying the computing environment 

doc/README.docs

@@ -6,7 +6,7 @@ steps 2 & 3 can be neglected.)
 1) Update MS Word documentation, starting from ./doc directory:
    a) Copy ADES_Description_<date>.docx to ../attic
    b) Rename ADES_Description_<date>.docx to show current date
-   c) Edit and save ADES_Description_<date>].docx, including updates to
+   c) Edit and save ADES_Description_<date>.docx, including updates to
    date on cover page and change log in front matter
    d) Save PDF version of ADES_Description_<date>.docx to ../ADES_Description.pdf
    e) Close MS Word
@@ -28,5 +28,13 @@ steps 2 & 3 can be neglected.)
       makexsdfiles
       cd ..
 
-4) You should now be in the repo root. Final step is to commit and
+4) Update adesmaster.xml in Python/ades/data/xml
+      cd xml/
+      cp adesmaster.xml ../Python/ades/data/xml/
+      cd ..
+
+5) Be sure you have added the tests to prove that changes you made 
+   to adesmaster.xml still works
+
+6) You should now be in the repo root. Final step is to commit and
 push branch.

doc/docsrc/makedoc

@@ -1,9 +1,9 @@
 #!/usr/bin/env csh
 #set tex="/usr/local/texlive/2016/bin/x86_64-darwin/"
 set tex="/Library/Tex/texbin/"
-#set tex="/bin"
+#set tex="/ades"
 ./cleanup
-../../Python/bin/maketexfiles "../.."
+../../Python/ades/maketexfiles "../.."
 $tex/latex ades.tex
 $tex/latex ades.tex
 $tex/dvips ades.dvi

pyproject.toml

@@ -2,6 +2,7 @@
 name = "iau-ades"
 dynamic = ['version']
 dependencies = [
+    "json5",
     "lxml",
     "xmltodict",
     "pyyaml"

tests/input/obssubid_35char.xml

@@ -0,0 +1,72 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<ades version="2022">
+  <obsBlock>
+    <obsContext>
+      <observatory>
+        <mpcCode>X05</mpcCode>
+        <name>Vera C. Rubin Observatory</name>
+      </observatory>
+      <submitter>
+        <name>V. Rubin PreopsLSSTCam</name>
+        <institution>Vera C. Rubin Observatory</institution>
+      </submitter>
+      <measurers>
+        <name>P. H. Bernardinelli</name>
+        <name>A. Heinze</name>
+        <name>M. Juric</name>
+        <name>J. Kurlander</name>
+        <name>J. Moeyens</name>
+      </measurers>
+      <telescope>
+        <design>Modified Paul-Baker</design>
+        <aperture>8.4</aperture>
+        <detector>CCD</detector>
+        <fRatio>1.234</fRatio>
+        <pixelScale>0.2</pixelScale>
+      </telescope>
+      <software>
+        <astrometry>astrometry LSST Science Pipelines</astrometry>
+        <photometry>LSST Science Pipelines</photometry>
+        <objectDetection>heliolincx</objectDetection>
+      </software>
+      <fundingSource>National Science Foundation; Department of Energy</fundingSource>
+      <comment>
+        <line>line ADES generated and submitted using B612 Asteroid Institute ADAM mpcq</line>
+      </comment>
+    </obsContext>
+    <obsData>
+      <optical>
+        <trkSub>cb00090</trkSub>
+        <obsSubID>LSST-AP-DS-NNNNNNNNNNNNNNNNNNNN</obsSubID>
+        <mode>CCD</mode>
+        <stn>X05</stn>
+        <obsTime>2025-04-22T02:38:05.222Z</obsTime>
+        <ra>187.572904</ra>
+        <dec>+6.924455</dec>
+        <rmsRA>0.027</rmsRA>
+        <rmsDec>0.034</rmsDec>
+        <astCat>Gaia3</astCat>
+        <mag>21.209</mag>
+        <rmsMag>0.029</rmsMag>
+        <band>Li</band>
+        <photCat>Gaia3</photCat>
+      </optical>
+      <optical>
+        <trkSub>cb00090</trkSub>
+        <obsSubID>LSST-DP1-DS-NNNNNNNNNNNNNNNNNNNN</obsSubID>
+        <mode>CCD</mode>
+        <stn>X05</stn>
+        <obsTime>2025-04-22T02:41:45.334Z</obsTime>
+        <ra>187.572460</ra>
+        <dec>+6.924549</dec>
+        <rmsRA>0.027</rmsRA>
+        <rmsDec>0.034</rmsDec>
+        <astCat>Gaia3</astCat>
+        <mag>21.213</mag>
+        <rmsMag>0.029</rmsMag>
+        <band>Li</band>
+        <photCat>Gaia3</photCat>
+      </optical>
+    </obsData>
+  </obsBlock>
+</ades>

tests/input/old_style_provid.xml

@@ -0,0 +1,72 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<ades version="2022">
+  <obsBlock>
+    <obsContext>
+      <observatory>
+        <mpcCode>X05</mpcCode>
+        <name>Vera C. Rubin Observatory</name>
+      </observatory>
+      <submitter>
+        <name>V. Rubin PreopsLSSTCam</name>
+        <institution>Vera C. Rubin Observatory</institution>
+      </submitter>
+      <measurers>
+        <name>P. H. Bernardinelli</name>
+        <name>A. Heinze</name>
+        <name>M. Juric</name>
+        <name>J. Kurlander</name>
+        <name>J. Moeyens</name>
+      </measurers>
+      <telescope>
+        <design>Modified Paul-Baker</design>
+        <aperture>8.4</aperture>
+        <detector>CCD</detector>
+        <fRatio>1.234</fRatio>
+        <pixelScale>0.2</pixelScale>
+      </telescope>
+      <software>
+        <astrometry>astrometry LSST Science Pipelines</astrometry>
+        <photometry>LSST Science Pipelines</photometry>
+        <objectDetection>heliolincx</objectDetection>
+      </software>
+      <fundingSource>National Science Foundation; Department of Energy</fundingSource>
+      <comment>
+        <line>line ADES generated and submitted using B612 Asteroid Institute ADAM mpcq</line>
+      </comment>
+    </obsContext>
+    <obsData>
+      <optical>
+        <provID>A899 CA</provID>
+        <obsSubID>LSST-AP-DS-NNNNNNNNNNNNNNNNNNNN</obsSubID>
+        <mode>CCD</mode>
+        <stn>X05</stn>
+        <obsTime>2025-04-22T02:38:05.222Z</obsTime>
+        <ra>187.572904</ra>
+        <dec>+6.924455</dec>
+        <rmsRA>0.027</rmsRA>
+        <rmsDec>0.034</rmsDec>
+        <astCat>Gaia3</astCat>
+        <mag>21.209</mag>
+        <rmsMag>0.029</rmsMag>
+        <band>Li</band>
+        <photCat>Gaia3</photCat>
+      </optical>
+      <optical>
+        <provID>A899 CA</provID>
+        <obsSubID>LSST-DP1-DS-NNNNNNNNNNNNNNNNNNNN</obsSubID>
+        <mode>CCD</mode>
+        <stn>X05</stn>
+        <obsTime>2025-04-22T02:41:45.334Z</obsTime>
+        <ra>187.572460</ra>
+        <dec>+6.924549</dec>
+        <rmsRA>0.027</rmsRA>
+        <rmsDec>0.034</rmsDec>
+        <astCat>Gaia3</astCat>
+        <mag>21.213</mag>
+        <rmsMag>0.029</rmsMag>
+        <band>Li</band>
+        <photCat>Gaia3</photCat>
+      </optical>
+    </obsData>
+  </obsBlock>
+</ades>