Skip to content

Some updates to ADES schema after validation attempts using MPC obs table #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
federicaspoto merged 7 commits into from
Mar 17, 2026
Merged

Some updates to ADES schema after validation attempts using MPC obs table #95

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
408a0da
some updates to ADES schema after validation attempts using MPC obs t…
federicaspoto Mar 16, 2026
b56a907
Potential fix for pull request finding
federicaspoto Mar 16, 2026
008a6ab
Potential fix for pull request finding
federicaspoto Mar 16, 2026
76070ad
Potential fix for pull request finding
federicaspoto Mar 16, 2026
1b49b4e
adding test about reference field
federicaspoto Mar 16, 2026
bfa7403
Merge branch 'magnitude-band' of https://github.com/IAU-ADES/ADES-Mas…
federicaspoto Mar 16, 2026
0aa2ea5
Potential fix for pull request finding
federicaspoto Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified ADES_Description.pdf
View file
Open in desktop
Binary file not shown.
994 changes: 551 additions & 443 deletions Python/ades/xmltompc80col.py
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified ades_master.pdf
View file
Open in desktop
Binary file not shown.
0 doc/ADES_Description_22Dec2025.docx → attic/ADES_Description_22Dec2025.docx
View file
Open in desktop
File renamed without changes.
0 doc/ades_master_22Dec2025.pdf → attic/ades_master_22Dec2025.pdf
View file
Open in desktop
File renamed without changes.
Binary file added doc/ADES_Description_16Mar2026.docx
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions doc/README.docs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ steps 2 & 3 can be neglected.)

mv ades_master_<old_date>.pdf ../attic
cd docsrc/
makedoc
./makedoc
cp ades.pdf ../ades_master_<new_date>.pdf
cp ades.pdf ../../ades_master.pdf
cleanup
./cleanup
cd ..

