quarchpy 2.2.4__py2.py3-none-any.whl → 2.2.5__py2.py3-none-any.whl

quarchpy/.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

quarchpy/.idea/inspectionProfiles/Project_Default.xml

@@ -1,48 +1,10 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="PyCompatibilityInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ourVersions">
-        <value>
-          <list size="3">
-            <item index="0" class="java.lang.String" itemvalue="3.12" />
-            <item index="1" class="java.lang.String" itemvalue="3.5" />
-            <item index="2" class="java.lang.String" itemvalue="3.11" />
-          </list>
-        </value>
-      </option>
-    </inspection_tool>
-    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoredPackages">
-        <value>
-          <list size="1">
-            <item index="0" class="java.lang.String" itemvalue="zeroconf" />
-          </list>
-        </value>
-      </option>
-    </inspection_tool>
-    <inspection_tool class="PyPep8Inspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="ignoredErrors">
-        <list>
-          <option value="E501" />
-          <option value="E302" />
-        </list>
-      </option>
-    </inspection_tool>
-    <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="ignoredErrors">
-        <list>
-          <option value="N806" />
-          <option value="N812" />
-          <option value="N802" />
-          <option value="N803" />
-        </list>
-      </option>
-    </inspection_tool>
     <inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoredIdentifiers">
         <list>
-          <option value="MainTests.standardErrors.qisPath" />
+          <option value="user_interface.user_interface.raw_input" />
         </list>
       </option>
     </inspection_tool>

quarchpy/.idea/misc.xml

@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Black">
-    <option name="sdkName" value="Python 3.11" />
-  </component>
   <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11" project-jdk-type="Python SDK" />
 </project>

quarchpy/.idea/modules.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/../../../../Application Notes/AN-015 - Automating with QPS/.idea/AN-015 - Automating with QPS.iml" filepath="$PROJECT_DIR$/../../../../Application Notes/AN-015 - Automating with QPS/.idea/AN-015 - Automating with QPS.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/quarchpy.iml" filepath="$PROJECT_DIR$/.idea/quarchpy.iml" />
     </modules>
   </component>

quarchpy/.idea/quarchpy.iml

@@ -4,6 +4,7 @@
     <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="AN-015 - Automating with QPS" />
   </component>
   <component name="PyDocumentationSettings">
     <option name="format" value="PLAIN" />

quarchpy/.idea/workspace.xml

@@ -4,50 +4,60 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="636aab8d-ddf5-4a16-9afb-6ef6a8d53577" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/Docs/CHANGES.rst" beforeDir="false" afterPath="$PROJECT_DIR$/Docs/CHANGES.rst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/_version.py" beforeDir="false" afterPath="$PROJECT_DIR$/_version.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/connection_specific/QPS/win-amd64/qps_lib/JFXUtilities-1.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/connection_specific/QPS/win-amd64/qps_lib/JFXUtilities-1.0.jar" afterDir="false" />
-    </list>
+    <list default="true" id="0bee3df3-4eba-4aa3-a42f-acd1db16081c" 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="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 0
-}</component>
-  <component name="ProjectId" id="2lheMHpb2GANz9pJUZgtTWz6b3S" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectId" id="2l19Ou77iy3Z8boaa16mxcWidBo" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">{
   &quot;keyToString&quot;: {
-    &quot;Python.Main.executor&quot;: &quot;Debug&quot;,
-    &quot;Python.QisAcStreamExample.executor&quot;: &quot;Debug&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;P:/Software/Python/QuarchPy/Trunk/quarchpy/run.py&quot;
+    &quot;last_opened_file_path&quot;: &quot;P:/Software/Application Notes/AN-015 - Automating with QPS&quot;
   }
 }</component>
-  <component name="RunManager">
-    <configuration name="Main" type="PythonConfigurationType" factoryName="Python">
+  <component name="RunManager" selected="Python.simple_terminal">
+    <configuration name="QpsRecordingExample" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="AN-015 - Automating with QPS" />
+      <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/QpsRecordingExample.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="quarchQPS" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="quarchpy" />
-      <option name="ENV_FILES" value="" />
       <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="SDK_NAME" value="Python 3.11" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/device" />
+      <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="PARAMETERS" value="qps -logging=ON -logtarget=&quot;C:\temp\logDir&quot; -qissamelogging=ON" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/device/quarchQPS.py" />
+      <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
       <option name="MODULE_MODE" value="false" />
@@ -55,107 +65,55 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-  </component>
-  <component name="SharedIndexes">
-    <attachedChunks>
-      <set>
-        <option value="bundled-python-sdk-0e3be3396995-c546a90a8094-com.jetbrains.pycharm.community.sharedIndexes.bundled-PC-242.23339.19" />
-      </set>
-    </attachedChunks>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="SvnConfiguration" cleanupOnStartRun="true">
-    <configuration>C:\Users\nghayyda\AppData\Roaming\Subversion</configuration>
-    <supportedVersion>125</supportedVersion>
-  </component>
-  <component name="SvnFileUrlMappingImpl">
-    <option name="myMappingRoots">
-      <list>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
-          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
-          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Cable_Modules" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
-          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Card_Modules" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
-          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Drive_Modules" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
-          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Power_Margining" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
-          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Switch_Modules" />
-        </SvnCopyRootSimple>
-      </list>
-    </option>
-    <option name="myMoreRealMappingRoots">
+    <configuration name="simple_terminal" 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$/debug" />
+      <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="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>
+    <recent_temporary>
       <list>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
