quarchpy 2.1.22__py2.py3-none-any.whl → 2.1.24.dev1__py2.py3-none-any.whl

quarchpy/.idea/.name

@@ -1 +1 @@
-qpsFuncs.py
+run.py

quarchpy/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,12 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredIdentifiers">
+        <list>
+          <option value="user_interface.user_interface.raw_input" />
+        </list>
+      </option>
+    </inspection_tool>
+  </profile>
+</component>

quarchpy/.idea/modules.xml

@@ -2,7 +2,6 @@
 <project version="4">
   <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$/.idea/quarchpy.iml" filepath="$PROJECT_DIR$/.idea/quarchpy.iml" />
     </modules>
   </component>

quarchpy/.idea/quarchpy.iml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/venv" />
-    </content>
+    <content url="file://$MODULE_DIR$" />
     <orderEntry type="jdk" jdkName="Python 3.11" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Application Notes" />
   </component>
   <component name="PyDocumentationSettings">
     <option name="format" value="PLAIN" />

quarchpy/.idea/workspace.xml

@@ -4,119 +4,25 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="868cb889-b9a9-4a57-9073-fcf7a5ade29d" name="Changes" comment="" />
+    <list default="true" id="40f7673a-627a-4f7c-af11-cbfe2901f1dd" name="Changes" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Python Script" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectId" id="2T0rSFX3wSYiHYg1HMDN2Ug8LET" />
+  <component name="ProjectId" id="2dXbnfSzynATcTeDdrRdh5ef4Yb" />
   <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;
-  },
-  &quot;keyToStringList&quot;: {
-    &quot;com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File&quot;: [
-      &quot;Python&quot;
-    ]
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;
   }
 }</component>
-  <component name="PyConsoleOptionsProvider">
-    <option name="myPythonConsoleState">
-      <console-settings module-name="quarchpy" is-module-sdk="true">
-        <option name="myUseModuleSdk" value="true" />
-        <option name="myModuleName" value="quarchpy" />
-      </console-settings>
-    </option>
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <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" />
-    </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <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" />
-      <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="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="PARAMETERS" value="" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
-    <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" />
-      <envs>
-        <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="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="PARAMETERS" value="" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
-    <configuration name="performanceTestFIO" 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$/../../../../Application Notes/AN-017 - QPS performance test with FIO/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="PARAMETERS" value="" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
-    <configuration name="run (2)" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+  <component name="RunManager" selected="Python.run (1)">
+    <configuration name="run (1)" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="quarchpy" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -137,7 +43,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="simple_terminal" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="run" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="quarchpy" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -145,11 +51,11 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/debug" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/connection_specific/QPS/win-amd64" />
       <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$/debug/simple_terminal.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/connection_specific/QPS/win-amd64/run.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -160,141 +66,31 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="Python.QisStreamExample" />
-        <item itemvalue="Python.simple_terminal" />
-        <item itemvalue="Python.QPSHelpReader" />
-        <item itemvalue="Python.run (2)" />
-        <item itemvalue="Python.performanceTestFIO" />
+        <item itemvalue="Python.run (1)" />
+        <item itemvalue="Python.run" />
       </list>
     </recent_temporary>
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="868cb889-b9a9-4a57-9073-fcf7a5ade29d" name="Changes" comment="" />
-      <created>1690190836669</created>
+      <changelist id="40f7673a-627a-4f7c-af11-cbfe2901f1dd" name="Changes" comment="" />
+      <created>1710157540918</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1690190836669</updated>
+      <updated>1710157540918</updated>
     </task>
     <servers />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/debug/SystemTest.py</url>
-          <line>50</line>
-          <option name="timeStamp" value="4" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/debug/SystemTest.py</url>
-          <line>52</line>
-          <option name="timeStamp" value="8" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/../../../../../../Python311/Lib/site-packages/quarchpy/device/quarchPPM.py</url>
-          <line>31</line>
-          <option name="timeStamp" value="10" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$APPLICATION_CONFIG_DIR$/scratches/quarchpy/device/quarchPPM.py</url>
-          <line>31</line>
-          <option name="timeStamp" value="12" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$APPLICATION_CONFIG_DIR$/scratches/quarchpy/connection_specific/connection_QIS.py</url>
-          <line>1601</line>
-          <option name="timeStamp" value="15" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$APPLICATION_CONFIG_DIR$/scratches/quarchpy/connection_specific/connection_QIS.py</url>
-          <line>1592</line>
-          <option name="timeStamp" value="16" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/device/quarchQPS.py</url>
-          <line>398</line>
-          <option name="timeStamp" value="23" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/connection_specific/connection_QPS.py</url>
-          <line>57</line>
-          <option name="timeStamp" value="25" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/../../../../Application Notes/AN-012 - Python Control of Power Modules via QIS/Trunk/testImport.py</url>
-          <line>8</line>
-          <option name="timeStamp" value="26" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/../../Branches/J21ReleaseBranch/quarchpy/run.py</url>
-          <line>209</line>
-          <option name="timeStamp" value="28" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://C:/Python311/Lib/site-packages/quarchpy/run.py</url>
-          <line>8</line>
-          <option name="timeStamp" value="39" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/../../../../Application Notes/AN-017 - QPS performance test with FIO/Trunk/TestQPSLaunch.py</url>
-          <line>66</line>
-          <option name="timeStamp" value="41" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/../../../../Application Notes/AN-012 - Python Control of Power Modules via QIS/Trunk/QisStreamExample.py</url>
-          <line>148</line>
-          <option name="timeStamp" value="42" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/../../../../Application Notes/AN-012 - Python Control of Power Modules via QIS/Trunk/QisStreamExample.py</url>
-          <line>199</line>
-          <option name="timeStamp" value="43" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/run.py</url>
-          <line>217</line>
-          <option name="timeStamp" value="45" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/../../../../Application Notes/AN-017 - QPS performance test with FIO/Trunk/performanceTestFIO.py</url>
-          <line>252</line>
-          <option name="timeStamp" value="66" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/../../../../Application Notes/AN-017 - QPS performance test with FIO/Trunk/performanceTestFIO.py</url>
-          <line>246</line>
-          <option name="timeStamp" value="67" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/../../../../Application Notes/AN-017 - QPS performance test with FIO/Trunk/performanceTestFIO.py</url>
-          <line>244</line>
-          <option name="timeStamp" value="68" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/../../../../Application Notes/AN-015 - Automating with QPS/Trunk/QPSHelpReader.py</url>
-          <line>68</line>
-          <option name="timeStamp" value="81" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/../../../../Application Notes/AN-015 - Automating with QPS/Trunk/QPSHelpReader.py</url>
-          <line>55</line>
-          <option name="timeStamp" value="83" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/debug/simple_terminal.py</url>
-          <line>21</line>
-          <option name="timeStamp" value="84" />
+          <line>12</line>
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
-      <default-breakpoints>
-        <breakpoint type="python-exception">
-          <properties notifyOnTerminate="true" exception="BaseException">
-            <option name="notifyOnTerminate" value="true" />
-          </properties>
-        </breakpoint>
-      </default-breakpoints>
     </breakpoint-manager>
   </component>
 </project>

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.24.dev1"

