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

implement coarse-grain #1152

Draft
wants to merge 116 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
cecec48
copy files from topoaa
rversin Aug 1, 2024
3da47ab
adapted the code to be used as a secondary module
rversin Aug 5, 2024
77a7a93
AA to CG mapping retrieved
rversin Aug 5, 2024
87e0ee9
helper of aa2cg.py
rversin Aug 5, 2024
1b391f7
path to helper corrected
rversin Aug 5, 2024
606ad87
pdb output path corrected
rversin Aug 7, 2024
4048363
topology file created
rversin Aug 9, 2024
193c1a1
correct file names
rversin Aug 16, 2024
eb88399
files renamed
rversin Aug 19, 2024
6006b95
force-field parameter added to the module
rversin Aug 20, 2024
42997cf
name change of the variable ffversion to cgffversion
rversin Aug 28, 2024
50c4e6a
adaptation of the cns file for the generation of topology
rversin Aug 28, 2024
85054c9
cgffversion parameter is changed from string to integer
rversin Sep 4, 2024
5e6b852
topology files named as a function of the MARTINI version
rversin Sep 4, 2024
0b07eda
nucleic acid topology file as function of the MARTINI version
rversin Sep 5, 2024
605a887
cgffversion modified from integer to string
rversin Sep 5, 2024
53b5380
pipeline removed: addition of a covalent bond between acetylated Nter…
rversin Sep 11, 2024
b08ab61
pipeline removed: addition of a covalent bond between a hemeC and a c…
rversin Sep 11, 2024
78c1a50
martini3 option removed
rversin Sep 11, 2024
8af1d3e
pipeline removed: build missing atoms (build-missing.cns)
rversin Sep 12, 2024
7a6b29d
files corrected
rversin Sep 20, 2024
7084271
test files added
rversin Sep 23, 2024
eb354ff
parameter files recreated
rversin Sep 23, 2024
98f1a3f
secondary structures analyzed by aa2cg.py
rversin Sep 25, 2024
1c817c3
parameter files corrected
rversin Sep 25, 2024
a276094
Merge branch 'main' of https://github.com/haddocking/haddock3 into to…
amjjbonvin Sep 25, 2024
d3804de
Updated dna-rna params to match the 2.5 HADDOCK version
amjjbonvin Sep 25, 2024
a6a793b
Merge branch 'main' into dna-CG-params
rvhonorato Sep 25, 2024
69ab9f3
Merge pull request #1051 from haddocking/dna-CG-params
rvhonorato Sep 25, 2024
343a524
Updated the topocg module - mainly the CNS scripts
amjjbonvin Sep 25, 2024
ceeeb0f
Merge branch 'CG-HADDOCK' of https://github.com/haddocking/haddock3 i…
amjjbonvin Sep 25, 2024
1b84163
Added a CG docking example (for devel purposes)
amjjbonvin Sep 25, 2024
286b9da
Modified rigidbody CNS scripts for CG docking
amjjbonvin Sep 25, 2024
131566f
Added rigidbody CG integration test
amjjbonvin Sep 25, 2024
2e5c1ad
added call to a missing CG-related script
amjjbonvin Sep 26, 2024
b1954a8
Cleaning of CG CNS scripts
amjjbonvin Sep 26, 2024
1cc9181
Updated CNS scripts
amjjbonvin Sep 26, 2024
4e7ca8a
remove old protein Martini version
amjjbonvin Sep 26, 2024
82a9e93
codacy style edits
amjjbonvin Sep 26, 2024
7537cfa
Added proper warning logging
amjjbonvin Sep 26, 2024
1fb8c80
Restored original log level
amjjbonvin Sep 26, 2024
6b0cf1b
Added logging import
amjjbonvin Sep 26, 2024
1ea440a
Adapted to use haddock logging mechanism
amjjbonvin Sep 27, 2024
b5d124b
Merge pull request #1053 from haddocking/CG-topo
rvhonorato Sep 27, 2024
20ef0d2
Merge pull request #1054 from haddocking/CG-rigidbody
rvhonorato Sep 27, 2024
379f06b
Merge branch 'main' into CG-HADDOCK
amjjbonvin Sep 27, 2024
e4514f4
Merge branch 'CG-HADDOCK' into CG-topo
amjjbonvin Sep 28, 2024
9762d54
Corrected param/interactions settings
amjjbonvin Sep 28, 2024
bd96960
Merge pull request #1059 from haddocking/CG-topo
amjjbonvin Sep 28, 2024
3cff3f9
Adapted rigidbody CG mode for proper handling of param/interactions
amjjbonvin Sep 28, 2024
29b8e59
Merge pull request #1061 from haddocking/cg-rigidbody
amjjbonvin Sep 28, 2024
97768fd
CG-related changes:
amjjbonvin Sep 28, 2024
ceb2c51
Added missing epsilon_cg variable
amjjbonvin Sep 28, 2024
8c71017
Removed electrostatic from final EM to focus on covalent geometry
amjjbonvin Sep 28, 2024
0818eab
Merge pull request #1062 from haddocking/cg-flexref
amjjbonvin Sep 28, 2024
2ede6b3
Added CG support to the emref module
amjjbonvin Sep 29, 2024
61a497c
Merge pull request #1063 from haddocking/CG-emref
amjjbonvin Oct 1, 2024
1545790
function to add a line in pdb file
rversin Oct 2, 2024
42c8901
successfull creation of a temporary pdb file with a cryst line to be …
rversin Oct 8, 2024
a9de70e
absence of secondary structure predicted is coil (C)
rversin Oct 9, 2024
9fd4b1f
secondary structure correctly assigned to each residues of the struct…
rversin Oct 9, 2024
5e4ac3f
DSSP from Bio.PDB removed
rversin Oct 9, 2024
b141dbb
adapted create_file_with_cryst function to open file using with
rversin Oct 11, 2024
d455ca2
changed position of p.communicate
rversin Oct 11, 2024
b8e2c74
use of python tooling for removal of temporary files
rversin Oct 11, 2024
3e2f958
type signatures added
rversin Oct 11, 2024
a25b188
os.linestep added
rversin Oct 11, 2024
559bdfd
superfluous 1st line of dssp output removed
rversin Oct 16, 2024
c9d95e2
removal of temporary file placed in the finally clause
rversin Oct 16, 2024
8715599
create_file_with_cryst function modified
rversin Oct 17, 2024
ce6b33f
temporary file name changed
rversin Oct 17, 2024
7623a10
output_path argument removed from determine_ss
rversin Oct 18, 2024
2600bd3
creation of temporary file placed in the try
rversin Oct 18, 2024
c7047a3
dssp dictionary creation reworked
rversin Oct 18, 2024
859e974
Merge pull request #1090 from haddocking/CG-topocg-DSSP
rversin Oct 25, 2024
17419de
Merge branch 'main' into CG-HADDOCK to keep the CG branch up to date …
rversin Oct 29, 2024
9a1049b
formating issues and unused variable
rversin Oct 29, 2024
7ef1522
unecessary else removed
rversin Oct 30, 2024
c796027
subprocess shell=true removed
rversin Oct 30, 2024
3125ef3
docstrings added to the martinize function
rversin Oct 31, 2024
3886b51
subprocess call removed
rversin Nov 1, 2024
e2e2768
Update src/haddock/modules/topology/topocg/aa2cg.py
rversin Nov 18, 2024
43480c1
Update src/haddock/modules/topology/topocg/aa2cg.py
rversin Nov 18, 2024
c2158ec
unused module removed
rversin Nov 18, 2024
8ef3ff2
Merge branch 'main' into CG-HADDOCK
rvhonorato Nov 18, 2024
8f75d87
Merge branch 'CG-HADDOCK' into CG-HADDOCK-aa2cg-fix
rvhonorato Nov 18, 2024
7dc7866
Merge pull request #1125 from haddocking/CG-HADDOCK-aa2cg-fix
rversin Nov 18, 2024
e2c80e4
copy emref as a starting point
rversin Nov 19, 2024
465c08b
cgtoaa cns pipeline
rversin Nov 22, 2024
59c73e2
emref explanations removed from script
rversin Nov 28, 2024
16702de
explanation of the script added
rversin Nov 28, 2024
981bb29
Merge pull request #1171 from haddocking/main
amjjbonvin Dec 8, 2024
626588a
Fixed failing test (reverted force constant assigment to AA version)
amjjbonvin Dec 8, 2024
7e7cc94
Removed overlap in atom types with the protein force field
amjjbonvin Dec 9, 2024
0d7084c
Merge pull request #1178 from haddocking/main
amjjbonvin Dec 11, 2024
aa5ef32
files switched
rversin Dec 12, 2024
eb6d044
aa_topology added
rversin Dec 13, 2024
ba1aac0
aa_topology inherited between modules rigidbody and sampling
rversin Jan 8, 2025
f17eb92
aatocg_tbl added
rversin Jan 8, 2025
76eba29
Updated CNS scripts for the cg-to-aa module
amjjbonvin Jan 16, 2025
d043f8b
parameters added to the input file
rversin Jan 20, 2025
7a75d66
removal of ambig_fname
rversin Jan 21, 2025
f6152f7
aa-to-cg tbl file corrected
rversin Jan 21, 2025
6fe37bc
AA topology saved into the topology parameter
rversin Jan 21, 2025
e7683f5
line removed
rversin Jan 21, 2025
975bf41
Updated CNS cgtoaa module and scripts - now working
amjjbonvin Jan 23, 2025
51e2d62
Removed file
amjjbonvin Jan 23, 2025
6a2ce01
aa_topology object modified to match topology
rversin Jan 24, 2025
fd4c237
Update src/haddock/libs/libcns.py
amjjbonvin Jan 27, 2025
12ee89f
removed some unneeded parameters
amjjbonvin Jan 27, 2025
ac0beee
All-Atom instead of AA and Coarse-Grain instead of CG
rversin Jan 29, 2025
57a5d62
Update src/haddock/modules/refinement/cgtoaa/__init__.py
rversin Jan 29, 2025
9e9904a
aatocg changed to cgtoaa
rversin Jan 29, 2025
629e88a
explanation added
rversin Jan 29, 2025
79fa8b1
Merge pull request #1193 from haddocking/CG-HADDOCK-cg2aa
rversin Feb 3, 2025
ea8647e
Merge branch 'main' into CG-HADDOCK
rversin Feb 6, 2025
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
3,686 changes: 3,686 additions & 0 deletions examples/docking-protein-protein-CG/data/e2a-hpr_1GGR.pdb

