peakextraction.py and init

sbillinge · Jul 31, 2024 · 1248ed4 · 1248ed4
1 parent c0d43e6
commit 1248ed4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/diffpy/srmise/__init__.py b/diffpy/srmise/__init__.py
@@ -16,3 +16,6 @@
 
 
 from diffpy.srmise.version import __version__
+
+# silence the pyflakes syntax checker
+assert __version__ or True
diff --git a/diffpy/srmise/peakextraction.py b/diffpy/srmise/peakextraction.py
@@ -20,17 +20,15 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
+from diffpy.srmise import srmiselog
 from diffpy.srmise.baselines import Baseline
 from diffpy.srmise.dataclusters import DataClusters
 from diffpy.srmise.modelcluster import ModelCluster, ModelCovariance
-from diffpy.srmise.modelparts import ModelPart, ModelParts
 from diffpy.srmise.peaks import Peak, Peaks
-from diffpy.srmise.srmiseerrors import *
+from diffpy.srmise.srmiseerrors import SrMiseDataFormatError, SrMiseEstimationError, SrMiseFileError
 
 logger = logging.getLogger("diffpy.srmise")
 
-from diffpy.srmise import srmiselog
-
 
 class PeakExtraction(object):
     """Class for peak extraction.
@@ -461,8 +459,8 @@ def readstr(self, datastring):
         # raise SrMiseDataFormatError if something goes wrong
         try:
             for line in start_data.split("\n"):
-                l = line.split()
-                if len(arrays) != len(l):
+                split_line = line.split()
+                if len(arrays) != len(split_line):
                     emsg = "Number of value fields does not match that given by '%s'" % start_data_info
                 for a, v in zip(arrays, line.split()):
                     a.append(float(v))
@@ -892,7 +890,8 @@ def extract_single(self, recursion_depth=1):
                 # left_data, right_data: indices defining the extent of the "interpeak range" for x, etc.
                 near_peaks = np.array([], dtype=np.int)
 
-                # interpeak range goes from peak to peak of next nearest peaks, although their contributions to the data are still removed.
+                # interpeak range goes from peak to peak of next nearest peaks, although their contributions
+                # to the data are still removed.
                 if pivot == 0:
                     # No peaks left of border_x!
                     left_data = full_cluster.slice.indices(len(x))[0]
@@ -1035,7 +1034,8 @@ def extract_single(self, recursion_depth=1):
                 # left_data, right_data: indices defining the extent of the "interpeak range" for x, etc.
                 near_peaks = np.array([], dtype=np.int)
 
-                # interpeak range goes from peak to peak of next nearest peaks, although their contributions to the data are still removed.
+                # interpeak range goes from peak to peak of next nearest peaks, although their contributions
+                # to the data are still removed.
                 if pivot == 0:
                     # No peaks left of border_x!
                     left_data = new_cluster.slice.indices(len(x))[0]
@@ -1307,7 +1307,6 @@ def fit_single(self):
 
     from numpy.random import randn
 
-    from diffpy.srmise import srmiselog
     from diffpy.srmise.modelevaluators import AICc
     from diffpy.srmise.peaks import GaussianOverR