MultiPyVu 3.5.4__tar.gz → 3.8.0__tar.gz

{multipyvu-3.5.4 → multipyvu-3.8.0}/LICENSE

@@ -1,21 +1,21 @@
-MIT License (MIT)
-
-Copyright (c) 2023 Quantum Design, Inc
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+MIT License (MIT)
+
+Copyright (c) 2023 Quantum Design, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

{multipyvu-3.5.4/src/MultiPyVu.egg-info → multipyvu-3.8.0}/PKG-INFO

@@ -1,41 +1,20 @@
 Metadata-Version: 2.4
 Name: MultiPyVu
-Version: 3.5.4
+Version: 3.8.0
 Summary: Control MultiVu using Python
 Author-email: Damon D Jackson <djackson@qdusa.com>
 Maintainer-email: "Quantum Design, Inc." <apps@qdusa.com>
-License: MIT License (MIT)
-        
-        Copyright (c) 2023 Quantum Design, Inc
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
+License-Expression: MIT
 Project-URL: Quantum Design, https://qdusa.com
 Project-URL: Pharos, https://www.qdusa.com/register/account/login
 Keywords: Quantum Design,QD,MultiVu,PPMS,DynaCool,MPMS3,VersaLab,OptiCool
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Scientific/Engineering :: Chemistry
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.9
+Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pandas
@@ -43,9 +22,7 @@ Requires-Dist: pywin32>=300; platform_system == "Windows"
 Requires-Dist: pillow
 Requires-Dist: pyyaml
 Dynamic: license-file
-Dynamic: requires-dist
 Dynamic: requires-python
