Skip to content

Commit 8999a4d

Browse files
committed
[Bug]
- Hotfixed
1 parent 13c2604 commit 8999a4d

File tree

2 files changed

+17
-21
lines changed

2 files changed

+17
-21
lines changed

gempy/data_management.py

+8-12
Original file line numberDiff line numberDiff line change
@@ -992,26 +992,22 @@ def set_faults(self, series_name=None):
992992
try:
993993
# Check if there is already a df
994994
self.faults
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:
1004-
series_name = self.count_faults()
995+
try:
996+
if any(self.faults.columns != self.series.columns):
997+
series_name_d = self.count_faults()
1005998
self.faults = pn.DataFrame(index=self.series.columns, columns=['isFault'])
1006-
self.faults['isFault'] = self.faults.index.isin(series_name)
999+
self.faults['isFault'] = self.faults.index.isin(series_name_d)
1000+
except ValueError:
1001+
series_name_d = self.count_faults()
1002+
self.faults = pn.DataFrame(index=self.series.columns, columns=['isFault'])
1003+
self.faults['isFault'] = self.faults.index.isin(series_name_d)
10071004

10081005
except AttributeError:
10091006
print("creating fautls")
10101007
if not series_name:
10111008
series_name_d = self.count_faults()
10121009
self.faults = pn.DataFrame(index=self.series.columns, columns=['isFault'])
10131010
self.faults['isFault'] = self.faults.index.isin(series_name_d)
1014-
10151011
if series_name:
10161012
self.faults['isFault'] = self.faults.index.isin(series_name)
10171013

notebooks/tutorials/ch1.ipynb

+9-9
Original file line numberDiff line numberDiff line change
@@ -2419,7 +2419,7 @@
24192419
{
24202420
"data": {
24212421
"text/plain": [
2422-
"<gempy.plotting.sequential_pile.StratigraphicPile at 0x7f09e7c76080>"
2422+
"<gempy.plotting.sequential_pile.StratigraphicPile at 0x7f6a479c6748>"
24232423
]
24242424
},
24252425
"execution_count": 7,
@@ -2456,7 +2456,7 @@
24562456
},
24572457
{
24582458
"cell_type": "code",
2459-
"execution_count": 17,
2459+
"execution_count": 8,
24602460
"metadata": {},
24612461
"outputs": [
24622462
{
@@ -2486,23 +2486,23 @@
24862486
" <tbody>\n",
24872487
" <tr>\n",
24882488
" <th>Fault_Series</th>\n",
2489-
" <td>False</td>\n",
2489+
" <td>True</td>\n",
24902490
" </tr>\n",
24912491
" <tr>\n",
24922492
" <th>Strat_Series</th>\n",
2493-
" <td>True</td>\n",
2493+
" <td>False</td>\n",
24942494
" </tr>\n",
24952495
" </tbody>\n",
24962496
"</table>\n",
24972497
"</div>"
24982498
],
24992499
"text/plain": [
25002500
" isFault\n",
2501-
"Fault_Series False\n",
2502-
"Strat_Series True"
2501+
"Fault_Series True\n",
2502+
"Strat_Series False"
25032503
]
25042504
},
2505-
"execution_count": 17,
2505+
"execution_count": 8,
25062506
"metadata": {},
25072507
"output_type": "execute_result"
25082508
}
@@ -2513,7 +2513,7 @@
25132513
},
25142514
{
25152515
"cell_type": "code",
2516-
"execution_count": 18,
2516+
"execution_count": 9,
25172517
"metadata": {},
25182518
"outputs": [
25192519
{
@@ -2522,7 +2522,7 @@
25222522
"1"
25232523
]
25242524
},
2525-
"execution_count": 18,
2525+
"execution_count": 9,
25262526
"metadata": {},
25272527
"output_type": "execute_result"
25282528
}

0 commit comments

Comments
 (0)