Skip to content

Commit

Permalink
correct the cylinder definition
Browse files Browse the repository at this point in the history
  • Loading branch information
Chenggong committed Jul 31, 2023
1 parent 7c359a9 commit 0ebb470
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 49 deletions.
85 changes: 36 additions & 49 deletions tutorial/01_sfilter_tutorial.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,13 +395,13 @@
},
{
"cell_type": "code",
"execution_count": 11,
"execution_count": 13,
"id": "4898aaa3-926a-4c15-9c4f-29acd0a3425a",
"metadata": {},
"outputs": [],
"source": [
"# Do the same with water\n",
"wat = u.select_atoms(\"resname SOL\")\n",
"wat = u.select_atoms(\"resname SOL and name OW\")\n",
"site_occu_wat = []\n",
"for ts in u.trajectory:\n",
" wat_array = sf.state_detect(wat, s5_z_cutoff, r_cutoff, s0_r_cutoff) \n",
Expand All @@ -410,7 +410,7 @@
},
{
"cell_type": "code",
"execution_count": 12,
"execution_count": 14,
"id": "421c3e83-05f9-4b31-84c9-be3950713483",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -446,12 +446,12 @@
" <tbody>\n",
" <tr>\n",
" <th>0</th>\n",
" <td>[56425, 60299, 60300, 60301]</td>\n",
" <td>[60299]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[31255, 32579, 32580, 32581, 40145, 40146, 401...</td>\n",
" <td>[40145, 44588]</td>\n",
" </tr>\n",
" <tr>\n",
" <th>1</th>\n",
Expand All @@ -460,7 +460,7 @@
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[36476, 36477, 39977, 39978, 39979, 41862, 522...</td>\n",
" <td>[61961]</td>\n",
" </tr>\n",
" <tr>\n",
" <th>2</th>\n",
Expand All @@ -469,113 +469,100 @@
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[36476, 36477, 36478, 37471, 41862, 47115, 490...</td>\n",
" <td>[49097, 51185, 51449]</td>\n",
" </tr>\n",
" <tr>\n",
" <th>3</th>\n",
" <td>[35385, 35386, 48137, 48138]</td>\n",
" <td>[48137]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[31295, 31296, 31297, 37469, 37471, 40427, 404...</td>\n",
" <td>[31295, 43874, 55148, 58355]</td>\n",
" </tr>\n",
" <tr>\n",
" <th>4</th>\n",
" <td>[35384, 35385, 35386, 42595, 50423, 50424]</td>\n",
" <td>[35384, 50423]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[37016, 37017, 37018, 38117, 38118, 38119, 399...</td>\n",
" <td>[37016, 49463]</td>\n",
" </tr>\n",
" <tr>\n",
" <th>5</th>\n",
" <td>[42764, 42765, 42766, 47197, 53675, 53676, 53677]</td>\n",
" <td>[42764, 53675]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[30694, 36476, 36477, 36478, 36844, 37470, 384...</td>\n",
" <td>[40154, 48152, 58601]</td>\n",
" </tr>\n",
" <tr>\n",
" <th>6</th>\n",
" <td>[55301, 55302]</td>\n",
" <td>[55301]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[30692, 30693, 30694, 38414, 38415, 38416, 390...</td>\n",
" <td>[38414, 39023, 59456]</td>\n",
" </tr>\n",
" <tr>\n",
" <th>7</th>\n",
" <td>[41922, 41923, 43610, 43611, 43612]</td>\n",
" <td>[43610]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[30692, 30693, 30694, 32579, 32580, 32581, 364...</td>\n",
" <td>[37358, 39977, 40088]</td>\n",
" </tr>\n",
" <tr>\n",
" <th>8</th>\n",
" <td>[37128, 41121, 41122, 54627]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[32580, 39023, 39025, 40088, 40089, 40090, 547...</td>\n",
" <td>[]</td>\n",
" <td>[40088, 55916]</td>\n",
" </tr>\n",
" <tr>\n",
" <th>9</th>\n",
" <td>[33339, 37620, 41318, 41319, 41320]</td>\n",
" <td>[41318]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[30775, 33674, 33675, 33676, 37121, 37122, 371...</td>\n",
" <td>[33674, 37121]</td>\n",
" </tr>\n",
" <tr>\n",
" <th>10</th>\n",
" <td>[34520, 38763]</td>\n",
" <td>[34520]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[]</td>\n",
" <td>[32392, 33140, 33141, 33142, 33674, 33675, 336...</td>\n",
" <td>[33140, 33674, 55745]</td>\n",
" </tr>\n",
" </tbody>\n",
"</table>\n",
"</div>"
],
"text/plain": [
" S0 S1 S2 S3 S4 \\\n",
"0 [56425, 60299, 60300, 60301] [] [] [] [] \n",
"1 [] [] [] [] [] \n",
"2 [] [] [] [] [] \n",
"3 [35385, 35386, 48137, 48138] [] [] [] [] \n",
"4 [35384, 35385, 35386, 42595, 50423, 50424] [] [] [] [] \n",
"5 [42764, 42765, 42766, 47197, 53675, 53676, 53677] [] [] [] [] \n",
"6 [55301, 55302] [] [] [] [] \n",
"7 [41922, 41923, 43610, 43611, 43612] [] [] [] [] \n",
"8 [37128, 41121, 41122, 54627] [] [] [] [] \n",
"9 [33339, 37620, 41318, 41319, 41320] [] [] [] [] \n",
"10 [34520, 38763] [] [] [] [] \n",
"\n",
" SCav \n",
"0 [31255, 32579, 32580, 32581, 40145, 40146, 401... \n",
"1 [36476, 36477, 39977, 39978, 39979, 41862, 522... \n",
"2 [36476, 36477, 36478, 37471, 41862, 47115, 490... \n",
"3 [31295, 31296, 31297, 37469, 37471, 40427, 404... \n",
"4 [37016, 37017, 37018, 38117, 38118, 38119, 399... \n",
"5 [30694, 36476, 36477, 36478, 36844, 37470, 384... \n",
"6 [30692, 30693, 30694, 38414, 38415, 38416, 390... \n",
"7 [30692, 30693, 30694, 32579, 32580, 32581, 364... \n",
"8 [32580, 39023, 39025, 40088, 40089, 40090, 547... \n",
"9 [30775, 33674, 33675, 33676, 37121, 37122, 371... \n",
"10 [32392, 33140, 33141, 33142, 33674, 33675, 336... "
" S0 S1 S2 S3 S4 SCav\n",
"0 [60299] [] [] [] [] [40145, 44588]\n",
"1 [] [] [] [] [] [61961]\n",
"2 [] [] [] [] [] [49097, 51185, 51449]\n",
"3 [48137] [] [] [] [] [31295, 43874, 55148, 58355]\n",
"4 [35384, 50423] [] [] [] [] [37016, 49463]\n",
"5 [42764, 53675] [] [] [] [] [40154, 48152, 58601]\n",
"6 [55301] [] [] [] [] [38414, 39023, 59456]\n",
"7 [43610] [] [] [] [] [37358, 39977, 40088]\n",
"8 [] [] [] [] [] [40088, 55916]\n",
"9 [41318] [] [] [] [] [33674, 37121]\n",
"10 [34520] [] [] [] [] [33140, 33674, 55745]"
]
},
"execution_count": 12,
"execution_count": 14,
"metadata": {},
"output_type": "execute_result"
}
Expand Down
Binary file modified tutorial/SF_definition.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0ebb470

Please sign in to comment.