-Dynamic: summary
 
 ![qd_logo](https://qdusa.com/images/QD_logo.png)
 # MultiPyVu
@@ -82,13 +59,13 @@ The components of MultiPyVu enable access to the set and read the temperature, f
 
 ### Module Requirements<a class="anchor" id="requirements"></a>
 MultiPyVu uses the following modules:
-- python version 3.10 or higher
+- python version 3.7 or higher
 - pywin32 - version 300 or higher.
 - pandas - data read back from a *.dat* file is a Pandas Dataframe
 - pillow - supports server gui
 - pyyaml - supports logging
 
-For the Python 3 distribution Quantum Design recommends [Anaconda](https://www.anaconda.com/products/individual) as it includes most modules needed for this server and other packages useful for scientific computing.  This code was built and tested using Python 3.8.  If you are not sure which version of Python you are using, from a command prompt type:
+To find which version of Python is used on the local computer, from a command prompt type:
 ```
 python --version
 ```
@@ -109,13 +86,13 @@ Remote Connection\example_MVDataFile_VISA.py | Simple example showing how to rou
 Data Processing\example_save_open_dat.py | Script showing how to save and read a MultiVu *.dat* file into a Pandas DataFrame, then plot with matplotlib.
 Measuring\example_stabilize.py | Measures the temperature while stabilizing at each temperature.
 Measuring\example_sweep.py | Measures the temperature while sweeping the temperature.
-Options\example_aux_therm.py | Gets the temperature of the auxilary thermometer from the OptiCool.
+Measuring\example_get_setpoints.py | Shows how to get the temperature and magnetic field setpoints.
+Options\example_aux_therm.py | Gets the temperature of the auxiliary thermometer from the OptiCool.
 Options\example_resistivity_option.py | Demonstrates how to set up the BRT module bridges for resistivity measurements and how to save the data.
 Options\example_horizontal_rotator.py | Demonstrates how to move the horizontal rotator to a new position.
-UsefulBatchFiles\whats_my_ip_address.cmd | This batch file script prints out the IP address for the computer, providing an easy way to get the server IP address needed for remote operation. Alternatively, the gui can be used to get the IP address by calling ```python -m MultiPyVu```.
-UsefulBatchFiles\show_process_with_port.cmd | Shows that active processes are running and what port is being used. By default, this looks for processes running on port 5000.  To query a different port number, append it to the command line arguments.  ```$ show_processes_with_port.cmd 4567```
+UsefulBatchFiles\show_processes_with_port.cmd | Shows that active processes are running and what port is being used. By default, this looks for processes running on port 27183.  To query a different port number, append it to the command line arguments.  ```$ show_processes_with_port.cmd 45678```
 UsefulBatchFiles\RunServer.cmd | This runs the server GUI.
-UsefulBatchFiles\kill_process.cmd | This ends the processes with the specified PID (which can be identified using show_process_with_port.cmd). Run using ```$ kill_process.cmd 13579```
+UsefulBatchFiles\kill_process.cmd | This ends the processes with the specified PID (which can be identified using show_processes_with_port.cmd). Run using ```$ kill_process.cmd 13579```
 
 ### Getting Started<a class="anchor" id="getting-started"></a>
  Once the MultiPyVu module has been installed, be sure that the MultiVu executable is running on the PC connected to the cryostat before starting the server. For testing purposes, you can use MultiVu in simulation mode on an office computer, or run mpv.Server with the -s flag which runs the python code in scaffolding that mimics MultiVu. This is especially helpful for developing a script on a computer that does not have MultiVu running (Mac, Linux, or any PC without MultiVu).  When running MultiVu and MultiPyVu, be sure that they are running under the same permissions.
@@ -181,7 +158,7 @@ with mpv.Client('127.0.0.1') as client:
 # do post-processing once the client has been closed
 ```
 
-If the host or port are not default values (localhost and 5000, respectively), then these parameters must be specified when instantiating MultiPyVu.Client().
+If the host or port are not default values (localhost and 27183, respectively), then these parameters must be specified when instantiating MultiPyVu.Client().
 
 Alternatively, one can start a connection to the server using:
 ```python
@@ -191,7 +168,7 @@ client.open()
 client.close_client()
 # do post-processing once the client has been closed
 ```
-Using the above method could end up with the server hung up because errors need to be correctly accounted for.  It is safer to use the Client as a context manager using a with-block.
+Using the above method could end up with the server hung up because errors need to be correctly accounted for.  It is safer to use the Client as a context manager using a with-block.  In addition, a client object can only connect to the server once.  For a second connection, one must instantiate a new client instance.
 
 The client can also close the server directly using:
 ```python
@@ -239,6 +216,10 @@ The <enum_options> mode is set using the client.temperature.approach_mode enum,
 ```python
 temperature, status = client.get_temperature()
 ```
+One can also retrieve the setpoint, rate, and approach mode:
+```python
+temperature, rate, approach = client.get_temperature_setpoints()
+```
 
 **Field**<a class="anchor" id="field"></a>
 ```python
@@ -260,6 +241,10 @@ The field and status are read back using:
 ```python
 field, status = client.get_field()
 ```
+One can also retrieve the setpoint, rate, and approach mode:
+```python
+field, rate, approach, driven = client.get_field_setpoints()
+```
 
 **Chamber**<a class="anchor" id="chamber"></a>
 ```python
@@ -325,7 +310,7 @@ For DynaCool, VersaLab, and PPMS customers with the horizontal rotator option, M
 Once configured, the following commands are simple to use:
 ```python
 position = 374.5
-rate_deg_per_sec = 100.0
+rate_deg_per_sec = 30.0
 client.set_position(position, rate_deg_per_sec)
 pos, status = client.get_position()
 ```
@@ -400,7 +385,7 @@ The server status can be queried from the command line.  First, we can see if th
 ```cmd
 $ python -m MultiPyVu -running
 ```
-By default, this queries the server at IP address = localhost and port = 5000.  To query a different address, use the *-ip=* or *-p=* flags.
+By default, this queries the server at IP address = localhost and port = 27183.  To query a different address, use the *-ip=* or *-p=* flags.
 
 Similarly, in order to get the server status at a specific ip address, use:
 ```cmd
@@ -439,8 +424,8 @@ with mpv.Server(flags=['-s', 'DYNACOOL']) as server:
 
 ### Troubleshooting<a class="anchor" id="troubleshooting"></a>
 Typical connection issues are due to:
-- Firewall. You might need to allow connections on port 5000 (the default port number) in your firewall. Windows Firewall may cause issues depending upon your network settings. If the server is open and a connection fails disabling Firewalls temporarily may be your best option to troubleshoot. If your computers are on the same domain disabling the Domain Firewall may be sufficient.
-- Port conflict. If port 5000 is in use, a different number can be specified when instantiating MultiPyVu.Server() and MultiPyVu.Client().
+- Firewall. You might need to allow connections on port 27183 (the default port number) in your firewall. Windows Firewall may cause issues depending upon your network settings. If the server is open and a connection fails disabling Firewalls temporarily may be your best option to troubleshoot. If your computers are on the same domain disabling the Domain Firewall may be sufficient.
+- Port conflict. If port 27183 is in use, a different number can be specified when instantiating MultiPyVu.Server() and MultiPyVu.Client().
 ```python
 server = mpv.Server(port=6000)
 client = mpv.Client(port=6000)
@@ -449,6 +434,22 @@ client = mpv.Client(port=6000)
 - A log file named QdMultiVu.log shows the traffic between the server and client which can also be useful during troubleshooting.
 
 ## Changelog<a class="anchor" id="changelog"></a>
+**3.8.0**
+- September 2026
+- Add support for the OptiCool Vector magnet
+- Improvements to the GUI for a better look on MacOS.
+- Improvements to wait_for() command.
+
+**3.7.0**
+ - September 2025
+ - Point MultiPyVuDataFile to version 00.05.00, which ignores blank lines when importing .dat files into a Pandas Dataframe.
+ 
+**3.6.1**
+- August 2025
+- Add commands to get the temperature and field setpoints.
+- Remove dependencies on the distutils module.
+- Minimum python version 3.7
+
 **3.5.4**
 - June 2025
 - Add the horizontal rotator option for DynaCool, VersaLab, and PPMS.

{multipyvu-3.5.4 → multipyvu-3.8.0}/README.md

@@ -33,13 +33,13 @@ The components of MultiPyVu enable access to the set and read the temperature, f
 
 ### Module Requirements<a class="anchor" id="requirements"></a>
 MultiPyVu uses the following modules:
-- python version 3.10 or higher
+- python version 3.7 or higher
 - pywin32 - version 300 or higher.
 - pandas - data read back from a *.dat* file is a Pandas Dataframe
 - pillow - supports server gui
 - pyyaml - supports logging
 
-For the Python 3 distribution Quantum Design recommends [Anaconda](https://www.anaconda.com/products/individual) as it includes most modules needed for this server and other packages useful for scientific computing.  This code was built and tested using Python 3.8.  If you are not sure which version of Python you are using, from a command prompt type:
+To find which version of Python is used on the local computer, from a command prompt type:
 ```
 python --version
 ```
@@ -60,13 +60,13 @@ Remote Connection\example_MVDataFile_VISA.py | Simple example showing how to rou
 Data Processing\example_save_open_dat.py | Script showing how to save and read a MultiVu *.dat* file into a Pandas DataFrame, then plot with matplotlib.
 Measuring\example_stabilize.py | Measures the temperature while stabilizing at each temperature.
 Measuring\example_sweep.py | Measures the temperature while sweeping the temperature.
-Options\example_aux_therm.py | Gets the temperature of the auxilary thermometer from the OptiCool.
+Measuring\example_get_setpoints.py | Shows how to get the temperature and magnetic field setpoints.
+Options\example_aux_therm.py | Gets the temperature of the auxiliary thermometer from the OptiCool.
 Options\example_resistivity_option.py | Demonstrates how to set up the BRT module bridges for resistivity measurements and how to save the data.
 Options\example_horizontal_rotator.py | Demonstrates how to move the horizontal rotator to a new position.
-UsefulBatchFiles\whats_my_ip_address.cmd | This batch file script prints out the IP address for the computer, providing an easy way to get the server IP address needed for remote operation. Alternatively, the gui can be used to get the IP address by calling ```python -m MultiPyVu```.
-UsefulBatchFiles\show_process_with_port.cmd | Shows that active processes are running and what port is being used. By default, this looks for processes running on port 5000.  To query a different port number, append it to the command line arguments.  ```$ show_processes_with_port.cmd 4567```
+UsefulBatchFiles\show_processes_with_port.cmd | Shows that active processes are running and what port is being used. By default, this looks for processes running on port 27183.  To query a different port number, append it to the command line arguments.  ```$ show_processes_with_port.cmd 45678```
 UsefulBatchFiles\RunServer.cmd | This runs the server GUI.
-UsefulBatchFiles\kill_process.cmd | This ends the processes with the specified PID (which can be identified using show_process_with_port.cmd). Run using ```$ kill_process.cmd 13579```
+UsefulBatchFiles\kill_process.cmd | This ends the processes with the specified PID (which can be identified using show_processes_with_port.cmd). Run using ```$ kill_process.cmd 13579```
 
 ### Getting Started<a class="anchor" id="getting-started"></a>
  Once the MultiPyVu module has been installed, be sure that the MultiVu executable is running on the PC connected to the cryostat before starting the server. For testing purposes, you can use MultiVu in simulation mode on an office computer, or run mpv.Server with the -s flag which runs the python code in scaffolding that mimics MultiVu. This is especially helpful for developing a script on a computer that does not have MultiVu running (Mac, Linux, or any PC without MultiVu).  When running MultiVu and MultiPyVu, be sure that they are running under the same permissions.
@@ -132,7 +132,7 @@ with mpv.Client('127.0.0.1') as client:
 # do post-processing once the client has been closed
 ```
 
-If the host or port are not default values (localhost and 5000, respectively), then these parameters must be specified when instantiating MultiPyVu.Client().
+If the host or port are not default values (localhost and 27183, respectively), then these parameters must be specified when instantiating MultiPyVu.Client().
 
 Alternatively, one can start a connection to the server using:
 ```python
@@ -142,7 +142,7 @@ client.open()
 client.close_client()
 # do post-processing once the client has been closed
 ```
-Using the above method could end up with the server hung up because errors need to be correctly accounted for.  It is safer to use the Client as a context manager using a with-block.
+Using the above method could end up with the server hung up because errors need to be correctly accounted for.  It is safer to use the Client as a context manager using a with-block.  In addition, a client object can only connect to the server once.  For a second connection, one must instantiate a new client instance.
 
 The client can also close the server directly using:
 ```python
@@ -190,6 +190,10 @@ The <enum_options> mode is set using the client.temperature.approach_mode enum,
 ```python
 temperature, status = client.get_temperature()
 ```
+One can also retrieve the setpoint, rate, and approach mode:
+```python
+temperature, rate, approach = client.get_temperature_setpoints()
+```
 
 **Field**<a class="anchor" id="field"></a>
 ```python
@@ -211,6 +215,10 @@ The field and status are read back using:
 ```python
 field, status = client.get_field()
 ```
+One can also retrieve the setpoint, rate, and approach mode:
+```python
+field, rate, approach, driven = client.get_field_setpoints()
+```
 
 **Chamber**<a class="anchor" id="chamber"></a>
 ```python
@@ -276,7 +284,7 @@ For DynaCool, VersaLab, and PPMS customers with the horizontal rotator option, M
 Once configured, the following commands are simple to use:
 ```python
 position = 374.5
-rate_deg_per_sec = 100.0
+rate_deg_per_sec = 30.0
 client.set_position(position, rate_deg_per_sec)
 pos, status = client.get_position()
 ```
@@ -351,7 +359,7 @@ The server status can be queried from the command line.  First, we can see if th
 ```cmd
 $ python -m MultiPyVu -running
 ```
-By default, this queries the server at IP address = localhost and port = 5000.  To query a different address, use the *-ip=* or *-p=* flags.
+By default, this queries the server at IP address = localhost and port = 27183.  To query a different address, use the *-ip=* or *-p=* flags.
 
 Similarly, in order to get the server status at a specific ip address, use:
 ```cmd
@@ -390,8 +398,8 @@ with mpv.Server(flags=['-s', 'DYNACOOL']) as server:
 
 ### Troubleshooting<a class="anchor" id="troubleshooting"></a>
 Typical connection issues are due to:
-- Firewall. You might need to allow connections on port 5000 (the default port number) in your firewall. Windows Firewall may cause issues depending upon your network settings. If the server is open and a connection fails disabling Firewalls temporarily may be your best option to troubleshoot. If your computers are on the same domain disabling the Domain Firewall may be sufficient.
-- Port conflict. If port 5000 is in use, a different number can be specified when instantiating MultiPyVu.Server() and MultiPyVu.Client().
+- Firewall. You might need to allow connections on port 27183 (the default port number) in your firewall. Windows Firewall may cause issues depending upon your network settings. If the server is open and a connection fails disabling Firewalls temporarily may be your best option to troubleshoot. If your computers are on the same domain disabling the Domain Firewall may be sufficient.
+- Port conflict. If port 27183 is in use, a different number can be specified when instantiating MultiPyVu.Server() and MultiPyVu.Client().
 ```python
 server = mpv.Server(port=6000)
 client = mpv.Client(port=6000)
@@ -400,6 +408,22 @@ client = mpv.Client(port=6000)
 - A log file named QdMultiVu.log shows the traffic between the server and client which can also be useful during troubleshooting.
 
 ## Changelog<a class="anchor" id="changelog"></a>
+**3.8.0**
+- September 2026
+- Add support for the OptiCool Vector magnet
+- Improvements to the GUI for a better look on MacOS.
+- Improvements to wait_for() command.
+
+**3.7.0**
+ - September 2025
+ - Point MultiPyVuDataFile to version 00.05.00, which ignores blank lines when importing .dat files into a Pandas Dataframe.
+ 
+**3.6.1**
+- August 2025
+- Add commands to get the temperature and field setpoints.
+- Remove dependencies on the distutils module.
+- Minimum python version 3.7
+
 **3.5.4**
 - June 2025
 - Add the horizontal rotator option for DynaCool, VersaLab, and PPMS.

{multipyvu-3.5.4 → multipyvu-3.8.0}/pyproject.toml

@@ -6,19 +6,23 @@ build-backend = "setuptools.build_meta"
 name = "MultiPyVu"
 dynamic = [
     "version",
-    "description",
     "requires-python",
-    "dependencies",
     ]
 authors = [{name = "Damon D Jackson", email = "djackson@qdusa.com"}]
 maintainers = [
     { name = "Quantum Design, Inc.", email = "apps@qdusa.com" },
     ]
 readme = "README.md"
-license = {file = "LICENSE"}
+description = "Control MultiVu using Python"
+dependencies = [
+    "pandas",
+    "pywin32>=300; platform_system=='Windows'",
+    "pillow",
+    "pyyaml",
+    ]
+license = "MIT"
 classifiers = [
     "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Intended Audience :: Science/Research",
     "Topic :: Scientific/Engineering :: Physics",
@@ -39,3 +43,6 @@ keywords = [
 [project.urls]
 "Quantum Design" = "https://qdusa.com"
 "Pharos" = "https://www.qdusa.com/register/account/login"
+
+[tool.setuptools.dynamic]
+version = {attr = "MultiPyVu.__version.__version__"}

multipyvu-3.8.0/setup.py

@@ -0,0 +1,27 @@
+"""A setuptools based setup module.
+
+See:
+https://packaging.python.org/guides/distributing-packages-using-setuptools/
+https://github.com/pypa/sampleproject
+"""
+
+# Always prefer setuptools over distutils
+from setuptools import find_packages, setup
+
+# name, version, description, license, dependencies, and readme are
+# configured in pyproject.toml. Only the settings without a pyproject.toml
+# equivalent (package discovery/layout and non-Python package data) live here.
+setup(
+    package_dir={"": "src"},
+    packages=find_packages(where="src"),
+    package_data={"MultiPyVu": [
+            "images/*.jpg",
+            "images/*.png",
+            "font/*.ttf",
+            "scripts/*",
+            "MultiVuDataFile/*.py",
+            "logging_config.yaml"
+            ]
+        },
+    python_requires=">=3.7",
+)

{multipyvu-3.5.4 → multipyvu-3.8.0}/src/MultiPyVu/CommandChamber.py

@@ -13,7 +13,7 @@ from typing import Dict, List, Tuple, Union
 
 from .exceptions import MultiPyVuError
 from .ICommand import (ICommand, ICommandImp, ICommandObserverSim,
-                       ISimulateChange, catch_thread_error)
+                       ISimulateChange)
 from .IEventManager import IObserver
 
 
@@ -90,7 +90,7 @@ class CommandChamberBase(ICommand):
 
     def convert_result(self, response: Dict[str, str]) -> Tuple:
         """
-        Converts the CommandMultiVu response from get_state()
+        Converts the CommandMultiVu response from get_state_server()
         to something usable for the user.
 
         Parameters:
@@ -131,7 +131,7 @@ class CommandChamberBase(ICommand):
         raise NotImplementedError
 
     @abstractmethod
-    def _set_state_imp(self, mode: int) -> Union[str, int]:
+    def _set_state_imp(self, mode: modeEnum) -> Union[str, int]:
         raise NotImplementedError
 
     def set_state_server(self, arg_string) -> Union[str, int]:
@@ -148,8 +148,8 @@ class CommandChamberBase(ICommand):
             for m in modeEnum:
                 err_msg += f'\n\t{m.value}: {m.name}'
             raise MultiPyVuError(err_msg)
-        self.state = set_mode
-        return self._set_state_imp(set_mode)
+        self.state = modeEnum(set_mode)
+        return self._set_state_imp(self.state)
 
     def state_code_dict(self):
         return STATE_DICT
@@ -195,7 +195,7 @@ class CommandChamberImp(ICommandImp, CommandChamberBase):
         if self.instrument_name == 'OPTICOOL':
             err_msg = 'get_chamber() is not available for the OptiCool'
             raise MultiPyVuError(err_msg)
-        error = self._mvu.GetChamber(state_variant)
+        can_error = self._mvu.GetChamber(state_variant)
         # On 6/10/25, I found that the PPMS was returning something greater
         # than 1 with the GetTemperature() command.  After talking with Mark,
         # I have decided to only check for a value greater than 1 for all
@@ -206,7 +206,7 @@ class CommandChamberImp(ICommandImp, CommandChamberBase):
 
         return 0.0, self.state
 
-    def _set_state_imp(self, mode: int) -> Union[str, int]:
+    def _set_state_imp(self, mode: modeEnum) -> Union[str, int]:
         can_error = self._mvu.SetChamber(mode)
         self.set_point = mode
 
@@ -216,7 +216,7 @@ class CommandChamberImp(ICommandImp, CommandChamberBase):
             else:
                 # returning this string makes CommandMultiVu_base happy
                 return 'Call was successful'
-        elif can_error > 0:
+        elif can_error > 1:
             raise MultiPyVuError('Error when calling SetChamber()')
         return can_error
 
@@ -266,15 +266,22 @@ class CommandChamberImp(ICommandImp, CommandChamberBase):
 #
 ############################
 
-@catch_thread_error
 class SimulateChamberChange(ISimulateChange):
-    # class variables
+    # These are class variables, not instance variables, so that the
+    # simulated instrument keeps its condition from one change
+    # thread to the next.  See ISimulateChange for the reasoning.
     _stop_flag: bool = False
-    _val: float
-    _state: str
-    _set_point: float
-    _rate: float
-    _flavor: str
+    _state_dict = STATE_DICT
+    # The starting values come from the Command*Base class so that
+    # the scaffolding and the real implementation begin in the
+    # same place.
+    _current_val: float = CommandChamberBase._current_val
+    _state: int = CommandChamberBase._state
+    _set_point: float = CommandChamberBase._set_point
+    # The chamber has no rate, and the flavor is set by
+    # CommandChamberSim._set_state_imp() before the thread runs.
+    _rate: float = 0.0
+    _flavor: str = ''
     _observers: List[IObserver] = []
 
     def __init__(self):
@@ -282,11 +289,11 @@ class SimulateChamberChange(ISimulateChange):
 
     @property
     def current_val(self):
-        return SimulateChamberChange._val
+        return SimulateChamberChange._current_val
 
     @current_val.setter
     def current_val(self, new):
-        SimulateChamberChange._val = new
+        SimulateChamberChange._current_val = new
 
     @property
     def set_point(self):
@@ -323,20 +330,20 @@ class SimulateChamberChange(ISimulateChange):
         if self.stop_requested():
             return
         if self.set_point == modeEnum.seal.value:
-            self.state = STATE_DICT[1]
+            self.state = 1
         elif self.set_point == modeEnum.purge_seal.value:
-            self.state = STATE_DICT[1]
+            self.state = 1
         elif self.set_point == modeEnum.vent_seal.value:
-            self.state = STATE_DICT[2]
+            self.state = 2
         elif self.set_point == modeEnum.high_vacuum.value:
-            self.state = STATE_DICT[7]
+            self.state = 7
         elif self.set_point == modeEnum.pump_continuous.value:
-            self.state = STATE_DICT[8]
+            self.state = 8
         elif self.set_point == modeEnum.vent_continuous.value:
             if self.flavor == 'PPMS':
-                self.state = STATE_DICT[5]
+                self.state = 5
             else:
-                self.state = STATE_DICT[9]
+                self.state = 9
         else:
             msg = f'{self.set_point} is an invalid mode'
             raise ValueError(msg)
@@ -401,13 +408,12 @@ class CommandChamberSim(CommandChamberBase,
             raise MultiPyVuError(err_msg)
         return 0.0, self.state
 
-    def _set_state_imp(self, mode: int) -> Union[str, int]:
-        self.change_thread = self.get_sim_instance()
-        state_string = STATE_DICT[self.state]
+    def _set_state_imp(self, mode: modeEnum) -> Union[str, int]:
+        self.change_thread: SimulateChamberChange = self.get_sim_instance()
         self.change_thread.set_params('',
                                       mode,
                                       0.0,
-                                      state_string,
+                                      self.state,
                                       )
         self.change_thread.flavor = self.instrument_name
         self.change_thread.subscribe(self)
@@ -422,7 +428,4 @@ class CommandChamberSim(CommandChamberBase,
         return error
 
     def update(self, value, state):
-        for state_number, state_str in STATE_DICT.items():
-            if state_str == state:
-                self.state = state_number
-                break
+        self.state = state