From d28ee65f0866fa14b31ae507f91ce847bcd7ed38 Mon Sep 17 00:00:00 2001
From: Nicolas Forquet <nicolas.forquet@irstea.fr>
Date: Mon, 16 Dec 2019 20:56:20 +0100
Subject: [PATCH] fixing issue #10
---
ohmpy_v_1_01.py | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/ohmpy_v_1_01.py b/ohmpy_v_1_01.py
index c35963bc..0bbb39e0 100644
--- a/ohmpy_v_1_01.py
+++ b/ohmpy_v_1_01.py
@@ -53,12 +53,19 @@ def switch_mux(quadripole):
# function to find rows with identical values in different columns
def find_identical_in_line(array_object):
output = []
- for i in range(len(array_object[:,1])):
- temp = numpy.zeros(len(array_object[1,:]))
- for j in range(len(array_object[1,:])):
- temp[j] = numpy.count_nonzero(array_object[i,:] == array_object[i,j])
+ if array_object.ndim == 1:
+ temp = numpy.zeros(4)
+ for i in range(len(array_object)):
+ temp[i] = numpy.count_nonzero(array_object == array_object[i])
if any(temp > 1):
- output.append(i)
+ output.append(0)
+ else:
+ for i in range(len(array_object[:,1])):
+ temp = numpy.zeros(len(array_object[1,:]))
+ for j in range(len(array_object[1,:])):
+ temp[j] = numpy.count_nonzero(array_object[i,:] == array_object[i,j])
+ if any(temp > 1):
+ output.append(i)
return output
# read quadripole file and apply tests
--
GitLab