Large diffs are not rendered by default.

757 changes: 757 additions & 0 deletions examples/docking-protein-protein-CG/data/e2a-hpr_air.tbl

Large diffs are not rendered by default.

1,118 changes: 1,118 additions & 0 deletions examples/docking-protein-protein-CG/data/e2a_1F3G.pdb

Large diffs are not rendered by default.

788 changes: 788 additions & 0 deletions examples/docking-protein-protein-CG/data/hpr_ensemble_B.pdb

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# ====================================================================
# Protein-protein docking example with NMR-derived ambiguous interaction restraints
# ====================================================================

# directory in which the scoring will be done
run_dir = "run1"

# execution mode
mode = "local"
# concatenate models inside each job, concat = 5 each .job will produce 5 models
#concat = 5
# Limit the number of concurrent submissions to the queue
#queue_limit = 100
debug = True

# molecules to be docked
molecules = [
"data/e2a_1F3G.pdb",
"data/hpr_ensemble_B.pdb"
]

postprocess = false

# ====================================================================
# Parameters for each stage are defined below, prefer full paths
# ====================================================================

[topoaa]
autohis = true

[topocg]
cgffversion = "martini2"

[rigidbody]
ambig_fname = "data/e2a-hpr_air.tbl"
tolerance = 5
sampling = 10

[caprieval]
reference_fname = "data/e2a-hpr_1GGR.pdb"

[seletop]
select = 2

[flexref]
ambig_fname = "data/e2a-hpr_air.tbl"
tolerance = 5

[caprieval]
reference_fname = "data/e2a-hpr_1GGR.pdb"

[cgtoaa]
log_level = "verbose"

[caprieval]
reference_fname = "data/e2a-hpr_1GGR.pdb"

[emref]
ambig_fname = "data/e2a-hpr_air.tbl"
tolerance = 5

[caprieval]
reference_fname = "data/e2a-hpr_1GGR.pdb"

# ====================================================================
687 changes: 687 additions & 0 deletions integration_tests/golden_data/e2a-hpr-rigid-cg.pdb

Large diffs are not rendered by default.

405 changes: 405 additions & 0 deletions integration_tests/golden_data/e2a_haddock_cg.pdb

Large diffs are not rendered by default.

Loading