Skip to content

Commit

Permalink
fix datapath for notebooks
Browse files Browse the repository at this point in the history
  • Loading branch information
@jgeisz
jgeisz committed Dec 27, 2024
1 parent b7dc52f commit 02af9f0
Show file tree
Hide file tree
Showing 11 changed files with 1,304 additions and 225 deletions.
31 changes: 17 additions & 14 deletions notebooks/4J IMM.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@
"path = pvc.datapath\n",
"ELcsv = 'MM927Bn10EL.csv'\n",
"JVscv = 'MM927Bn10JV.csv'\n",
"dfEL = pd.read_csv(path+ELcsv, index_col=0)\n",
"dfJV = pd.read_csv(path+JVscv, index_col=0)\n",
"ELcsv = path.joinpath(ELcsv)\n",
"JVscv = path.joinpath(JVscv)\n",
"dfEL = pd.read_csv(ELcsv, index_col=0)\n",
"dfJV = pd.read_csv(JVscv, index_col=0)\n",
"#parse\n",
"data_I0=np.array(dfEL['J0'])/1000. #->A\n",
"data_V0=np.array(dfEL['V0'])\n",
Expand Down Expand Up @@ -89,7 +91,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": 5,
"id": "9ac045cc-f893-4f9a-a7f6-f82caeb74c7d",
"metadata": {},
"outputs": [],
Expand All @@ -102,17 +104,17 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 6,
"id": "fc908aa2-60a8-405f-ae73-42cb9e5e7f30",
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"[<matplotlib.lines.Line2D at 0x2f0beaa6500>]"
"[<matplotlib.lines.Line2D at 0x10f52fc50>]"
]
},
"execution_count": 8,
"execution_count": 6,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -133,7 +135,7 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": 7,
"id": "b1ef0475-afe7-417d-a4a0-a4e63d09e62c",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -189,7 +191,7 @@
"RBB_dict: {'method': 'JFG', 'mrb': 43.0, 'J0rb': 0.3, 'Vrb': 0.0}"
]
},
"execution_count": 9,
"execution_count": 7,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -200,23 +202,24 @@
},
{
"cell_type": "code",
"execution_count": 10,
"execution_count": 8,
"id": "5dd5e423-b857-4f03-8153-0746f5f58dfd",
"metadata": {},
"outputs": [
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "5d0fc313cc7b416190deb395c2d3164d",
"model_id": "6ef489a421524d69882d1824d10f40e4",
"version_major": 2,
"version_minor": 0
},
"text/plain": [
"VBox(children=(HBox(children=(Output(outputs=({'output_type': 'display_data', 'data': {'text/plain': \"Canvas(t…"
"VBox(children=(HBox(children=(Output(), Output()), layout=Layout(display='flex', flex_flow='row', justify_cont…"
]
},
"execution_count": 8,
"metadata": {},
"output_type": "display_data"
"output_type": "execute_result"
}
],
"source": [
Expand All @@ -234,7 +237,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
Expand All @@ -248,7 +251,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.4"
"version": "3.11.7"
}
},
"nbformat": 4,
Expand Down
1,078 changes: 1,042 additions & 36 deletions notebooks/EYmap.ipynb
View file

Large diffs are not rendered by default.

103 changes: 85 additions & 18 deletions notebooks/EYtest.ipynb
View file

Large diffs are not rendered by default.

