Merge branch 'master' into devel

SNflows · May 12, 2022 · cf55dba · cf55dba · emirkmo · May 16, 2022
2 parents b46432b + 6189dd2
commit cf55dba
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-master-v0.9.4
+master-v0.9.5
diff --git a/flows/load_image.py b/flows/load_image.py
@@ -179,6 +179,20 @@ def get_exptime(self):
             raise ValueError("Image exposure time could not be extracted")
         return exptime
 
+		elif telescope.upper().startswith('SWO') and (hdr.get('SITENAME') == 'LCO' or origin == 'ziggy'):
+			image.site = api.get_site(10) # Hard-coded the siteid for Swope, Las Campanas Observatory
+			jd = hdr.get('JD', '')
+			if jd:
+				image.obstime = Time(hdr['JD'], format='jd', scale='utc', location=image.site['EarthLocation'])
+			else:
+				image.obstime = Time(hdr['MJD-OBS'], format='mjd', scale='utc', location=image.site['EarthLocation'])
+				image.obstime += 0.5 * image.exptime * u.second  # Make time centre of exposure
+			image.photfilter = {
+				'u': 'up',
+				'g': 'gp',
+				'r': 'rp',
+				'i': 'ip',
+			}.get(hdr['FILTER'], hdr['FILTER'])
     def get_obstime(self):
         """Default for JD, jd, utc."""
         return Time(self.image.header['JD'], format='jd', scale='utc', location=self.image.site['EarthLocation'])