Merge pull request #204 from astrophpeter/djones-host-fixes

Djones host fixes

app/host/cutouts.py

@@ -108,19 +108,24 @@ def download_and_save_cutouts(
 
         if not cutout_object.exists():
             cutout_object = Cutout(name=cutout_name, filter=filter, transient=transient)
+            cutout_exists = False
         else:
             cutout_object = cutout_object[0]
+            cutout_exists = True
 
         fits = None
         if (
-            not file_exists and cutout_object.message != "No image found"
+            (not file_exists or not cutout_exists)
+            and cutout_object.message != "No image found"
         ) or not overwrite == "False":
-            fits, status, err = cutout(transient.sky_coord, filter, fov=fov)
-            if fits:
-                save_dir = f"{media_root}/{transient.name}/{filter.survey.name}/"
-                os.makedirs(save_dir, exist_ok=True)
-                path_to_fits = save_dir + f"{filter.name}.fits"
-                fits.writeto(path_to_fits, overwrite=True)
+            if not file_exists and cutout_object.message != "No image found":
+                fits, status, err = cutout(transient.sky_coord, filter, fov=fov)
+
+                if fits:
+                    save_dir = f"{media_root}/{transient.name}/{filter.survey.name}/"
+                    os.makedirs(save_dir, exist_ok=True)
+                    path_to_fits = save_dir + f"{filter.name}.fits"
+                    fits.writeto(path_to_fits, overwrite=True)
 
             # if there is data, save path to the file
             # otherwise record that we searched and couldn't find anything

app/host/ghost.py

@@ -46,15 +46,18 @@ def run_ghost(transient, output_dir=settings.GHOST_OUTPUT_ROOT):
         ascentMatch=False,
     )
 
-    # sometimes photo-zs randomly fail
-    try:
-        host_data = calc_photoz(
-            host_data,
-            dust_path=settings.GHOST_DUST_PATH,
-            model_path=settings.GHOST_PHOTOZ_PATH,
-        )
-    except Exception as err:
-        print(f"""Error running calc_photoz(): {err}""")
+    # photo-z only implemented for dec > -30
+    if transient_position.dec.deg > -30:
+        # still getting random photo-z bugs
+        # but this shouldn't be a show-stopper
+        try:
+            host_data = calc_photoz(
+                host_data,
+                dust_path=settings.GHOST_DUST_PATH,
+                model_path=settings.GHOST_PHOTOZ_PATH,
+            )
+        except Exception as e:
+            print("warning : photo-z step failed")
 
     # clean up after GHOST...
     # dir_list = glob.glob('transients_*/*/*')

app/host/host_utils.py

@@ -4,6 +4,7 @@
 import time
 import warnings
 from collections import namedtuple
+from xml.parsers.expat import ExpatError
 
 import astropy.units as u
 import extinction
@@ -23,6 +24,7 @@
 cosmo = FlatLambdaCDM(H0=70, Om0=0.315)
 
 from django.conf import settings
+from django.db.models import Q
 from dustmaps.sfd import SFDQuery
 from photutils.aperture import aperture_photometry
 from photutils.aperture import EllipticalAperture
@@ -396,7 +398,7 @@ def select_cutout_aperture(cutouts, choice=0):
     ### edited to allow initial offset
     filter_choice = filter_names[choice]
 
-    while not cutouts.filter(filter__name=filter_choice).exists():
+    while not cutouts.filter(filter__name=filter_choice).filter(~Q(fits="")).exists():
         choice += 1
         filter_choice = filter_names[choice]
 
@@ -533,7 +535,20 @@ def get_source_data(threshhold_sigma):
 def query_ned(position):
     """Get a Galaxy's redshift from ned if it is available."""
 
-    result_table = Ned.query_region(position, radius=1.0 * u.arcsec)
+    too_many_requests_count = 0
+    too_many_requests = True
+    while too_many_requests and too_many_requests_count < 5:
+        try:
+            result_table = Ned.query_region(position, radius=1.0 * u.arcsec)
+            too_many_requests = False
+        except ExpatError as e:
+            too_many_requests = True
+            print("too many requests!  going to sleep 60s...")
+            time.sleep(60)
+        too_many_requests_count += 1
+    if too_many_requests:
+        raise RuntimeError("too many requests to NED")
+
     result_table = result_table[result_table["Redshift"].mask == False]
 
     redshift = result_table["Redshift"].value

app/host/system_tasks.py

@@ -2,6 +2,7 @@
 import glob
 import shutil
 
+from dateutil import parser
 from django.conf import settings
 from django.db.models import Q
 from django.utils import timezone
@@ -15,6 +16,7 @@
 from .transient_name_server import get_daily_tns_staging_csv
 from .transient_name_server import get_tns_credentials
 from .transient_name_server import get_transients_from_tns
+from .transient_name_server import get_transients_from_tns_by_name
 from .transient_name_server import tns_staging_blast_transient
 from .transient_name_server import tns_staging_file_date_name
 from .transient_name_server import update_blast_transient
@@ -29,12 +31,18 @@ def run_process(self, interval_minutes=200):
         recent_transients = get_transients_from_tns(
             now - time_delta, tns_credentials=tns_credentials
         )
+
         print("TNS DONE")
         saved_transients = Transient.objects.all()
         count = 0
         for transient in recent_transients:
+            print(transient.name)
             try:
                 saved_transient = saved_transients.get(name__exact=transient.name)
+                if saved_transient.public_timestamp.replace(tzinfo=None) - parser.parse(
+                    transient.public_timestamp
+                ) == datetime.timedelta(0):
+                    continue
 
                 # if there was *not* a redshift before and there *is* one now
                 # then it would be safest to reprocess everything
@@ -47,9 +55,22 @@ def run_process(self, interval_minutes=200):
                 ### update info
                 new_transient_dict = transient.__dict__
                 if "host_id" in new_transient_dict.keys():
-                    del new_transient_dict["host_id"]
-                del new_transient_dict["_state"]
-                del new_transient_dict["id"]
+                    if saved_transient.host_id is not None:
+                        new_transient_dict["host_id"] = saved_transient.host_id
+                    else:
+                        del new_transient_dict["host_id"]
+
+                keys_to_del = [
+                    "_state",
+                    "id",
+                    "progress",
+                    "tasks_initialized",
+                    "photometric_class",
+                    "milkyway_dust_reddening",
+                    "processing_status",
+                ]
+                for k in keys_to_del:
+                    del new_transient_dict[k]
                 saved_transients.filter(name__exact=transient.name).update(
                     **new_transient_dict
                 )

app/host/views.py

@@ -298,13 +298,15 @@ def results(request, slug):
     else:
         form = ImageGetForm(filter_choices=filters)
 
-        cutouts = Cutout.objects.filter(transient__name__exact=slug)
+        cutouts = Cutout.objects.filter(transient__name__exact=slug).filter(~Q(fits=""))
         ## choose a cutout, if possible
         cutout = None
         choice = 0
         try:
             while cutout is None and choice <= 8:
-                cutout = select_cutout_aperture(cutouts, choice=choice)
+                cutout = select_cutout_aperture(cutouts, choice=choice).filter(
+                    ~Q(fits="")
+                )
             if not len(cutout):
                 cutout = None
             else: