fix import and counting to make it work (diffpy#74)

stevenhua0320 · Aug 16, 2024 · 578a972 · 578a972
1 parent 6e62077
commit 578a972
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/diffpy/srmise/modelcluster.py b/src/diffpy/srmise/modelcluster.py
@@ -1408,8 +1408,8 @@ def prune(self):
 if __name__ == "__main__":
     from numpy.random import randn
 
-    from diffpy.srmise.modelevaluators import AICc
-    from diffpy.srmise.peaks import GaussianOverR
+    from diffpy.srmise.modelevaluators.aicc import AICc
+    from diffpy.srmise.peaks.gaussianoverr import GaussianOverR
 
     pf = GaussianOverR(0.7)
     res = 0.01

diff --git a/src/diffpy/srmise/modelparts.py b/src/diffpy/srmise/modelparts.py
@@ -558,7 +558,7 @@ def npars(self, count_fixed=True):
         if count_fixed:
             return self._owner.npars
         else:
-            return (self.free is True).sum()
+            return np.sum(self.free)
 
     def __str__(self):
         """Return string representation of ModelPart parameters."""