From ed1a52fa23db849268d97e7a3c0120391f91a14a Mon Sep 17 00:00:00 2001
From: tomrink <rink@ssec.wisc.edu>
Date: Fri, 1 Jul 2022 13:12:33 -0500
Subject: [PATCH] minor...
---
modules/icing/moon_phase.py | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/modules/icing/moon_phase.py b/modules/icing/moon_phase.py
index 99d1cdbe..c98d7bf1 100644
--- a/modules/icing/moon_phase.py
+++ b/modules/icing/moon_phase.py
@@ -2,27 +2,32 @@ from skyfield import api
from skyfield import almanac
from util.util import get_time_tuple_utc
-ts = api.load.timescale()
+time_scale = api.load.timescale()
eph = api.load('de421.bsp')
def convert_time(epoch_time):
dt_obj, dt_tup = get_time_tuple_utc(epoch_time)
- t = ts.from_datetime(dt_obj)
- t = ts.utc(dt_tup[0], dt_tup[1], dt_tup[2], dt_tup[3])
+ t = time_scale.from_datetime(dt_obj)
+ t = time_scale.utc(dt_tup[0], dt_tup[1], dt_tup[2], dt_tup[3])
return t
+def moon_phase(epoch_time, phs_deg=70):
+ phase = almanac.moon_phase(eph, convert_time(epoch_time))
+ return (phase.degrees > phs_deg) & (phase.degrees < 360 - phs_deg)
+
+
def convert_times(epoch_time_s):
dt_obj_s = []
for et in epoch_time_s:
dt_obj_s.append(get_time_tuple_utc(et)[0])
- t = ts.from_datetimes(dt_obj_s)
+ t = time_scale.from_datetimes(dt_obj_s)
return t
-def moon_phase(dt_obj_s, phs_deg=70):
- t = ts.from_datetimes(dt_obj_s)
+def moon_phases(dt_obj_s, phs_deg=70):
+ t = time_scale.from_datetimes(dt_obj_s)
phase = almanac.moon_phase(eph, t)
return (phase.degrees > phs_deg) & (phase.degrees < 360-phs_deg)
--
GitLab