v3.1.0

hypernets/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "3.0.0"
+__version__ = "3.1.0"
 
 import sys
 MIN_PYTHON = (3, 9)

hypernets/abstract/geometry.py

@@ -48,6 +48,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)
+        self.get_absolute_pan_tilt(quiet=True)
         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}] (abs)"
         str_output += f" -- {self.flags}"
@@ -100,7 +101,7 @@ def create_block_position_name(self, iter_line, iter_scheduler=1):
 
         return block_position
 
-    def get_absolute_pan_tilt(self, now=None):
+    def get_absolute_pan_tilt(self, now=None, quiet=False):
         try:  # FIXME
             from configparser import ConfigParser
             config_file = "config_dynamic.ini"
@@ -129,7 +130,7 @@ def get_absolute_pan_tilt(self, now=None):
         # Get sun position
         if 'sun' in [pan_ref, tilt_ref]:  # pickle me :
             from hypernets.geometry.spa_hypernets import spa_from_datetime
-            azimuth_sun, zenith_sun = spa_from_datetime(now=now)
+            azimuth_sun, zenith_sun = spa_from_datetime(now=now, quiet=quiet)
             zenith_sun = 180 - zenith_sun
 
             # determine hemisphere

hypernets/abstract/get_led_tilt.py

@@ -0,0 +1,60 @@
+from hypernets.abstract.protocol import Protocol
+from hypernets.abstract.request import Request, InstrumentAction
+from hypernets.hypstar.libhypstar.python.data_structs.spectrum_raw \
+        import RadiometerEntranceType
+from hypernets.abstract.geometry import Geometry
+from configparser import ConfigParser
+import sys
+
+if __name__ == '__main__':
+    config = ConfigParser()
+    config.read('config_dynamic.ini')
+
+    ## look for VM measurement in all sequence files
+    expected_keys = ['sequence_file_sched2', 'sequence_file_alt', 
+                     'sequence_file_sched1', 'sequence_file', 
+                     'sequence_file_sched3']
+    values = {}
+
+    ## get file names from config_dynamic.ini
+    if config.has_section('general'):
+        for key in expected_keys:
+            value = config.get('general', key, fallback=None)
+            if value is not None:
+                values[key] = value
+
+    if not values:
+        print(f"No sequence file names found in config_dynamic.ini")
+        exit(-1)
+
+    ## loop through sequence files and look for VM measurements
+    for key, value in values.items():
+        try:
+            protocol = Protocol(value)
+        except FileNotFoundError as e:
+            print(f"Failed to open '{key}' file '{value}' when looking for LED source tilt position", file=sys.stderr)
+            continue
+        except Exception as e:
+            print(f"{e}", file=sys.stderr)
+            print(f"Failed to read '{key}' file '{sequence_file} when looking for LED source tilt position", file=sys.stderr)
+            print("Wrong syntax in sequence file?", file=sys.stderr)
+            continue
+
+        # found sequence containing VM measurement
+        if protocol.check_if_vm_requested() == True:
+            for i, (geometry, requests) in enumerate(protocol, start=1):
+                for request in requests:
+                        ## look for VM measurement with irradiance entrance
+                        if request.action == InstrumentAction.VALIDATION and \
+                                request.entrance == RadiometerEntranceType.IRRADIANCE:
+
+                            geometry.get_absolute_pan_tilt()
+                            #print(f"{geometry}")
+                            #print(f"{request.entrance.name}")
+
+                            ## print absolute tilt position
+                            print(f"{geometry.tilt_abs}")
+                            exit(0)
+
+    print("Did not find any LED source irradiance measurements from sequence files defined in config_dynamic.ini")
+    exit(-1)

hypernets/geometry/spa_hypernets.py

@@ -5,7 +5,7 @@
 from logging import info, debug, error
 
 
-def spa_from_datetime(now=None):
+def spa_from_datetime(now=None, quiet=False):
 
     if now is None:
         now = datetime.now(timezone.utc)
@@ -32,7 +32,11 @@ def spa_from_datetime(now=None):
         azimuth = get_azimuth(latitude, longitude, now, elevation)
         zenith = 90 - get_altitude(latitude, longitude, now, elevation)
 
-    info(f"Sun Position  (azimuth : {azimuth:.2f}, "
+    if quiet is False:
+        info(f"Sun Position  (azimuth : {azimuth:.2f}, "
+         f"zenith : {zenith:.2f})")
+    else:
+        debug(f"Sun Position  (azimuth : {azimuth:.2f}, "
          f"zenith : {zenith:.2f})")
 
     return azimuth, zenith

hypernets/hypstar/handler.py

@@ -75,7 +75,7 @@ def __init__(self, instrument_port="/dev/radiometer0",
                 if self.hw_info.optical_multiplexer_available:
                     break
                 else:
-                    if i < retry_count:
+                    if i < retry_count - 1:
                         debug("MUX+SWIR+TEC hardware not available, retrying in 5 seconds")
                         sleep(5)
                     else:

hypernets/open_sequence.py

@@ -240,9 +240,36 @@ def run_sequence_file(sequence_file, instrument_port, instrument_br, # noqa C901
     # power, one has to remember, that during initial thermal regulation
     # TEC consumes 5x more current + does it for longer.
     if swir_is_requested:
-        info(f"Cooling SWIR module to {instrument_swir_tec}°C...")
-        instrument_instance.set_SWIR_module_temperature(instrument_swir_tec)
-        info("Done!")
+        try:
+            # check if radiometer S/N is in the HYPSTAR-XR range and warn if it is not
+            if instrument_sn < 200000 or instrument_sn > 299999:
+                warning(f"Attempting SWIR measurement with radiometer S/N {instrument_sn} that is not in HYPSTAR-XR range!");
+
+            # make sure SWIR+TEC have finished init
+            for i in range(retry_count := 5):
+                if instrument_instance.hw_info.swir_module_available and \
+                   instrument_instance.hw_info.swir_pixel_count != 0 and \
+                   instrument_instance.hw_info.swir_tec_module_available:
+                    break
+                else:
+                    if i < retry_count - 1:
+                        debug("SWIR+TEC hardware initialisation is not completed, retrying in 5 seconds")
+                        sleep(5)
+                        instrument_instance.get_hw_info()
+                    else:
+                        error("SWIR+TEC hardware not available")
+                        exit(27)
+
+            info(f"Cooling SWIR module to {instrument_swir_tec}°C...")
+            instrument_instance.set_SWIR_module_temperature(instrument_swir_tec)
+            info("Done!")
+        except Exception as e:
+            # bail out instead of collecting bad data
+            error(f"{e}")
+            error("Failed to stabilise SWIR temperature. Aborting sequence.")
+            if not instrument_standalone:
+                park_to_nadir()
+            exit(33) # exit code 33
 
     # print env log header
     info(get_csv_header())
@@ -261,7 +288,7 @@ def run_sequence_file(sequence_file, instrument_port, instrument_br, # noqa C901
         #         print(f"\t- {key} : {value}")
 
         # Check if it is raining
-        if check_rain:
+        if not instrument_standalone and check_rain:
             try:
                 if is_raining(rain_sensor):
                     warning("Aborting sequence due to rain")
@@ -370,7 +397,8 @@ def run_sequence_file(sequence_file, instrument_port, instrument_br, # noqa C901
             except Exception as e:
                 if request.action == InstrumentAction.VALIDATION:
                     error("LED source measurement failed, aborting sequence")
-                    park_to_nadir()
+                    if not instrument_standalone:
+                        park_to_nadir()
                     exit(78) # exit code 78
 
                 error(f"Error : {e}")