-          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
-          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Cable_Modules" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
-          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Card_Modules" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
-          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Drive_Modules" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
-          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Power_Margining" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
-          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Switch_Modules" />
-        </SvnCopyRootSimple>
+        <item itemvalue="Python.simple_terminal" />
+        <item itemvalue="Python.QpsRecordingExample" />
+        <item itemvalue="Python.quarchQPS" />
       </list>
-    </option>
+    </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="636aab8d-ddf5-4a16-9afb-6ef6a8d53577" name="Changes" comment="" />
-      <created>1725636685995</created>
+      <changelist id="0bee3df3-4eba-4aa3-a42f-acd1db16081c" name="Changes" comment="" />
+      <created>1724336687759</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1725636685995</updated>
-    </task>
-    <task id="LOCAL-00001" summary="Quarchpy power class now automatically creates the default synthetic channels.">
-      <option name="closed" value="true" />
-      <created>1728642843471</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1728642843471</updated>
-    </task>
-    <task id="LOCAL-00002" summary="Fixed arguments not being passed correctly to QPS.">
-      <option name="closed" value="true" />
-      <created>1728648255650</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1728648255650</updated>
+      <updated>1724336687759</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="Quarchpy power class now automatically creates the default synthetic channels." />
-    <MESSAGE value="Fixed arguments not being passed correctly to QPS." />
-    <option name="LAST_COMMIT_MESSAGE" value="Fixed arguments not being passed correctly to QPS." />
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://C:/Python311/Lib/site-packages/quarchpy/connection_specific/connection_TCP.py</url>
+          <line>46</line>
+          <option name="timeStamp" value="1" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
   </component>
 </project>

quarchpy/_version.py

@@ -1 +1 @@
-__version__ = "2.2.4"
+__version__ = "2.2.5"

quarchpy/_version.py.bak

@@ -0,0 +1 @@
+__version__ = "2.2.2.dev1"

quarchpy/connection_specific/QPS/win-amd64/resources/profiles/3_PHASE_PAM_AC_DEFAULT.rcf

@@ -19,8 +19,8 @@ Currently it supports:
 <RecordingConfiguration>
     <Header> <!-- Header information for the recording configuration -->
         <FileVersion>2.0</FileVersion> <!-- Version of the file, checked on load. -->
-        <DeviceTarget>QTL2582-01, QTL2751-03, QTL2789-01</DeviceTarget> <!-- Device identifier for the compatible device(s) -->
-        <FileDescription></FileDescription> <!-- Description of the file to make it clear what the file is intended for -->
+        <DeviceTarget>QTL2582-01, QTL2751-03, QTL2789-01, QTL2843-02</DeviceTarget> <!-- Device identifier for the compatible device(s) -->
+        <FileDescription>This file contains the default synthetic channel setup for an AC PAM.</FileDescription> <!-- Description of the file to make it clear what the file is intended for -->
     </Header>
     <SyntheticChannels> <!-- Root tag for synthetic channels configuration -->
         <Clear>false</Clear> <!-- Indicates whether to clear existing synthetic channels -->

quarchpy/connection_specific/QPS/win-amd64/resources/profiles/3_PHASE_PAM_AC_FULL.rcf

@@ -2,62 +2,11 @@
 <RecordingConfiguration>
     <Header>
         <FileVersion>2.0</FileVersion>
-        <DeviceTarget>QTL2582-01, QTL2751-03, QTL2789-01</DeviceTarget>
-        <FileDescription></FileDescription>
+        <DeviceTarget>QTL2582-01, QTL2751-03, QTL2789-01, QTL2843-02</DeviceTarget>
+        <FileDescription>This file contains the additional channels of interest for an AC PAM, such as total harmonic distortion and crest factor.</FileDescription>
     </Header>
     <SyntheticChannels>
         <Clear>false</Clear>
