Skip to content

Main update #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmramos merged 13 commits into from
Jul 25, 2025
Merged

Main update #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f7dbe4b
some changes into data reading
mmramos Jul 14, 2025
3d680d7
reestructuration of data management. Test for las2
mmramos Jul 15, 2025
472ebd7
update version
mmramos Jul 17, 2025
47bbbeb
changes elements in data access (some testing), and add proper tests …
mmramos Jul 22, 2025
5d49ba2
Removed package notebook, added ipykernel
DChrispim Jul 25, 2025
0897e03
Merge pull request #126 from giecaruff/dependencies-review
mmramos Jul 25, 2025
58e1729
downgrade test requirement (70 to 30)
mmramos Jul 25, 2025
6caa9ab
Merge pull request #127 from giecaruff/data_management3
DChrispim Jul 25, 2025
e4953d1
Removed trigger on push from CI and uv workflows
DChrispim Jul 25, 2025
a461ac4
Merge pull request #128 from giecaruff/correction-workflow
DChrispim Jul 25, 2025
2689485
Update version
DChrispim Jul 25, 2025
91cccf6
Merge pull request #129 from giecaruff/version-update
mmramos Jul 25, 2025
49d4e60
Merge branch 'main' into development
DChrispim Jul 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: Pip Verification

on:
push:
branches:
- development
- main
pull_request:
branches:
- development
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/python-uv.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: Pytest and ruff using uv

