Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhance flexible definition in config files / defaults.yaml #969

Merged
merged 45 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
df5e61e
Addressing issue #919
amjjbonvin Aug 7, 2024
94ff3c2
Updated all relevant config files
amjjbonvin Aug 7, 2024
6155979
Updated / cleaning of CNS code
amjjbonvin Aug 7, 2024
8735558
Corrected cfg file
amjjbonvin Aug 7, 2024
5edd320
Corrected default.yaml file
amjjbonvin Aug 7, 2024
29547c6
update yaml file
amjjbonvin Aug 7, 2024
57b9678
add `text_flexref`
rvhonorato Aug 12, 2024
c906ffd
add `test_mdfref`
rvhonorato Aug 12, 2024
0bb0d29
add `test_emref`
rvhonorato Aug 12, 2024
a80c096
updating documentation to reflect new parameter scheme
VGPReys Aug 14, 2024
24f7b27
add `run_dockq_analysis`
rvhonorato Aug 21, 2024
c2e84a1
add `fnat` check via dockq
rvhonorato Aug 21, 2024
c465531
add dockq to test deps
rvhonorato Aug 21, 2024
2c0f245
update tox.ini
rvhonorato Aug 21, 2024
66ee8d2
tweak values
rvhonorato Aug 21, 2024
3d94ffc
revert to using `caprieval`
rvhonorato Aug 21, 2024
c3875d8
update tox.ini
rvhonorato Aug 21, 2024
9226d14
clean integration tests
rvhonorato Aug 21, 2024
56182b5
add `2oob` golden data
rvhonorato Aug 22, 2024
7318cf6
tweak integration tests
rvhonorato Aug 22, 2024
d48856a
remove unused test data
rvhonorato Aug 22, 2024
cb26470
Merge branch 'main' into flexseg
rvhonorato Aug 22, 2024
f0715e7
Merge branch 'main' into flexseg
amjjbonvin Sep 3, 2024
a644729
Update test_ilrmsdmatrix.py
amjjbonvin Sep 3, 2024
f5ba4e5
Merge branch 'main' into flexseg
amjjbonvin Sep 6, 2024
84320f4
Merge branch 'main' into flexseg
amjjbonvin Sep 6, 2024
2a2286d
Merge branch 'main' of https://github.com/haddocking/haddock3 into fl…
amjjbonvin Sep 10, 2024
eea0267
Updated integration tests to match main branch
amjjbonvin Sep 10, 2024
f6be62d
Merge branch 'main' into flexseg
amjjbonvin Sep 10, 2024
278912e
Updated nfle parameters in cfg files
amjjbonvin Sep 10, 2024
44058da
Merge branch 'main' into flexseg
amjjbonvin Sep 12, 2024
ac9465a
Update src/haddock/modules/refinement/mdref/defaults.yaml
amjjbonvin Sep 12, 2024
1f0a8ac
Update src/haddock/modules/refinement/mdref/defaults.yaml
amjjbonvin Sep 12, 2024
5bb76ea
Update src/haddock/modules/refinement/mdref/defaults.yaml
amjjbonvin Sep 12, 2024
5f66678
Update src/haddock/modules/refinement/mdref/defaults.yaml
amjjbonvin Sep 12, 2024
dbca8f0
Update src/haddock/modules/refinement/flexref/defaults.yaml
amjjbonvin Sep 12, 2024
bfe83d9
Update src/haddock/modules/refinement/emref/defaults.yaml
amjjbonvin Sep 12, 2024
ca4e758
Update src/haddock/modules/refinement/emref/defaults.yaml
amjjbonvin Sep 12, 2024
14e9d73
Update src/haddock/modules/refinement/emref/defaults.yaml
amjjbonvin Sep 12, 2024
c4dbdbe
Update src/haddock/modules/refinement/emref/defaults.yaml
amjjbonvin Sep 12, 2024
1b1da65
Update src/haddock/modules/refinement/flexref/defaults.yaml
amjjbonvin Sep 12, 2024
dac4b1a
Update src/haddock/modules/refinement/flexref/defaults.yaml
amjjbonvin Sep 12, 2024
6a451c4
Update src/haddock/modules/refinement/flexref/defaults.yaml
amjjbonvin Sep 12, 2024
2919e72
Merge branch 'main' into flexseg
amjjbonvin Sep 12, 2024
aba8ada
Merge branch 'main' into flexseg
amjjbonvin Sep 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@ mdsteps_cool2 = 10000
mdsteps_cool3 = 10000
ambig_fname = "data/ambig.tbl"
# give full flexibilit to the glycan
nfle2 = 1
fle_sta_2_1 = 1
fle_end_2_1 = 4
nfle = 1
fle_sta_1 = 1
fle_end_1 = 4
fle_seg_1 = "B"

[caprieval]
reference_fname = "data/target.pdb"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ mdsteps_cool2 = 10000
mdsteps_cool3 = 10000
ambig_fname = "data/ambig.tbl"
# give full flexibilit to the glycan
nfle2 = 1
fle_sta_2_1 = 1
fle_end_2_1 = 4
nfle = 1
fle_sta_1 = 1
fle_end_1 = 4
fle_seg_1 = "B"

