Skip to content

Commit e678645

Browse files
committed
fix:check what else we edited
1 parent ed29b92 commit e678645

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/diffpy/srmise/dataclusters.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -206,19 +206,19 @@ def __next__(self):
206206

207207
if np.abs(nearest_cluster[1]) <= self.res:
208208
# Add to an existing cluster
209-
self.lastcluster_idx = int(nearest_cluster[0])
210-
if test_idx < self.clusters[int(nearest_cluster[0]), 0]:
211-
self.clusters[int(nearest_cluster[0]), 0] = test_idx
209+
self.lastcluster_idx = nearest_cluster[0]
210+
if test_idx < self.clusters[nearest_cluster[0], 0]:
211+
self.clusters[nearest_cluster[0], 0] = test_idx
212212
else:
213-
self.clusters[int(nearest_cluster[0]), 1] = test_idx
213+
self.clusters[nearest_cluster[0], 1] = test_idx
214214
else:
215215
# Make a new cluster
216216
if nearest_cluster[1] < 0:
217217
# Insert left of nearest cluster
218-
self.lastcluster_idx = int(nearest_cluster[0])
218+
self.lastcluster_idx = nearest_cluster[0]
219219
else:
220220
# insert right of nearest cluster
221-
self.lastcluster_idx = int(nearest_cluster[0]) + 1
221+
self.lastcluster_idx = nearest_cluster[0] + 1
222222
self.clusters = np.insert(
223223
self.clusters,
224224
int(self.lastcluster_idx),
@@ -289,7 +289,7 @@ def find_nearest_cluster(self, idx):
289289
return None
290290

291291
flat_idx = clusters_flat.searchsorted(idx)
292-
near_idx = flat_idx / 2
292+
near_idx = flat_idx // 2
293293

294294
if flat_idx == len(clusters_flat):
295295
# test_idx is right of the last cluster

src/diffpy/srmise/peakextraction.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,7 @@ def extract_single(self, recursion_depth=1):
905905
)
906906
else:
907907
# Update an existing cluster
908-
mclusters[int(step.lastcluster_idx)].change_slice(step.cut(step.lastcluster_idx))
908+
mclusters[step.lastcluster_idx].change_slice(step.cut(step.lastcluster_idx))
909909

910910
# Find newly adjacent clusters
911911
adjacent = step.find_adjacent_clusters().ravel()

0 commit comments

Comments
 (0)