Skip to content

Commit 562712d

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 924cff0 + 77e8b3a commit 562712d

20 files changed

+6747
-11
lines changed

gempy/data_management.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -992,22 +992,21 @@ def set_faults(self, series_name=None):
992992
try:
993993
# Check if there is already a df
994994
self.faults
995-
996-
try:
997-
if any(self.faults.columns != self.series.columns):
995+
if series_name:
996+
self.faults['isFault'] = self.faults.index.isin(series_name)
997+
else:
998+
try:
999+
if any(self.faults.columns != self.series.columns):
1000+
series_name = self.count_faults()
1001+
self.faults = pn.DataFrame(index=self.series.columns, columns=['isFault'])
1002+
self.faults['isFault'] = self.faults.index.isin(series_name)
1003+
except ValueError:
9981004
series_name = self.count_faults()
9991005
self.faults = pn.DataFrame(index=self.series.columns, columns=['isFault'])
10001006
self.faults['isFault'] = self.faults.index.isin(series_name)
1001-
except ValueError:
1002-
series_name = self.count_faults()
1003-
self.faults = pn.DataFrame(index=self.series.columns, columns=['isFault'])
1004-
self.faults['isFault'] = self.faults.index.isin(series_name)
1005-
1006-
if series_name:
1007-
self.faults['isFault'] = self.faults.index.isin(series_name)
10081007

10091008
except AttributeError:
1010-
1009+
print("creating fautls")
10111010
if not series_name:
10121011
series_name = self.count_faults()
10131012
self.faults = pn.DataFrame(index=self.series.columns, columns=['isFault'])

0 commit comments

Comments
 (0)