wasatch 2.2.17__tar.gz → 2.3.6__tar.gz

{wasatch-2.2.17 → wasatch-2.3.6}/CHANGELOG.md

@@ -1,5 +1,43 @@
 # Changelog
 
+- 2025-11-06 2.3.6
+    - resolve hotplug race condition when laser power set in percent
+    - cache certain device getters to avoid I2C overruns
+    - stop trying to read laser temperature on FX2, it's never worked right
+- 2025-10-22 2.3.5
+    - don't loop on spectral read errors on XS
+- 2025-10-22 2.3.4
+    - ignore heartbeat on Andor
+- 2025-06-30 2.3.3
+    - Hamamatsu 2048px area scan
+- 2025-06-18 2.3.2
+    - XS area scan
+        - fixed off-by-one stop line
+        - fixed xs_area_scan_offset_kludge on newer FPGAs
+    - added "max" to utils.vercmp
+- 2025-05-30 2.3.1
+    - enforce signed and unsigned integers in MultiWavecalCalibration (resolve XL
+      config files with floating-point horizontal ROI)
+    - update BatchCollection and Scan Averaging for AndorDevice
+    - added EEPROM.laser_interlock_excluded
+    - area scan mostly works for XS
+    - packaging
+        - remove legacy package install files
+        - add all dependencies to pyproject.toml
+- 2025-04-08 2.3.0
+    - IDS cameras
+        - add IDSDevice, IDSCamera
+    - area scan
+        - add AreaScanImage
+        - expect start-of-frame marker at spectrum[0]
+        - move row index to spectrum[1]
+        - redesigned for Hamamatsu
+    - vertical ROI
+        - support vertical ROI in Hamamatsu
+    - firmware logging
+        - allow ENLIGHTEN to display firmware log
+- 2025-02-26 2.2.18
+    - add laser state to Reading from AutoRaman
 - 2025-02-11 2.2.17
     - [#133] merged in Fast BatchCollection fixes, part of ENLIGHTEN [#516]
 - 2025-01-20 2.2.16

wasatch-2.3.6/Makefile

@@ -0,0 +1,38 @@
+help:
+	@echo "Supported targets:"
+	@echo "  doc               (render Doxygen)"
+	@echo "  clean             (delete artifacts)"
+	@echo "  cloc              (count SLOC)"
+	@echo "  publish           (flit --> pypi)"
+	@echo "  publish-test      (flit --> testpypi)"
+	@echo "  pip-install-local"                
+
+.PHONY: doc docs clean cloc publish publish-test pip-install-local
+
+cloc:
+	@cloc --include-lang=Python .
+
+doc docs:
+	@echo "Rendering Doxygen..."
+	@mkdir -p doxygen
+	@doxygen 1>doxygen.out 2>doxygen.err
+	@cat doxygen.err
+
+clean:
+	@rm -rf doxygen     \
+            doxygen.out \
+            doxygen.err
+	@find . -name \*.pyc -exec rm {} \;
+
+pip-install-local:
+	pip install $$PWD
+
+publish-test:
+	@echo REMINDER to keep .toml in sync with __init__.py!
+	@echo 
+	flit publish --repository testpypi
+
+publish:
+	@echo REMINDER to keep .toml in sync with __init__.py!
+	@echo 
+	flit publish

{wasatch-2.2.17 → wasatch-2.3.6}/PKG-INFO

@@ -1,11 +1,26 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: wasatch
-Version: 2.2.17
-Summary: This package is a driver for Wasatch Photonics spectrometers
-Author-email: Wasatch Photonics <edort@wasatchphotonics.com>
+Version: 2.3.6
+Summary: Application-level driver for Wasatch Photonics spectrometers
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Classifier: License :: OSI Approved :: MIT License
-Project-URL: Home, https://github.com/WasatchPhotonics/Wasatch.PY
+License-File: LICENSE
+Requires-Dist: numpy
+Requires-Dist: six
+Requires-Dist: psutil
+Requires-Dist: future
+Requires-Dist: pygtail
+Requires-Dist: pyusb
+Requires-Dist: requests
+Requires-Dist: pexpect
+Requires-Dist: seabreeze
+Requires-Dist: pyudev
+Requires-Dist: pywin32; platform_system=='Windows'
+Requires-Dist: pyftdi
+Requires-Dist: crcmod
+Requires-Dist: bleak
+Requires-Dist: ids_peak; platform_system=='Windows'
+Project-URL: Homepage, https://github.com/WasatchPhotonics/wasatch.py
 
 ![Sample Console Views](https://github.com/WasatchPhotonics/Wasatch.PY/raw/master/screenshots/multiplatform.png)
 

wasatch-2.3.6/pyproject.toml

@@ -0,0 +1,36 @@
+[project]
+name = "wasatch"
+version = "2.3.6"
+description= "Application-level driver for Wasatch Photonics spectrometers"
+requires-python = ">=3.9"
+readme = "README.md"
+dependencies = [
+    #"mkl",
+    "numpy",
+    "six",
+    "psutil",
+    "future",
+    "pygtail",
+    "pyusb",
+    "requests",
+    "pexpect",
+    "seabreeze",
+    "pyudev",
+    "pywin32; platform_system=='Windows'",
+    "pyftdi",
+    "crcmod",
+    "bleak",
+    "ids_peak; platform_system=='Windows'",
+]
+
+[project.urls]
+Homepage = "https://github.com/WasatchPhotonics/wasatch.py"
+
+[build-system]
+requires=["setuptools"]
+build-backend="setuptools.build_meta"
+
+[tool.setuptools.packages.find]
+where=["."]
+include=["wasatch"]
+exclude=[]

{wasatch-2.2.17 → wasatch-2.3.6}/wasatch/AndorDevice.py

@@ -1,14 +1,17 @@
 import os
 import usb
 import json
+import numpy as np
 import struct
 import logging
 import datetime
+
 from ctypes import *
 
 from .SpectrometerSettings        import SpectrometerSettings
 from .SpectrometerResponse        import SpectrometerResponse
 from .InterfaceDevice             import InterfaceDevice
+from .StatusMessage               import StatusMessage
 from .DeviceID                    import DeviceID
 from .Reading                     import Reading
 from .ROI                         import ROI
@@ -71,11 +74,10 @@ class AndorDevice(InterfaceDevice):
         # An AndorDevice has-a SpectrometerSettings, which has-a EEPROM, which 
         # has-a MultiWavelengthCalibration
         self.settings = SpectrometerSettings(self.device_id)
-        self.summed_spectra         = None
-        self.sum_count              = 0
         self.session_reading_count  = 0
-        self.take_one               = False
-        self.failure_count          = 0
+        self.sum_count              = 0
+        self.take_one_request       = None
+
         self.dll_fail               = True
         self.tec_enabled            = True
         self.driver                 = None
@@ -147,6 +149,27 @@ class AndorDevice(InterfaceDevice):
     # Private Methods
     ###############################################################
 
+    def _queue_message(self, setting, value):
+        """
+        If an upstream queue is defined, send the name-value pair.  Does nothing
+        if the caller hasn't provided a queue.
+
+        "setting" is application (caller) dependent, but ENLIGHTEN currently uses
+        "marquee_info" and "marquee_error".
+        """
+        if self.message_queue is None:
+            return
+
+        msg = StatusMessage(setting, value)
+        try:
+            log.debug(f"queue_message: msg {msg}")
+            self.message_queue.put(msg) 
+        except:
+            log.error(f"failed to enqueue StatusMessage {msg}", exc_info=1)
+
+    def not_implemented(self):
+        pass
+
     def _init_process_funcs(self):
         process_f = {}
 
@@ -158,10 +181,14 @@ class AndorDevice(InterfaceDevice):
         process_f["init_tec_setpoint"]          = self.init_tec_setpoint
         process_f["set_tec_setpoint"]           = self.set_tec_setpoint
         process_f["init_detector_area"]         = self.init_detector_area
-        process_f["scans_to_average"]           = self.scans_to_average
+        process_f["scans_to_average"]           = self.set_scans_to_average
         process_f["high_gain_mode_enable"]      = self.high_gain_mode_enable
         process_f["save_config"]                = self.save_config
         process_f["vertical_binning"]           = self.set_vertical_binning
+        process_f["take_one_request"]           = self.set_take_one_request
+
+        process_f["reset_scan_averaging"]       = self.not_implemented
+        process_f["heartbeat"]                  = lambda x: None
 
         ##################################################################
         # What follows is the old init-lambdas that are squashed into process_f
@@ -204,142 +231,147 @@ class AndorDevice(InterfaceDevice):
             os.makedirs(self.config_dir)
         return os.path.isfile(self.config_file)
 
-    def _get_spectrum_raw(self): # -> list[float] 
+    def _get_spectrum_raw(self):
         """
         @todo missing bad-pixel correction
         """
         spec_arr = c_long * self.pixels
         spec_init_vals = [0] * self.pixels
-        spec = spec_arr(*spec_init_vals)
+        spectrum = spec_arr(*spec_init_vals)
 
         # ask for spectrum then collect, NOT multithreaded (though we should look into that!), blocks
         self.driver.StartAcquisition()
         self.driver.WaitForAcquisition()
-        success = self.driver.GetAcquiredData(spec, c_ulong(self.pixels))
+        result = self.driver.GetAcquiredData(spectrum, c_ulong(self.pixels))
 
-        if (success != self.SUCCESS):
-            log.debug(f"getting spectra did not succeed. Received code of {success}. Returning")
+        if (result != self.SUCCESS):
+            log.error(f"_get_spectrum_raw: GetAcquiredData failed (result {result})")
             return
 
         # convert from wasatch.AndorDevice.c_long_Array_512
-        convertedSpec = [x for x in spec]
+        spectrum = np.array(spectrum, dtype=np.float32) # [x for x in spectrum]
 
         if (self.settings.eeprom.invert_x_axis):
-            convertedSpec.reverse()
+            # spectrum.reverse()
+            spectrum = spectrum[::-1]
+
+        # Andor cameras can return all zeros when saturated
+        if not spectrum.any():
+            self._queue_message("marquee_error", "Andor camera is saturated")
 
-        return convertedSpec
+        # log.debug(f"_get_spectrum_raw: returning spectrum {spectrum}")
+        return spectrum
 
     def _take_one_averaged_reading(self):
-        averaging_enabled = (self.settings.state.scans_to_average > 1)
-
-        if averaging_enabled:
-            # collect the entire averaged spectrum at once (added for
-            # BatchCollection with laser delay)
-            #
-            # So: we're NOT in "free-running" mode, so we're basically being
-            # slaved to parent process and doing exactly what is requested
-            # "on command."  That means we can perform a big, heavy blocking
-            # scan average all at once, because they requested it.
-            self.sum_count = 0
-            loop_count = self.settings.state.scans_to_average
+        """ 
+        @note this may be collecting a dark spectrum requested through TakeOneRequest.take_dark 
+        @returns Reading
+        """
+
+        ########################################################################
+        # take the averaged spectrum
+        ########################################################################
+
+        tor = self.take_one_request
+        if tor is not None:
+            scans_to_average = tor.scans_to_average
+            log.debug(f"take_one_averaged_reading: taking scans_to_average from tor {tor}")
         else:
-            # we're in free-running mode
-            loop_count = 1
+            scans_to_average = self.settings.state.scans_to_average
+            log.debug(f"take_one_averaged_reading: taking scans_to_average from SpectrometerState")
 
-        log.debug("take_one_averaged_reading: loop_count = %d", loop_count)
+        log.debug(f"take_one_averaged_reading: scans_to_average {scans_to_average}")
 
         # either take one measurement (normal), or a bunch (blocking averaging)
-        reading = None
-        for _ in range(0, loop_count):
-
-            # start a new reading
-            # NOTE: reading.timestamp is when reading STARTED, not FINISHED!
-            reading = Reading(self.device_id)
-
-            if self.tec_enabled:
-                log.debug("TEC enabled, so reading temperature")
-
-                use_float = True    # seems to work on 785XL (WP-01635 and WP-01491)
-
-                if use_float:
-                    c_temp = c_float()
-                    result = self.driver.GetTemperatureF(byref(c_temp))
-                else:
-                    c_temp = c_int()
-                    result = self.driver.GetTemperature(byref(c_temp))
-
-                label = self.get_error_code(result)
-                
-                if label in [ "DRV_SUCCESS", 
-                              "DRV_TEMPERATURE_DRIFT",
-                              "DRV_TEMPERATURE_STABILIZED",
-                              "DRV_TEMPERATURE_NOT_REACHED",
-                              "DRV_TEMPERATURE_NOT_STABILIZED" ]:
-                    reading.detector_temperature_degC = c_temp.value
-                    log.debug(f"Andor temperature {reading.detector_temperature_degC:.2f} ({label})")
-                else:
-                    log.error(f"unable to read detector temperature, result was {label}")
-
+        reading = Reading(self.device_id) # reading.timestamp is when reading STARTED, not FINISHED!
+        self.sum_count = 0
+        failure_count = 0
+        self.summed_spectrum = None
+        MAX_FAILURES = 3
+
+        # this loop can DELIBERATELY be changed (shortened, reset or lengthened)
+        # by external changes to self.sum_count and self.settings.state.scans_to_average
+        while self.sum_count < scans_to_average:
+
+            # monitor for external changes (but NOT new TakeOneRequest...that will appear in due process)
+            if scans_to_average != self.settings.state.scans_to_average:
+                log.debug(f"detected change in scans_to_average from {scans_to_average} to {self.settings.state.scans_to_average}")
+                self.scan_count = 0
+                scans_to_average = self.settings.state.scans_to_average
+                self.summed_spectrum = None
+            
             try:
-                reading.integration_time_ms = self.settings.state.integration_time_ms
-                reading.laser_power_perc    = self.settings.state.laser_power_perc
-                reading.laser_power_mW      = self.settings.state.laser_power_mW
-                reading.laser_enabled       = self.settings.state.laser_enabled
-                reading.spectrum            = self._get_spectrum_raw()
+                log.debug(f"take_one_averaged_reading: taking spectrum {self.sum_count+1} of {scans_to_average}")
+                spectrum = self._get_spectrum_raw()
+            except usb.USBError:
+                failure_count += 1
+                log.error(f"failure_count {failure_count}, encountered USB error in reading for device {self.device}", exc_info=1)
+                if failure_count < MAX_FAILURES:
+                    continue
+
+            if spectrum is None or spectrum == []:
+                failure_count += 1
+                log.error(f"failure_count {failure_count}, received empty spectrum {reading.spectrum}")
+                if failure_count < MAX_FAILURES:
+                    log.error(f"failure_count {failure_count}, trying again")
+                    continue
+
+            if failure_count >= MAX_FAILURES:
+                msg = f"exceeded MAX_FAILURES {MAX_FAILURES} while trying to read an averaged spectrum"
+                log.error(msg)
+                return 
+
+            log.debug("successfully read one spectrum")
+            self.sum_count += 1
+            if scans_to_average > 1 and self.sum_count < scans_to_average:
+                # MZ: why aren't we following this pattern in WasatchDevice / FeatureInterfaceDevice?
+                log.debug(f"floating message upstream because sum_count {self.sum_count}, scans_to_average {scans_to_average}")
+                self._queue_message("scan_averaging", (self.device_id, self.sum_count))
+
+            if self.summed_spectrum is None:
+                self.summed_spectrum = spectrum
+            else:
+                self.summed_spectrum += spectrum
+            log.debug(f"take_one_averaged_reading: sum_count {self.sum_count}, summed_spectrum : {self.summed_spectrum[0:9]}")
+
+        # have we completed the averaged reading?
+        reading.spectrum = self.summed_spectrum / self.sum_count if self.sum_count > 1 else spectrum
+
+        log.debug(f"take_one_averaged_reading: {'averaged' if self.sum_count > 1 else 'non-averaged'} spectrum : %s ...", reading.spectrum[0:9])
+        reading.averaged = True
+        reading.sum_count = self.sum_count
+        return reading
+
+    def get_detector_temperature_degC(self):
+        if self.tec_enabled:
+            log.debug("TEC enabled, so reading temperature")
+
+            use_float = True    # seems to work on 785XL (WP-01635 and WP-01491)
+            if use_float:
+                c_temp = c_float()
+                result = self.driver.GetTemperatureF(byref(c_temp))
+            else:
+                c_temp = c_int()
+                result = self.driver.GetTemperature(byref(c_temp))
 
                 # MZ: why were we trying to use GetTemperatureF(float) here, when above it was GetTemperature(int)?
                 # temperature = c_float()
                 # temp_success = self.driver.GetTemperatureF(byref(temperature))
                 # reading.detector_temperature_degC = temperature.value
-            except usb.USBError:
-                self.failure_count += 1
-                log.error(f"Andor Device: encountered USB error in reading for device {self.device}")
-
-            if reading.spectrum is None or reading.spectrum == []:
-                if self.failure_count > 3:
-                    return SpectrometerResponse(data=False,error_msg="exceeded failure for readings")
-
-            if not reading.failure:
-                if averaging_enabled:
-                    if self.sum_count == 0:
-                        self.summed_spectra = [float(i) for i in reading.spectrum]
-                    else:
-                        log.debug("device.take_one_averaged_reading: summing spectra")
-                        for i in range(len(self.summed_spectra)):
-                            self.summed_spectra[i] += reading.spectrum[i]
-                    self.sum_count += 1
-                    log.debug("device.take_one_averaged_reading: summed_spectra : %s ...", self.summed_spectra[0:9])
-
-            # count spectra
-            self.session_reading_count += 1
-            reading.session_count = self.session_reading_count
-            reading.sum_count = self.sum_count
-
-            # have we completed the averaged reading?
-            if averaging_enabled:
-                if self.sum_count >= self.settings.state.scans_to_average:
-                    reading.spectrum = [ x / self.sum_count for x in self.summed_spectra ]
-                    log.debug("device.take_one_averaged_reading: averaged_spectrum : %s ...", reading.spectrum[0:9])
-                    reading.averaged = True
-
-                    # reset for next average
-                    self.summed_spectra = None
-                    self.sum_count = 0
+
+            label = self.get_error_code(result)
+            
+            if label in [ "DRV_SUCCESS", 
+                          "DRV_TEMPERATURE_DRIFT",
+                          "DRV_TEMPERATURE_STABILIZED",
+                          "DRV_TEMPERATURE_NOT_REACHED",
+                          "DRV_TEMPERATURE_NOT_STABILIZED" ]:
+                detector_temperature_degC = c_temp.value
+                log.debug(f"Andor temperature {detector_temperature_degC:.2f} ({label})")
+                return detector_temperature_degC
             else:
-                # if averaging isn't enabled...then a single reading is the
-                # "averaged" final measurement (check reading.sum_count to confirm)
-                reading.averaged = True
-
-            # were we told to only take one (potentially averaged) measurement?
-            if self.take_one and reading.averaged:
-                log.debug("completed take_one")
-                self.change_setting("cancel_take_one", True)
-
-        log.debug("device.take_one_averaged_reading: returning %s", reading)
-        if reading.spectrum is not None and reading.spectrum != []:
-            self.failure_count = 0
-        # reading.dump_area_scan()
-        return SpectrometerResponse(data=reading)
+                log.error(f"unable to read detector temperature, result was {label}")
+
 
     def _close_ex_shutter(self):
         self.check_result(self.driver.SetShutterEx(1, 1, self.SHUTTER_SPEED_MS, self.SHUTTER_SPEED_MS, 2), "SetShutterEx(2)")
@@ -439,6 +471,10 @@ class AndorDevice(InterfaceDevice):
         self.settings.eeprom.has_cooling = True
         return SpectrometerResponse(data=True)
 
+    def set_take_one_request(self, tor):
+        log.debug(f"set_take_one_request: storing {tor}")
+        self.take_one_request = tor
+
     def set_vertical_binning(self, roi):
         """
         Note that this follows the same (start, end) vertical ROI API as 
@@ -547,8 +583,54 @@ class AndorDevice(InterfaceDevice):
             self.set_tec_setpoint(self.settings.eeprom.startup_temp_degC)
 
     def acquire_data(self):
+        # handle TakeOneRequest.take_dark
+        dark_reading = None
+        tor = self.take_one_request
+        log.debug(f"acquire_data: tor {tor}")
+        if tor and tor.take_dark:
+            self.set_shutter_enable(True)
+            dark_reading = self._take_one_averaged_reading()
+            if dark is None:
+                return SpectrometerResponse(False, error_msg="failed to collect dark")
+            self.set_shutter_enable(False)
+
+        # get spectrum (potentially averaged)
         reading = self._take_one_averaged_reading()
-        return reading
+        if reading is None:
+            return SpectrometerResponse(False, error_msg="failed to collect reading")
+
+        # fill-out metadata
+        if dark_reading:
+            reading.dark = dark_reading.spectrum
+        reading.integration_time_ms = self.settings.state.integration_time_ms
+        reading.detector_temperature_degC = self.get_detector_temperature_degC()
+
+        # only bump session_count by one for a dark-corrected averaged reading 
+        # (regardless of how many spectra were collected to generate it)
+        self.session_reading_count += 1
+        reading.session_count = self.session_reading_count
+
+        # update or close TakeOneRequest
+        if tor is not None:
+            log.debug(f"acquire_data: adding to to reading: {tor}")
+            reading.take_one_request = tor
+
+            # XL units don't provide laser control
+            if tor.laser_warmup_ms:     log.error("TakeOneRequest.laser_warmup_ms not supported")
+            if tor.auto_raman_request:  log.error("TakeOneRequest.auto_raman_request not supported")
+            if tor.enable_laser_before: log.error("TakeOneRequest.enable_laser_before not supported")
+            if tor.disable_laser_after: log.error("TakeOneRequest.disable_laser_after not supported")
+
+            # readings_current/target are for "fast (streaming) BatchCollection"
+            if tor.readings_target:
+                tor.readings_current += 1
+
+            if not tor.readings_target or tor.readings_current >= tor.readings_target:
+                log.debug(f"completed {tor}")
+                self.take_one_request = None
+
+        log.debug(f"acquire_data: reading {reading}")
+        return SpectrometerResponse(data=reading)
 
     def set_shutter_enable(self, enable):
         if enable:
@@ -679,9 +761,13 @@ class AndorDevice(InterfaceDevice):
         log.debug(f"set AD channel {ADnumber} with horizontal speed {HSnumber} ({STemp})")
         return SpectrometerResponse(True)
 
-    def scans_to_average(self, value):
+    def set_scans_to_average(self, value):
+        value = int(value)
+
+        # reset count on changes
         self.sum_count = 0
-        self.settings.state.scans_to_average = int(value)
+        self.summed_spectrum = None
+        self.settings.state.scans_to_average = value
         return SpectrometerResponse(True)
 
     def get_error_code_long(self, code):

wasatch-2.3.6/wasatch/AreaScanImage.py

@@ -0,0 +1,19 @@
+class AreaScanImage:
+
+    FRAME_COUNT = 0
+
+    def __init__(self, data=None, width=None, height=None, format_name=None, width_orig=None, height_orig=None, pathname_png=None, line_index=None):
+        self.data = data
+        self.width = width
+        self.height = height
+        self.width_orig = width_orig
+        self.height_orig = height_orig
+        self.format_name = format_name
+        self.pathname_png = pathname_png
+        self.line_index = line_index
+
+        self.frame_count = AreaScanImage.FRAME_COUNT
+        AreaScanImage.FRAME_COUNT += 1
+
+    def __repr__(self):
+        return f"AreaScanImage<frame {self.frame_count}, line_index {line_index}, width {self.width} (orig {self.width_orig}), height {self.height} (orig {self.height_orig}), format_name {self.format_name}, pathname_png {self.pathname_png}>"

{wasatch-2.2.17 → wasatch-2.3.6}/wasatch/AutoRaman.py

@@ -105,6 +105,9 @@ class AutoRaman:
         reading.sum_count               = 1         # todo: get_scans_to_average()
         reading.new_integration_time_ms = None      # todo: get_integration_time_ms()
         reading.new_gain_db             = None      # todo: get_detector_gain()
+        reading.laser_enabled           = True
+        reading.laser_power_perc = hardware.settings.state.laser_power_perc
+        reading.laser_power_mW = hardware.settings.state.laser_power_mW
 
         return SpectrometerResponse(data=reading)
 
@@ -415,6 +418,9 @@ class AutoRaman:
         reading.sum_count = num_avg
         reading.new_integration_time_ms = int_time
         reading.new_gain_db = gain_db
+        reading.laser_enabled = True
+        reading.laser_power_perc = self.hardware.settings.state.laser_power_perc
+        reading.laser_power_mW = self.hardware.settings.state.laser_power_mW
 
         log.debug("done")
         return reading

{wasatch-2.2.17 → wasatch-2.3.6}/wasatch/AutoRamanRequest.py

@@ -5,7 +5,7 @@ class AutoRamanRequest:
     START_GAIN_DB           = 0
     MAX_INTEG_MS            = 2000
     MIN_INTEG_MS            = 10
-    MAX_GAIN_DB             = 32
+    MAX_GAIN_DB             = 30
     MIN_GAIN_DB             = 0
     TARGET_COUNTS           = 45000
     MAX_COUNTS              = 50000
@@ -82,7 +82,7 @@ if __name__ == "__main__":
         start_gain_db  = 0,
         max_integ_ms   = 2000,
         min_integ_ms   = 10,
-        max_gain_db    = 32,
+        max_gain_db    = 30,
         min_gain_db    = 0,
         target_counts  = 45000,
         max_counts     = 50000,

{wasatch-2.2.17 → wasatch-2.3.6}/wasatch/CSVLoader.py

@@ -41,11 +41,10 @@ class CSVLoader:
         # default
         self.timestamp = datetime.datetime.now()
 
-        # temporarily store these if no wavecal is provided
+        # define buckets into which we will load the data in load_data()
         self.metadata = {
             "pixel": []
         }
-
         self.headers = []
         self.processed_reading = ProcessedReading()
         self.processed_reading.reading = Reading(device_id = "LOAD:" + pathname)
@@ -104,7 +103,7 @@ class CSVLoader:
                     # check for end of metadata
                     looks_like_header = False
                     for tok in [ part.strip().lower() for part in line ]:
-                        if tok in ["pixel", "wavelength", "wavenumber", "processed", "intensity"]:
+                        if tok in ["pixel", "wavelength", "wavenumber", "processed", "intensity", "raw"]:
                             looks_like_header = True
                             break
 
@@ -181,4 +180,9 @@ class CSVLoader:
         # clear any arrays we ended up not filling
         self.processed_reading.post_load_cleanup()
 
+        log.debug("returning processed_reading:")
+        self.processed_reading.dump()
+
+        log.debug(f"returning metadata {self.metadata}")
+
         return self.processed_reading, self.metadata