-        <SyntheticChannel>
-            <Configuration>
-                <Enable>true</Enable>
-                <Visible>true</Visible>
-            </Configuration>
-            <SyntheticChannelFunction>
-                <FunctionDetails>
-                    <DisplayGroup>v</DisplayGroup>
-                    <DisplayName>+3.3V_VOLT_RMS</DisplayName>
-                    <FunctionName>rms</FunctionName>
-                </FunctionDetails>
-                <FunctionArguments>
-                    <Argument>1ms</Argument>
-                    <Argument>chan(+3.3V,v)</Argument>
-                </FunctionArguments>
-            </SyntheticChannelFunction>
-        </SyntheticChannel>
-        <SyntheticChannel>
-            <Configuration>
-                <Enable>true</Enable>
-                <Visible>true</Visible>
-            </Configuration>
-            <SyntheticChannelFunction>
-                <FunctionDetails>
-                    <DisplayGroup>a</DisplayGroup>
-                    <DisplayName>+3.3V_CURR_RMS</DisplayName>
-                    <FunctionName>rms</FunctionName>
-                </FunctionDetails>
-                <FunctionArguments>
-                    <Argument>1ms</Argument>
-                    <Argument>chan(+3.3V,a)</Argument>
-                </FunctionArguments>
-            </SyntheticChannelFunction>
-        </SyntheticChannel>
-        <SyntheticChannel>
-            <Configuration>
-                <Enable>true</Enable>
-                <Visible>true</Visible>
-            </Configuration>
-            <SyntheticChannelFunction>
-                <FunctionDetails>
-                    <DisplayGroup>w</DisplayGroup>
-                    <DisplayName>+3.3V_POWER_RMS</DisplayName>
-                    <FunctionName>rms</FunctionName>
-                </FunctionDetails>
-                <FunctionArguments>
-                    <Argument>1ms</Argument>
-                    <Argument>chan(+3.3V,v)</Argument>
-                </FunctionArguments>
-            </SyntheticChannelFunction>
-        </SyntheticChannel>
         <SyntheticChannel>
             <Configuration>
                 <Enable>true</Enable>
@@ -121,7 +70,7 @@
                 <FunctionDetails>
                     <DisplayGroup>V</DisplayGroup>
                     <DisplayName>L1_HAR</DisplayName>
-                    <FunctionName>subtract</FunctionName>
+                    <FunctionName>harSubtract</FunctionName>
                 </FunctionDetails>
                 <FunctionArguments>
                     <Argument>100ms</Argument>
@@ -139,7 +88,7 @@
                 <FunctionDetails>
                     <DisplayGroup>V</DisplayGroup>
                     <DisplayName>L2_HAR</DisplayName>
-                    <FunctionName>subtract</FunctionName>
+                    <FunctionName>harSubtract</FunctionName>
                 </FunctionDetails>
                 <FunctionArguments>
                     <Argument>100ms</Argument>
@@ -157,7 +106,7 @@
                 <FunctionDetails>
                     <DisplayGroup>V</DisplayGroup>
                     <DisplayName>L3_HAR</DisplayName>
-                    <FunctionName>subtract</FunctionName>
+                    <FunctionName>harSubtract</FunctionName>
                 </FunctionDetails>
                 <FunctionArguments>
                     <Argument>100ms</Argument>

quarchpy/connection_specific/QPS/win-amd64/resources/profiles/PAM_EXAMPLE_CONFIG.rcf

@@ -20,7 +20,7 @@ Currently it supports:
     <Header> <!-- Header information for the recording configuration -->
         <FileVersion>2.0</FileVersion> <!-- Version of the file, checked on load. -->
         <DeviceTarget>QTL2312-01</DeviceTarget> <!-- Device identifier for the compatible device(s) -->
-        <FileDescription></FileDescription> <!-- Description of the file to make it clear what the file is intended for -->
+        <FileDescription>This is an example file for PAMs, showing how to configure channels and add an RMS</FileDescription> <!-- Description of the file to make it clear what the file is intended for -->
     </Header>
     <SyntheticChannels> <!-- Root tag for synthetic channels configuration -->
         <Clear>false</Clear> <!-- Indicates whether to clear existing synthetic channels -->

quarchpy/connection_specific/connection_QPS.py

@@ -206,7 +206,7 @@ class QpsInterface:
         startTime=time.time()
         notLoadingMessageStartTime=None
         while(1):
-            update=self.sendCmdVerbose("$progress check \"open recording\"",timeout=cmdTimeout)
+            update=self.sendCmdVerbose("$progress check task=\"open recording\"",timeout=cmdTimeout)
             #print(update)
             m = re.search(r'\d+(\.\d+)?%', update)
             if m: # A percentage was found
@@ -216,8 +216,8 @@ class QpsInterface:
                 if found > 99.9: # This will catch the case we have 99.9999% or 100% loaded. recording with less that 1mill records auto return 100%
                     message = "Passed, Recording opened, loading detected and complete."
                     break
-            elif("Chart window is open but no loading is in progress." in update):
-                if loadingStarted ==True:
+            elif "Chart window is open but no loading is in progress." in update:
+                if loadingStarted == True:
                     # Loading started and has now ended, so we can exit the loop.
                     message="Passed, Recording opened, loading detected and complete."
                     break
@@ -227,7 +227,7 @@ class QpsInterface:
                         # we exit, stating that no loading started within the desired time.
                         notLoadingMessageStartTime = time.time()
                     elif time.time() - notLoadingMessageStartTime> startOpenTimout:
-                        message = "No detection that QPS started loading the recording within "+str(startOpenTimout)+"s."
+                        message = "No detection that QPS started loading the recording within " + str(startOpenTimout) + "s."
                         break
 
             time.sleep(pollInterval) #Sleep pollInterval time, so we are not hammering QPS for updates while its busy loading.