Merge pull request #91 from jkuusk/dev

Merge dev into main

Author: jkuusk

.gitignore

@@ -2,6 +2,7 @@ __pycache__/
 DATA/
 LOGS/
 OTHER/
+ARCHIVE/
 config_hypernets.ini
 config_dynamic.ini
 config_static.ini

NOTES.md

@@ -1,7 +1,7 @@
-__version__ = "1.0b"
+__version__ = "2.3.0"
 
 import sys
 MIN_PYTHON = (3, 9)
 if sys.version_info < MIN_PYTHON:
     sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON)
-    
+

hypernets/__init__.py

@@ -1,29 +1,18 @@
 
 from hypernets import __version__
-from datetime import datetime
+from datetime import datetime, timezone
 from configparser import ConfigParser, ExtendedInterpolation
 from configparser import MissingSectionHeaderError
+from re import split
 
-from logging import warning
-
-# TODO : Dump data from pickle for lat:lon
-
-
-def special_value(value):
-    if value == "{datetime}":
-        return datetime.utcnow().strftime("%Y%m%dT%H%M%S")
-    elif value == "{v_hypernets_tools}":
-        return __version__
-    else:
-        return "N/A"
+from logging import debug, info, warning  # noqa
 
 
 def metadata_header_base(protocol_file="placeholder.csv", now=None,
                          PI="Hypernets Virtual",
                          site_name="Virtual Site"):
     if now is None:
