Merge pull request #145 from wright-group/codeql_warnings

CodeQL identified error/warning changes

CHANGELOG.md

@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ## [Unreleased]
 
+### Fixed
+- Resolve some issues discovered by CodeQL which could result in unexpected behavior
+
 ## [0.4.3]
 
 ### Added

attune/_arrangement.py

@@ -63,7 +63,7 @@ def independent(self):
         out = np.unique(
             np.concatenate([t.independent for t in self._tunes.values() if isinstance(t, Tune)], 0)
         )
-        tol = tol = 1e-3 * (self.ind_max - self.ind_min)
+        tol = 1e-3 * (self.ind_max - self.ind_min)
         diff = np.append(tol * 2, np.diff(out))
         out = out[diff > tol]
         out = out[out <= self.ind_max]

attune/_note.py

@@ -39,7 +39,6 @@ def items(self):
 
     def keys(self):
         """Settable keys in the Note."""
-        return self.setable_positions.items()
         return self.setable_positions.keys()
 
     def values(self):

attune/io/topas4.py

@@ -31,6 +31,8 @@ def from_topas4(topas4_folder):
         if a["GUID"] == opt_dev_active_guid:
             opt_dev_active = a["OpticalDevices"]
             break
+    else:
+        raise ValueError("Active optical device GUID not found")
 
     sep_dev_active_guid = sep_dev.get("ActiveConfigurationGUID")
     sep_dev_conf = sep_dev["Configurations"]
@@ -40,6 +42,8 @@ def from_topas4(topas4_folder):
         if a["GUID"] == sep_dev_active_guid:
             sep_dev_active = a["SeparationDevices"]
             break
+    else:
+        raise ValueError("Active separation device GUID not found")
 
     arrangements = {}
     setables = {}