41 changes: 21 additions & 20 deletions notebooks/MS874_3T.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": 3,
"id": "3d7dd5f8-2a35-461c-a5d7-81bceee9093e",
"metadata": {},
"outputs": [],
Expand All @@ -65,7 +65,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": 4,
"id": "f471637c-4313-4988-8f8c-1683e5ddf91c",
"metadata": {},
"outputs": [],
Expand All @@ -86,7 +86,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": 5,
"id": "8f62fafb-eeaa-4ea1-91a6-01102d3518a4",
"metadata": {},
"outputs": [],
Expand All @@ -100,23 +100,24 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 6,
"id": "179a3a24-50f6-4f39-bbef-493f44c54d04",
"metadata": {},
"outputs": [
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "9c1f15b3795949c8aeca8fa0765fe2b1",
"model_id": "3b672b367507462bb22710a53fc6e548",
"version_major": 2,
"version_minor": 0
},
"text/plain": [
"HBox(children=(Output(), Output()))"
]
},
"execution_count": 6,
"metadata": {},
"output_type": "display_data"
"output_type": "execute_result"
}
],
"source": [
Expand All @@ -137,7 +138,7 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": 7,
"id": "1484973f-fe1a-44fa-8018-0a8899ecce1c",
"metadata": {},
"outputs": [
Expand All @@ -148,19 +149,19 @@
"{'name': 'MS874dev3T SpecialPoints', 'meastype': 'CZ', 'area': 0.25, 'shape': (9,)}\n",
"sizes(9, 9)\n",
"\n",
" # mIro mIzo mIto Vzt Vrz Vtr mIA mIB VA VB mPtot mIxhex mIyhex Vxhex Vyhex \n",
" Voc3 0.00 0.00 0.00 1.431 -1.029 -0.402 0.00 0.00 -1.029 -1.431 0.00 0.00 0.00 1.296 -1.189 \n",
" Isc3 2.82 -6.68 3.81 0.000 0.000 -0.000 2.82 3.81 0.000 0.000 -0.00 -0.70 -7.69 0.000 0.000 \n",
" VrzIto 3.24 -3.24 0.00 1.427 0.000 -1.427 3.24 0.00 0.000 -1.427 -0.00 2.29 -3.74 2.018 0.000 \n",
" VztIro 0.00 -3.81 3.81 0.686 -1.021 0.335 0.00 3.81 -1.021 -0.686 2.62 -2.70 -4.40 0.249 -1.179 \n",
" VtrIzo nan nan nan nan nan nan nan nan nan nan -100000.00 nan nan nan nan \n",
" MPP 2.73 -6.46 3.69 1.302 -0.906 -0.396 2.73 3.69 -0.906 -1.302 7.27 -0.67 -7.43 1.201 -1.046 \n",
"MPPVM32 2.79 -6.50 3.67 1.306 -0.871 -0.435 2.79 3.67 -0.871 -1.306 7.22 -0.62 -7.49 1.231 -1.005 \n",
"MPPVM43 2.59 -6.41 3.78 1.248 -0.936 -0.312 2.59 3.78 -0.936 -1.248 7.14 -0.84 -7.38 1.103 -1.081 \n",
" MPPCM -3.40 0.00 3.40 1.350 -1.057 -0.294 -3.40 3.40 -1.057 -1.350 1.00 -4.81 0.00 1.162 -1.220 "
" # mIro mIzo mIto Vzt Vrz Vtr mIA mIB VA VB mPtot mIxhex mIyhex Vxhex Vyhex \n",
" Voc3 0.00 0.00 0.00 1.431 -1.029 -0.402 0.00 0.00 -1.029 -1.431 0.00 0.00 0.00 1.296 -1.189 \n",
" Isc3 2.82 -6.68 3.81 0.000 0.000 0.000 2.82 3.81 0.000 0.000 0.00 -0.70 -7.69 0.000 0.000 \n",
" VrzIto 3.24 -3.24 0.00 1.427 0.000 -1.427 3.24 0.00 0.000 -1.427 0.00 2.29 -3.74 2.018 0.000 \n",
" VztIro 0.00 -3.81 3.81 0.686 -1.021 0.335 0.00 3.81 -1.021 -0.686 2.62 -2.70 -4.40 0.249 -1.179 \n",
" VtrIzo nan nan nan nan nan nan nan nan nan nan -100000.00 nan nan nan nan \n",
" MPP 2.73 -6.46 3.69 1.302 -0.906 -0.396 2.73 3.69 -0.906 -1.302 7.27 -0.67 -7.43 1.201 -1.046 \n",
" MPPVM32 2.79 -6.50 3.67 1.306 -0.871 -0.435 2.79 3.67 -0.871 -1.306 7.22 -0.62 -7.49 1.231 -1.005 \n",
" MPPVM43 2.59 -6.41 3.78 1.248 -0.936 -0.312 2.59 3.78 -0.936 -1.248 7.14 -0.84 -7.38 1.103 -1.081 \n",
" MPPCM -3.40 0.00 3.40 1.350 -1.057 -0.294 -3.40 3.40 -1.057 -1.350 1.00 -4.81 0.00 1.162 -1.220 "
]
},
"execution_count": 9,
"execution_count": 7,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -187,7 +188,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
Expand All @@ -201,7 +202,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.4"
"version": "3.11.7"
}
},
"nbformat": 4,
Expand Down
37 changes: 18 additions & 19 deletions notebooks/QEclasstest.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,7 @@
"execution_count": 2,
"id": "b2c27ce3-bd05-4e25-8122-652c7c21dadb",
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Tandems version 0.989\n",
"Data path is: /Users/jgeisz/Documents/GitHub/Tandems/tandems/data/\n"
]
}
],
"outputs": [],
"source": [
"import pandas as pd\n",
"import numpy as np\n",
Expand All @@ -54,7 +45,7 @@
{
"data": {
"text/plain": [
"<matplotlib.pyplot._IoffContext at 0x7fa9696aa6d0>"
"<contextlib.ExitStack at 0x118eb0d10>"
]
},
"execution_count": 3,
Expand All @@ -65,9 +56,8 @@
"source": [
"#import EQE of MM927 4J\n",
"path = pvc.datapath\n",
"\n",
"file = 'MM927Bn5CEQE.csv'\n",
"df4J = pd.read_csv(path+file, index_col=0)\n",
"file = path.joinpath('MM927Bn5CEQE.csv')\n",
"df4J = pd.read_csv(file, index_col=0)\n",
"MM927_EQE = df4J.to_numpy(dtype=np.float64, copy=True) #numpy.ndarray\n",
"MM927_xEQE = df4J.index.to_numpy(dtype=np.float64, copy=True) #numpy.ndarray\n",
"\n",
Expand All @@ -84,16 +74,17 @@
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "44f8ef3ce34840da92fbb8218a7f4762",
"model_id": "daa69e1bad6943a1b8a2d54f9f460885",
"version_major": 2,
"version_minor": 0
},
"text/plain": [
"VBox(children=(Output(), Output(layout=Layout(height='70px')), HBox(children=(Label(value='EQE: ', description…"
]
},
"execution_count": 4,
"metadata": {},
"output_type": "display_data"
"output_type": "execute_result"
}
],
"source": [
Expand All @@ -108,13 +99,21 @@
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "d07b1dc5-8851-4425-82cb-dedbea320ce9",
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
"kernelspec": {
"display_name": "pvdev",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "pvdev"
"name": "python3"
},
"language_info": {
"codemirror_mode": {
Expand All @@ -126,7 +125,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.12"
"version": "3.11.7"
}
},
"nbformat": 4,
Expand Down
66 changes: 38 additions & 28 deletions notebooks/QEtest.ipynb
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 02af9f0

Please sign in to comment.