psat-server-web 0.7.0__tar.gz → 0.7.1__tar.gz

{psat_server_web-0.7.0/psat_server_web.egg-info → psat_server_web-0.7.1}/PKG-INFO

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

psat_server_web-0.7.1/psat_server_web/__version__.py

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

{psat_server_web-0.7.0 → psat_server_web-0.7.1}/psat_server_web/ps1/generate_mod_wsgi_apachectl.sh

@@ -37,6 +37,11 @@
 # export DJANGO_ATLAS_TOKEN=''
 # export DJANGO_ATLAS_BASE_URL=''
 
+# DJANGO_PANSTARRS_DESCRIPTIONS='Comma,Separated,Descriptions'
+# DJANGO_PANSTARRS_BASE_URLS='https://baseurl1.com/,https://baseurl2.com/,https://baseurl3.com/'
+# DJANGO_PANSTARRS_TOKENS='aaa','bbb','ccc'
+
+
 
 if [ -f ~/.config/django/django_env_$CONDA_DEFAULT_ENV ]; then chmod 600 ~/.config/django/django_env_$CONDA_DEFAULT_ENV; source ~/.config/django/django_env_$CONDA_DEFAULT_ENV; fi
 

{psat_server_web-0.7.0 → psat_server_web-0.7.1}/psat_server_web/ps1/psdb/settings.py

@@ -107,6 +107,11 @@ NAMESERVER_MULTIPLIER = os.environ.get('DJANGO_NAMESERVER_MULTIPLIER')
 ATLAS_TOKEN = os.environ.get('DJANGO_ATLAS_TOKEN')
 ATLAS_BASE_URL = os.environ.get('DJANGO_ATLAS_BASE_URL')
 
+# Pan-STARRS API. Info is comma separated. We will loop through the cone searches.
+PANSTARRS_DESCRIPTIONS = [s for s in os.environ.get('DJANGO_PANSTARRS_DESCRIPTIONS', '').split(',') if s]
+PANSTARRS_BASE_URLS = [s for s in os.environ.get('DJANGO_PANSTARRS_BASE_URLS', '').split(',') if s]
+PANSTARRS_TOKENS = [s for s in os.environ.get('DJANGO_PANSTARRS_TOKENS', '').split(',') if s]
+
 DISPLAY_AGNS = os.environ.get('DJANGO_DISPLAY_AGNS') in ('true', '1', 't', 'True', 'TRUE', 'T')
 
 # 2021-05-06 KWS New settings means that if we edit a static file we MUST rerun the collectstatic

{psat_server_web-0.7.0 → psat_server_web-0.7.1}/psat_server_web/ps1/psdb/views.py

@@ -848,6 +848,27 @@ def candidateflot(request, tcs_transient_objects_id):
         sys.stderr.write('%s\n' % str(e))
 
 
+    panstarrsCrossmatches = []
+    if len(settings.PANSTARRS_TOKENS) > 0 and len(settings.PANSTARRS_TOKENS) == len(settings.PANSTARRS_BASE_URLS) and len(settings.PANSTARRS_TOKENS) == len(settings.PANSTARRS_DESCRIPTIONS):
+        for i in range(len(settings.PANSTARRS_TOKENS)):
+            P = psat(settings.PANSTARRS_TOKENS[i], endpoint = settings.PANSTARRS_BASE_URLS[i] + '/api/', timeout = 2.0)
+            try:
+                pc = P.cone(avgCoords['ra'], avgCoords['dec'], 1.0, requestType='all')
+                if len(pc) > 0:
+                    panstarrsCrossmatches.append({'description': settings.PANSTARRS_DESCRIPTIONS[i], 'crossmatches': pc, 'baseurl': settings.PANSTARRS_BASE_URLS[i]})
+            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))
+
+
     coneSearchRadius = 4.0   # arcsec
 
     # Grab all objects within 3 arcsec of this one.
@@ -948,7 +969,7 @@ def candidateflot(request, tcs_transient_objects_id):
     # 2011-04-04 KWS Add the user defined list to the objects passed to the web page.
     # 2013-10-24 KWS Added context_instance=RequestContext(request) to the render_to_response call.
     #                If not included, the specified template won't understand STATIC_URL.
