Improve python variable names to be more explicit

Author: robertapplin

Framework/PythonInterface/plugins/algorithms/CylinderPaalmanPingsCorrection2.py

@@ -790,10 +790,11 @@ def _sum_rom(self, n_scat, n_abs, a, r1, r2, ms, theta, amu_scat, amu_tot_i, amu
                         LIS.append(LISN - LIST)
                     #
                     # CALCULATE DISTANCE SCATTERED NEUTRON PASSES THROUGH EACH ANNULUS
+                    omega_scattered = omega + theta_deg
                     LSS = []
                     for j in range(0, nan):
-                        LSST = self._distance(r, self._radii[j], omega + theta_deg)
-                        LSSN = self._distance(r, self._radii[j + 1], omega + theta_deg)
+                        LSST = self._distance(r, self._radii[j], omega_scattered)
+                        LSSN = self._distance(r, self._radii[j + 1], omega_scattered)
                         LSS.append(LSSN - LSST)
                     #
                     # CALCULATE ABSORPTION FOR PATH THROUGH ALL ANNULI,AND THROUGH INNER ANNULI

Framework/PythonInterface/plugins/algorithms/LoadNMoldyn3Ascii.py

@@ -20,8 +20,8 @@
 # ==============================================================================
 
 
-def _find_starts(data, c, l1):
-    for i in range(l1, len(data)):
+def _find_starts(data, c, start_i):
+    for i in range(start_i, len(data)):
         char = data[i]
         if char.startswith(c):
             line = i
@@ -32,8 +32,8 @@ def _find_starts(data, c, l1):
 # ==============================================================================
 
 
-def _find_tab_starts(data, c, l1):
-    for i in range(l1, len(data)):
+def _find_tab_starts(data, c, start_i):
+    for i in range(start_i, len(data)):
         char = data[i][1:]
         if char.startswith(c):
             line = i
@@ -44,8 +44,8 @@ def _find_tab_starts(data, c, l1):
 # ==============================================================================
 
 
-def _find_ends(data, c, l1):
-    for i in range(l1, len(data)):
+def _find_ends(data, c, start_i):
+    for i in range(start_i, len(data)):
         char = data[i]
         if char.endswith(c):
             line = i
@@ -56,9 +56,9 @@ def _find_ends(data, c, l1):
 # ==============================================================================
 
 
-def _make_list(a, l1, l2):
+def _make_list(a, start_i, end_i):
     data = ""
-    for m in range(l1, l2 + 1):
+    for m in range(start_i, end_i + 1):
         data += a[m]
         alist = data.split(",")
     return alist

qt/python/mantidqtinterfaces/mantidqtinterfaces/drill/presenter/DrillPresenter.py

@@ -139,16 +139,16 @@ def inc(value, i):
             if ":" in value:
                 substrings = value.split(":")
                 try:
-                    values = [int(e) for e in substrings]
+                    runs = [int(e) for e in substrings]
                 except:
                     return value
-                if len(values) == 2:
+                if len(runs) == 2:
                     if i > 0:
-                        return str(values[1] + i) + ":" + str(values[1] + (values[1] - values[0]) + i)
+                        return str(runs[1] + i) + ":" + str(runs[1] + (runs[1] - runs[0]) + i)
                     else:
-                        return str(values[0] - (values[1] - values[0]) + i) + ":" + str(values[0] + i)
-                if len(values) == 3:
-                    return inc(str(values[0]) + ":" + str(values[1]), i) + ":" + str(values[2])
+                        return str(runs[0] - (runs[1] - runs[0]) + i) + ":" + str(runs[0] + i)
+                if len(runs) == 3:
+                    return inc(str(runs[0]) + ":" + str(runs[1]), i) + ":" + str(runs[2])
                 else:
                     return value
 

scripts/pychop/Instruments.py

@@ -650,8 +650,10 @@ def getMeasuredFlux(self, Ei):
         """Interpolates flux from a table of measured flux"""
         if not hasattr(self, "flux_interp"):
             raise AttributeError("This instrument does not have a table of measured flux")
-        wavelength = [min(max(value, self.fmn), self.fmx) for value in np.sqrt(E2L / np.array(Ei if hasattr(Ei, "__len__") else [Ei]))]
-        return self.flux_interp(wavelength[0])
+        wavelengths = [
+            min(max(wavelength, self.fmn), self.fmx) for wavelength in np.sqrt(E2L / np.array(Ei if hasattr(Ei, "__len__") else [Ei]))
+        ]
+        return self.flux_interp(wavelengths[0])
 
     @property
     def theta_m(self):

tools/CodeAnalysis/gcovr

@@ -705,20 +705,20 @@ def print_xml_report(covdata):  # noqa: C901
             class_lines += 1
             if hits > 0:
                 class_hits += 1
-            line = doc.createElement("line")
-            line.setAttribute("number", str(line))
-            line.setAttribute("hits", str(hits))
+            line_element = doc.createElement("line")
+            line_element.setAttribute("number", str(line))
+            line_element.setAttribute("hits", str(hits))
             branches = data.branches.get(line)
             if branches is None:
-                line.setAttribute("branch", "false")
+                line_element.setAttribute("branch", "false")
             else:
                 b_hits = 0
                 for v in branches.values():
                     if v > 0:
                         b_hits += 1
                 coverage = 100 * b_hits / len(branches)
-                line.setAttribute("branch", "true")
-                line.setAttribute("condition-coverage", "%i%% (%i/%i)" % (coverage, b_hits, len(branches)))
+                line_element.setAttribute("branch", "true")
+                line_element.setAttribute("condition-coverage", "%i%% (%i/%i)" % (coverage, b_hits, len(branches)))
                 cond = doc.createElement("condition")
                 cond.setAttribute("number", "0")
                 cond.setAttribute("type", "jump")
@@ -727,9 +727,9 @@ def print_xml_report(covdata):  # noqa: C901
                 class_branches += float(len(branches))
                 conditions = doc.createElement("conditions")
                 conditions.appendChild(cond)
-                line.appendChild(conditions)
+                line_element.appendChild(conditions)
 
-            lines.appendChild(line)
+            lines.appendChild(line_element)
 
         className = fname.replace(".", "_")
         c.setAttribute("name", className)