Adding Guitastro to PyROS (With git clone project on install), replacing all cel…

…me import with guitastro, add guitastro dependencies in requirements.txt

Adding Guitastro to PyROS (With git clone project on install), replacing all cel…
…me import with guitastro, add guitastro dependencies in requirements.txt
Alexis Koralewski
1 parent 4290c2cf
Showing 8 changed files with 42 additions and 26 deletions Show diff stats
install/requirements.txt
pyros.py
src/core/pyros_django/utils/plc/guitalens_observatory/run_goc.py
src/core/pyros_django/utils/report/status_json.py
src/device_controller/abstract_component/device_controller.py
src/device_controller/abstract_component/mount.py
src/device_controller/abstract_component/plc.py
src/logpyros.py
@@ -38,8 +38,10 @@ django-debug-toolbar==1.9.1
 #plantuml
 httplib2
 dataclasses
+# For YAML Config
 pykwalify
 PyYAML
+# For SP TAC Assignation
 matplotlib
 numpy
 # For Celery:
@@ -51,5 +53,15 @@ numpy
 ##kombu==3.0.37
 ##django-celery==3.1.17
+# For working with GIT within Python
+GitPython
+
 # For working with date
-python-dateutil
 \ No newline at end of file
+python-dateutil
+
+# Celme / guitastro packages 
+pypylon
+sep
+astroquery
+astroalign
+ccdproc
 \ No newline at end of file
@@ -13,7 +13,7 @@ import sys
 import time
 import re
 import glob
