psat-server-web 0.4.0__tar.gz → 0.4.1__tar.gz

{psat_server_web-0.4.0/psat_server_web.egg-info → psat_server_web-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psat-server-web
-Version: 0.4.0
+Version: 0.4.1
 Summary: Pan-STARRS and ATLAS web interface.
 Home-page: https://github.com/genghisken/psat-server-web
 Author: genghisken

psat_server_web-0.4.1/psat_server_web/__version__.py

@@ -0,0 +1 @@
+__version__ = '0.4.1'

{psat_server_web-0.4.0 → psat_server_web-0.4.1}/psat_server_web/atlas/atlas/views.py

@@ -1148,57 +1148,8 @@ def candidateddc(request, atlas_diff_objects_id, template_name):
     from django.db import connection
     import sys
 
-    # 2021-10-21 KWS Use the Lasair API to do a cone search so we can check for nearby ZTF objects
-    from lasair import LasairError, lasair_client as lasair
-
     transient = get_object_or_404(AtlasDiffObjects, pk=atlas_diff_objects_id)
 
-    token = settings.LASAIR_TOKEN
-    # 2022-11-16 KWS Added a new timeout parameter, now available from Lasair client
-    #                version v0.0.5+. This should help if Lasair goes offline for any
-    #                reason. But extra (Requests)ConnectionError catch needed.
-    L = lasair(token, endpoint = 'https://lasair-ztf.lsst.ac.uk/api', timeout = 2.0)
-
-    lasairZTFCrossmatches = None
-
-    # If Lasair connectivity problems arise, comment out the following 4 lines.
-    try:
-        lasairZTFCrossmatches = L.cone(transient.ra, transient.dec, 2.0, requestType='all')
-    except RequestsConnectionError as e:
-        # If the API URL is incorrect or times out we will get a connection error.
-        sys.stderr.write('Lasair API Connection Error\n')
-        sys.stderr.write('%s\n' % str(e))
-    except RequestsConnectionTimeoutError as e:
-        # If the API times out, we will get a timeout error.
-        sys.stderr.write('Lasair API Timeout Error\n')
-        sys.stderr.write('%s\n' % str(e))
-    except LasairError as e:
-        sys.stderr.write('Lasair Error\n')
-        sys.stderr.write('%s\n' % str(e))
-        
-    # 2024-10-15 KWS Talk to the ATLAS API. Are there any ATLAS objects nearby?
-    sys.path.append('../../common')
-    from psat_api_client import PSATAPIError, psat_client as psat
-    
-    # 2022-11-16 KWS Added a new timeout parameter, now available from Lasair client
-    #                version v0.0.5+. This should help if Lasair goes offline for any
-    #                reason. But extra (Requests)ConnectionError catch needed.
-    P = psat(settings.PANSTARRS_TOKEN, endpoint = settings.PANSTARRS_BASE_URL + '/api/', timeout = 2.0)
-
-    panstarrsCrossmatches = None
-    try:           
-        panstarrsCrossmatches = P.cone(transient.ra, transient.dec, 2.0, requestType='all')
-    except RequestsConnectionError as e:
-        # If the API URL is incorrect or times out we will get a connection error.
-        sys.stderr.write('Pan-STARRS API Connection Error\n')
-        sys.stderr.write('%s\n' % str(e))
-    except RequestsConnectionTimeoutError as e:
-        # If the API times out, we will get a timeout error.
-        sys.stderr.write('Pan-STARRS API Timeout Error\n')
-        sys.stderr.write('%s\n' % str(e))
-    except PSATAPIError as e:
-        sys.stderr.write('Pan-STARRS Error\n')
-        sys.stderr.write('%s\n' % str(e))
 
     # 2015-11-17 KWS Get the processing status. If it's not 2, what is it?
     processingStatusData = TcsProcessingStatus.objects.all().exclude(status = 2)
@@ -1341,6 +1292,54 @@ def candidateddc(request, atlas_diff_objects_id, template_name):
     if detectionList:
         listId = detectionList.id
 
+    # 2024-10-18 KWS Moved to down below where the average coordinates are calculated so we can use them.
+    # 2021-10-21 KWS Use the Lasair API to do a cone search so we can check for nearby ZTF objects
+    from lasair import LasairError, lasair_client as lasair
+
+    token = settings.LASAIR_TOKEN
+    # 2022-11-16 KWS Added a new timeout parameter, now available from Lasair client
+    #                version v0.0.5+. This should help if Lasair goes offline for any
+    #                reason. But extra (Requests)ConnectionError catch needed.
+    L = lasair(token, endpoint = 'https://lasair-ztf.lsst.ac.uk/api', timeout = 2.0)
+
+    lasairZTFCrossmatches = None
+
+    # If Lasair connectivity problems arise, comment out the following 4 lines.
+    try:
+        lasairZTFCrossmatches = L.cone(avgCoords['ra'], avgCoords['dec'], 2.0, requestType='all')
+    except RequestsConnectionError as e:
+        # If the API URL is incorrect or times out we will get a connection error.
+        sys.stderr.write('Lasair API Connection Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except RequestsConnectionTimeoutError as e:
+        # If the API times out, we will get a timeout error.
+        sys.stderr.write('Lasair API Timeout Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except LasairError as e:
+        sys.stderr.write('Lasair Error\n')
+        sys.stderr.write('%s\n' % str(e))
+        
+    # 2024-10-15 KWS Talk to the ATLAS API. Are there any ATLAS objects nearby?
+    sys.path.append('../../common')
+    from psat_api_client import PSATAPIError, psat_client as psat
+    
+    P = psat(settings.PANSTARRS_TOKEN, endpoint = settings.PANSTARRS_BASE_URL + '/api/', timeout = 2.0)
+
+    panstarrsCrossmatches = None
+    try:           
+        panstarrsCrossmatches = P.cone(avgCoords['ra'], avgCoords['dec'], 1.0, requestType='all')
+    except RequestsConnectionError as e:
+        # If the API URL is incorrect or times out we will get a connection error.
+        sys.stderr.write('Pan-STARRS API Connection Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except RequestsConnectionTimeoutError as e:
+        # If the API times out, we will get a timeout error.
+        sys.stderr.write('Pan-STARRS API Timeout Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except PSATAPIError as e:
+        sys.stderr.write('Pan-STARRS Error\n')
+        sys.stderr.write('%s\n' % str(e))
+
     # Dummy form initialisation
     formSearchObject = SearchForObjectForm()
     form = PromoteAndCommentsForm()

{psat_server_web-0.4.0 → psat_server_web-0.4.1}/psat_server_web/atlas/templates/atlas/candidate_plotly.html

@@ -470,7 +470,7 @@ jscolourlabelsglobal["#flot-colourplot-forced"] = jscolourlabelsforced;
 
         {% for row in panstarrsCrossmatches %}
         <div class="col-lg-12 col-md-12 col-sm-12">
-          <h3><a href="{{ panstarrsBaseURL }}/psdb/candidate/{{ row.object }}/">{% if row.objectname %}{{ row.objectname }}{% else %}{{ row.object }}{% endif %}</a></h3>
+          <h3><a href="{{ panstarrsBaseURL }}/psdb/candidate/{{ row.object }}/">{% if row.objectname %}{{ row.objectname }}{% else %}PS Object{% endif %}</a></h3>
         </div>
 
         {% if row.separation %}

{psat_server_web-0.4.0 → psat_server_web-0.4.1}/psat_server_web/ps1/psdb/views.py

@@ -376,58 +376,8 @@ def candidateflot(request, tcs_transient_objects_id):
     #                the short term.  May consider doing it longer term.
     from django.db import connection
 
-    # 2021-10-21 KWS Use the Lasair API to do a cone search so we can check for nearby ZTF objects
-    from lasair import LasairError, lasair_client as lasair
-
     transient = get_object_or_404(TcsTransientObjects, pk=tcs_transient_objects_id)
 
-    token = settings.LASAIR_TOKEN
-    # 2022-11-16 KWS Added a new timeout parameter, now available from Lasair client
-    #                version v0.0.5+. This should help if Lasair goes offline for any
-    #                reason. But extra (Requests)ConnectionError catch needed.
-    L = lasair(token, endpoint = 'https://lasair-ztf.lsst.ac.uk/api', timeout = 2.0)
-
-    lasairZTFCrossmatches = None
-    try:
-        lasairZTFCrossmatches = L.cone(transient.ra_psf, transient.dec_psf, 2.0, requestType='all')
-    except RequestsConnectionError as e:
-        # If the API URL is incorrect or times out we will get a connection error.
-        sys.stderr.write('Lasair API Connection Error\n')
-        sys.stderr.write('%s\n' % str(e))
-    except RequestsConnectionTimeoutError as e:
-        # If the API times out, we will get a timeout error.
-        sys.stderr.write('Lasair API Timeout Error\n')
-        sys.stderr.write('%s\n' % str(e))
-    except LasairError as e:
-        sys.stderr.write('Lasair Error\n')
-        sys.stderr.write('%s\n' % str(e))
-        
-
-    # 2024-10-15 KWS Talk to the ATLAS API. Are there any ATLAS objects nearby?
-    sys.path.append('../../common')
-    from psat_api_client import PSATAPIError, psat_client as psat
-
-    # 2022-11-16 KWS Added a new timeout parameter, now available from Lasair client
-    #                version v0.0.5+. This should help if Lasair goes offline for any
-    #                reason. But extra (Requests)ConnectionError catch needed.
-    A = psat(settings.ATLAS_TOKEN, endpoint = settings.ATLAS_BASE_URL + '/api/', timeout = 2.0)
-
-    atlasCrossmatches = None
-    try:
-        atlasCrossmatches = A.cone(transient.ra_psf, transient.dec_psf, 2.0, requestType='all')
-    except RequestsConnectionError as e:
-        # If the API URL is incorrect or times out we will get a connection error.
-        sys.stderr.write('ATLAS API Connection Error\n')
-        sys.stderr.write('%s\n' % str(e))
-    except RequestsConnectionTimeoutError as e:
-        # If the API times out, we will get a timeout error.
-        sys.stderr.write('ATLAS API Timeout Error\n')
-        sys.stderr.write('%s\n' % str(e))
-    except PSATAPIError as e:
-        sys.stderr.write('ATLAS Error\n')
-        sys.stderr.write('%s\n' % str(e))
-
-
     # 2015-11-17 KWS Get the processing status. If it's not 2, what is it?
     processingStatusData = TcsProcessingStatus.objects.all().exclude(status = 2)
     processingStatus = None
@@ -836,6 +786,53 @@ def candidateflot(request, tcs_transient_objects_id):
 
     galactic = transform([avgCoords['ra'], avgCoords['dec']], J2000toGalactic)
 
+    # 2021-10-21 KWS Use the Lasair API to do a cone search so we can check for nearby ZTF objects
+    from lasair import LasairError, lasair_client as lasair
+
+    # 2024-10-18 KWS Moved the code down to after the average RA and Dec are calculated
+    #                so we don't need to calculate it twice.
+    token = settings.LASAIR_TOKEN
+    # 2022-11-16 KWS Added a new timeout parameter, now available from Lasair client
+    #                version v0.0.5+. This should help if Lasair goes offline for any
+    #                reason. But extra (Requests)ConnectionError catch needed.
+    L = lasair(token, endpoint = 'https://lasair-ztf.lsst.ac.uk/api', timeout = 2.0)
+
+    lasairZTFCrossmatches = None
+    try:
+        lasairZTFCrossmatches = L.cone(avgCoords['ra'], avgCoords['dec'], 2.0, requestType='all')
+    except RequestsConnectionError as e:
+        # If the API URL is incorrect or times out we will get a connection error.
+        sys.stderr.write('Lasair API Connection Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except RequestsConnectionTimeoutError as e:
+        # If the API times out, we will get a timeout error.
+        sys.stderr.write('Lasair API Timeout Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except LasairError as e:
+        sys.stderr.write('Lasair Error\n')
+        sys.stderr.write('%s\n' % str(e))
+        
+    # 2024-10-15 KWS Talk to the ATLAS API. Are there any ATLAS objects nearby?
+    sys.path.append('../../common')
+    from psat_api_client import PSATAPIError, psat_client as psat
+
+    A = psat(settings.ATLAS_TOKEN, endpoint = settings.ATLAS_BASE_URL + '/api/', timeout = 2.0)
+
+    atlasCrossmatches = None
+    try:
+        atlasCrossmatches = A.cone(avgCoords['ra'], avgCoords['dec'], 1.0, requestType='all')
+    except RequestsConnectionError as e:
+        # If the API URL is incorrect or times out we will get a connection error.
+        sys.stderr.write('ATLAS API Connection Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except RequestsConnectionTimeoutError as e:
+        # If the API times out, we will get a timeout error.
+        sys.stderr.write('ATLAS API Timeout Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except PSATAPIError as e:
+        sys.stderr.write('ATLAS Error\n')
+        sys.stderr.write('%s\n' % str(e))
+
 
     coneSearchRadius = 4.0   # arcsec
 

{psat_server_web-0.4.0 → psat_server_web-0.4.1}/psat_server_web/ps1/templates/psdb/candidate_plotly.html

@@ -481,7 +481,7 @@ jscolourlabelsglobal["#flot-colourplot-forced"] = jscolourlabelsforced;
 
         {% for row in atlasCrossmatches %}
         <div class="col-lg-12 col-md-12 col-sm-12">
-          <h3><a href="{{ atlasBaseURL }}/candidate/{{ row.object }}/">{% if row.objectname %}{{ row.objectname }}{% else %}{{ row.object }}{% endif %}</a></h3>
+          <h3><a href="{{ atlasBaseURL }}/candidate/{{ row.object }}/">{% if row.objectname %}{{ row.objectname }}{% else %}ATLAS object{% endif %}</a></h3>
         </div>
 
         {% if row.separation %}

{psat_server_web-0.4.0 → psat_server_web-0.4.1/psat_server_web.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psat-server-web
-Version: 0.4.0
+Version: 0.4.1
 Summary: Pan-STARRS and ATLAS web interface.
 Home-page: https://github.com/genghisken/psat-server-web
 Author: genghisken

psat_server_web-0.4.0/psat_server_web/__version__.py

@@ -1 +0,0 @@
-__version__ = '0.4.0'