quarchpy 2.1.22__py2.py3-none-any.whl → 2.1.23__py2.py3-none-any.whl

quarchpy/.idea/modules.xml

@@ -3,6 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/../../../../Application Notes/.idea/Application Notes.iml" filepath="$PROJECT_DIR$/../../../../Application Notes/.idea/Application Notes.iml" />
+      <module fileurl="file://$PROJECT_DIR$/../../../QuarchCalibration/.idea/QuarchCalibration.iml" filepath="$PROJECT_DIR$/../../../QuarchCalibration/.idea/QuarchCalibration.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/quarchpy.iml" filepath="$PROJECT_DIR$/.idea/quarchpy.iml" />
     </modules>
   </component>

quarchpy/.idea/quarchpy.iml

@@ -7,6 +7,7 @@
     <orderEntry type="jdk" jdkName="Python 3.11" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="Application Notes" />
+    <orderEntry type="module" module-name="QuarchCalibration" />
   </component>
   <component name="PyDocumentationSettings">
     <option name="format" value="PLAIN" />

quarchpy/.idea/workspace.xml

@@ -17,23 +17,26 @@
       </list>
     </option>
   </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="ProjectId" id="2T0rSFX3wSYiHYg1HMDN2Ug8LET" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;P:/Software/Application Notes/AN-015 - Automating with QPS/Trunk&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;diff.base&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "last_opened_file_path": "P:/Software/Python/QuarchCalibration",
+    "settings.editor.selected.configurable": "diff.base"
   },
-  &quot;keyToStringList&quot;: {
-    &quot;com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File&quot;: [
-      &quot;Python&quot;
+  "keyToStringList": {
+    "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
+      "Python"
     ]
   }
-}</component>
+}]]></component>
   <component name="PyConsoleOptionsProvider">
     <option name="myPythonConsoleState">
       <console-settings module-name="quarchpy" is-module-sdk="true">
@@ -44,6 +47,8 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="P:\Software\Python\QuarchPy\Trunk\quarchpy\debug" />
+      <recent name="P:\Software\Application Notes\AN-006 - Python Control of Quarch Modules\Trunk" />
       <recent name="P:\Software\Application Notes\AN-015 - Automating with QPS\Trunk" />
       <recent name="P:\Software\Application Notes\AN-017 - QPS performance test with FIO\Trunk" />
       <recent name="C:\Users\sboon\AppData\Roaming\JetBrains\PyCharmCE2023.1\scratches" />
@@ -52,20 +57,20 @@
       <recent name="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
     </key>
   </component>
-  <component name="RunManager" selected="Python.QisStreamExample">
-    <configuration name="QPSHelpReader" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
-      <module name="Application Notes" />
+  <component name="RunManager" selected="Python.HammerRegRead">
+    <configuration name="HammerRegRead" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="quarchpy" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../../../Application Notes/AN-015 - Automating with QPS/Trunk" />
-      <option name="IS_MODULE_SDK" value="true" />
+      <option name="WORKING_DIRECTORY" value="$USER_HOME$/Desktop" />
+      <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/../../../../Application Notes/AN-015 - Automating with QPS/Trunk/QPSHelpReader.py" />
+      <option name="SCRIPT_NAME" value="$USER_HOME$/Desktop/HammerRegRead.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -74,7 +79,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="QisStreamExample" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="PowerExamples" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Application Notes" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -82,11 +87,11 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../../../Application Notes/AN-012 - Python Control of Power Modules via QIS/Trunk" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../../../Application Notes/AN-022 - QIS Automation and post processing example/Trunk" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/../../../../Application Notes/AN-012 - Python Control of Power Modules via QIS/Trunk/QisStreamExample.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/../../../../Application Notes/AN-022 - QIS Automation and post processing example/Trunk/PowerExamples.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -95,7 +100,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="performanceTestFIO" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="QisStreamExample" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Application Notes" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -103,11 +108,11 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../../../Application Notes/AN-017 - QPS performance test with FIO/Trunk" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../../../Application Notes/AN-012 - Python Control of Power Modules via QIS/Trunk" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/../../../../Application Notes/AN-017 - QPS performance test with FIO/Trunk/performanceTestFIO.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/../../../../Application Notes/AN-012 - Python Control of Power Modules via QIS/Trunk/QisStreamExample.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -116,19 +121,19 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="run (2)" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
-      <module name="quarchpy" />
+    <configuration name="TestPYQPSQISConnectionsSameModule" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="Application Notes" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../../../Application Notes/AN-006 - Python Control of Quarch Modules/Trunk" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/run.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/../../../../Application Notes/AN-006 - Python Control of Quarch Modules/Trunk/TestPYQPSQISConnectionsSameModule.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -160,11 +165,11 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="Python.HammerRegRead" />
+        <item itemvalue="Python.TestPYQPSQISConnectionsSameModule" />
+        <item itemvalue="Python.PowerExamples" />
         <item itemvalue="Python.QisStreamExample" />
         <item itemvalue="Python.simple_terminal" />