-        from datetime import datetime
-        now = datetime.utcnow()
+        now = datetime.now(timezone.utc)
 
     return ("[Metadata]\n"
             f"datetime = {now.strftime('%Y%m%dT%H%M%S')}\n"
@@ -32,7 +21,11 @@ def metadata_header_base(protocol_file="placeholder.csv", now=None,
             f"protocol_filename = {protocol_file}\n")
 
 
-def parse_config_metadata(config_file="config_dynamic.ini"):
+def parse_config_metadata(sequence_file, config_file="config_dynamic.ini",
+                          instrument_sn=0, vm_sn=0):
+    globals()["instrument_sn"] = instrument_sn
+    globals()["vm_sn"] = vm_sn
+    globals()["sequence_file"] = sequence_file
 
     config = ConfigParser(interpolation=ExtendedInterpolation())
 
@@ -45,19 +38,51 @@ def parse_config_metadata(config_file="config_dynamic.ini"):
         str_metadata = metadata_header_base()
         return str_metadata
 
+    # copy user-defined metadata from config file
     str_metadata = "[Metadata]\n"
     for field in metadata_section.keys():
-        if '{' and '}' in metadata_section[field]:
-            special = special_value(metadata_section[field])
-            str_metadata += f"{field} = {special}\n"
+        if field in ["hypernets_tools_version", "datetime", "hypstar_sn", "led_sn",
+                     "protocol_file_name", "latitude", "longitude", "offset_pan",
+                     "offset_tilt", "azimuth_switch"]:
+            warning(f"metadata:{field} is auto-generated and should be removed "
+                    "from the [metadata] section of config_dynamic.ini")
         else:
             str_metadata += f"{field} = {metadata_section[field]}\n"
-    return str_metadata
 
+    # populate auto-generated metadata
+    str_metadata += f"hypernets_tools_version = {__version__}\n"
+    now = datetime.now(timezone.utc).strftime("%Y%m%dT%H%M%S")
+    str_metadata += f"datetime = {now}\n"
+    str_metadata += f"hypstar_sn = {instrument_sn}\n"
+    str_metadata += f"led_sn = {vm_sn}\n"
+    str_metadata += f"protocol_file_name = {sequence_file}\n"
+
+    # populate metadata from other config file sections
+    meta_fields = {"latitude": "GPS:latitude", "longitude": "GPS:longitude", 
+                   "offset_pan": "pantilt:offset_pan", "offset_tilt": "pantilt:offset_tilt",
+                   "azimuth_switch": "pantilt:azimuth_switch"}
+
+    for key in meta_fields:
+        try:
+            conf_sec, conf_parm = split(":", meta_fields[key])
+            str_metadata += f"{key} = {config[conf_sec][conf_parm]}\n"
+
+        except (KeyError) as e:
+            warning(f"{e} not found in '{config_file}' while parsing '{meta_fields[key]}'")
+
+    return str_metadata
 
-def create_metadata():
-    pass
 
 
 if __name__ == '__main__':
-    print(parse_config_metadata())
+    from argparse import ArgumentParser
+    parser = ArgumentParser()
+    parser.add_argument("-f", "--filename", type=str, required=True,
+                        help="Select a protocol file (txt, csv)")
+
+    from logging import basicConfig, DEBUG
+    log_fmt = '[%(levelname)-7s %(asctime)s] (%(module)s) %(message)s'
+    dt_fmt = '%H:%M:%S'
+    basicConfig(level=DEBUG, format=log_fmt, datefmt=dt_fmt)
+    args = parser.parse_args()
+    info("\n" + parse_config_metadata(args.filename))

hypernets/abstract/create_metadata.py

@@ -49,7 +49,7 @@ def __init__(self, reference: int, pan=0.0, tilt=0.0, flags=[]):
     def __str__(self):
         ref_pan, ref_tilt = Geometry.int_to_reference(self.reference)
         str_output = f"{self.pan:.2f} ({ref_pan}) ; {self.tilt:.2f} ({ref_tilt})" # noqa
-        str_output += f" --> [{self.pan_abs:.2f} ; {self.tilt_abs:.2f}]"
+        str_output += f" --> [{self.pan_abs:.2f} ; {self.tilt_abs:.2f}] (abs)"
         str_output += f" -- {self.flags}"
         return str_output
 
@@ -106,31 +106,29 @@ def get_absolute_pan_tilt(self, now=None):
             config_file = "config_dynamic.ini"
             config = ConfigParser()
             config.read(config_file)
-            offset_pan = int(config["pantilt"]["offset_pan"])
-            offset_tilt = int(config["pantilt"]["offset_tilt"])
-            reverse_tilt = config["pantilt"]["reverse_tilt"] == "yes"
-            azimuth_switch = int(config["pantilt"]["azimuth_switch"])
+            offset_pan = float(config["pantilt"]["offset_pan"])
+            offset_tilt = float(config["pantilt"]["offset_tilt"])
+            azimuth_switch = float(config["pantilt"]["azimuth_switch"])
 
         except KeyError as key:
             warning(f" {key} default values loaded")
             # Default values :
             # offset_tilt = 0
-            offset_pan, reverse_tilt = 0, False
+            offset_pan = 0
             azimuth_switch = 360
 
         except Exception as e:
             error(f"Config Error : {e}")
 
         from operator import neg, pos
-        reverse_tilt = {True: neg, False: pos}[reverse_tilt]
 
         self.pan_abs, self.tilt_abs = self.pan, self.tilt
         pan_ref, tilt_ref = Geometry.int_to_reference(self.reference)
 
 
         # Get sun position
         if 'sun' in [pan_ref, tilt_ref]:  # pickle me :
-            from hypernets.geometry.spa.spa_hypernets import spa_from_datetime
+            from hypernets.geometry.spa_hypernets import spa_from_datetime
             azimuth_sun, zenith_sun = spa_from_datetime(now=now)
             zenith_sun = 180 - zenith_sun
 
@@ -168,15 +166,10 @@ def get_absolute_pan_tilt(self, now=None):
         if 'sun' in [pan_ref, tilt_ref] or 'hyp' in [pan_ref, tilt_ref]:
             # Orientation
             if pan_ref in ['sun', 'hyp']:
-                self.pan_abs -= reverse_tilt(offset_pan)
-                # self.pan_abs -= offset_pan
+                self.pan_abs -= offset_pan
 
             if tilt_ref in ['sun', 'hyp']:
-                self.tilt_abs -= reverse_tilt(offset_tilt)
-
-        self.tilt_abs = reverse_tilt(self.tilt_abs)
-        if reverse_tilt is neg:
-            self.pan_abs = self.pan_abs + 180
+                self.tilt_abs -= offset_tilt
 
         # force to [0...360] range
         self.pan_abs = self.pan_abs % 360

hypernets/abstract/geometry.py

@@ -33,6 +33,7 @@ def make_pan_tilt_list(geometries, dates):
         pan, tilt = list(), list()
         for now in dates:
             info(f"--> {str(now)}")
+            now.replace(tzinfo=timezone.utc)
             geometry.get_absolute_pan_tilt(now)
             pan.append(geometry.pan_abs)
             tilt.append(geometry.tilt_abs)