psat-server-web 0.3.15__tar.gz → 0.3.16__tar.gz

{psat-server-web-0.3.15/psat_server_web.egg-info → psat-server-web-0.3.16}/PKG-INFO

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

psat-server-web-0.3.16/psat_server_web/__version__.py

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

{psat-server-web-0.3.15 → psat-server-web-0.3.16}/psat_server_web/ps1/psdb/helpers.py

@@ -4,6 +4,8 @@
 
 from psdb.models import TcsTransientObjects
 from psdb.models import TcsImages, TcsLatestObjectStats
+from psdb.models import TcsTransientReobservations
+from psdb.lightcurvequeries import getRecurrenceDataForPlotting
 from gkutils.commonutils import getObjectNamePortion, getCoordsAndSearchRadius, coneSearchHTM, FULL, Struct, ra_to_sex, dec_to_sex, CAT_ID_RA_DEC_COLS
 from django.db.models import Q    # Need Q objects for OR query
 import sys
@@ -84,7 +86,7 @@ def processSearchForm(searchText, getAssociatedData = False, getNonDets = False,
     return results
 
 
-def getNearbyObjectsForScatterPlot(candidate, ra, dec, coneSearchRadius = 8.0):
+def getNearbyObjectsForScatterPlot(candidate, ra, dec, coneSearchRadius = 4.0):
     """getNearbyObjectsForScatterPlot.
 
     Args:
@@ -136,8 +138,7 @@ def getNearbyObjectsForScatterPlot(candidate, ra, dec, coneSearchRadius = 8.0):
                 # Add the recurrence from the objects table!
                 xmRecurrences.append({"RA": xmra, "DEC": xmdec})
 
-
-                xmrecurrencePlotData, xmrecurrencePlotLabels, xmaverageObjectCoords, xmrmsScatter = getRecurrenceDataForPlotting(xmRecurrences, ra, dec, secRA = xmra, secDEC = xmdec, secId = xmid, secName = xmName, objectColour = 23)
+                xmrecurrencePlotData, xmrecurrencePlotLabels, xmaverageObjectCoords, xmrmsScatter = getRecurrenceDataForPlotting(candidate, ra, dec, secRA = xmra, secDEC = xmdec, secId = xmid, secName = xmName, objectColour = 23)
                 recurrencePlotData += xmrecurrencePlotData
                 recurrencePlotLabels += xmrecurrencePlotLabels
                 averageObjectCoords += xmaverageObjectCoords

{psat-server-web-0.3.15 → psat-server-web-0.3.16}/psat_server_web/ps1/psdb/lightcurvequeries.py

@@ -394,7 +394,7 @@ def getRecurrenceDataForPlotting(candidate, primRA, primDEC, secRA = None, secDE
         # Add an anchor tag so that we can click on the legend to go to the new object.
         # This should really be done inside the javascript itself, but it's hard to know
         # which label to add a tag to, hence it's done here.
-        objectName = '<a href="../' + str(secId) + '/">' + str(secName) + '</a>'
+        objectName = '<a href="../../candidate/' + str(secId) + '/">' + str(secName) + '</a>'
         meanCoordsLabel = 'mean coords'
         meanCoordsDisplay = False
     else:

{psat-server-web-0.3.15 → psat-server-web-0.3.16}/psat_server_web/ps1/templates/psdb/search_results_plotly.html

@@ -28,10 +28,10 @@ var jsrecurrencelimitsglobal = new Object();
 {% for row in subdata %}
 var jsrecurrencedata = new Array();
 var jsrecurrencelabels = new Array();
-var jsrecurrencelimits = { "xmin": -8.0,  // arcsec
-                           "xmax": 8.0,
-                           "ymin": -8.0,
-                           "ymax": 8.0 };
+var jsrecurrencelimits = { "xmin": -3.0,  // arcsec
+                           "xmax": 3.0,
+                           "ymin": -3.0,
+                           "ymax": 3.0 };
 
 {% for recurrencepoints in row.recurrenceData.0 %}
   jsrecurrencedata.push({{recurrencepoints}});

{psat-server-web-0.3.15 → psat-server-web-0.3.16/psat_server_web.egg-info}/PKG-INFO

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

psat-server-web-0.3.15/psat_server_web/__version__.py

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