Skip to content

Commit a53aa7c

Browse files
authored
Merge branch 'main' into update-md-tutorial
2 parents fefa8d5 + d0043f2 commit a53aa7c

8 files changed

+308
-35
lines changed

.pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ ci:
66
files: (^notebooks)
77
repos:
88
- repo: https://github.com/psf/black
9-
rev: 24.10.0
9+
rev: 25.1.0
1010
hooks:
1111
- id: black
1212
- repo: https://github.com/psf/black
13-
rev: 24.10.0
13+
rev: 25.1.0
1414
hooks:
1515
- id: black-jupyter

cookbook/assets/calc_dg.tsv

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
ligand DG(MLE) (kcal/mol) uncertainty (kcal/mol)
2+
lig_ejm_31 -0.09 0.05
3+
lig_ejm_42 0.7 0.1
4+
lig_ejm_46 -0.98 0.05
5+
lig_ejm_47 -0.1 0.1
6+
lig_ejm_48 0.53 0.09
7+
lig_ejm_50 0.91 0.06
8+
lig_ejm_43 2.0 0.2
9+
lig_jmc_23 -0.68 0.09
10+
lig_jmc_27 -1.1 0.1
11+
lig_jmc_28 -1.25 0.08

cookbook/assets/experimental.tsv

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
ligand estimate (kcal/mol) uncertainty (kcal/mol)
2+
lig_ejm_42 -9.81 0.18
3+
lig_ejm_43 -8.29 0.18
4+
lig_ejm_45 -9.59 0.18
5+
lig_ejm_46 -11.35 0.17
6+
lig_ejm_47 -9.73 0.18
7+
lig_ejm_48 -9.03 0.18
8+
lig_ejm_50 -9.01 0.18
9+
lig_ejm_54 -10.57 0.18
10+
lig_ejm_55 -9.24 0.18
11+
lig_jmc_23 -11.74 0.18
12+
lig_jmc_27 -11.31 0.17
13+
lig_jmc_28 -11.01 0.18

cookbook/bespoke_parameters_showcase.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
" sysA = openfe.ChemicalSystem(sysA_dict, name=f\"{mapping.componentA.name}_{leg}\")\n",
9090
" sysB = openfe.ChemicalSystem(sysB_dict, name=f\"{mapping.componentB.name}_{leg}\")\n",
9191
"\n",
92-
" prefix = \"easy_rbfe_\" # prefix is only to exactly reproduce CLI\n",
92+
" prefix = \"rbfe_\" # prefix is only to exactly reproduce CLI\n",
9393
"\n",
9494
" transformation = openfe.Transformation(\n",
9595
" stateA=sysA,\n",

cookbook/cinnabar_absolute.ipynb

+249
Large diffs are not rendered by default.

