Skip to content
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

CADC-13258 - POSSUM support #180

Open
wants to merge 37 commits into
base: main
Choose a base branch
from
Open

CADC-13258 - POSSUM support #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
53e43b5
CADC-12805 - stop partial Function creation from keywords, so that Ra…
SharonGoliath Oct 30, 2023
6e3b94b
CADC-12805 - interim commit.
SharonGoliath Nov 2, 2023
e982c3e
CADC-12805 - interim commit.
SharonGoliath Nov 3, 2023
bced568
CADC-12805 - interim commit - clean up finished, regression testing t…
SharonGoliath Nov 5, 2023
e82a5e6
CADC-12805 - interim commit.
SharonGoliath Nov 5, 2023
ad79c3a
CADC-12805 - remove dependency on deprecated imp package.
SharonGoliath Nov 6, 2023
d8140fe
CADC-12805 - remove dependency that is not installed in test environm…
SharonGoliath Nov 6, 2023
cbcbb83
CADC-12805 - flake8.
SharonGoliath Nov 7, 2023
5fcbb7e
CADC-12805 - flake8.
SharonGoliath Nov 7, 2023
5ac4790
CADC-12805 - code review comments.
SharonGoliath Nov 16, 2023
7809eb1
CADC-12805 - bump versions.
SharonGoliath Nov 16, 2023
2dafefc
CADC-12805 - remove 'import imp' from setup.py
SharonGoliath Nov 17, 2023
4d6886e
CADC-12805 - update the default resource id.
SharonGoliath Nov 21, 2023
8a14c35
Merge branch 'main' into CADC-12805
SharonGoliath Nov 23, 2023
cb48cd5
CADC-12858 - comma in keywords for splitting
SharonGoliath Jan 3, 2024
bad24bf
CADC-12858 - add WcsParser handling for non-file based content.
SharonGoliath Jan 6, 2024
73624e6
CADC-12858/CADC-13010 - refactor triggered by LoTSS collection, which…
SharonGoliath Jan 8, 2024
261d3c8
CADC-12858 - addresss code review comments.
SharonGoliath Jan 16, 2024
1afe62d
CADC-12858 - flake8
SharonGoliath Jan 16, 2024
bdc2e3f
Refactor caom2blueprint.py content into separate modules.
SharonGoliath Jan 17, 2024
142cfca
refactor_caom2utils - black.
SharonGoliath Jan 17, 2024
baa71e8
CADC-12017 - set the cardinality of parser:wcs_parser as 1:n.
SharonGoliath Jan 18, 2024
2be7de6
CADC-13017 - interim commit, add handling for extensions in apply_blu…
SharonGoliath Jan 22, 2024
6f03d77
CADC-13017 - update __init__.py
SharonGoliath Jan 22, 2024
2f1a944
CADC-13017 - test cases cover DerivedObservation.members, differening…
SharonGoliath Jan 25, 2024
5494288
Refactor comment line length.
SharonGoliath Feb 1, 2024
de2b1ab
Merge branch 'refactor_caom2utils' into CADC-13017
SharonGoliath Feb 1, 2024
f92ef93
CADC-13017 - support bz2 extensions for Content-Type.
SharonGoliath Feb 6, 2024
acaceb2
CADC-10810 - interim commit.
SharonGoliath Feb 19, 2024
b7b0edc
CADC-13223 - regression with black formatting changes.
SharonGoliath Feb 28, 2024
0367a8c
CADC-13204 - get the HDF5 test cases working.
SharonGoliath Feb 28, 2024
13368cd
CADC-10810 - interim commit.
SharonGoliath Mar 5, 2024
7afe395
CADC-13258 - interim commit.
SharonGoliath Mar 13, 2024
27ae15e
CADC-13258
SharonGoliath Apr 2, 2024
6bd4d87
Merge branch 'main' into CADC-13258
SharonGoliath Apr 29, 2024
ab91066
CADC-13258 - remove spurious log messages.
SharonGoliath Apr 29, 2024
fedb395
CADC-13258 - code review comments.
SharonGoliath May 1, 2024
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
3 changes: 2 additions & 1 deletion caom2/caom2/diff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,8 @@
tracking_expected = e

if not match_found:
report.extend(tracking_report)
if tracking_report:
report.extend(tracking_report)

Check warning on line 278 in caom2/caom2/diff.py

View check run for this annotation

Codecov / codecov/patch

caom2/caom2/diff.py#L278 