-    return render(request, 'psdb/candidate_plotly.html',{'transient' : transient, 'table' : table, 'images' : transient_images, 'form' : form, 'crossmatches' : crossmatches, 'userList': userListQuerySet, 'cfaMatch': cfaMatch, 'conesearchresults': xmList, 'avg_coords': avgCoords, 'lcdata': lcData, 'lclimits': lcLimits, 'lcdataforced': lcDataForced, 'lcdataforcedflux': lcDataForcedFlux, 'lcdataforcedinput': lcDataForcedInput, 'lcdataforcedfluxinput': lcDataForcedFluxInput, 'colourdata': colourData, 'colourplotlimits': colourPlotLimits, 'colourdataforced': colourDataForced, 'colourdataforcedInput': colourDataForcedInput, 'recurrencedata': recurrenceData, 'conesearchold': oldDBXmList, 'olddburl': oldDBURL, 'externalXMs': externalXMs, 'tnsXMs': tnsXMs, 'public': public, 'form_searchobject': formSearchObject, 'dbName': dbName, 'finderImages': finderImages, 'processingStatus': processingStatus, 'galactic': galactic, 'comments': existingComments, 'sc': sc, 'gw': gw, 'citizens': z, 'sx': sx, 'lasairZTFCrossmatches': lasairZTFCrossmatches, 'atlasCrossmatches': atlasCrossmatches, 'atlasBaseURL': settings.ATLAS_BASE_URL, 'displayagns': settings.DISPLAY_AGNS})
+    return render(request, 'psdb/candidate_plotly.html',{'transient' : transient, 'table' : table, 'images' : transient_images, 'form' : form, 'crossmatches' : crossmatches, 'userList': userListQuerySet, 'cfaMatch': cfaMatch, 'conesearchresults': xmList, 'avg_coords': avgCoords, 'lcdata': lcData, 'lclimits': lcLimits, 'lcdataforced': lcDataForced, 'lcdataforcedflux': lcDataForcedFlux, 'lcdataforcedinput': lcDataForcedInput, 'lcdataforcedfluxinput': lcDataForcedFluxInput, 'colourdata': colourData, 'colourplotlimits': colourPlotLimits, 'colourdataforced': colourDataForced, 'colourdataforcedInput': colourDataForcedInput, 'recurrencedata': recurrenceData, 'conesearchold': oldDBXmList, 'olddburl': oldDBURL, 'externalXMs': externalXMs, 'tnsXMs': tnsXMs, 'public': public, 'form_searchobject': formSearchObject, 'dbName': dbName, 'finderImages': finderImages, 'processingStatus': processingStatus, 'galactic': galactic, 'comments': existingComments, 'sc': sc, 'gw': gw, 'citizens': z, 'sx': sx, 'lasairZTFCrossmatches': lasairZTFCrossmatches, 'atlasCrossmatches': atlasCrossmatches, 'atlasBaseURL': settings.ATLAS_BASE_URL, 'displayagns': settings.DISPLAY_AGNS, 'panstarrsCrossmatches': panstarrsCrossmatches})
 
 
 

{psat_server_web-0.7.0 → psat_server_web-0.7.1}/psat_server_web/ps1/templates/psdb/candidate_plotly.html

@@ -538,6 +538,27 @@ jscolourlabelsglobal["#flot-colourplot-forced"] = jscolourlabelsforced;
         {% endfor %}
         {% endif %}
 
+        {% if panstarrsCrossmatches %}
+        {% for p in panstarrsCrossmatches %}
+
+        <div class="col-lg-12 col-md-12 col-sm-12">
+          <span class="parameter-label">{{ p.description }} Crossmatches: </span>
+        </div>
+
+        {% for row in p.crossmatches %}
+        <div class="col-lg-12 col-md-12 col-sm-12">
+          <h3><a href="{{ p.baseurl }}/psdb/candidate/{{ row.object }}/">{% if row.objectname %}{{ row.objectname }}{% else %}Pan-STARRS object{% endif %}</a></h3>
+        </div>
+
+        <div class="col-lg-12 col-md-12 col-sm-12">
+          <span class="parameter-value">Offset = {{ row.separation|floatformat:"2" }}"</span>
+        </div>
+        {% endfor %}
+
+        {% endfor %}
+        {% endif %}
+
+
         {% if tnsXMs %}
         <div class="col-lg-12 col-md-12 col-sm-12">
           <span class="parameter-label">TNS Crossmatch: </span>

psat_server_web-0.7.1/psat_server_web/schema/tcs_cat_ps_tessellation.sql

@@ -0,0 +1,17 @@
+drop table if exists `tcs_cat_ps_tessellation`;
+
+create table `tcs_cat_ps_tessellation` (
+`id` int unsigned not null auto_increment,
+`skycell` char(40) not null,
+`ra` double not null,
+`dec` double not null,
+`htm10ID` int unsigned not null,
+`htm13ID` int unsigned not null,
+`htm16ID` bigint(20) unsigned not null,
+PRIMARY KEY `idx_id` (`id`),
+UNIQUE KEY `idx_name` (`skycell`),
+KEY `idx_htm10ID` (`htm10ID`),
+KEY `idx_htm13ID` (`htm13ID`),
+KEY `idx_htm16ID` (`htm16ID`),
+UNIQUE KEY `idx_ra_dec` (`ra`,`dec`)
+) ENGINE=MyISAM;

{psat_server_web-0.7.0 → psat_server_web-0.7.1/psat_server_web.egg-info}/PKG-INFO

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

{psat_server_web-0.7.0 → psat_server_web-0.7.1}/psat_server_web.egg-info/SOURCES.txt

@@ -456,6 +456,7 @@ psat_server_web/schema/tcs_cat_kepler_k2.sql
 psat_server_web/schema/tcs_cat_kepler_k2_pixels.sql
 psat_server_web/schema/tcs_cat_ps1_medium_deep_ref.sql
 psat_server_web/schema/tcs_cat_ps1_ubercal_stars.sql
+psat_server_web/schema/tcs_cat_ps_tessellation.sql
 psat_server_web/schema/tcs_cat_satellites.sql
 psat_server_web/schema/tcs_catalogue_tables.sql
 psat_server_web/schema/tcs_cfa_detections.sql

psat_server_web-0.7.0/psat_server_web/__version__.py

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