From 011c08cbbc7b9705a0d87b65373f2f17b25dec67 Mon Sep 17 00:00:00 2001 From: David Turner Date: Wed, 1 May 2024 10:25:53 -0400 Subject: [PATCH] Jessica (@jessicapilling) noticed the online table for XMM evidently changed the 'count' header to 'COUNT' - means the XMM class just won't work until I change it back. This should resolve issue #278 Signed-off-by: David Turner --- daxa/mission/xmm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daxa/mission/xmm.py b/daxa/mission/xmm.py index 1b2396f3..86737b22 100644 --- a/daxa/mission/xmm.py +++ b/daxa/mission/xmm.py @@ -1,5 +1,5 @@ # This code is a part of the Democratising Archival X-ray Astronomy (DAXA) module. -# Last modified by David J Turner (turne540@msu.edu) 24/04/2024, 13:58. Copyright (c) The Contributors +# Last modified by David J Turner (turne540@msu.edu) 01/05/2024, 10:25. Copyright (c) The Contributors import os.path import tarfile from datetime import datetime @@ -185,7 +185,7 @@ def _fetch_obs_info(self): # I'll explain in a second count_tab = AQXMMNewton.query_xsa_tap('select count(observation_id) from xsa.v_all_observations') # Then I round up to the nearest 1000, probably unnecessary but oh well - num_obs = np.ceil(count_tab['count'].tolist()[0] / 1000).astype(int) * 1000 + num_obs = np.ceil(count_tab['COUNT'].tolist()[0] / 1000).astype(int) * 1000 # Now I have to be a bit cheesy - If I used select * (which is what I would normally do in an SQL-derived # language to grab every row) it actually only returns the top 2000. I think that * is replaced with TOP 2000 # before the query is sent to the server. However if I specify a TOP N, where N is greater than 2000, then it