Skip to content

Commit ac74469

Browse files
adamginsburgadamginsburg
committed
fix local tests: there is no longer any way to retrieve data from an
asdm. I don't feel like going through the hell of implementing a download button click....
1 parent a8c1831 commit ac74469

File tree

3 files changed

+455
-228
lines changed

3 files changed

+455
-228
lines changed

‎astroquery/alma/tests/data/ngc4945.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,64 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2">
33
<RESOURCE type="results">
44
<INFO name="QUERY_STATUS" value="OK" />
5+
<INFO name="QUERY" value="SELECT&#xA; distinct asa_science.project_code AS &quot;Project code&quot;,&#xA;asa_science.source_name AS &quot;Source name&quot;,&#xA;asa_science.ra AS &quot;RA&quot;,&#xA;asa_science.dec AS &quot;Dec&quot;,&#xA;asa_science.band AS &quot;Band&quot;,&#xA;asa_science.frequency_resolution AS &quot;Frequency resolution&quot;,&#xA;asa_science.int_time AS &quot;Integration&quot;,&#xA;to_char(dp_delivery_status.release_date, 'YYYY-MM-DD') AS &quot;Release date&quot;,&#xA;asa_science.frequency_support AS &quot;Frequency support&quot;,&#xA;asa_science.velocity_resolution AS &quot;Velocity resolution&quot;,&#xA;asa_science.pol_products AS &quot;Pol products&quot;,&#xA;to_char(asa_science.start_date, 'YYYY-MM-DD HH24:MI:SS') AS &quot;Observation date&quot;,&#xA;asa_project.pi_name AS &quot;PI name&quot;,&#xA;asa_science.pwv AS &quot;PWV&quot;,&#xA;asa_science.member_ouss_id as &quot;Member ous id&quot;,&#xA;asa_science.asdm_uid AS &quot;Asdm uid&quot;,&#xA;asa_project.title AS &quot;Project title&quot;,&#xA;asa_project.type AS &quot;Project type&quot;,&#xA;asa_science.scan_intent AS &quot;Scan intent&quot;&#xA; FROM ALMA.asa_science &#xA; inner join ALMA.aqua_execblock on asa_science.asdm_uid = aqua_execblock.execblockuid&#xA; inner join ALMA.asa_project on asa_science.project_code = asa_project.code&#xA; left outer join ALMA.dp_delivery_asdm_ous on asa_science.asdm_uid = dp_delivery_asdm_ous.asdm_uid&#xA; left outer join ALMA.dp_delivery_status on dp_delivery_asdm_ous.deliverable_name = dp_delivery_status.delivery_id&#xA;WHERE (1=1)&#xA; AND (aqua_execblock.qa0status = 'Pass' OR aqua_execblock.qa0status = 'SemiPass')&#xA; AND (dp_delivery_status.qa2_passed is null or dp_delivery_status.qa2_passed = 'Y')&#xA; AND lower(project_code) not like '%.csv'&#xA; AND ( DEC BETWEEN -50.4679 AND -48.4679&#xA; AND RA BETWEEN 194.82487587885976 AND 197.90244912114025&#xA; AND (asin(sqrt((-0.623549 - cx) * (-0.623549 - cx) + (-0.183091 - cy) * (-0.183091 - cy) + (-0.760042 - cz) * (-0.760042 - cz)) / 2.0) &lt; 0.008727))&#xA; AND (lower(ASA_SCIENCE.scan_intent) LIKE '%target%')&#xA; AND (dp_delivery_status.release_date &lt; to_date('2015-03-25', 'YYYY-mm-dd'))&#xA; AND (lower(ASA_SCIENCE.project_code) LIKE '2011.0.00121.s')&#xA; ORDER BY &quot;Release date&quot; asc" />
56
<TABLE>
6-
<FIELD name="Project code" ucd="meta.code" xtype="adql:VARCHAR" datatype="char" arraysize="16*">
7+
<FIELD name="Project code" datatype="char" ID="1251" ucd="meta.code" xtype="adql:VARCHAR" arraysize="16*">
78
<DESCRIPTION>Project code, in the form YYYY.NNNNN.C.AAA, where:</DESCRIPTION>
89
</FIELD>
9-
<FIELD name="Source name" utype="Observation.Target.name" ucd="meta.id;pos" xtype="adql:VARCHAR" datatype="char" arraysize="256*">
10+
<FIELD name="Source name" datatype="char" ID="1206" ucd="meta.id;pos" utype="Observation.Target.name" xtype="adql:VARCHAR" arraysize="256*">
1011
<DESCRIPTION>Name of the source as registered in the ASDM. Partial matches through wildcards (?, *), and boolean OR expressions ("|"), can be used.</DESCRIPTION>
1112
</FIELD>
12-
<FIELD name="RA" utype="Characterisation.SpatialAxis.Coverage.Location.coord.Position2D.Value2.C1" ucd="pos.eq.ra;meta.main" unit="deg" xtype="adql:DOUBLE" datatype="double">
13+
<FIELD name="RA" datatype="double" ID="1186" ucd="pos.eq.ra;meta.main" unit="deg" utype="Characterisation.SpatialAxis.Coverage.Location.coord.Position2D.Value2.C1" xtype="adql:DOUBLE">
1314
<DESCRIPTION>Right Ascension of the field pointing.</DESCRIPTION>
1415
</FIELD>
15-
<FIELD name="Dec" utype="Characterisation.SpatialAxis.Coverage.Location.coord.Position2D.Value2.C2" ucd="pos.eq.dec;meta.main" unit="deg" xtype="adql:DOUBLE" datatype="double">
16+
<FIELD name="Dec" datatype="double" ID="1187" ucd="pos.eq.dec;meta.main" unit="deg" utype="Characterisation.SpatialAxis.Coverage.Location.coord.Position2D.Value2.C2" xtype="adql:DOUBLE">
1617
<DESCRIPTION>Declination of the field pointing.</DESCRIPTION>
1718
</FIELD>
18-
<FIELD name="Band" ucd="meta.code;instr.bandpass" xtype="adql:INTEGER" datatype="int">
19+
<FIELD name="Band" datatype="int" ID="1223" ucd="meta.code;instr.bandpass" xtype="adql:INTEGER">
1920
<DESCRIPTION>ALMA receiver band.</DESCRIPTION>
2021
</FIELD>
21-
<FIELD name="Frequency resolution" utype="Char.SpectralAxis.Resolution.refval" ucd="spect.resolution" unit="kHz" xtype="adql:DOUBLE" datatype="double">
22+
<FIELD name="Frequency resolution" datatype="double" ID="1217" ucd="spect.resolution" unit="kHz" utype="Char.SpectralAxis.Resolution.refval" xtype="adql:DOUBLE">
2223
<DESCRIPTION>Estimated frequency resolution from all the spectral windows, using median values of channel widths.</DESCRIPTION>
2324
</FIELD>
24-
<FIELD name="Integration" utype="Char.TimeAxis.Coverage.Support.Extent" ucd="time.duration;obs.exposure" unit="s" xtype="adql:DOUBLE" datatype="double">
25+
<FIELD name="Integration" datatype="double" ID="1213" ucd="time.duration;obs.exposure" unit="s" utype="Char.TimeAxis.Coverage.Support.Extent" xtype="adql:DOUBLE">
2526
<DESCRIPTION>Aggregated integration time for the field in the ASDM.</DESCRIPTION>
2627
</FIELD>
27-
<FIELD name="Release date" ucd="time.release_date" xtype="adql:TIMESTAMP" datatype="char" arraysize="*">
28-
<DESCRIPTION>RELEASE_DATE</DESCRIPTION>
29-
</FIELD>
30-
<FIELD name="Frequency support" utype="Char.SpectralAxis.Coverage.Location.support" ucd="em.freq;obs;meta.main" unit="GHz" xtype="adql:VARCHAR" datatype="char" arraysize="2700*">
28+
<FIELD name="Release date" datatype="char" unit="" xtype="adql:VARCHAR" arraysize="*" />
29+
<FIELD name="Frequency support" datatype="char" ID="1216" ucd="em.freq;obs;meta.main" unit="GHz" utype="Char.SpectralAxis.Coverage.Location.support" xtype="adql:VARCHAR" arraysize="2700*">
3130
<DESCRIPTION>All frequency ranges used by the field</DESCRIPTION>
3231
</FIELD>
33-
<FIELD name="Velocity resolution" utype="Char.VelocityAxis.Resolution.refval" ucd="phys.veloc;spect.resolution" unit="m/s" xtype="adql:DOUBLE" datatype="double">
32+
<FIELD name="Velocity resolution" datatype="double" ID="1225" ucd="phys.veloc;spect.resolution" unit="m/s" utype="Char.VelocityAxis.Resolution.refval" xtype="adql:DOUBLE">
3433
<DESCRIPTION>Estimated velocity resolution from all the spectral windows, from frequency resolution.</DESCRIPTION>
3534
</FIELD>
36-
<FIELD name="Pol products" ucd="phys.polarization;meta.code" xtype="adql:VARCHAR" datatype="char" arraysize="64*">
35+
<FIELD name="Pol products" datatype="char" ID="1238" ucd="phys.polarization;meta.code" xtype="adql:VARCHAR" arraysize="64*">
3736
<DESCRIPTION>Polarisation products provided.</DESCRIPTION>
3837
</FIELD>
39-
<FIELD name="Observation date" unit="" xtype="adql:VARCHAR" datatype="char" arraysize="*" />
40-
<FIELD name="PI name" ucd="meta.id.PI" xtype="adql:VARCHAR" datatype="char" arraysize="256*">
38+
<FIELD name="Observation date" datatype="char" unit="" xtype="adql:VARCHAR" arraysize="*" />
39+
<FIELD name="PI name" datatype="char" ID="1260" ucd="meta.id.PI" xtype="adql:VARCHAR" arraysize="256*">
4140
<DESCRIPTION>case-insensitive partial match over the full PI name. Wildcards can be used</DESCRIPTION>
4241
</FIELD>
43-
<FIELD name="PWV" ucd="obs.atmos.extinction" unit="mm" xtype="adql:FLOAT" datatype="float">
42+
<FIELD name="PWV" datatype="float" ID="1240" ucd="obs.atmos.extinction" unit="mm" xtype="adql:FLOAT">
4443
<DESCRIPTION>Estimated precipitable water vapour from the XML_CALWVR_ENTITIES table.</DESCRIPTION>
4544
</FIELD>
46-
<FIELD name="Member ous id" ucd="meta.id;obs" xtype="adql:VARCHAR" datatype="char" arraysize="32*">
45+
<FIELD name="Member ous id" datatype="char" ID="1234" ucd="meta.id;obs" xtype="adql:VARCHAR" arraysize="32*">
4746
<DESCRIPTION>MEMBER_OUSS_ID generating this ASDM.</DESCRIPTION>
4847
</FIELD>
49-
<FIELD name="Asdm uid" ucd="meta.id" xtype="adql:VARCHAR" datatype="char" arraysize="32*">
48+
<FIELD name="Asdm uid" datatype="char" ID="1182" ucd="meta.id" xtype="adql:VARCHAR" arraysize="32*">
5049
<DESCRIPTION>UID of the ASDM containing this Field.</DESCRIPTION>
5150
</FIELD>
52-
<FIELD name="Project title" ucd="meta.title;obs.proposal" xtype="adql:VARCHAR" datatype="char" arraysize="256*">
51+
<FIELD name="Project title" datatype="char" ID="1263" ucd="meta.title;obs.proposal" xtype="adql:VARCHAR" arraysize="256*">
5352
<DESCRIPTION>Case-insensitive search over the project title</DESCRIPTION>
5453
</FIELD>
55-
<FIELD name="Project type" ucd="meta.code.class;obs.proposal" xtype="adql:VARCHAR" datatype="char" arraysize="16*">
54+
<FIELD name="Project type" datatype="char" ID="1264" ucd="meta.code.class;obs.proposal" xtype="adql:VARCHAR" arraysize="16*">
5655
<DESCRIPTION>Project type.</DESCRIPTION>
5756
</FIELD>
58-
<FIELD name="Scan intent" ucd="meta.code.class;obs" xtype="adql:VARCHAR" datatype="char" arraysize="256*">
57+
<FIELD name="Scan intent" datatype="char" ID="1254" ucd="meta.code.class;obs" xtype="adql:VARCHAR" arraysize="256*">
5958
<DESCRIPTION>Scan intent list for the observed field.</DESCRIPTION>
6059
</FIELD>
6160
<DATA>
62-
<TABLEDATA>
61+
<TABLEDATA>
6362
<TR>
6463
<TD>2011.0.00121.S</TD>
6564
<TD>NGC4945</TD>
@@ -68,7 +67,7 @@
6867
<TD>7</TD>
6968
<TD>976.5625</TD>
7069
<TD>245.89</TD>
71-
<TD>2013-08-21T08:18:00.000</TD>
70+
<TD>2013-08-21</TD>
7271
<TD>[319.69..321.56GHz,976.56kHz, XX YY]</TD>
7372
<TD>913.1147716968562</TD>
7473
<TD>XX YY</TD>
@@ -80,9 +79,10 @@
8079
<TD>Search for Submillimeter H2O Maser Towards Active Galactic Nuclei</TD>
8180
<TD>S</TD>
8281
<TD>TARGET</TD>
83-
</TR>
82+
</TR>
8483
</TABLEDATA>
8584
</DATA>
8685
</TABLE>
86+
<INFO name="QUERY_STATUS" value="OK" />
8787
</RESOURCE>
88-
</VOTABLE>
88+
</VOTABLE>

0 commit comments

Comments
 (0)