rbfe_tutorial/cli_tutorial.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ network_setup
7373
├── ligand_network.graphml
7474
├── network_setup.json
7575
└── transformations/
76-
├── easy_rbfe_lig_ejm_31_complex_lig_ejm_42_complex.json
77-
├── easy_rbfe_lig_ejm_31_complex_lig_ejm_46_complex.json
78-
├── easy_rbfe_lig_ejm_31_complex_lig_ejm_47_complex.json
79-
├── easy_rbfe_lig_ejm_31_complex_lig_ejm_48_complex.json
80-
├── easy_rbfe_lig_ejm_31_complex_lig_ejm_50_complex.json
81-
├── easy_rbfe_lig_ejm_31_solvent_lig_ejm_42_solvent.json
82-
├── easy_rbfe_lig_ejm_31_solvent_lig_ejm_46_solvent.json
76+
├── rbfe_lig_ejm_31_complex_lig_ejm_42_complex.json
77+
├── rbfe_lig_ejm_31_complex_lig_ejm_46_complex.json
78+
├── rbfe_lig_ejm_31_complex_lig_ejm_47_complex.json
79+
├── rbfe_lig_ejm_31_complex_lig_ejm_48_complex.json
80+
├── rbfe_lig_ejm_31_complex_lig_ejm_50_complex.json
81+
├── rbfe_lig_ejm_31_solvent_lig_ejm_42_solvent.json
82+
├── rbfe_lig_ejm_31_solvent_lig_ejm_46_solvent.json
8383
[continues]
8484
```
8585

@@ -98,7 +98,7 @@ The files that describe each individual simulation we will run are located withi
9898
`network_setup/transformations/`. Each JSON file represents a single alchemical
9999
leg to run and contains all the necessary information to run that leg.
100100
Filenames indicate ligand names as taken from the SDF; for example, the file
101-
`easy_rbfe_lig_ejm_31_complex_lig_ejm_42_complex.json` is the leg
101+
`rbfe_lig_ejm_31_complex_lig_ejm_42_complex.json` is the leg
102102
associated with the transformation of the ligand `lig_ejm_31` into `lig_ejm_42`
103103
while in complex with the protein.
104104

@@ -273,7 +273,7 @@ openfe
273273

274274
```text
275275
results
276-
├── easy_rbfe_lig_ejm_31_complex_lig_ejm_42_complex
276+
├── rbfe_lig_ejm_31_complex_lig_ejm_42_complex
277277
│   ├── shared_RelativeHybridTopologyProtocolUnit-3ea82011-75f0-4bb6-b415-e7d05bd012f6
278278
│   │   ├── checkpoint.nc
279279
│   │   └── simulation.nc
@@ -283,8 +283,8 @@ results
283283
│   └── shared_RelativeHybridTopologyProtocolUnit-7a6def34-2967-4452-8d47-483bc7219c06
284284
│   ├── checkpoint.nc
285285
│   └── simulation.nc
286-
├── easy_rbfe_lig_ejm_31_complex_lig_ejm_42_complex.json
287-
├── easy_rbfe_lig_ejm_31_complex_lig_ejm_46_complex
286+
├── rbfe_lig_ejm_31_complex_lig_ejm_42_complex.json
287+
├── rbfe_lig_ejm_31_complex_lig_ejm_46_complex
288288
│   ├── shared_RelativeHybridTopologyProtocolUnit-ad113e55-5636-474e-9be3-ee77fe887e77
289289
│   │   ├── checkpoint.nc
290290
│   │   └── simulation.nc
@@ -294,7 +294,7 @@ results
294294
│   └── shared_RelativeHybridTopologyProtocolUnit-f848e671-fdd3-4b8d-8bd2-6eb5140e3ed3
295295
│   ├── checkpoint.nc
296296
│   └── simulation.nc
297-
├── easy_rbfe_lig_ejm_31_complex_lig_ejm_46_complex.json
297+
├── rbfe_lig_ejm_31_complex_lig_ejm_46_complex.json
298298
[continues]
299299
```
300300

rbfe_tutorial/python_tutorial.ipynb

+19-19
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@
472472
" sysA = openfe.ChemicalSystem(sysA_dict, name=f\"{mapping.componentA.name}_{leg}\")\n",
473473
" sysB = openfe.ChemicalSystem(sysB_dict, name=f\"{mapping.componentB.name}_{leg}\")\n",
474474
" \n",
475-
" prefix = \"easy_rbfe_\" # prefix is only to exactly reproduce CLI\n",
475+
" prefix = \"rbfe_\" # prefix is only to exactly reproduce CLI\n",
476476
" \n",
477477
" transformation = openfe.Transformation(\n",
478478
" stateA=sysA,\n",
@@ -523,24 +523,24 @@
523523
"name": "stdout",
524524
"output_type": "stream",
525525
"text": [
526-
"easy_rbfe_lig_ejm_31_complex_lig_ejm_42_complex.json\n",
527-
"easy_rbfe_lig_ejm_31_complex_lig_ejm_46_complex.json\n",
528-
"easy_rbfe_lig_ejm_31_complex_lig_ejm_47_complex.json\n",
529-
"easy_rbfe_lig_ejm_31_complex_lig_ejm_48_complex.json\n",
530-
"easy_rbfe_lig_ejm_31_complex_lig_ejm_50_complex.json\n",
531-
"easy_rbfe_lig_ejm_31_solvent_lig_ejm_42_solvent.json\n",
532-
"easy_rbfe_lig_ejm_31_solvent_lig_ejm_46_solvent.json\n",
533-
"easy_rbfe_lig_ejm_31_solvent_lig_ejm_47_solvent.json\n",
534-
"easy_rbfe_lig_ejm_31_solvent_lig_ejm_48_solvent.json\n",
535-
"easy_rbfe_lig_ejm_31_solvent_lig_ejm_50_solvent.json\n",
536-
"easy_rbfe_lig_ejm_42_complex_lig_ejm_43_complex.json\n",
537-
"easy_rbfe_lig_ejm_42_solvent_lig_ejm_43_solvent.json\n",
538-
"easy_rbfe_lig_ejm_46_complex_lig_jmc_23_complex.json\n",
539-
"easy_rbfe_lig_ejm_46_complex_lig_jmc_27_complex.json\n",
540-
"easy_rbfe_lig_ejm_46_complex_lig_jmc_28_complex.json\n",
541-
"easy_rbfe_lig_ejm_46_solvent_lig_jmc_23_solvent.json\n",
542-
"easy_rbfe_lig_ejm_46_solvent_lig_jmc_27_solvent.json\n",
543-
"easy_rbfe_lig_ejm_46_solvent_lig_jmc_28_solvent.json\n"
526+
"rbfe_lig_ejm_31_complex_lig_ejm_42_complex.json\n",
527+
"rbfe_lig_ejm_31_complex_lig_ejm_46_complex.json\n",
528+
"rbfe_lig_ejm_31_complex_lig_ejm_47_complex.json\n",
529+
"rbfe_lig_ejm_31_complex_lig_ejm_48_complex.json\n",
530+
"rbfe_lig_ejm_31_complex_lig_ejm_50_complex.json\n",
531+
"rbfe_lig_ejm_31_solvent_lig_ejm_42_solvent.json\n",
532+
"rbfe_lig_ejm_31_solvent_lig_ejm_46_solvent.json\n",
533+
"rbfe_lig_ejm_31_solvent_lig_ejm_47_solvent.json\n",
534+
"rbfe_lig_ejm_31_solvent_lig_ejm_48_solvent.json\n",
535+
"rbfe_lig_ejm_31_solvent_lig_ejm_50_solvent.json\n",
536+
"rbfe_lig_ejm_42_complex_lig_ejm_43_complex.json\n",
537+
"rbfe_lig_ejm_42_solvent_lig_ejm_43_solvent.json\n",
538+
"rbfe_lig_ejm_46_complex_lig_jmc_23_complex.json\n",
539+
"rbfe_lig_ejm_46_complex_lig_jmc_27_complex.json\n",
540+
"rbfe_lig_ejm_46_complex_lig_jmc_28_complex.json\n",
541+
"rbfe_lig_ejm_46_solvent_lig_jmc_23_solvent.json\n",
542+
"rbfe_lig_ejm_46_solvent_lig_jmc_27_solvent.json\n",
543+
"rbfe_lig_ejm_46_solvent_lig_jmc_28_solvent.json\n"
544544
]
545545
}
546546
],

showcase/openfe_showcase.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"if \"COLAB_RELEASE_TAG\" in os.environ:\n",
8989
" !pip install -q condacolab\n",
9090
" import condacolab\n",
91-
" condacolab.install_from_url(\"https://github.com/OpenFreeEnergy/openfe/releases/download/v1.2.0/OpenFEforge-1.2.0-Linux-x86_64.sh\")"
91+
" condacolab.install_from_url(\"https://github.com/OpenFreeEnergy/openfe/releases/download/v1.3.1/OpenFEforge-1.3.1-Linux-x86_64.sh\")"
9292
]
9393
},
9494
{

0 commit comments

Comments
 (0)