[caprieval]
reference_fname = "data/target.pdb"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,10 @@ reference_fname = "data/1nx1_refe.pdb"
tolerance = 5
ambig_fname = "data/ambig.tbl"
# Define peptide as fully flexible
nfle2 = 1
fle_sta_2_1 = 1
fle_end_2_1 = 11
nfle = 1
fle_sta_1 = 1
fle_end_1 = 11
fle_seg_1 = "B"
# Define automatically dihedral restraints
# for alpha and beta secondary structure elements
ssdihed = "alphabeta"
Expand All @@ -71,9 +72,10 @@ reference_fname = "data/1nx1_refe.pdb"
tolerance = 5
ambig_fname = "data/ambig.tbl"
# Define peptide as fully flexible
nfle2 = 1
fle_sta_2_1 = 1
fle_end_2_1 = 11
nfle = 1
fle_sta_1 = 1
fle_end_1 = 11
fle_seg_1 = "B"
# Define automatically dihedral restraints
# for alpha and beta secondary structure elements
ssdihed = "alphabeta"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ select = 400
tolerance = 5
ambig_fname = "data/ambig.tbl"
# Define peptide as fully flexible
nfle2 = 1
fle_sta_2_1 = 1
fle_end_2_1 = 11
nfle = 1
fle_sta_1 = 1
fle_end_1 = 11
fle_seg_1 = "B"
# Define automatically dihedral restraints
# for alpha and beta secondary structure elements
ssdihed = "alphabeta"
Expand All @@ -64,9 +65,10 @@ reference_fname = "data/1nx1_refe.pdb"
tolerance = 5
ambig_fname = "data/ambig.tbl"
# Define peptide as fully flexible
nfle2 = 1
fle_sta_2_1 = 1
fle_end_2_1 = 11
nfle = 1
fle_sta_1 = 1
fle_end_1 = 11
fle_seg_1 = "B"
# Define automatically dihedral restraints
# for alpha and beta secondary structure elements
ssdihed = "alphabeta"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ select = 400
tolerance = 5
ambig_fname = "data/ambig.tbl"
# Define peptide as fully flexible
nfle2 = 1
fle_sta_2_1 = 1
fle_end_2_1 = 11
nfle = 1
fle_sta_1 = 1
fle_end_1 = 11
fle_seg_1 = "B"
# Define automatically dihedral restraints
# for alpha and beta secondary structure elements
ssdihed = "alphabeta"
Expand All @@ -64,9 +65,10 @@ reference_fname = "data/1nx1_refe.pdb"
tolerance = 5
ambig_fname = "data/ambig.tbl"
# Define peptide as fully flexible
nfle2 = 1
fle_sta_2_1 = 1
fle_end_2_1 = 11
nfle = 1
fle_sta_1 = 1
fle_end_1 = 11
fle_seg_1 = "B"
# Define automatically dihedral restraints
# for alpha and beta secondary structure elements
ssdihed = "alphabeta"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ select = 5
tolerance = 20
ambig_fname = "data/ambig.tbl"
# Define peptide as fully flexible
nfle2 = 1
fle_sta_2_1 = 1
fle_end_2_1 = 11
nfle = 1
fle_sta_1 = 1
fle_end_1 = 11
fle_seg_1 = "B"
# Define automatically dihedral restraints
# for alpha and beta secondary structure elements
ssdihed = "alphabeta"
Expand All @@ -59,9 +60,10 @@ reference_fname = "data/1nx1_refe.pdb"
tolerance = 20
ambig_fname = "data/ambig.tbl"
# Define peptide as fully flexible
nfle2 = 1
fle_sta_2_1 = 1
fle_end_2_1 = 11
nfle = 1
fle_sta_1 = 1
fle_end_1 = 11
fle_seg_1 = "B"
# Define automatically dihedral restraints
# for alpha and beta secondary structure elements
ssdihed = "alphabeta"
Expand Down
19 changes: 11 additions & 8 deletions examples/docking-protein-peptide/docking-protein-peptide-test.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,13 @@ select = 5
tolerance = 20
ambig_fname = "data/ambig.tbl"
# Define peptide as fully flexible
nfle2 = 2
fle_sta_2_1 = 1
fle_end_2_1 = 5
fle_sta_2_2 = 6
fle_end_2_2 = 11
nfle = 2
fle_sta_1 = 1
fle_end_1 = 5
fle_seg_1 = "B"
fle_sta_2 = 6
fle_end_2 = 11
fle_seg_2 = "B"
# Define automatically dihedral restraints
# for alpha and beta secondary structure elements
ssdihed = "alphabeta"
Expand All @@ -61,9 +63,10 @@ reference_fname = "data/1nx1_refe.pdb"
tolerance = 20
ambig_fname = "data/ambig.tbl"
# Define peptide as fully flexible
nfle2 = 1
fle_sta_2_1 = 1
fle_end_2_1 = 11
nfle = 1
fle_sta_1 = 1
fle_end_1 = 11
fle_seg_1 = "B"
# Define automatically dihedral restraints
# for alpha and beta secondary structure elements
ssdihed = "alphabeta"
Expand Down
Loading
Loading