From a673c58f98358c2def511e517dfe94cba076a16f Mon Sep 17 00:00:00 2001 From: Jordan Eagle <43138823+jleagle94@users.noreply.github.com> Date: Thu, 7 Aug 2025 08:55:05 -0400 Subject: [PATCH 1/4] Update heasarc.rst Adding relevant information regarding issue #3387 --- docs/heasarc/heasarc.rst | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/docs/heasarc/heasarc.rst b/docs/heasarc/heasarc.rst index aad7956939..94820e17b0 100644 --- a/docs/heasarc/heasarc.rst +++ b/docs/heasarc/heasarc.rst @@ -268,7 +268,23 @@ for ``'box'`` and: >>> Heasarc.query_region(catalog='xmmmaster', spatial='polygon', polygon=[(226.2,10.6),(225.9,10.5),(225.8,10.2),(226.2,10.3)]) -for ``'polygon'``. +for ``'polygon'``. For ``'all-sky'``: + +..doctest-skip:: + + >>> Heasarc.query_region(pos, spatial='all-sky', catalog='csc', maxrec=None) + +though you may find that maxrec has a hard limit of 1e5 regardless of how you set it. See `issue #3387 tracker `_. + +In this case one can do instead: + +..doctest-skip:: + + >>> # get a comma-separated list of the default columns in csc. + >>> columns = ', '.join(Heasarc._get_default_columns('csc')) + >>> # construct a query for all entries; use TOP with a large number greater than the server's 1e5 LIMIT + >>> query = f'SELECT TOP 9999999 {columns} FROM csc' + >>> Heasarc.query_tap(query).to_table() List Catalog Columns -------------------- From 51bbb9068faf457b0fd5b75431216e8e64649c3a Mon Sep 17 00:00:00 2001 From: Jordan Eagle <43138823+jleagle94@users.noreply.github.com> Date: Thu, 7 Aug 2025 09:19:42 -0400 Subject: [PATCH 2/4] Update CHANGES.rst changelog to include heasarc.rst updates --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index e571f02403..e326de13dd 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -52,6 +52,7 @@ heasarc - Heasarc.locate_data returns empty rows with an error in the error_message column if there are no data associated with that row rather than filtering it out. [#3275] - Heasarc.locate_data changed to use POST request instead of GET to accomodate large requests. [#3356] +- maxrec in Heasarc.query_region maxes out on 1e5 regardless of how it is set [#3387]. Use instead an ADQL query using the TOP parameter set to something larger than 1e5. imcce ^^^^^ From 00f339a3eaa03244259c03b5582b51d92c82acf7 Mon Sep 17 00:00:00 2001 From: Jordan Eagle <43138823+jleagle94@users.noreply.github.com> Date: Thu, 7 Aug 2025 09:20:32 -0400 Subject: [PATCH 3/4] Update heasarc.rst minor text edits --- docs/heasarc/heasarc.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/heasarc/heasarc.rst b/docs/heasarc/heasarc.rst index 94820e17b0..9ba10f2bc2 100644 --- a/docs/heasarc/heasarc.rst +++ b/docs/heasarc/heasarc.rst @@ -270,7 +270,7 @@ for ``'box'`` and: for ``'polygon'``. For ``'all-sky'``: -..doctest-skip:: +.. doctest-skip:: >>> Heasarc.query_region(pos, spatial='all-sky', catalog='csc', maxrec=None) @@ -278,7 +278,7 @@ though you may find that maxrec has a hard limit of 1e5 regardless of how you se In this case one can do instead: -..doctest-skip:: +.. doctest-skip:: >>> # get a comma-separated list of the default columns in csc. >>> columns = ', '.join(Heasarc._get_default_columns('csc')) From 17ea5e600a5c3d78e2f31b35ba5ed33129da880f Mon Sep 17 00:00:00 2001 From: Jordan Eagle <43138823+jleagle94@users.noreply.github.com> Date: Thu, 7 Aug 2025 09:23:48 -0400 Subject: [PATCH 4/4] Update CHANGES.rst --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index e326de13dd..00e88042b5 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -52,7 +52,7 @@ heasarc - Heasarc.locate_data returns empty rows with an error in the error_message column if there are no data associated with that row rather than filtering it out. [#3275] - Heasarc.locate_data changed to use POST request instead of GET to accomodate large requests. [#3356] -- maxrec in Heasarc.query_region maxes out on 1e5 regardless of how it is set [#3387]. Use instead an ADQL query using the TOP parameter set to something larger than 1e5. +- maxrec in Heasarc.query_region maxes out on 1e5 regardless of how it is set. Use instead an ADQL query using the TOP parameter set to something larger than 1e5. [#3390] imcce ^^^^^