-
+from git import Repo
 """
@@ -476,6 +476,10 @@ def install_or_update(UPDATE:bool=False, packages_only:bool=False, database_only
         print("Running INSTALL command")
         print("- packages_only:", packages_only)
         print("- database_only:", database_only)
+        # Git clone Guitastro:
+        print("Cloning Guiastro repository")
+        cloned_repo = Repo.clone_from("https://gitlab.irap.omp.eu/aklotz/guitastro.git", os.path.join(os.getcwd(),"./src/core/guitastro"))
+        print("Cloned successfully: ", cloned_repo.__class__ is Repo)
     #if test_mode(): print("in test mode")
     # self.execProcess("python3 install/install.py install")
     # if (os.path.basename(os.getcwd()) != "private"):
@@ -20,7 +20,7 @@ py_pwd = os.getcwd()
 py_pwd = os.getcwd() + "/../.."
 if (py_pwd not in py_path):
     (os.sys.path).append(py_pwd)
-import celme
+import guitastro
 import report
 # === Some debug states
@@ -91,11 +91,11 @@ get_ip_address(&#39;eth0&#39;)
 # =======================================
 def get_sunelev():
-    date = celme.Date("now")
-    site = celme.Site("GPS 2 E 43 148")
+    date = guitastro.Date("now")
+    site = guitastro.Site("GPS 2 E 43 148")
     skyobj= {'planet':'Sun'}
     outputs = ['elev']
-    target = celme.Target()
+    target = guitastro.Target()
     target.define(skyobj)
     output0s = ['ra','dec']
     results = target.ephem(date,site,output0s)
@@ -226,7 +226,7 @@ while True:
         meteo_conditions = meteo_conditions +8
     # === Json status
-    date = celme.Date("now")
+    date = guitastro.Date("now")
     date_iso_utc = date.iso();
     rep = report.Status_json()
     rep.new_status("PLC","20181014_0854")
@@ -19,7 +19,7 @@ if (py_pwd not in py_path):
 #import utils.celme as celme
 #sys.path.append('..')
-import src.core.celme as celme
+import src.core.guitastro as guitastro
 # ========================================================
 # ========================================================
@@ -254,7 +254,7 @@ https://github.com/hjson/hjson-py
     def _status_new_entity(self, entity_name, theorigin, version_firmware, site, date=""):
         if date=="":
-            date = (celme.Date("now")).iso()
+            date = (guitastro.Date("now")).iso()
         entity= {'entity_name':entity_name, 'origin':theorigin, 'version_firmware':version_firmware, 'site':site, 'date':date, 'devices':[]}
         #self._status['statuses'][0]['entities'].append(entity);
         self._status['entities'].append(entity);
@@ -279,9 +279,9 @@ https://github.com/hjson/hjson-py
         if indiced == -1:
             return ""
         if date_data=="":
-            date_data = (celme.Date("now")).iso()
+            date_data = (guitastro.Date("now")).iso()
         else:
-            date_data = (celme.Date(date_data)).iso()
+            date_data = (guitastro.Date(date_data)).iso()
         dico = {'name':name, 'data_type':data_type, 'value':value, 'unit':unit, 'monitoring_name':monitoring_name, 'comment':comment, 'date_data':date_data}
         #self._status['statuses'][0]['entities'][indicee]['devices'][indiced]['device_values'].append(dico)
         self._status['entities'][indicee]['devices'][indiced]['device_values'].append(dico)
@@ -31,7 +31,7 @@ from typing import Dict
 #sys.path.append("../../..")
 sys.path.append("../../../..")
 #import src.core.pyros_django.utils.celme as celme
-import src.core.celme as celme
+import src.core.guitastro as guitastro
 from src.logpyros import LogPyros
 #sys.path.append('../..')
@@ -794,10 +794,10 @@ class DeviceController():
     def _connect_to_device(self):
         self._my_channel._connect_to_server()
-    def get_celme_longitude(self, longitude):
-        return celme.Angle(longitude).sexagesimal("d:+0180.0")
+    def get_guitastro_longitude(self, longitude):
+        return guitastro.Angle(longitude).sexagesimal("d:+0180.0")
     def get_celme_latitude(self, latitude):
-        return celme.Angle(latitude).sexagesimal("d:+090.0")
+        return guitastro.Angle(latitude).sexagesimal("d:+090.0")
     #@override ClientChannel send_data
     def send_data(self, data:str):
@@ -850,7 +850,7 @@ class DeviceController():
     def get_utc_date(self):
-        return celme.Date("now").iso(0)
+        return guitastro.Date("now").iso(0)
         #return celme.Date("now").ymdhms()
@@ -18,7 +18,7 @@ import time
 # from src_socket/client/
 sys.path.append("../../../..")
 #import src.core.pyros_django.utils.celme as celme
-import src.core.celme as celme
+import src.core.guitastro as guitastro
 # Local application imports
@@ -212,9 +212,9 @@ class DC_Mount(DeviceController):
     def get_celme_longitude(self, longitude):
-        return celme.Angle(longitude).sexagesimal("d:+0180.0")
+        return guitastro.Angle(longitude).sexagesimal("d:+0180.0")
     def get_celme_latitude(self, latitude):
-        return celme.Angle(latitude).sexagesimal("d:+090.0")
+        return guitastro.Angle(latitude).sexagesimal("d:+090.0")
@@ -21,7 +21,7 @@ sys.path.append(&quot;..&quot;)
 # from src_socket/client/
 sys.path.append("../../..")
 #import src.core.pyros_django.utils.celme as celme
-import src.core.celme as celme
+import src.core.guitastro as guitastro
 # Local application imports
@@ -11,7 +11,7 @@ if (py_pwd not in py_path):
     (os.sys.path).append(py_pwd)
 # --- import PyROS celestial mechanics from the pyros root directory
-import src.core.celme as celme
+import src.core.guitastro as guitastro
 '''
@@ -124,7 +124,7 @@ class LogPyros:
         self._date.date(date)
         jd = self._date.jd()
         jd0 = math.floor(jd) - self._noon_hour/24
-        d = celme.Date(jd0)
+        d = guitastro.Date(jd0)
         djd = jd-jd0
         # print(f"jd0 = {d.iso()} djd={djd}")
         if djd>=1:
@@ -132,7 +132,7 @@ class LogPyros:
         djd = jd-jd0
         if djd>=1:
             jd0 += 1
-        d = celme.Date(jd0)
+        d = guitastro.Date(jd0)
         night = d.digits(0)[0:8]
         return night
@@ -142,7 +142,7 @@ class LogPyros:
         jd_midnight = midnight instant
         jd_noon1 = next noon
         """
-        d = celme.Date(night)
+        d = guitastro.Date(night)
         d_noon0 = d + self._noon_hour/24
         jd_noon0 = d_noon0.jd()
         jd_midnight = jd_noon0 + 0.5
@@ -456,8 +456,8 @@ class LogPyros:
         # ---
         if path_wwwpyros != "":
             self.path_wwwpyros = path_wwwpyros
-        self._date = celme.Date()
-        self._home = celme.Home(home)
+        self._date = guitastro.Date()
+        self._home = guitastro.Home(home)
         self._noon_hour = 12 ; # local hour corresponding to the date change
         self.logtable = None
         self.nbmax_last_lines = 30