3) Update XSD files. Run the following commands:
Expand Down
Binary file added doc/ades_master_16Mar2026.pdf
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions tests/expected/band_conversions.obs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ CON A. Stronomer, University of Science
OBS A. Stronomer
MEA A. Stronomer
A10TlFw C2023 03 07.39538117 06 15.890-19 00 27.68 14.26VV XXX
A10TlFw C2023 03 07.39607517 10 15.890-19 00 27.68 14.26RV XXX
A10TlFw C2023 03 07.39824217 06 16.176-19 00 27.97 14.14gV XXX
15 changes: 15 additions & 0 deletions tests/input/band_conversions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,21 @@
<band>VR</band>
<logSNR>1.620</logSNR>
</optical>
<optical>
<trkSub>A10TlFw</trkSub>
<mode>CCD</mode>
<stn>XXX</stn>
<obsTime>2023-03-07T09:30:20.88Z</obsTime>
<ra>257.566210</ra>
<dec>-19.007690</dec>
<rmsRA>0.136</rmsRA>
<rmsDec>0.136</rmsDec>
<astCat>Gaia2</astCat>
<mag>14.26</mag>
<rmsMag>0.024</rmsMag>
<band>Rj</band>
<logSNR>1.620</logSNR>
</optical>
<optical>
<trkSub>A10TlFw</trkSub>
<mode>CCD</mode>
Expand Down
133 changes: 133 additions & 0 deletions tests/input/obs_ITF_trksub.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
<?xml version='1.0' encoding='UTF-8'?>
<ades version="2022">
<obsBlock>
<obsContext>
<observatory>
<mpcCode>T12</mpcCode>
<name>Mauna Kea-UH/Tholen NEO Follow-Up (2.24-m)</name>
</observatory>
<submitter>
<name>D. J. Tholen</name>
<institution>University of Hawaii</institution>
</submitter>
<observers>
<name>D. Hung</name>
</observers>
<measurers>
<name>D. J. Tholen</name>
</measurers>
<telescope>
<name>University of Hawaii 2.24-m</name>
<design>reflector</design>
<aperture>2.24</aperture>
<detector>STA1600 10k CCD</detector>
<fRatio>10.1</fRatio>
<filter>none</filter>
<arraySize>2112 x 2112 pixels</arraySize>
<pixelScale>0.4118</pixelScale>
</telescope>
<software>
<astrometry>Tholen custom ADES software, 2021 Apr 10 version</astrometry>
<fitOrder>1</fitOrder>
</software>
<fundingSource>NASA 80NSSC21K0807</fundingSource>
<comment>
<line>Second opposition recovery of 2022 KW.</line>
<line>A shutter delay of 0.16 sec was applied to the first and third exposures,</line>
<line>while 0.17 sec was applied to the second exposure.</line>
<line>Time correction was also applied to the field asteroid.</line>
</comment>
</obsContext>
<obsData>
<optical>
<trkSub>/022KW</trkSub>
<mode>CCD</mode>
<stn>T12</stn>
<obsTime>2023-06-15T13:44:30.18Z</obsTime>
<ra>325.589699</ra>
<dec>+0.560433</dec>
<rmsRA>0.033</rmsRA>
<rmsDec>0.033</rmsDec>
<astCat>Gaia2</astCat>
<mag>22.458</mag>
<rmsMag>0.069</rmsMag>
<band>G</band>
<photCat>Gaia2</photCat>
<photAp>1.2</photAp>
<logSNR>1.20</logSNR>
<seeing>1.3</seeing>
<exp>420.0</exp>
<rmsFit>0.049</rmsFit>
<nStars>395</nStars>
<remarks>S: 0.0018 0.0031 O: 0.0328 0.0328</remarks>
</optical>
<optical>
<trkSub>/022KW</trkSub>
<mode>CCD</mode>
<stn>T12</stn>
<obsTime>2023-06-15T13:51:56.52Z</obsTime>
<ra>325.591585</ra>
<dec>+0.563396</dec>
<rmsRA>0.037</rmsRA>
<rmsDec>0.037</rmsDec>
<astCat>Gaia2</astCat>
<mag>22.286</mag>
<rmsMag>0.059</rmsMag>
<band>G</band>
<photCat>Gaia2</photCat>
<photAp>1.1</photAp>
<logSNR>1.27</logSNR>
<seeing>1.3</seeing>
<exp>420.0</exp>
<rmsFit>0.049</rmsFit>
<nStars>405</nStars>
<remarks>S: 0.0020 0.0030 O: 0.0370 0.0370</remarks>
</optical>
<optical>
<trkSub>/022KW</trkSub>
<mode>CCD</mode>
<stn>T12</stn>
<obsTime>2023-06-15T13:59:51.14Z</obsTime>
<ra>325.593584</ra>
<dec>+0.566568</dec>
<rmsRA>0.041</rmsRA>
<rmsDec>0.041</rmsDec>
<astCat>Gaia2</astCat>
<mag>22.502</mag>
<rmsMag>0.078</rmsMag>
<band>G</band>
<photCat>Gaia2</photCat>
<photAp>1.3</photAp>
<logSNR>1.14</logSNR>
<seeing>1.4</seeing>
<exp>420.0</exp>
<rmsFit>0.045</rmsFit>
<nStars>392</nStars>
<remarks>S: 0.0019 0.0028 O: 0.0411 0.0411</remarks>
</optical>
<optical>
<trkSub>/15LQ20</trkSub>
<mode>CCD</mode>
<stn>T12</stn>
<obsTime>2023-06-15T13:51:56.54Z</obsTime>
<ra>325.5843270</ra>
<dec>+0.591102</dec>
<rmsRA>0.021</rmsRA>
<rmsDec>0.041</rmsDec>
<astCat>Gaia2</astCat>
<mag>21.369</mag>
<rmsMag>0.039</rmsMag>
<band>G</band>
<photCat>Gaia2</photCat>
<photAp>1.1</photAp>
<logSNR>1.45</logSNR>
<seeing>1.3</seeing>
<exp>1260.0</exp>
<rmsFit>0.049</rmsFit>
<nStars>405</nStars>
<notes>K</notes>
<remarks>S: 0.0022 0.0033 O: 0.0205 0.0411 From a stack of three 420 sec exposures. Time corresponds to the middle exposure.</remarks>
</optical>
</obsData>
</obsBlock>
</ades>
133 changes: 133 additions & 0 deletions tests/input/obs_design.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
<?xml version='1.0' encoding='UTF-8'?>
<ades version="2022">
<obsBlock>
<obsContext>
<observatory>
<mpcCode>T12</mpcCode>
<name>Mauna Kea-UH/Tholen NEO Follow-Up (2.24-m)</name>
</observatory>
<submitter>
<name>D. J. Tholen</name>
<institution>University of Hawaii</institution>
</submitter>
<observers>
<name>D. Hung</name>
</observers>
<measurers>
<name>D. J. Tholen</name>
</measurers>
<telescope>
<name>University of Hawaii 2.24-m</name>
<design>my very long reflector name</design>
<aperture>2.24</aperture>
<detector>STA1600 10k CCD</detector>
<fRatio>10.1</fRatio>
<filter>none</filter>
<arraySize>2112 x 2112 pixels</arraySize>
<pixelScale>0.4118</pixelScale>
</telescope>
<software>
<astrometry>Tholen custom ADES software, 2021 Apr 10 version</astrometry>
<fitOrder>1</fitOrder>
</software>
<fundingSource>NASA 80NSSC21K0807</fundingSource>
<comment>
<line>Second opposition recovery of 2022 KW.</line>
<line>A shutter delay of 0.16 sec was applied to the first and third exposures,</line>
<line>while 0.17 sec was applied to the second exposure.</line>
<line>Time correction was also applied to the field asteroid.</line>
</comment>
</obsContext>
<obsData>
<optical>
<provID>2022 KW</provID>
<mode>CCD</mode>
<stn>T12</stn>
<obsTime>2023-06-15T13:44:30.18Z</obsTime>
<ra>325.589699</ra>
<dec>+0.560433</dec>
<rmsRA>0.033</rmsRA>
<rmsDec>0.033</rmsDec>
<astCat>Gaia2</astCat>
<mag>22.458</mag>
<rmsMag>0.069</rmsMag>
<band>G</band>
<photCat>Gaia2</photCat>
<photAp>1.2</photAp>
<logSNR>1.20</logSNR>
<seeing>1.3</seeing>
<exp>420.0</exp>
<rmsFit>0.049</rmsFit>
<nStars>395</nStars>
<remarks>S: 0.0018 0.0031 O: 0.0328 0.0328</remarks>
</optical>
<optical>
<provID>2022 KW</provID>
<mode>CCD</mode>
<stn>T12</stn>
<obsTime>2023-06-15T13:51:56.52Z</obsTime>
<ra>325.591585</ra>
<dec>+0.563396</dec>
<rmsRA>0.037</rmsRA>
<rmsDec>0.037</rmsDec>
<astCat>Gaia2</astCat>
<mag>22.286</mag>
<rmsMag>0.059</rmsMag>
<band>G</band>
<photCat>Gaia2</photCat>
<photAp>1.1</photAp>
<logSNR>1.27</logSNR>
<seeing>1.3</seeing>
<exp>420.0</exp>
<rmsFit>0.049</rmsFit>
<nStars>405</nStars>
<remarks>S: 0.0020 0.0030 O: 0.0370 0.0370</remarks>
</optical>
<optical>
<provID>2022 KW</provID>
<mode>CCD</mode>
<stn>T12</stn>
<obsTime>2023-06-15T13:59:51.14Z</obsTime>
<ra>325.593584</ra>
<dec>+0.566568</dec>
<rmsRA>0.041</rmsRA>
<rmsDec>0.041</rmsDec>
<astCat>Gaia2</astCat>
<mag>22.502</mag>
<rmsMag>0.078</rmsMag>
<band>G</band>
<photCat>Gaia2</photCat>
<photAp>1.3</photAp>
<logSNR>1.14</logSNR>
<seeing>1.4</seeing>
<exp>420.0</exp>
<rmsFit>0.045</rmsFit>
<nStars>392</nStars>
<remarks>S: 0.0019 0.0028 O: 0.0411 0.0411</remarks>
</optical>
<optical>
<provID>2015 LQ20</provID>
<mode>CCD</mode>
<stn>T12</stn>
<obsTime>2023-06-15T13:51:56.54Z</obsTime>
<ra>325.5843270</ra>
<dec>+0.591102</dec>
<rmsRA>0.021</rmsRA>
<rmsDec>0.041</rmsDec>
<astCat>Gaia2</astCat>
<mag>21.369</mag>
<rmsMag>0.039</rmsMag>
<band>G</band>
<photCat>Gaia2</photCat>
<photAp>1.1</photAp>
<logSNR>1.45</logSNR>
<seeing>1.3</seeing>
<exp>1260.0</exp>
<rmsFit>0.049</rmsFit>
<nStars>405</nStars>
<notes>K</notes>
<remarks>S: 0.0022 0.0033 O: 0.0205 0.0411 From a stack of three 420 sec exposures. Time corresponds to the middle exposure.</remarks>
</optical>
</obsData>
</obsBlock>
</ades>
23 changes: 21 additions & 2 deletions tests/test_validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,16 @@