quarchpy/connection_specific/QPS/win-amd64/launchQPSJ21.bat

@@ -0,0 +1,4 @@
+cd..
+cd..
+cd..
+py run.py qps

quarchpy/connection_specific/QPS/{qis → win-amd64/qis}/README.txt

@@ -1,6 +1,6 @@
-qis 1.33
+qis 1.39
 
-Copyright Quarch Technology Limited 2022.
+Copyright Quarch Technology Limited 2023.
 
 Warning and Disclaimer
 ======================

quarchpy/connection_specific/QPS/{scriptCommands.txt → win-amd64/scriptCommands.txt}

@@ -1,7 +1,7 @@
 QPS Command Summary
 Copyright (c) Quarch Ltd
-QPS v1.39
-Generated: 18-Mar-2024
+QPS v1.39.02
+Generated: 26-Mar-2024
 
 
 *** Commands ***

quarchpy/connection_specific/connection_QIS.py

@@ -171,10 +171,6 @@ class QisInterface:
                 moduleStreaming= module.sendCommand("rec stream?").lower() #checking if module thinks its streaming.
                 moduleStreaming2= module.sendCommand("stream?").lower() #checking if the module has told qis it has stopped streaming.
 
-                #print("thread list = " + str(threadNameList))
-                #print("moduleStreaming rec stream? = " + str(moduleStreaming))
-                #print("moduleStreaming stream? = " + str(moduleStreaming2))
-
                 if (moduleName in threadNameList or "running" in moduleStreaming or "running" in moduleStreaming2):
                     time.sleep(0.1)
 
@@ -276,7 +272,6 @@ class QisInterface:
                     #now = time.time()
                     streamOverrun, removeChar, newStripes = self.streamGetStripesText(self.streamSock, module, numStripesPerRead)
                     newStripes = newStripes.replace(' ', separator)
-                    #print (time.time() - now)
                     if streamOverrun:
                         self.deviceDict[module][0:3] = [True, 'Stopped', 'Device buffer overrun']
                     # TODO: MD Why don't we return isEmpty in the tuple, instead of having this confusing test?
@@ -498,10 +493,7 @@ class QisInterface:
                     streamOverrun, removeChar, newStripes = self.streamGetStripesText(self.streamSock, module,
                                                                                       numStripesPerRead)
                     newStripes = newStripes.replace(' ',separator)
-                    # print(newStripes)
-                    # print(len(newStripes))
 
-                    # print (time.time() - now)
                     if streamOverrun:
                         self.deviceDict[module][0:3] = [True, 'Stopped', 'Device buffer overrun']
                     if (removeChar == -6 and len(newStripes) == 6):
@@ -1565,6 +1557,25 @@ class QisInterface:
             f.write("Saved: "+x+ "\n")
 
 
+    def sendCommand(self, cmd, device="", timeout=20,sock=None,readUntilCursor=True, betweenCommandDelay=0.0, expectedResponse=True):
+        '''Send command is used to send a command to QIS and as far as I can see it has no difference than sendAndReceiveCmd'''
+        if expectedResponse is True:
+            if sock == None:
+                sock = self.sock
+            if not (device == ''):
+                self.deviceDictSetup(device)
+            res = self.sendAndReceiveText(sock, cmd, device, readUntilCursor)
+            if (betweenCommandDelay > 0):
+                time.sleep(betweenCommandDelay)
+            # If ends with cursor get rid of it
+            if res[-1:] == '>':
+                res = res[:-3]  # remove last three chars - hopefully '\r\n>'
+            return res
+
+        else :
+            self.sendText(sock, cmd, device)
+            return
+
     # when sending commands to module (as opposed to back end)
     # If read until cursor is set to True (which is default) then keep reading response until a cursor is returned as the last character of result string
     # After command is sent wait for betweenCommandDelay which defaults to 0 but can be specified to add a delay between commands