on:
push:
branches:
- development
- main
pull_request:
branches:
- development
Expand Down
259 changes: 246 additions & 13 deletions examples/dlis_data_access_dlisio.ipynb → examples/_dlis_data_access_dlisio.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "3c35e36b825c4de1aef3523be4ef2f08",
"model_id": "b06c1dfdeaa24388a13a2e9f891115fb",
"version_major": 2,
"version_minor": 0
},
Expand Down Expand Up @@ -48,27 +48,57 @@
{
"data": {
"text/plain": [
"{'FDC/CNL/GR_repeat': {'B59180': {'TIME': {'unit': 's',\n",
" 'values': array([19.92 , 1.53 , 0.759, ..., 0.487, 0.496, 0.448],\n",
" shape=(1780,), dtype=float32)},\n",
"{'FDC/CNL/GR_main': {'B59067': {'TDEP': {'unit': 'm',\n",
" 'values': array([372.4656 , 372.3132 , 372.1608 , ..., -4.1146564,\n",
" -4.2670565, -4.4194565], shape=(2474,), dtype=float32)},\n",
" 'RHOB': {'unit': 'g/cm3',\n",
" 'values': array([2.0898438, 2.0898438, 2.0898438, ..., 1.1201172, 1.1132812,\n",
" 1.109375 ], shape=(2474,), dtype=float32)},\n",
" 'RNFD': {'unit': '1/s',\n",
" 'values': array([1501. , 1501. , 1501. , ..., 819.5, 884.5, 807.5],\n",
" shape=(2474,), dtype=float32)},\n",
" 'CALI': {'unit': 'in',\n",
" 'values': array([7.867864 , 7.867864 , 7.867864 , ..., 7.898622 , 7.9047737,\n",
" 7.9109254], shape=(1780,), dtype=float32)},\n",
" 'values': array([7.8555613, 7.8555613, 7.8555613, ..., 7.898622 , 7.9232283,\n",
" 7.898622 ], shape=(2474,), dtype=float32)},\n",
" 'CS': {'unit': 'm/h',\n",
" 'values': array([ 27.432 , 358.4448, 722.376 , ..., 1027.176 , 1036.9296,\n",
" 1224.0768], shape=(1780,), dtype=float32)},\n",
" 'values': array([686.4096, 29.8704, 473.0496, ..., 742.4928, 744.9312, 746.76 ],\n",
" shape=(2474,), dtype=float32)},\n",
" 'DIFF': {'unit': 'm',\n",
" 'values': array([0.9906 , 1.0515599, 0.9906 , ..., 0.79248 , 0.8534399,\n",
" 0.79248 ], shape=(2474,), dtype=float32)},\n",
" 'NPHI': {'unit': '%',\n",
" 'values': array([ 61.279297, 61.279297, 61.279297, ..., 96.728516, 106.640625,\n",
" 99.31641 ], shape=(2474,), dtype=float32)},\n",
" 'RFFD': {'unit': '1/s',\n",
" 'values': array([1862., 1862., 1862., ..., 6284., 6328., 6268.],\n",
" shape=(2474,), dtype=float32)}}},\n",
" 'FDC/CNL/GR_repeat': {'B59180': {'RHGX': {'unit': 'g/cm3',\n",
" 'values': array([2.9433594, 2.9433594, 2.9433594, ..., 2.7519531, 2.7539062,\n",
" 2.7363281], shape=(1780,), dtype=float32)},\n",
" 'RHOB': {'unit': 'g/cm3',\n",
" 'values': array([1.9287109, 1.9287109, 1.9287109, ..., 1.1601562, 1.1777344,\n",
" 1.1484375], shape=(1780,), dtype=float32)},\n",
" 'TIME': {'unit': 's',\n",
" 'values': array([19.92 , 1.53 , 0.759, ..., 0.487, 0.496, 0.448],\n",
" shape=(1780,), dtype=float32)},\n",
" 'DPHI': {'unit': '%',\n",
" 'values': array([43.652344, 43.652344, 43.652344, ..., 90.234375, 89.16016 ,\n",
" 90.91797 ], shape=(1780,), dtype=float32)},\n",
" 'DRHO': {'unit': 'g/cm3',\n",
" 'values': array([-2.1425781 , -2.1425781 , -2.1425781 , ..., -0.36621094,\n",
" -0.34375 , -0.36816406], shape=(1780,), dtype=float32)},\n",
" 'FCNL': {'unit': '1/s',\n",
" 'values': array([368.5 , 368.5 , 368.5 , ..., 95.8125, 107.0625, 96.625 ],\n",
" shape=(1780,), dtype=float32)},\n",
" 'NFDC': {'unit': '1/s',\n",
" 'values': array([ 16.671875, 16.671875, 16.671875, ..., 504.5 , 522.5 ,\n",
" 506.25 ], shape=(1780,), dtype=float32)},\n",
" 'NPHI': {'unit': '%',\n",
" 'values': array([ 56.591797, 56.591797, 56.591797, ..., 101.26953 , 99.90234 ,\n",
" 96.58203 ], shape=(1780,), dtype=float32)},\n",
" 'NRAT': {'unit': '',\n",
" 'values': array([4.171875 , 4.171875 , 4.171875 , ..., 6.6601562, 6.5859375,\n",
" 6.4023438], shape=(1780,), dtype=float32)}}}}"
" 6.4023438], shape=(1780,), dtype=float32)},\n",
" 'RCAL': {'unit': 'in',\n",
" 'values': array([7.8710938, 7.8710938, 7.8710938, ..., 7.9023438, 7.9101562,\n",
" 7.9140625], shape=(1780,), dtype=float32)}}}}"
]
},
"execution_count": 3,
Expand All @@ -93,9 +123,212 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 6,
"id": "fa017f06",
"metadata": {},
"outputs": [
{
"data": {
"text/html": [
"<div>\n",
"<style scoped>\n",
" .dataframe tbody tr th:only-of-type {\n",
" vertical-align: middle;\n",
" }\n",
"\n",
" .dataframe tbody tr th {\n",
" vertical-align: top;\n",
" }\n",
"\n",
" .dataframe thead th {\n",
" text-align: right;\n",
" }\n",
"</style>\n",
"<table border=\"1\" class=\"dataframe\">\n",
" <thead>\n",
" <tr style=\"text-align: right;\">\n",
" <th></th>\n",
" <th>Digital File</th>\n",
" <th>Frame Name</th>\n",
" <th>Mnemonics</th>\n",
" <th>Unit</th>\n",
" <th>Dimension</th>\n",
" <th>Min</th>\n",
" <th>Max</th>\n",
" <th>Long Name</th>\n",
" </tr>\n",
" </thead>\n",
" <tbody>\n",
" <tr>\n",
" <th>0</th>\n",
" <td>FDC/CNL/GR_main</td>\n",
" <td>B59067</td>\n",
" <td>TDEP</td>\n",
" <td>m</td>\n",
" <td>1D</td>\n",
" <td>-4.419456</td>\n",
" <td>372.465607</td>\n",
" <td>None</td>\n",
" </tr>\n",
" <tr>\n",
" <th>3</th>\n",
" <td>FDC/CNL/GR_main</td>\n",
" <td>B59067</td>\n",
" <td>RHOB</td>\n",
" <td>g/cm3</td>\n",
" <td>1D</td>\n",
" <td>-0.913086</td>\n",
" <td>3.863281</td>\n",
" <td>Bulk Density</td>\n",
" </tr>\n",
" <tr>\n",
" <th>8</th>\n",
" <td>FDC/CNL/GR_main</td>\n",
" <td>B59067</td>\n",
" <td>GR</td>\n",
" <td>gAPI</td>\n",
" <td>1D</td>\n",
" <td>3.285156</td>\n",
" <td>141.375000</td>\n",
" <td>Gamma Ray</td>\n",
" </tr>\n",
" <tr>\n",
" <th>9</th>\n",
" <td>FDC/CNL/GR_main</td>\n",
" <td>B59067</td>\n",
" <td>CALI</td>\n",
" <td>in</td>\n",
" <td>1D</td>\n",
" <td>7.818652</td>\n",
" <td>7.935532</td>\n",
" <td>Caliper</td>\n",
" </tr>\n",
" <tr>\n",
" <th>19</th>\n",
" <td>FDC/CNL/GR_main</td>\n",
" <td>B59067</td>\n",
" <td>NPHI</td>\n",
" <td>%</td>\n",
" <td>1D</td>\n",
" <td>32.958984</td>\n",
" <td>145.703125</td>\n",
" <td>Thermal Neutron Porosity (original Ratio Metho...</td>\n",
" </tr>\n",
" <tr>\n",
" <th>23</th>\n",
" <td>FDC/CNL/GR_repeat</td>\n",
" <td>B59180</td>\n",
" <td>TDEP</td>\n",
" <td>m</td>\n",
" <td>1D</td>\n",
" <td>-6.857943</td>\n",
" <td>264.261597</td>\n",
" <td>None</td>\n",
" </tr>\n",
" <tr>\n",
" <th>26</th>\n",
" <td>FDC/CNL/GR_repeat</td>\n",
" <td>B59180</td>\n",
" <td>RHOB</td>\n",
" <td>g/cm3</td>\n",
" <td>1D</td>\n",
" <td>-1.547852</td>\n",
" <td>2.876953</td>\n",
" <td>Bulk Density</td>\n",
" </tr>\n",
" </tbody>\n",
"</table>\n",
"</div>"
],
"text/plain": [
" Digital File Frame Name Mnemonics Unit Dimension Min \\\n",
"0 FDC/CNL/GR_main B59067 TDEP m 1D -4.419456 \n",
"3 FDC/CNL/GR_main B59067 RHOB g/cm3 1D -0.913086 \n",
"8 FDC/CNL/GR_main B59067 GR gAPI 1D 3.285156 \n",
"9 FDC/CNL/GR_main B59067 CALI in 1D 7.818652 \n",
"19 FDC/CNL/GR_main B59067 NPHI % 1D 32.958984 \n",
"23 FDC/CNL/GR_repeat B59180 TDEP m 1D -6.857943 \n",
"26 FDC/CNL/GR_repeat B59180 RHOB g/cm3 1D -1.547852 \n",
"\n",
" Max Long Name \n",
"0 372.465607 None \n",
"3 3.863281 Bulk Density \n",
"8 141.375000 Gamma Ray \n",
"9 7.935532 Caliper \n",
"19 145.703125 Thermal Neutron Porosity (original Ratio Metho... \n",
"23 264.261597 None \n",
"26 2.876953 Bulk Density "
]
},
"execution_count": 6,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"from stoneforge.io.dlisio_r import DLISAccess\n",
"\n",
"dlis_manager = DLISAccess(\"../stoneforge/datasets/DSDP_leg_96_hole_616_96_processed_data.dlis\", gui=False)\n",
"a = dlis_manager.select_header(idx=(0, 8, 3, 9, 19, 23, 26)) #idx=[0, 8, 3, 9, 19, 23, 26]\n",
"a"
]
},
{
"cell_type": "code",
"execution_count": 7,
"id": "88d713e8",
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"{'FDC/CNL/GR_main': {'B59067': {'TDEP': {'unit': 'm',\n",
" 'values': array([372.4656 , 372.3132 , 372.1608 , ..., -4.1146564,\n",
" -4.2670565, -4.4194565], shape=(2474,), dtype=float32)},\n",
" 'RHOB': {'unit': 'g/cm3',\n",
" 'values': array([2.0898438, 2.0898438, 2.0898438, ..., 1.1201172, 1.1132812,\n",
" 1.109375 ], shape=(2474,), dtype=float32)},\n",
" 'GR': {'unit': 'gAPI',\n",
" 'values': array([133.25 , 133.25 , 133.25 , ..., 3.765625 ,\n",
" 3.7519531, 3.7539062], shape=(2474,), dtype=float32)},\n",
" 'CALI': {'unit': 'in',\n",
" 'values': array([7.8555613, 7.8555613, 7.8555613, ..., 7.898622 , 7.9232283,\n",
" 7.898622 ], shape=(2474,), dtype=float32)},\n",
" 'NPHI': {'unit': '%',\n",
" 'values': array([ 61.279297, 61.279297, 61.279297, ..., 96.728516, 106.640625,\n",
" 99.31641 ], shape=(2474,), dtype=float32)}}},\n",
" 'FDC/CNL/GR_repeat': {'B59180': {'TDEP': {'unit': 'm',\n",
" 'values': array([264.2616 , 264.1092 , 263.9568 , ..., -6.5531425,\n",
" -6.7055426, -6.8579426], shape=(1780,), dtype=float32)},\n",
" 'RHOB': {'unit': 'g/cm3',\n",
" 'values': array([1.9287109, 1.9287109, 1.9287109, ..., 1.1601562, 1.1777344,\n",
" 1.1484375], shape=(1780,), dtype=float32)}}}}"
]
},
"execution_count": 7,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"dlis_manager.get_data()"
]
},
{
"cell_type": "code",
"execution_count": 8,
"id": "e5077cfe",
"metadata": {},
"outputs": [],
"source": [
"dlis_manager.export(r\"C:\\Users\\mario\\Documents\\test\")"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "befb31a8",
"metadata": {},
"outputs": [],
"source": []
}
Expand Down
Loading