# ------------------------
# valgeneral
@pytest.mark.parametrize("xmlfile", ["input/obs_v2022.xml", "input/obssubid_35char.xml", "input/old_style_provid.xml"])
@pytest.mark.parametrize(
"xmlfile",
[
"input/obs_v2022.xml",
"input/obssubid_35char.xml",
"input/old_style_provid.xml",
"input/obs_design.xml",
"input/obs_ITF_trksub.xml",
],
)
Comment thread
federicaspoto marked this conversation as resolved.
def test_valgeneral(xmlfile):
"""General validation"""

Expand All @@ -34,7 +43,17 @@ def test_valgeneral(xmlfile):
else:
assert False

@pytest.mark.parametrize("xmlfile", ["input/obs_v2022.xml", "input/obssubid_35char.xml", "input/old_style_provid.xml"])

@pytest.mark.parametrize(
"xmlfile",
[
"input/obs_v2022.xml",
"input/obssubid_35char.xml",
"input/old_style_provid.xml",
"input/obs_design.xml",
"input/obs_ITF_trksub.xml",
],
)
def test_valgeneral_routine(xmlfile):
"""General validation from import"""
if os.path.exists("valgeneral.file"):
Expand Down
8 changes: 4 additions & 4 deletions xml/adesmaster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,9 +890,9 @@ decimal types must be in a range