Added line #L278 was not covered by tests
if tracking_actual in actual_copy:
actual_index = actual_copy.index(tracking_actual)
actual_copy.pop(actual_index)
Expand Down
165 changes: 165 additions & 0 deletions caom2/caom2/tests/data/diff-failure-actual-CAOM-2.4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
<?xml version='1.0' encoding='UTF-8'?>
<caom2:Observation xmlns:caom2="http://www.opencadc.org/caom2/xml/v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="caom2:SimpleObservation" caom2:id="076d40dc-dd40-4ba3-af52-668df1d9c639" caom2:lastModified="2024-04-02T18:04:50.664" caom2:maxLastModified="2024-04-02T18:04:50.664" caom2:metaChecksum="md5:74fe0f489e78edc836bd822ed3874069" caom2:accMetaChecksum="md5:44c710e49833ac0056f32f5e5e261e04" caom2:metaProducer="wallaby2caom2/0.3.1">
<caom2:collection>WALLABY</caom2:collection>
<caom2:observationID>WALLABY_J101247-291053</caom2:observationID>
<caom2:metaRelease>2026-01-01T00:00:00.000</caom2:metaRelease>
<caom2:metaReadGroups>
<caom2:groupURI>ivo://cadc.nrc.ca/gms?CADC</caom2:groupURI>
<caom2:groupURI>ivo://cadc.nrc.ca/gms?WALLABY-RW</caom2:groupURI>
</caom2:metaReadGroups>
<caom2:algorithm>
<caom2:name>exposure</caom2:name>
</caom2:algorithm>
<caom2:type>OBJECT</caom2:type>
<caom2:intent>science</caom2:intent>
<caom2:proposal>
<caom2:id>WALLABY_J101247-291053</caom2:id>
<caom2:project>WALLABY</caom2:project>
<caom2:title>WALLABY</caom2:title>
</caom2:proposal>
<caom2:target>
<caom2:name>WALLABY J101247-291053</caom2:name>
</caom2:target>
<caom2:instrument>
<caom2:name>ASKAP</caom2:name>
</caom2:instrument>
<caom2:planes>
<caom2:plane caom2:id="923215fa-03df-419f-bab0-12216f3b0485" caom2:lastModified="2024-04-02T18:04:50.664" caom2:maxLastModified="2024-04-02T18:04:50.664" caom2:metaChecksum="md5:a22a1df51d2a102c9fd68245a9bd8e3b" caom2:accMetaChecksum="md5:2a9993805da66acf1d4325a346668f06" caom2:metaProducer="wallaby2caom2/0.3.1">
<caom2:productID>source_data_Hydra_TR2</caom2:productID>
<caom2:metaRelease>2026-01-01T00:00:00.000</caom2:metaRelease>
<caom2:metaReadGroups>
<caom2:groupURI>ivo://cadc.nrc.ca/gms?CADC</caom2:groupURI>
<caom2:groupURI>ivo://cadc.nrc.ca/gms?WALLABY-RW</caom2:groupURI>
</caom2:metaReadGroups>
<caom2:dataRelease>2026-01-01T00:00:00.000</caom2:dataRelease>
<caom2:dataReadGroups>
<caom2:groupURI>ivo://cadc.nrc.ca/gms?CADC</caom2:groupURI>
<caom2:groupURI>ivo://cadc.nrc.ca/gms?WALLABY-RW</caom2:groupURI>
</caom2:dataReadGroups>
<caom2:dataProductType>cube</caom2:dataProductType>
<caom2:calibrationLevel>2</caom2:calibrationLevel>
<caom2:provenance>
<caom2:name>SoFiA 2.2.1</caom2:name>
<caom2:project>WALLABY</caom2:project>
<caom2:producer>CSIRO</caom2:producer>
</caom2:provenance>
<caom2:position>
<caom2:bounds xsi:type="caom2:Polygon">
<caom2:points>
<caom2:point>
<caom2:cval1>153.16017416573715</caom2:cval1>
<caom2:cval2>-29.14998252059779</caom2:cval2>
</caom2:point>
<caom2:point>
<caom2:cval1>153.2288787465842</caom2:cval1>
<caom2:cval2>-29.15034613993521</caom2:cval2>
</caom2:point>
<caom2:point>
<caom2:cval1>153.22844536957604</caom2:cval1>
<caom2:cval2>-29.21204238972669</caom2:cval2>
</caom2:point>
<caom2:point>
<caom2:cval1>153.15969946309747</caom2:cval1>
<caom2:cval2>-29.211678539292905</caom2:cval2>
</caom2:point>
</caom2:points>
<caom2:samples>
<caom2:vertices>
<caom2:vertex>
<caom2:cval1>153.22844536957604</caom2:cval1>
<caom2:cval2>-29.212042389726676</caom2:cval2>
<caom2:type>2</caom2:type>
</caom2:vertex>
<caom2:vertex>
<caom2:cval1>153.15969946309747</caom2:cval1>
<caom2:cval2>-29.211678539292908</caom2:cval2>
<caom2:type>1</caom2:type>
</caom2:vertex>
<caom2:vertex>
<caom2:cval1>153.16017416573717</caom2:cval1>
<caom2:cval2>-29.149982520597785</caom2:cval2>
<caom2:type>1</caom2:type>
</caom2:vertex>
<caom2:vertex>
<caom2:cval1>153.22887874658417</caom2:cval1>
<caom2:cval2>-29.150346139935174</caom2:cval2>
<caom2:type>1</caom2:type>
</caom2:vertex>
<caom2:vertex>
<caom2:cval1>0.0</caom2:cval1>
<caom2:cval2>0.0</caom2:cval2>
<caom2:type>0</caom2:type>
</caom2:vertex>
</caom2:vertices>
</caom2:samples>
</caom2:bounds>
<caom2:dimension>
<caom2:naxis1>36</caom2:naxis1>
<caom2:naxis2>37</caom2:naxis2>
</caom2:dimension>
<caom2:resolution>30.08750860854601</caom2:resolution>
<caom2:sampleSize>6.000000000012</caom2:sampleSize>
</caom2:position>
<caom2:energy/>
<caom2:time/>
<caom2:polarization/>
<caom2:artifacts>
<caom2:artifact caom2:id="603d5be2-f498-474b-80bc-a3b44541afe8" caom2:lastModified="2024-04-02T18:04:50.664" caom2:maxLastModified="2024-04-02T18:04:50.664" caom2:metaChecksum="md5:7f02b72909d2023250a6bd10f7da7ac3" caom2:accMetaChecksum="md5:76443504e1e38f53bbd651ef4992788f" caom2:metaProducer="wallaby2caom2/0.3.1">
<caom2:uri>cadc:WALLABY/WALLABY_J101247-291053_Hydra_TR2_chan.fits</caom2:uri>
<caom2:productType>science</caom2:productType>
<caom2:releaseType>data</caom2:releaseType>
<caom2:contentType>application/fits</caom2:contentType>
<caom2:contentLength>8640</caom2:contentLength>
<caom2:contentChecksum>md5:a1d8912424aed55244a6e049dc366776</caom2:contentChecksum>
<caom2:parts>
<caom2:part caom2:id="dc73357c-09ac-44d2-843c-b599e73b24f3" caom2:lastModified="2024-04-02T18:04:50.664" caom2:maxLastModified="2024-04-02T18:04:50.664" caom2:metaChecksum="md5:3185c2e0578502c6c0c7a83cd0d3ec5c" caom2:accMetaChecksum="md5:065a17468d01ba624b52b79554f4e67d">
<caom2:name>0</caom2:name>
<caom2:chunks>
<caom2:chunk caom2:id="be479984-1de4-442a-9ab1-4991df1d47a4" caom2:lastModified="2024-04-02T18:04:50.664" caom2:maxLastModified="2024-04-02T18:04:50.664" caom2:metaChecksum="md5:9db4c3e81b2265c0ddec3f39578c47a5" caom2:accMetaChecksum="md5:3c1d6b7814dd12861c5a4eb1b24d6c2d" caom2:metaProducer="wallaby2caom2/0.3.1">
<caom2:naxis>2</caom2:naxis>
<caom2:positionAxis1>1</caom2:positionAxis1>
<caom2:positionAxis2>2</caom2:positionAxis2>
<caom2:position>
<caom2:axis>
<caom2:axis1>
<caom2:ctype>RA---SIN</caom2:ctype>
<caom2:cunit>deg</caom2:cunit>
</caom2:axis1>
<caom2:axis2>
<caom2:ctype>DEC--SIN</caom2:ctype>
<caom2:cunit>deg</caom2:cunit>
</caom2:axis2>
<caom2:function>
<caom2:dimension>
<caom2:naxis1>36</caom2:naxis1>
<caom2:naxis2>37</caom2:naxis2>
</caom2:dimension>
<caom2:refCoord>
<caom2:coord1>
<caom2:pix>-377.0</caom2:pix>
<caom2:val>153.949308333</caom2:val>
</caom2:coord1>
<caom2:coord2>
<caom2:pix>1104.0</caom2:pix>
<caom2:val>-27.3743805556</caom2:val>
</caom2:coord2>
</caom2:refCoord>
<caom2:cd11>-0.00166666666667</caom2:cd11>
<caom2:cd12>0.0</caom2:cd12>
<caom2:cd21>0.0</caom2:cd21>
<caom2:cd22>0.00166666666667</caom2:cd22>
</caom2:function>
</caom2:axis>
<caom2:coordsys>FK5</caom2:coordsys>
<caom2:equinox>2000.0</caom2:equinox>
<caom2:resolution>30.087508608546006</caom2:resolution>
</caom2:position>
</caom2:chunk>
</caom2:chunks>
</caom2:part>
</caom2:parts>
</caom2:artifact>
</caom2:artifacts>
</caom2:plane>
</caom2:planes>
</caom2:Observation>
Loading