Updated XDE testing notebook

Author: supersonik12

notebooks/Tricahue_XDE.ipynb

@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -19,21 +19,21 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 22,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
-    "files = [\"C:/Users/smf12/SPUR/Tricahue/tests/test_files/ExpNOTs_GFP.xlsx\", \"C:/Users/smf12/SPUR/Tricahue/tests/test_files/ExpNOTs_GFP_trans.xlsx\"]\n",
+    "files = [\"../tests/test_files/ExpNOTs_GFP.xlsx\", \"../tests/test_files/ExpNOTs_GFP_trans.xlsx\"]\n",
     "sheet_name = \"Table All Cycles\"\n",
     "time_col_name = \"Time\"\n",
-    "data_cols_offset = 11\n",
+    "data_cols_offset = 2\n",
     "\n",
-    "XDC_file_name = \"C:/Users/smf12/SPUR/Tricahue/tests/test_files/xperimental_data_connector_template.xlsx\""
+    "XDC_file_name = \"../tests/test_files/xperimental_data_connector_template.xlsx\""
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 23,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -43,49 +43,52 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 24,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
+    "# get sample data from files\n",
     "sample_list = xde.generateSampleData(files, sheet_name, time_col_name, data_cols_offset)\n",
-    "# sample_list"
+    "# print(sample_list)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 25,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "['C:/Users/smf12/SPUR/Tricahue/tests/test_files/ExpNOTs_GFP.xlsx', 'C:/Users/smf12/SPUR/Tricahue/tests/test_files/ExpNOTs_GFP_trans.xlsx']\n"
+      "['../tests/test_files/ExpNOTs_GFP.xlsx', '../tests/test_files/ExpNOTs_GFP_trans.xlsx']\n"
      ]
     }
    ],
    "source": [
+    "# build pandas DataFrame from the sample data\n",
     "output_df = xde.buildFinalDF(files,\n",
     "                             sample_list, \n",
     "                             time_col_name, \n",
     "                             data_cols_offset, \n",
     "                             num_rows_btwn_data=0, \n",
     "                             sheet_to_read_from=sheet_name)\n",
-    "# output_df.head()"
+    "# print(output_df.head())"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 26,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [],
    "source": [
+    "# write the DataFrame to the XDC file in the 'Measurement' sheet\n",
     "xde.writeToMeasurements(XDC_file_name, output_df)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 27,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [
     {
@@ -123,59 +126,60 @@
        "      <td>Sample1</td>\n",
        "      <td>Signal1</td>\n",
        "      <td>0 h</td>\n",
-       "      <td>740</td>\n",
+       "      <td>30</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>1</th>\n",
        "      <td>Measurement1</td>\n",
        "      <td>Sample1</td>\n",
        "      <td>Signal1</td>\n",
        "      <td>0 h 4 min</td>\n",
-       "      <td>754</td>\n",
+       "      <td>30</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2</th>\n",
        "      <td>Measurement2</td>\n",
        "      <td>Sample1</td>\n",
        "      <td>Signal1</td>\n",
        "      <td>0 h 8 min</td>\n",
-       "      <td>770</td>\n",
+       "      <td>28</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>3</th>\n",
        "      <td>Measurement3</td>\n",
        "      <td>Sample1</td>\n",
        "      <td>Signal1</td>\n",
        "      <td>0 h 12 min</td>\n",
-       "      <td>773</td>\n",
+       "      <td>29</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>4</th>\n",
        "      <td>Measurement4</td>\n",
        "      <td>Sample1</td>\n",
        "      <td>Signal1</td>\n",
        "      <td>0 h 16 min</td>\n",
-       "      <td>777</td>\n",
+       "      <td>30</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
        "</div>"
       ],
       "text/plain": [
        "  Measurement ID Sample ID Signal ID        Time  Value\n",
-       "0   Measurement0   Sample1   Signal1        0 h     740\n",
-       "1   Measurement1   Sample1   Signal1   0 h 4 min    754\n",
-       "2   Measurement2   Sample1   Signal1   0 h 8 min    770\n",
-       "3   Measurement3   Sample1   Signal1  0 h 12 min    773\n",
-       "4   Measurement4   Sample1   Signal1  0 h 16 min    777"
+       "0   Measurement0   Sample1   Signal1        0 h      30\n",
+       "1   Measurement1   Sample1   Signal1   0 h 4 min     30\n",
+       "2   Measurement2   Sample1   Signal1   0 h 8 min     28\n",
+       "3   Measurement3   Sample1   Signal1  0 h 12 min     29\n",
+       "4   Measurement4   Sample1   Signal1  0 h 16 min     30"
       ]
      },
-     "execution_count": 27,
+     "execution_count": 7,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
+    "# for testing; read the 'Measurement' sheet from the XDC excel file\n",
     "xls = pd.ExcelFile(XDC_file_name)\n",
     "measurement = pd.read_excel(xls, 'Measurement')\n",
     "measurement.head()"

src/__pycache__/tricahue.cpython-39.pyc

@@ -334,7 +334,7 @@ def generateSampleData(self, file_list,sheet_to_read_from,time_col_name,data_col
             sample_data_list.append(temp_tuple)
 
         with pd.ExcelWriter(file_list[0], mode='a', engine='openpyxl', if_sheet_exists='replace') as writer:
-                result.to_excel(writer,'Sample',index=False)
+            result.to_excel(writer,'Sample',index=False)
 
         return sample_data_list