Add matching group and marker count to align step.

ABI-Software · Dec 12, 2024 · 0e7073b · 0e7073b
1 parent 97cea0c
commit 0e7073b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/scaffoldfitter/fitterstepalign.py b/src/scaffoldfitter/fitterstepalign.py
@@ -216,10 +216,14 @@ def _match_markers(self):
 
         return matches
 
+    def matchingMarkerCount(self):
+        return len(self._match_markers())
+
+    def matchingGroupCount(self):
+        return self._alignable_group_count()
+
     def canAutoAlign(self):
-        group_count = self._alignable_group_count()
-        matches = self._match_markers()
-        total = group_count + len(matches)
+        total = self.matchingGroupCount() + self.matchingMarkerCount()
         return total > 2
 
     def canAlignGroups(self):

diff --git a/tests/test_fitcube.py b/tests/test_fitcube.py
@@ -183,6 +183,8 @@ def test_alignMarkersFitRegularData(self):
         self.assertTrue(align.canAlignMarkers())
         self.assertTrue(align.canAlignGroups())
         self.assertTrue(align.canAutoAlign())
+        self.assertEqual(4, align.matchingMarkerCount())
+        self.assertEqual(3, align.matchingGroupCount())
 
         align.run()
         # fitter.getRegion().writeFile(os.path.join(here, "resources", "km_fitgeometry2.exf"))