<simpletype name="RefType">
<restriction base="StringType">
<restrict name="xsd:maxLength" value="16"/>
<restrict name="xsd:maxLength" value="28"/>
</restriction>
<doc>MPC-assigned reference, up to sixteen characters</doc>
<doc>MPC-assigned reference, up to eighteen characters</doc>
Comment thread
federicaspoto marked this conversation as resolved.
Outdated
</simpletype>

<simpletype name="RemarkType">
Expand Down Expand Up @@ -1033,7 +1033,7 @@ decimal types must be in a range

<simpletype name="OldTrkSubType">
<restriction base="StringType">
<restrict name="xsd:pattern" value="[- ?+@.()/\\A-Za-z0-9_]*"/>
<restrict name="xsd:pattern" value="[- ?+@./()/\\A-Za-z0-9_]*"/>
<restrict name="xsd:maxLength" value="8"/>
</restriction>
<doc>A trkSub is up to eight funky characters</doc>
Expand Down Expand Up @@ -1083,7 +1083,7 @@ decimal types must be in a range
<complextype name="TelescopeType">
<all>
<element name="name" type="StringTypeW100" use="optional" doc="telescope name"/>
<element name="design" type="StringTypeW25" doc="telescope design"/>
<element name="design" type="StringTypeW35" doc="telescope design"/>
<element name="aperture" type="PosDecimalTypeW6" doc="telescope aperture"/>
<element name="detector" type="StringTypeW25" doc="telescope detector"/>
<element name="fRatio" type="PosDecimalTypeW6" use="optional" doc="telescope f number"/>
Expand Down
Loading
Loading