-        <item itemvalue="Python.QPSHelpReader" />
-        <item itemvalue="Python.run (2)" />
-        <item itemvalue="Python.performanceTestFIO" />
       </list>
     </recent_temporary>
   </component>
@@ -219,7 +224,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/connection_specific/connection_QPS.py</url>
-          <line>57</line>
+          <line>82</line>
           <option name="timeStamp" value="25" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -287,6 +292,21 @@
           <line>21</line>
           <option name="timeStamp" value="84" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/../../../../Application Notes/AN-022 - QIS Automation and post processing example/Trunk/PowerExamples.py</url>
+          <line>74</line>
+          <option name="timeStamp" value="88" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/connection_specific/connection_QIS.py</url>
+          <line>1049</line>
+          <option name="timeStamp" value="89" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/../../../../Application Notes/AN-006 - Python Control of Quarch Modules/Trunk/TestPYQPSQISConnectionsSameModule.py</url>
+          <line>36</line>
+          <option name="timeStamp" value="97" />
+        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="python-exception">

quarchpy/__init__.py

@@ -46,17 +46,17 @@ from debug.versionCompare import requiredQuarchpyVersion
 #breacking back-compatibility with old scripts.  Avoid using these direct imports
 #and use the managed sub module format instead (from quarchpy.device import *)
 from device import quarchDevice, getQuarchDevice
-from connection_specific.connection_QIS import QisInterface as qisInterface
-from connection_specific.connection_QPS import QpsInterface as qpsInterface
+from connection_specific.connection_QIS import QisInterface, QisInterface as qisInterface
+from connection_specific.connection_QPS import QpsInterface, QpsInterface as qpsInterface
 from qis.qisFuncs import isQisRunning, startLocalQis, GetQisModuleSelection
-from qis.qisFuncs import closeQis as closeQIS
+from qis.qisFuncs import closeQis, closeQis as closeQIS
 from device.quarchPPM import quarchPPM
 from iometer.iometerFuncs import generateIcfFromCsvLineData, readIcfCsvLineData, generateIcfFromConf, runIOMeter, processIometerInstResults
 from device.quarchQPS import quarchQPS
 from qps.qpsFuncs import isQpsRunning, startLocalQps, GetQpsModuleSelection
-from qps.qpsFuncs import closeQps as closeQPS
-from disk_test.DiskTargetSelection import getDiskTargetSelection as GetDiskTargetSelection
-from qps.qpsFuncs import toQpsTimeStamp as adjustTime
+from qps.qpsFuncs import closeQps, closeQps as closeQPS
+from disk_test.DiskTargetSelection import getDiskTargetSelection, getDiskTargetSelection as GetDiskTargetSelection
+from qps.qpsFuncs import toQpsTimeStamp, toQpsTimeStamp as adjustTime
 from fio.FIO_interface import runFIO
 from device.scanDevices import scanDevices
 

quarchpy/_version.py

@@ -1 +1 @@
-__version__ = "2.1.22"
+__version__ = "2.1.23"