wasatch 2.3.8__tar.gz → 2.3.24__tar.gz

{wasatch-2.3.8 → wasatch-2.3.24}/.gitignore

@@ -111,3 +111,4 @@ wasatch_applog.txt
 .DS_Store
 .vs/*
 environment.yml
+data/

{wasatch-2.3.8 → wasatch-2.3.24}/CHANGELOG.md

@@ -1,5 +1,84 @@
 # Changelog
 
+- 2026-04-18 2.3.24
+    - add avg_resolution to IDSDevice EEPROM
+    - change XS attenuator default from 127 to 40
+- 2026-04-16 2.3.23
+    - XS BLE
+        - tidied BLEDevice
+        - added USBCPowerConnectionState
+        - added SpectrometerState.power_connection_state
+        - added SpectrometerSettings.cpu_unique_id
+        - added SET_POWER_OFF, SET_RESET_UNIT, GET/SET_AUTO_RAMAN_PARAMS, 
+          GET_IMAGE_SENSOR_STATE, GET_CPU_UNIQUE_ID, GET_USB_ADAPTER_INFO, 
+          GET/SET_LASER_OFF_DELAY_MS
+        - suffixed all async methods with _async
+        - provided synchronous wrappers around user-facing asynchronous calls
+        - added BLEDevice.testing for enlighten.plugins.RnD.BluetoothTester
+        - battery percentage matches USB
+        - ambient_temperature_deg_c now flowing up to ENLIGHTEN
+        - POWER_OFF working
+        - decoding STM32 CPU_UNIQUE_ID (debug-only)
+        - ignore 1-line vertical ROI
+        - SET_AUTO_RAMAN_PARAMS bugfix
+- 2026-04-10 2.3.22
+    - added Reading.protocol
+    - XS
+        - disable detector timeout during area scan
+        - adding Auto-Raman to BLEDevice
+        - only use one ACQUIRE to start Area Scan readout
+        - send extra ACQUIRE on occasional timeout
+- 2026-04-09 2.3.21
+    - XS Area Scan
+        - fixed line increment
+        - disable area scan while changing line increment
+    - XS BLE
+        - move firmware revisions to SpectrometerSettings
+        - fix gain
+        - fix laser enable
+        - fixed heartbeat
+        - working on LASER_STATE and BATTERY_STATE
+- 2026-04-09 2.3.20
+    - XS BLE
+        - fix None in utils.to_hex
+        - only parse first 8 EEPROM fields until BLE FW updated to support 9 
+        - stop checking for old FX2 code string in corrupted EEPROMs
+        - support V2.EVT prefix
+        - add new ACQUIRE status codes
+        - add new SPECTRA Characteristic
+        - read as many EEPROM bytes per page as supported by Peripheral
+- 2026-04-06 2.3.18
+    - replaced WrapperWorker.is_FOO with .class_name
+    - XL / Andor
+        - only warn once on missing driver
+        - more robust support for blank model
+        - default EEPROM.model
+    - XS
+        - support is_laser_firing on all XS
+- 2026-04-01 2.3.17
+    - adding Reading.is_auto_raman()
+    - temporarily bumping XS spectra timeout
+    - filling in standard device meta-data in Auto-Raman Readings
+- 2026-03-30 2.3.16
+    - assume all XS have interlock feedback
+- 2026-03-13 2.3.15
+    - capture changes to vertical ROI in IDSDevice's EEPROM
+- 2026-03-09 2.3.14
+    - save IDS detector in EEPROM
+- 2026-03-02 2.3.13
+    - add experimental FPGA reset for InGaAs
+    - add Reading.image_format
+- 2026-02-17 2.3.12
+    - added laser_password, startup_scans_to_average, laser_attenuator
+    - added [un]pack_field
+    - un-rotated Hamamatsu area scan 180 deg :-(
+    - allow IDS config files to be located by serial number prefix
+- 2026-02-09 2.3.11
+    - rotate Hamamatsu area scan 180 deg
+- 2026-01-16 2.3.10
+    - support 2min integrations on STARVIS
+- 2026-01-15 2.3.9
+    - added --normalize to demo-ids-raman.py
 - 2026-01-12 2.3.8
     - added settings.has_detector
     - improved support for Andor .json "virtual EEPROMs"

{wasatch-2.3.8 → wasatch-2.3.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wasatch
-Version: 2.3.8
+Version: 2.3.24
 Summary: Application-level driver for Wasatch Photonics spectrometers
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown

{wasatch-2.3.8 → wasatch-2.3.24}/README_PYPI.md

@@ -50,6 +50,12 @@ before uploading to the "public, global, default" pypi repository.
 When you are ready to publish run `flit publish` or `flit publish --repository pypi`
 (or just "make publish").
 
+## Common Errors
+
+### requests.exceptions.HTTPError: 400 Client Error: Bad Request for url: https://test.pypi.org/legacy/
+
+Ensure wasatch/__init__.py version matches pyproject.toml.
+
 # Installing 'wasatch' package from source
 
 If you've cloned the Wasatch.PY repo and want to just install the `wasatch` 

{wasatch-2.3.8 → wasatch-2.3.24}/demo-ids-raman.py

@@ -26,6 +26,7 @@ import argparse
 
 from datetime import datetime
 from time import sleep
+from PIL import Image, ImageStat  # for image normalization
 
 import wasatch
 from wasatch                      import applog
@@ -59,6 +60,7 @@ class WasatchDemo:
         parser.add_argument("--save-spectra",        action="store_true",      help="save vertically-binned spectra to row-ordered CSV")
         parser.add_argument("--save-png",            action="store_true",      help="save PNG of each image frame")
         parser.add_argument("--save-data",           action="store_true",      help="save 2D array of each image frame")
+        parser.add_argument("--normalize",           action="store_true",      help="normalize PNG image")
         parser.add_argument("--save-dir",            type=str, default=".",    help="directory to save files")
         parser.add_argument("--prefix",              type=str, default="ids-raman", help="filename prefix")
 
@@ -150,6 +152,9 @@ class WasatchDemo:
     ############################################################################
 
     def run(self):
+        if self.args.save_dir != ".":
+            os.makedirs(self.args.save_dir, exist_ok=True)
+
         self.camera_device.set_integration_time_ms(self.args.integration_time_ms)
 
         # initialize outfile if saving spectra
@@ -229,6 +234,17 @@ class WasatchDemo:
                 os.replace(asi.pathname_png, filename)
                 print(f"\tsaved {filename}")
 
+                # normalize PNG (just the image file, not the raw 2D data)
+                if self.args.normalize:
+                    img = Image.open(filename).convert('L')
+                    stat = ImageStat.Stat(img)
+                    mean_brightness = stat.mean[0]
+                    img_array = np.array(img)
+                    normalized_img_array = img_array / mean_brightness * 100 
+                    normalized_img = Image.fromarray(np.uint8(normalized_img_array))
+                    normalized_img.save(filename)
+                    print(f"\tnormalized {filename}")
+
             # save area scan data
             if self.args.save_data and asi.data is not None:
                 filename = os.path.join(self.args.save_dir, f"{self.args.prefix}-{self.reading_count:04d}.csv")

{wasatch-2.3.8 → wasatch-2.3.24}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "wasatch"
-version = "2.3.8"
+version = "2.3.24"
 description= "Application-level driver for Wasatch Photonics spectrometers"
 requires-python = ">=3.9"
 readme = "README.md"

{wasatch-2.3.8 → wasatch-2.3.24}/wasatch/AndorDevice.py

@@ -10,7 +10,7 @@ from ctypes import *
 
 from .SpectrometerSettings        import SpectrometerSettings
 from .SpectrometerResponse        import SpectrometerResponse
-from .InterfaceDevice             import InterfaceDevice
+from .InterfaceDevice             import InterfaceDevice, InterfaceDeviceClassUnavailable
 from .StatusMessage               import StatusMessage
 from .DeviceID                    import DeviceID
 from .Reading                     import Reading
@@ -52,9 +52,15 @@ class AndorDevice(InterfaceDevice):
     SHUTTER_SPEED_MS = 50       #!< allow time for mechanical shutter to stabilize
     TEMPERATURE_CACHE_SEC = 1.0
 
+    DRIVER_NOT_INSTALLED = False
+
     def __init__(self, device_id, message_queue=None, alert_queue=None):
         # if passed a string representation of a DeviceID, deserialize it
         super().__init__()
+
+        if self.DRIVER_NOT_INSTALLED:
+            raise InterfaceDeviceClassUnavailable("Andor driver not installed")
+
         if type(device_id) is str:
             device_id = DeviceID(label=device_id)
 
@@ -119,8 +125,9 @@ class AndorDevice(InterfaceDevice):
                     break
 
         if self.driver is None:
-            log.error(f"could not find {filename} in search path: {dll_paths}")
-            # MZ: interesting that we don't return here
+            # only need to display / log this once per session
+            self.DRIVER_NOT_INSTALLED = True
+            raise InterfaceDeviceClassUnavailable(f"could not find {filename} in search path: {dll_paths}")
 
         # "serial_number", "model" etc are ambiguous in an Andor configuration 
         # file -- do they refer to the camera (Andor), or the spectrometer 
@@ -135,8 +142,9 @@ class AndorDevice(InterfaceDevice):
         # (all but has_cooling can be overridden via config file)
 
         # Andor API doesn't(?) seem to have access to detector info.
-        # Note that we use non-iDus cameras, including the Newton.
+        # Note that we use non-iDus cameras, including the Newton and iVac.
         self.settings.eeprom.detector = "iDus" 
+        self.settings.eeprom.model = "WP-XL" 
 
         self.settings.eeprom.has_cooling = True
         self.settings.eeprom.startup_integration_time_ms = 10

{wasatch-2.3.8 → wasatch-2.3.24}/wasatch/AutoRaman.py

@@ -56,7 +56,7 @@ class AutoRaman:
       any point.
     """
 
-    INTER_SPECTRA_DELAY_MS = 50
+    INTER_SPECTRA_DELAY_MS = 100
 
     def __init__(self, wasatch_device):
         self.wasatch_device = wasatch_device
@@ -109,6 +109,18 @@ class AutoRaman:
         reading.laser_power_perc = hardware.settings.state.laser_power_perc
         reading.laser_power_mW = hardware.settings.state.laser_power_mW
 
+        # fill-out some otherwise missing attributes from WasatchDevice.acquire_spectrum_standard
+        setting_to_attr = [ ('can_laser_fire',    'laser_can_fire'),
+                            ('is_laser_firing',   'laser_is_firing') ]
+        if self.settings.is_xs() and self.settings.eeprom.sig_laser_tec:
+            setting_to_attr.extend( [ ('get_laser_tec_mode', 'laser_tec_enabled'),
+                                      ('get_ambient_temperature_degC', 'ambient_temperature_degC') ] )
+        for (setting, attr_name) in setting_to_attr:
+            request = SpectrometerRequest(setting)
+            result = self.hardware.handle_requests([request])[0]
+            if result is not None:
+                setattr(reading, attr_name, result.data)
+
         return SpectrometerResponse(data=reading)
 
     ############################################################################
@@ -236,7 +248,7 @@ class AutoRaman:
 
         # enable the laser and wait for it to fire
         self.set_laser_enable(True)
-        self.hardware.queue_message("laser_firing_indicators", True)
+        self.hardware.queue_message("laser_firing_indicators", "firing")
         warning_delay_sec = self.get_laser_warning_delay_sec()
         if warning_delay_sec > 0:
             self.hardware.queue_message("marquee_info", f"waiting {warning_delay_sec}sec for laser to fire")
@@ -399,7 +411,7 @@ class AutoRaman:
 
         # 2. turn laser off
         self.set_laser_enable(False)
-        self.hardware.queue_message("laser_firing_indicators", False)
+        self.hardware.queue_message("laser_firing_indicators", "not firing")
 
         # 3. take dark
         self.hardware.queue_message("marquee_info", f"averaging {num_avg} dark spectra at {int_time}ms")
@@ -422,6 +434,18 @@ class AutoRaman:
         reading.laser_power_perc = self.hardware.settings.state.laser_power_perc
         reading.laser_power_mW = self.hardware.settings.state.laser_power_mW
 
+        # fill-out some otherwise missing attributes from WasatchDevice.acquire_spectrum_standard
+        setting_to_attr = [ ('can_laser_fire',    'laser_can_fire'),
+                            ('is_laser_firing',   'laser_is_firing') ]
+        if self.settings.is_xs() and self.settings.eeprom.sig_laser_tec:
+            setting_to_attr.extend( [ ('get_laser_tec_mode', 'laser_tec_enabled'),
+                                      ('get_ambient_temperature_degC', 'ambient_temperature_degC') ] )
+        for (setting, attr_name) in setting_to_attr:
+            request = SpectrometerRequest(setting)
+            result = self.hardware.handle_requests([request])[0]
+            if result is not None:
+                setattr(reading, attr_name, result.data)
+
         log.debug("done")
         return reading