Skip to content

Commit 9a69027

Browse files
authored
Merge pull request #23 from ccdc-opensource/csd544_updates
Csd544 updates
2 parents 941748d + 7dccf04 commit 9a69027

23 files changed

+3132
-2318
lines changed

notebooks/Discovery/01_CSD_Search/01_Substructure_searching_the_CSD.ipynb

Lines changed: 139 additions & 122 deletions
Large diffs are not rendered by default.

notebooks/Discovery/02_Protein_Ligand/01_Protein_Ligand_Searching.ipynb

Lines changed: 53 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"cells": [
33
{
4+
"attachments": {},
45
"cell_type": "markdown",
56
"metadata": {},
67
"source": [
@@ -17,6 +18,7 @@
1718
]
1819
},
1920
{
21+
"attachments": {},
2022
"cell_type": "markdown",
2123
"metadata": {},
2224
"source": [
@@ -33,14 +35,14 @@
3335
},
3436
{
3537
"cell_type": "code",
36-
"execution_count": null,
38+
"execution_count": 1,
3739
"metadata": {},
3840
"outputs": [],
3941
"source": [
4042
"import logging\n",
4143
"from pathlib import Path\n",
42-
"from platform import platform\n",
4344
"import sys\n",
45+
"\n",
4446
"import os\n",
4547
"from time import time\n",
4648
"\n",
@@ -49,7 +51,7 @@
4951
},
5052
{
5153
"cell_type": "code",
52-
"execution_count": null,
54+
"execution_count": 2,
5355
"metadata": {},
5456
"outputs": [],
5557
"source": [
@@ -60,7 +62,7 @@
6062
},
6163
{
6264
"cell_type": "code",
63-
"execution_count": null,
65+
"execution_count": 3,
6466
"metadata": {},
6567
"outputs": [],
6668
"source": [
@@ -72,7 +74,7 @@
7274
},
7375
{
7476
"cell_type": "code",
75-
"execution_count": null,
77+
"execution_count": 4,
7678
"metadata": {},
7779
"outputs": [],
7880
"source": [
@@ -83,12 +85,16 @@
8385
},
8486
{
8587
"cell_type": "code",
86-
"execution_count": null,
88+
"execution_count": 5,
8789
"metadata": {},
8890
"outputs": [],
89-
"source": []
91+
"source": [
92+
"sys.path.append('../..')\n",
93+
"from ccdc_notebook_utilities import run_hermes, create_logger"
94+
]
9095
},
9196
{
97+
"attachments": {},
9298
"cell_type": "markdown",
9399
"metadata": {},
94100
"source": [
@@ -97,48 +103,15 @@
97103
},
98104
{
99105
"cell_type": "code",
100-
"execution_count": null,
106+
"execution_count": 6,
101107
"metadata": {},
102108
"outputs": [],
103109
"source": [
104-
"logger = logging.getLogger(__name__)\n",
105-
"\n",
106-
"if not logger.hasHandlers():\n",
107-
" handler = logging.StreamHandler()\n",
108-
" handler.setFormatter(logging.Formatter('[%(asctime)s %(levelname)-7s] %(message)s', datefmt='%y-%m-%d %H:%M:%S'))\n",
109-
" logger.addHandler(handler)\n",
110-
" logger.setLevel(logging.INFO)"
110+
"logger = create_logger()"
111111
]
112112
},
113113
{
114-
"cell_type": "code",
115-
"execution_count": null,
116-
"metadata": {},
117-
"outputs": [],
118-
"source": [
119-
"logger.info(f\"\"\"\n",
120-
"Platform: {platform()}\n",
121-
"\n",
122-
"Python exe: {sys.executable}\n",
123-
"Python version: {'.'.join(str(x) for x in sys.version_info[:3])}\n",
124-
"\n",
125-
"CSD version: {ccdc.io.csd_version()}\n",
126-
"CSD directory: {ccdc.io.csd_directory()}\n",
127-
"API version: {ccdc.__version__}\n",
128-
"\n",
129-
"CSDHOME: {os.environ.get('CSDHOME', 'Not set')}\n",
130-
"CCDC_LICENSING_CONFIGURATION: {os.environ.get('CCDC_LICENSING_CONFIGURATION', 'Not set')}\n",
131-
"\"\"\")"
132-
]
133-
},
134-
{
135-
"cell_type": "code",
136-
"execution_count": null,
137-
"metadata": {},
138-
"outputs": [],
139-
"source": []
140-
},
141-
{
114+
"attachments": {},
142115
"cell_type": "markdown",
143116
"metadata": {},
144117
"source": [
@@ -149,7 +122,7 @@
149122
},
150123
{
151124
"cell_type": "code",
152-
"execution_count": null,
125+
"execution_count": 7,
153126
"metadata": {},
154127
"outputs": [],
155128
"source": [
@@ -159,6 +132,7 @@
159132
]
160133
},
161134
{
135+
"attachments": {},
162136
"cell_type": "markdown",
163137
"metadata": {},
164138
"source": [
@@ -167,7 +141,7 @@
167141
},
168142
{
169143
"cell_type": "code",
170-
"execution_count": null,
144+
"execution_count": 8,
171145
"metadata": {},
172146
"outputs": [],
173147
"source": [
@@ -184,6 +158,7 @@
184158
"source": []
185159
},
186160
{
161+
"attachments": {},
187162
"cell_type": "markdown",
188163
"metadata": {},
189164
"source": [
@@ -209,6 +184,7 @@
209184
]
210185
},
211186
{
187+
"attachments": {},
212188
"cell_type": "markdown",
213189
"metadata": {},
214190
"source": [
@@ -230,6 +206,7 @@
230206
"source": []
231207
},
232208
{
209+
"attachments": {},
233210
"cell_type": "markdown",
234211
"metadata": {},
235212
"source": [
@@ -238,7 +215,7 @@
238215
},
239216
{
240217
"cell_type": "code",
241-
"execution_count": null,
218+
"execution_count": 9,
242219
"metadata": {},
243220
"outputs": [],
244221
"source": [
@@ -253,6 +230,7 @@
253230
"source": []
254231
},
255232
{
233+
"attachments": {},
256234
"cell_type": "markdown",
257235
"metadata": {},
258236
"source": [
@@ -272,7 +250,7 @@
272250
},
273251
{
274252
"cell_type": "code",
275-
"execution_count": null,
253+
"execution_count": 10,
276254
"metadata": {},
277255
"outputs": [],
278256
"source": [
@@ -284,6 +262,7 @@
284262
]
285263
},
286264
{
265+
"attachments": {},
287266
"cell_type": "markdown",
288267
"metadata": {},
289268
"source": [
@@ -292,14 +271,15 @@
292271
},
293272
{
294273
"cell_type": "code",
295-
"execution_count": null,
274+
"execution_count": 11,
296275
"metadata": {},
297276
"outputs": [],
298277
"source": [
299278
"guanidino = query.add_substructure(guanidino_ss)"
300279
]
301280
},
302281
{
282+
"attachments": {},
303283
"cell_type": "markdown",
304284
"metadata": {},
305285
"source": [
@@ -310,14 +290,15 @@
310290
},
311291
{
312292
"cell_type": "code",
313-
"execution_count": null,
293+
"execution_count": 12,
314294
"metadata": {},
315295
"outputs": [],
316296
"source": [
317297
"query.add_centroid('CENT1', (guanidino, 3), (guanidino, 4))"
318298
]
319299
},
320300
{
301+
"attachments": {},
321302
"cell_type": "markdown",
322303
"metadata": {},
323304
"source": [
@@ -326,7 +307,7 @@
326307
},
327308
{
328309
"cell_type": "code",
329-
"execution_count": null,
310+
"execution_count": 13,
330311
"metadata": {},
331312
"outputs": [],
332313
"source": [
@@ -341,6 +322,7 @@
341322
"source": []
342323
},
343324
{
325+
"attachments": {},
344326
"cell_type": "markdown",
345327
"metadata": {},
346328
"source": [
@@ -349,7 +331,7 @@
349331
},
350332
{
351333
"cell_type": "code",
352-
"execution_count": null,
334+
"execution_count": 14,
353335
"metadata": {},
354336
"outputs": [],
355337
"source": [
@@ -362,7 +344,7 @@
362344
},
363345
{
364346
"cell_type": "code",
365-
"execution_count": null,
347+
"execution_count": 15,
366348
"metadata": {},
367349
"outputs": [],
368350
"source": [
@@ -371,7 +353,7 @@
371353
},
372354
{
373355
"cell_type": "code",
374-
"execution_count": null,
356+
"execution_count": 16,
375357
"metadata": {},
376358
"outputs": [],
377359
"source": [
@@ -388,6 +370,7 @@
388370
"source": []
389371
},
390372
{
373+
"attachments": {},
391374
"cell_type": "markdown",
392375
"metadata": {},
393376
"source": [
@@ -398,7 +381,7 @@
398381
},
399382
{
400383
"cell_type": "code",
401-
"execution_count": null,
384+
"execution_count": 17,
402385
"metadata": {},
403386
"outputs": [],
404387
"source": [
@@ -415,6 +398,7 @@
415398
"source": []
416399
},
417400
{
401+
"attachments": {},
418402
"cell_type": "markdown",
419403
"metadata": {},
420404
"source": [
@@ -452,6 +436,7 @@
452436
"source": []
453437
},
454438
{
439+
"attachments": {},
455440
"cell_type": "markdown",
456441
"metadata": {},
457442
"source": [
@@ -482,6 +467,7 @@
482467
]
483468
},
484469
{
470+
"attachments": {},
485471
"cell_type": "markdown",
486472
"metadata": {},
487473
"source": [
@@ -496,6 +482,7 @@
496482
"source": []
497483
},
498484
{
485+
"attachments": {},
499486
"cell_type": "markdown",
500487
"metadata": {},
501488
"source": [
@@ -519,6 +506,7 @@
519506
"source": []
520507
},
521508
{
509+
"attachments": {},
522510
"cell_type": "markdown",
523511
"metadata": {},
524512
"source": [
@@ -547,6 +535,7 @@
547535
"source": []
548536
},
549537
{
538+
"attachments": {},
550539
"cell_type": "markdown",
551540
"metadata": {},
552541
"source": [
@@ -585,6 +574,7 @@
585574
"source": []
586575
},
587576
{
577+
"attachments": {},
588578
"cell_type": "markdown",
589579
"metadata": {},
590580
"source": [
@@ -610,15 +600,21 @@
610600
],
611601
"metadata": {
612602
"kernelspec": {
613-
"display_name": "Python 3.7 (XPython)",
603+
"display_name": "Python 3 (ipykernel)",
614604
"language": "python",
615-
"name": "xpython"
605+
"name": "python3"
616606
},
617607
"language_info": {
608+
"codemirror_mode": {
609+
"name": "ipython",
610+
"version": 3
611+
},
618612
"file_extension": ".py",
619613
"mimetype": "text/x-python",
620614
"name": "python",
621-
"version": "3.7.12"
615+
"nbconvert_exporter": "python",
616+
"pygments_lexer": "ipython3",
617+
"version": "3.9.16"
622618
}
623619
},
624620
"nbformat": 4,

0 commit comments

Comments
 (0)