diff --git a/data_notes.ipynb b/data_notes.ipynb
index fb04aaa6697a3c268707a5e165e9419212426e34..e4c8c3f3b71c53ea94076d71cc27f7aa596aa376 100644
--- a/data_notes.ipynb
+++ b/data_notes.ipynb
@@ -28,349 +28,7 @@
},
{
"cell_type": "code",
- "execution_count": 91,
- "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>image</th>\n",
- " <th>avg fiber diameter (um)</th>\n",
- " <th>thickness (mm)</th>\n",
- " <th>weight (g/cm^2)</th>\n",
- " <th>filter efficiency (%)</th>\n",
- " <th>pressure drop (psi)</th>\n",
- " <th>nameref</th>\n",
- " <th>imagepath</th>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>name</th>\n",
- " <th></th>\n",
- " <th></th>\n",
- " <th></th>\n",
- " <th></th>\n",
- " <th></th>\n",
- " <th></th>\n",
- " <th></th>\n",
- " <th></th>\n",
- " </tr>\n",
- " </thead>\n",
- " <tbody>\n",
- " <tr>\n",
- " <th>3M_1000MPR</th>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>0.280</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>./materials/3M_1000MPR/3M_1000MPR.html</td>\n",
- " <td>./materials/3M_1000MPR/SEM/3M_filtrete1000_20n...</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>3M_1900MPR</th>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>0.319</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>./materials/3M_1900MPR/3M_1900MPR.html</td>\n",
- " <td>./materials/3M_1900MPR/SEM/3M_filtrete1900_20n...</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>3M_300MPR</th>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>0.292</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>./materials/3M_300MPR/3M_300MPR.html</td>\n",
- " <td>./materials/3M_300MPR/SEM/3M_filtrete300_20nmA...</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>3M_N95</th>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>0.721</td>\n",
- " <td>0.0223</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>./materials/3M_N95/3M_N95.html</td>\n",
- " <td>./materials/3M_N95/SEM/3MN95_nosputter_top_000...</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>Arauco_BKP</th>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>1.800</td>\n",
- " <td>0.0639</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>./materials/Arauco_BKP/Arauco_BKP.html</td>\n",
- " <td>./materials/Arauco_BKP/SEM/AraucoBKP_6_20nmAu_...</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>Arauco_EKP</th>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>1.300</td>\n",
- " <td>0.0772</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>./materials/Arauco_EKP/Arauco_EKP.html</td>\n",
- " <td>./materials/Arauco_EKP/SEM/AraucoEKP_8_20nmAu_...</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>Arauco_UKP</th>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>1.600</td>\n",
- " <td>0.0821</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>./materials/Arauco_UKP/Arauco_UKP.html</td>\n",
- " <td>./materials/Arauco_UKP/SEM/AraucoUKP_6_20nmAu_...</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>Gerson_N95</th>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>1.076</td>\n",
- " <td>0.0306</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>./materials/Gerson_N95/Gerson_N95.html</td>\n",
- " <td>./materials/Gerson_N95/SEM/GersonN95_nosputter...</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>HEPA</th>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>0.209</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>./materials/HEPA/HEPA.html</td>\n",
- " <td>./materials/HEPA/SEM/inline_HEPA_20nmAu_top_00...</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>HV_PN13015AP2</th>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>0.081</td>\n",
- " <td>0.0020</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>./materials/HV_PN13015AP2/HV_PN13015AP2.html</td>\n",
- " <td>./materials/HV_PN13015AP2/SEM/PN13015AP2_20nmA...</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>HV_TSP050PLUS</th>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>0.295</td>\n",
- " <td>0.0064</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>./materials/HV_TSP050PLUS/HV_TSP050PLUS.html</td>\n",
- " <td>./materials/HV_TSP050PLUS/SEM/TS050PLUS_20nmAu...</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>HV_TSP050YA002</th>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>0.446</td>\n",
- " <td>0.0143</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>./materials/HV_TSP050YA002/HV_TSP050YA002.html</td>\n",
- " <td>./materials/HV_TSP050YA002/SEM/TSP050YA002_20n...</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>HV_TSP100NS015</th>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>0.437</td>\n",
- " <td>0.0152</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>./materials/HV_TSP100NS015/HV_TSP100NS015.html</td>\n",
- " <td>./materials/HV_TSP100NS015/SEM/TSP100NS015_20n...</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>KC_47117</th>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>0.184</td>\n",
- " <td>0.0067</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>./materials/KC_47117/KC_47117.html</td>\n",
- " <td>./materials/KC_47117/SEM/KC47117_20sputter_mid...</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>cotton</th>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>0.333</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>./materials/cotton/cotton.html</td>\n",
- " <td>./materials/cotton/SEM/tshirt_100cotton_20nmAu...</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>polyester</th>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>0.137</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>./materials/polyester/polyester.html</td>\n",
- " <td>./materials/polyester/SEM/pillowcase_20nmAu_to...</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>tyvek</th>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>0.143</td>\n",
- " <td>0.0065</td>\n",
- " <td>NaN</td>\n",
- " <td>NaN</td>\n",
- " <td>./materials/tyvek/tyvek.html</td>\n",
- " <td>./materials/tyvek/SEM/tyvek_20nmAu_top_0005_re...</td>\n",
- " </tr>\n",
- " </tbody>\n",
- "</table>\n",
- "</div>"
- ],
- "text/plain": [
- " image avg fiber diameter (um) thickness (mm) \\\n",
- "name \n",
- "3M_1000MPR NaN NaN 0.280 \n",
- "3M_1900MPR NaN NaN 0.319 \n",
- "3M_300MPR NaN NaN 0.292 \n",
- "3M_N95 NaN NaN 0.721 \n",
- "Arauco_BKP NaN NaN 1.800 \n",
- "Arauco_EKP NaN NaN 1.300 \n",
- "Arauco_UKP NaN NaN 1.600 \n",
- "Gerson_N95 NaN NaN 1.076 \n",
- "HEPA NaN NaN 0.209 \n",
- "HV_PN13015AP2 NaN NaN 0.081 \n",
- "HV_TSP050PLUS NaN NaN 0.295 \n",
- "HV_TSP050YA002 NaN NaN 0.446 \n",
- "HV_TSP100NS015 NaN NaN 0.437 \n",
- "KC_47117 NaN NaN 0.184 \n",
- "cotton NaN NaN 0.333 \n",
- "polyester NaN NaN 0.137 \n",
- "tyvek NaN NaN 0.143 \n",
- "\n",
- " weight (g/cm^2) filter efficiency (%) pressure drop (psi) \\\n",
- "name \n",
- "3M_1000MPR NaN NaN NaN \n",
- "3M_1900MPR NaN NaN NaN \n",
- "3M_300MPR NaN NaN NaN \n",
- "3M_N95 0.0223 NaN NaN \n",
- "Arauco_BKP 0.0639 NaN NaN \n",
- "Arauco_EKP 0.0772 NaN NaN \n",
- "Arauco_UKP 0.0821 NaN NaN \n",
- "Gerson_N95 0.0306 NaN NaN \n",
- "HEPA NaN NaN NaN \n",
- "HV_PN13015AP2 0.0020 NaN NaN \n",
- "HV_TSP050PLUS 0.0064 NaN NaN \n",
- "HV_TSP050YA002 0.0143 NaN NaN \n",
- "HV_TSP100NS015 0.0152 NaN NaN \n",
- "KC_47117 0.0067 NaN NaN \n",
- "cotton NaN NaN NaN \n",
- "polyester NaN NaN NaN \n",
- "tyvek 0.0065 NaN NaN \n",
- "\n",
- " nameref \\\n",
- "name \n",
- "3M_1000MPR ./materials/3M_1000MPR/3M_1000MPR.html \n",
- "3M_1900MPR ./materials/3M_1900MPR/3M_1900MPR.html \n",
- "3M_300MPR ./materials/3M_300MPR/3M_300MPR.html \n",
- "3M_N95 ./materials/3M_N95/3M_N95.html \n",
- "Arauco_BKP ./materials/Arauco_BKP/Arauco_BKP.html \n",
- "Arauco_EKP ./materials/Arauco_EKP/Arauco_EKP.html \n",
- "Arauco_UKP ./materials/Arauco_UKP/Arauco_UKP.html \n",
- "Gerson_N95 ./materials/Gerson_N95/Gerson_N95.html \n",
- "HEPA ./materials/HEPA/HEPA.html \n",
- "HV_PN13015AP2 ./materials/HV_PN13015AP2/HV_PN13015AP2.html \n",
- "HV_TSP050PLUS ./materials/HV_TSP050PLUS/HV_TSP050PLUS.html \n",
- "HV_TSP050YA002 ./materials/HV_TSP050YA002/HV_TSP050YA002.html \n",
- "HV_TSP100NS015 ./materials/HV_TSP100NS015/HV_TSP100NS015.html \n",
- "KC_47117 ./materials/KC_47117/KC_47117.html \n",
- "cotton ./materials/cotton/cotton.html \n",
- "polyester ./materials/polyester/polyester.html \n",
- "tyvek ./materials/tyvek/tyvek.html \n",
- "\n",
- " imagepath \n",
- "name \n",
- "3M_1000MPR ./materials/3M_1000MPR/SEM/3M_filtrete1000_20n... \n",
- "3M_1900MPR ./materials/3M_1900MPR/SEM/3M_filtrete1900_20n... \n",
- "3M_300MPR ./materials/3M_300MPR/SEM/3M_filtrete300_20nmA... \n",
- "3M_N95 ./materials/3M_N95/SEM/3MN95_nosputter_top_000... \n",
- "Arauco_BKP ./materials/Arauco_BKP/SEM/AraucoBKP_6_20nmAu_... \n",
- "Arauco_EKP ./materials/Arauco_EKP/SEM/AraucoEKP_8_20nmAu_... \n",
- "Arauco_UKP ./materials/Arauco_UKP/SEM/AraucoUKP_6_20nmAu_... \n",
- "Gerson_N95 ./materials/Gerson_N95/SEM/GersonN95_nosputter... \n",
- "HEPA ./materials/HEPA/SEM/inline_HEPA_20nmAu_top_00... \n",
- "HV_PN13015AP2 ./materials/HV_PN13015AP2/SEM/PN13015AP2_20nmA... \n",
- "HV_TSP050PLUS ./materials/HV_TSP050PLUS/SEM/TS050PLUS_20nmAu... \n",
- "HV_TSP050YA002 ./materials/HV_TSP050YA002/SEM/TSP050YA002_20n... \n",
- "HV_TSP100NS015 ./materials/HV_TSP100NS015/SEM/TSP100NS015_20n... \n",
- "KC_47117 ./materials/KC_47117/SEM/KC47117_20sputter_mid... \n",
- "cotton ./materials/cotton/SEM/tshirt_100cotton_20nmAu... \n",
- "polyester ./materials/polyester/SEM/pillowcase_20nmAu_to... \n",
- "tyvek ./materials/tyvek/SEM/tyvek_20nmAu_top_0005_re... "
- ]
- },
- "execution_count": 91,
- "metadata": {},
- "output_type": "execute_result"
- }
- ],
- "source": [
- "master_table = pd.read_html(\"./index.html\")[0]\n",
- "xml_table = lhtml.parse(\"./index.html\")\n",
- "master_table['nameref'] = xml_table.xpath('//tr/td/a/@href')\n",
- "master_table['imagepath'] = xml_table.xpath('//tr/td/img/@src')\n",
- "master_table = master_table.set_index('name')\n",
- "master_table"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "### Fiber diameter (fd in $\\mu$m)"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 92,
+ "execution_count": 121,
"metadata": {},
"outputs": [
{
@@ -689,11 +347,32 @@
"tyvek ./materials/tyvek/SEM/tyvek_20nmAu_top_0005_re... "
]
},
- "execution_count": 92,
+ "execution_count": 121,
"metadata": {},
"output_type": "execute_result"
}
],
+ "source": [
+ "master_table = pd.read_html(\"./index.html\")[0]\n",
+ "xml_table = lhtml.parse(\"./index.html\")\n",
+ "master_table['nameref'] = xml_table.xpath('//tr/td/a/@href')\n",
+ "master_table['imagepath'] = xml_table.xpath('//tr/td/img/@src')\n",
+ "master_table = master_table.set_index('name')\n",
+ "master_table"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "metadata": {},
+ "source": [
+ "### Fiber diameter (fd in $\\mu$m)"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": 124,
+ "metadata": {},
+ "outputs": [],
"source": [
"fd_data = pd.read_csv(\"./data/fiber_diameter.csv\", header=1, dtype=float)\n",
"fd_sum = pd.DataFrame(index=fd_data.columns, columns=[\"fiber diam\"], dtype=str)\n",
@@ -701,9 +380,9 @@
" data = data.dropna().to_numpy()\n",
" mean = round(data.mean(), 2)\n",
" std = round(data.std(), 2)\n",
- " master_table.loc[name, \"avg fiber diameter (um)\"] = \"%s +/- %s\" %(mean, std)\n",
+ " #master_table.loc[name, \"avg fiber diameter (um)\"] = \"%s +/- %s\" %(mean, std)\n",
" \n",
- "master_table"
+ "#master_table\n"
]
},
{
@@ -1020,6 +699,9 @@
"metadata": {},
"outputs": [],
"source": [
+ "# CAUTION WITH THIS GUY\n",
+ "#\n",
+ "#\n",
"# wrrite to file\n",
"index_html = open(\"./index.html\", mode=\"a\")\n",
"index_html.write(html_table)\n",