diff --git a/multi-ego-basic.ff/aminoacids.rtp b/multi-ego-basic.ff/aminoacids.rtp index a7abfe92..f6b7d978 100644 --- a/multi-ego-basic.ff/aminoacids.rtp +++ b/multi-ego-basic.ff/aminoacids.rtp @@ -88,6 +88,7 @@ ; ai aj ak al gromos type -CA -C N CA gd_14 -C N CA C gd_44A + -C N CA C gd_44bA -C N CA C gd_43A N CA C +N gd_45A N CA C +N gd_42A diff --git a/multi-ego-basic.ff/ffbonded.itp b/multi-ego-basic.ff/ffbonded.itp index f99c2eb9..71ab3ccb 100644 --- a/multi-ego-basic.ff/ffbonded.itp +++ b/multi-ego-basic.ff/ffbonded.itp @@ -376,115 +376,118 @@ ;;;;;;;;;;;;;;;;;;;; ;ALA ;;;;;;;;;;;;;;;;;;;; -#define gd_42A 100.0000 3.0000 2 +#define gd_42A 80.0000 2.5000 2 ; Backbone dihedral angle -N-CA-C-N- ALA ; -#define gd_43A 25.0000 0.000 4 ;heigher k to shift down J coupling and have a cleaner distinction between betas +#define gd_43A 70.0000 2.000 2 ;heigher k to shift down J coupling and have a cleaner distinction between betas ; Backbone dihedral angle -C-N-CA-C- ALA ; -#define gd_44A 160.000 3.0 1 +#define gd_44A 170.000 2.7 1 ; Backbone dihedral angle -C-N-CA-C- ALA ; -#define gd_45A 180.00 4.00 1 +#define gd_44bA 50.0000 1.700 3 ;heigher k to shift down J coupling and have a cleaner distinction between betas +; Backbone dihedral angle -C-N-CA-C- ALA +; +#define gd_45A 180.00 4.50 1 ; Backbone dihedral angle -N-CA-C-N- ALA ; ;;;;;;;;;;;;;;;;;;;; ; ASN ;;;;;;;;;;;;;;;;;;;; -#define gd_42N 100.0000 1.0000 2 +#define gd_42N 100.0000 1.4000 2 ; Backbone dihedral angle -N-CA-C-N- ASN ; -#define gd_43N -80.0000 1.900 3 +#define gd_43N -120.0000 0.000 3 ; Backbone dihedral angle -C-N-CA-C- ASN ; -#define gd_44N -90.000 2.0 1 +#define gd_44N -120.000 4.0 1 ; Backbone dihedral angle -C-N-CA-C- ASN ; -#define gd_44Nb 0.000 1.6 4 +#define gd_44Nb 20.000 0.7 4 ; Backbone dihedral angle -C-N-CA-C- ASN ; -#define gd_45N -90.00 1.0 1 +#define gd_45N -70.00 0.6 1 ; Backbone dihedral angle -N-CA-C-N- ASN ; ;;;;;;;;;;;;;;;;;;;; ; ASP ;;;;;;;;;;;;;;;;;;;; -#define gd_42D 120.0000 0.5000 2 +#define gd_42D 120.0000 1.0000 2 ; Backbone dihedral angle -N-CA-C-N- ASP ; -#define gd_43D 15.0000 0.000 3 +#define gd_43D 100.0000 0.800 3 ; Backbone dihedral angle -C-N-CA-C- ASPl ; -#define gd_44D -150.000 2.40 1 +#define gd_44D -150.000 4.00 1 ; Backbone dihedral angle -C-N-CA-C- ASP ; -#define gd_45D 0.00 1.5 1 +#define gd_45D 0.00 0.5 1 ; Backbone dihedral angle -N-CA-C-N- ASP ; ;;;;;;;;;;;;;;;;;;;; ; CYS ;;;;;;;;;;;;;;;;;;;; -#define gd_42C 100.0000 1.2000 2 +#define gd_42C 100.0000 1.0000 2 ; Backbone dihedral angle -N-CA-C-N- CYS ; #define gd_43C 70.0000 0.000 3 ; lower k for higher J coupling and more population in intermediate beta region ; Backbone dihedral angle -C-N-CA-C- CYS ; -#define gd_44C -150.000 2.5 1 +#define gd_44C -150.000 3.3 1 ; Backbone dihedral angle -C-N-CA-C- CYS ; #define gd_43Cb -110.0000 1.000 2 ; lower k for higher J coupling and more population in intermediate beta region ; Backbone dihedral angle -C-N-CA-C- CYS ; -#define gd_45C 0.00 2.50 1 +#define gd_45C 0.00 1.50 1 ; Backbone dihedral angle -N-CA-C-N- CYS ; ;;;;;;;;;;;;;;;;;;;; ;GLU ;;;;;;;;;;;;;;;;;;;; -#define gd_42E 90.0000 2.5000 2 +#define gd_42E 90.0000 1.1000 2 ; Backbone dihedral angle -N-CA-C-N- GLU ; -#define gd_43E 15.0000 0.00 3 ;heigher k to shift down J coupling and have a cleaner distinction between betas +#define gd_43E 90.0000 1.80 3 ;heigher k to shift down J coupling and have a cleaner distinction between betas ; Backbone dihedral angle -C-N-CA-C- GLU ; -#define gd_44E -160.000 1.50 1 +#define gd_44E -160.000 1.80 1 ; Backbone dihedral angle -C-N-CA-C- GLU ; -#define gd_45E 180.00 2.500 1 +#define gd_45E 170.00 2.100 1 ; Backbone dihedral angle -N-CA-C-N- GLU ; ;;;;;;;;;;;;;;;;;;;; ; HIS ;;;;;;;;;;;;;;;;;;;; -#define gd_42H 100.0000 1.9000 2 +#define gd_42H 100.0000 1.3000 2 ; Backbone dihedral angle -N-CA-C-N- HIS ; -#define gd_43H 30.0000 0.000 3 +#define gd_43H 90.0000 0.300 3 ; Backbone dihedral angle -C-N-CA-C- HIS ; -#define gd_44H -150.000 2.00 1 +#define gd_44H -125.000 2.50 1 ; Backbone dihedral angle -C-N-CA-C- HIS ; #define gd_44Hb 60.000 0.50 4 ; Backbone dihedral angle -C-N-CA-C- HIS ; -#define gd_45H 0.000 2.0 1 +#define gd_45H 0.000 1.5 1 ; Backbone dihedral angle -N-CA-C-N- HIS ; ;;;;;;;;;;;;;;;;;;;; ; LEU ;;;;;;;;;;;;;;;;;;;; -#define gd_42L 90.0000 2.5000 2 +#define gd_42L 90.0000 1.1000 2 ; Backbone dihedral angle -N-CA-C-N- LEU ; -#define gd_43L 15.0000 0.600 3 +#define gd_43L 90.0000 1.80 3 ; Backbone dihedral angle -C-N-CA-C- LEU ; -#define gd_44L -160.000 1.5 1 +#define gd_44L -160.000 1.8 1 ; Backbone dihedral angle -C-N-CA-C- LEU ; -#define gd_45L 180.00 2.0 1 +#define gd_45L 180.00 4.2 1 ; Backbone dihedral angle -N-CA-C-N- LEU ; ;;;;;;;;;;;;;;;;;;;; @@ -493,28 +496,28 @@ #define gd_42M 90.0000 2.5000 2 ; Backbone dihedral angle -N-CA-C-N- MET ; -#define gd_43M 15.0000 0.000 3 +#define gd_43M 90.0000 0.900 3 ; Backbone dihedral angle -C-N-CA-C- MET ; #define gd_44M -160.000 3.0 1 ; Backbone dihedral angle -C-N-CA-C- MET ; -#define gd_45M 180.00 0.6 1 +#define gd_45M 180.00 1.5 1 ; Backbone dihedral angle -N-CA-C-N- MET ; ;;;;;;;;;;;;;;;;;;;; ; ARG ;;;;;;;;;;;;;;;;;;;; -#define gd_42R 95.0000 2.0000 2 +#define gd_42R 95.0000 1.6000 2 ; Backbone dihedral angle -N-CA-C-N- ARG ; -#define gd_43R 15.0000 0.000 3 +#define gd_43R 90.0000 0.500 3 ; Backbone dihedral angle -C-N-CA-C- ARG ; -#define gd_44R -160.000 2.50 1 +#define gd_44R -150.000 2.50 1 ; Backbone dihedral angle -C-N-CA-C- ARG ; -#define gd_45R 180.000 1.50 1 +#define gd_45R 180.000 2.10 1 ; Backbone dihedral angle -N-CA-C-N- ARG ; ;;;;;;;;;;;;;;;;;;;; @@ -523,16 +526,16 @@ #define gd_42W 100.0000 1.20000 2 ; Backbone dihedral angle -N-CA-C-N- TRP ; -#define gd_43W 80.0000 0.000 3 ; lower k for higher J coupling and more population in intermediate beta region +#define gd_43W 90.0000 0.200 3 ; lower k for higher J coupling and more population in intermediate beta region ; Backbone dihedral angle -C-N-CA-C- TRP ; -#define gd_43Wb -150.000 0.800 2 ; lower k for higher J coupling and more population in intermediate beta region +#define gd_43Wb 60.000 0.800 2 ; lower k for higher J coupling and more population in intermediate beta region ; Backbone dihedral angle -C-N-CA-C- TRP ; #define gd_44W -130.000 1.5 1 ; Backbone dihedral angle -C-N-CA-C- TRP ; -#define gd_45W 0.00 1.0 1 +#define gd_45W 0.00 2.0 1 ; Backbone dihedral angle -N-CA-C-N- TRP ; ;;;;;;;;;;;;;;;;;;;; @@ -541,31 +544,31 @@ #define gd_42Q 90.0000 1.5000 2 ; Backbone dihedral angle -N-CA-C-N- GLN ; -#define gd_43Q 15.0000 0.000 3 +#define gd_43Q 90.0000 0.700 3 ; Backbone dihedral angle -C-N-CA-C- GLN ; -#define gd_44Q 180.000 2.60 1 +#define gd_44Q -155.000 2.60 1 ; Backbone dihedral angle -C-N-CA-C- GLN ; -#define gd_45Q 180.000 1.00 1 +#define gd_45Q 180.000 1.50 1 ; Backbone dihedral angle -N-CA-C-N- GLN ; ;;;;;;;;;;;;;;;;;;;; ; LYS ;;;;;;;;;;;;;;;;;;;; -#define gd_42K 100.0000 1.9000 2 +#define gd_42K 100.0000 1.5000 2 ; Backbone dihedral angle -N-CA-C-N- LYS ; -#define gd_43K 30.0000 0.000 3 +#define gd_43K 90.0000 0.300 3 ; Backbone dihedral angle -C-N-CA-C- LYS ; -#define gd_44K -150.000 2.00 1 +#define gd_44K -125.000 2.00 1 ; Backbone dihedral angle -C-N-CA-C- LYS ; #define gd_44Kb 60.000 0.50 4 ; Backbone dihedral angle -C-N-CA-C- LYS ; -#define gd_45K 0.000 1.0 1 +#define gd_45K 0.000 0.1 1 ; Backbone dihedral angle -N-CA-C-N- LYS ; ;;;;;;;;;;;;;;;;;;;; @@ -583,7 +586,7 @@ #define gd_44I 70.000 0.0 1 ; Backbone dihedral angle -C-N-CA-C- ILE ; -#define gd_45I 180.00 0.4 1 +#define gd_45I 180.00 0.6 1 ; Backbone dihedral angle -N-CA-C-N- ILE ; ;;;;;;;;;;;;;;;;;;;; @@ -592,7 +595,7 @@ #define gd_42V 100.0000 2.4000 2 ; Backbone dihedral angle -N-CA-C-N- VAL ; -#define gd_43V 95.0000 0.000 3 ; lower k for higher J coupling and more population in intermediate beta region +#define gd_43V 90.0000 0.300 3 ; lower k for higher J coupling and more population in intermediate beta region ; Backbone dihedral angle -C-N-CA-C- VAL ; #define gd_43Vb -120.0000 1.700 2 ; lower k for higher J coupling and more population in intermediate beta region @@ -620,25 +623,25 @@ #define gd_44F 100.000 2.5 1 ; Backbone dihedral angle -C-N-CA-C- PHE ; -#define gd_45F 0.00 0.7 1 +#define gd_45F 0.00 0.0 1 ; Backbone dihedral angle -N-CA-C-N- PHE ;;;;;;;;;;;;;;;;;;;; ;SER ;;;;;;;;;;;;;;;;;;;; -#define gd_42S 100.0000 1.9000 2 +#define gd_42S 100.0000 1.1000 2 ; Backbone dihedral angle -N-CA-C-N- SER ; #define gd_43S 30.0000 0.000 3 ; Backbone dihedral angle -C-N-CA-C- SER ; -#define gd_44S -150.000 2.00 1 +#define gd_44S -125.000 2.50 1 ; Backbone dihedral angle -C-N-CA-C- SER ; #define gd_44Sb 60.000 0.50 4 ; Backbone dihedral angle -C-N-CA-C- SER ; -#define gd_45S 0.000 1.3 1 +#define gd_45S 0.000 0.0 1 ; Backbone dihedral angle -N-CA-C-N- SER ; ;;;;;;;;;;;;;;;;;;;; @@ -685,22 +688,22 @@ #define gd_48G 180.0 5.0 2 ; Backbone dihedral angle -N-CA-C-N GLY ; -#define gd_49G 180 3.0 1 +#define gd_49G 180 5.0 1 ; Backbone dihedral angle -C-N-CA-C GLY ; -#define gd_51G 180 1.0 1 +#define gd_51G 180 0.5 1 ; Backbone dihedral angle -N-CA-C-N GLY ; ;;;;;;;;;;;;;;;;;;;; ;PRO ;;;;;;;;;;;;;;;;;;;; -#define gd_52P 180.0000 5.0000 2 +#define gd_52P 170.0000 5.0000 2 ; Backbone dihedral angle -N-CA-C-N PRO ; -#define gd_53P 0.0000 4.000 4 +#define gd_53P -10.0000 4.000 4 ; Backbone dihedral angle -C-N-CA-C PRO ; -#define gd_55P 180.0000 0.80 1 +#define gd_55P 180.0000 0.60 1 ; Backbone dihedral angle -N-CA-C-N PRO ; #define gd_56P 180.000 31.0 2 diff --git a/src/multiego/Minimum_CUTOFF_Manual_modif.csv b/src/multiego/Minimum_CUTOFF_Manual_modif.csv index 9f45ea57..54607ce8 100644 --- a/src/multiego/Minimum_CUTOFF_Manual_modif.csv +++ b/src/multiego/Minimum_CUTOFF_Manual_modif.csv @@ -1,14 +1,14 @@ atp1 atp2 c12 old_rc12 # >6 c12 c12 O O 7.703205086354507e-07 7.5e-7 # Manual 5.801734210627211e-07 7.703205086354507e-07 O OM 7.013840414318058e-07 7.5e-7 # Manual 3.2228956345557457e-07 7.013840414318058e-07 -O OA 5.1110687858211906e-08 3.6340510035416444e-07 # >6 2.9137432184408464e-07 5.1110687858211906e-08 +O OA 2.9137432184408464e-07 3.6340510035416444e-07 # >6 2.9137432184408464e-07 5.1110687858211906e-08 O N 3.9332116172143173e-07 7.5e-7 # Manual 3.9332116172143173e-07 1.0115434594394737e-07 O NT 1.1292692029579082e-07 8.265637568519653e-07 # >6 5.801734210627211e-07 1.1292692029579082e-07 O NL 5.742618275042624e-08 4.799376617607296e-07 # 4-5 5.742618275042624e-08 6.444980961093803e-08 O NR 1.2594349761073345e-07 6.296055527893412e-07 # >6 4.78449438233876e-07 1.2594349761073345e-07 O NZ 9.05167362258012e-08 4.799376617607296e-07 # >6 0.0 9.05167362258012e-08 O NE 1.2594349761073345e-07 4.799376617607296e-07 # >6 0.0 1.2594349761073345e-07 -O C 1.5619221473243766e-07 2.5445798665780286e-06 # 4-5 1.5619221473243766e-07 1.8933619871479337e-06 +O C 1.8933619871479337e-06 2.5445798665780286e-06 # 4-5 1.5619221473243766e-07 1.8933619871479337e-06 O CR 8.454178454694858e-07 2.5445798665780286e-06 # 4-5 8.454178454694858e-07 1.7356754565546296e-06 O CZ 9.271725969950735e-07 8.269390364517911e-07 # >6 0.0 9.271725969950735e-07 O CH 7.013840414318058e-07 8.269390364517911e-07 # 4-5 7.013840414318058e-07 1.0161170406288952e-06 @@ -180,16 +180,16 @@ NE SM 2.064082678151929e-06 1.544133911550011e-06 # >6 0.0 NE SH 1.3319957855440268e-06 1.544133911550011e-06 # >6 0.0 1.3319957855440268e-06 NE H 2.4782805153887164e-08 2.8298068718749842e-08 # >6 0.0 2.4782805153887164e-08 C C 2.4604350727657302e-05 2.4604350727657302e-05 # Manual 2.448580108078591e-06 2.4604350727657302e-05 -C CR 2.064082678151929e-06 2.4604350727657302e-05 # 4-5 2.064082678151929e-06 8.20374377950018e-06 +C CR 8.20374377950018e-06 2.4604350727657302e-05 # 4-5 2.064082678151929e-06 8.20374377950018e-06 C CZ 6.503393009784176e-06 7.995936127016803e-06 # >6 0.0 6.503393009784176e-06 C CH 4.37074965270138e-06 7.995936127016803e-06 # Manual 1.0161170406288952e-06 4.37074965270138e-06 -C CH1 5.556363657234973e-06 4.0161776406945595e-05 # 4-5 5.556363657234973e-06 1.9908604884064596e-05 +C CH1 1.9908604884064596e-05 4.0161776406945595e-05 # 4-5 5.556363657234973e-06 1.9908604884064596e-05 C CH1t 1.6047872836151582e-05 4.0161776406945595e-05 # >6 4.2522323000155225e-05 1.6047872836151582e-05 C CAH 2.2936907742668513e-05 4.0161776406945595e-05 # 4-5 2.2936907742668513e-05 2.4604350727657302e-05 -C CH2 3.421320847663108e-06 1.948994844187309e-05 # 4-5 3.421320847663108e-06 1.110557678004124e-05 +C CH2 1.110557678004124e-05 1.948994844187309e-05 # 4-5 3.421320847663108e-06 1.110557678004124e-05 C CAH2 7.596342311330096e-06 1.948994844187309e-05 # >6 2.2936907742668513e-05 7.596342311330096e-06 C CH3 6.012808612204707e-06 1.4542573404132365e-05 # Manual 2.064082678151929e-06 6.012808612204707e-06 -C CH2r 1.7356754565546296e-06 1.713951896012432e-05 # 4-5 1.7356754565546296e-06 6.012808612204707e-06 +C CH2r 6.012808612204707e-06 1.713951896012432e-05 # 4-5 1.7356754565546296e-06 6.012808612204707e-06 C S 4.030347871778446e-06 8.186838366082229e-06 # >6 4.37074965270138e-06 4.030347871778446e-06 C SM 4.030347871778446e-06 8.186838366082229e-06 # >6 4.37074965270138e-06 4.030347871778446e-06 C SH 4.737322988859966e-06 8.186838366082229e-06 # Manual 2.897745766558051e-06 4.737322988859966e-06 diff --git a/src/multiego/atdhisto.pkl b/src/multiego/atdhisto.pkl index ea62958c..94fc38ab 100644 Binary files a/src/multiego/atdhisto.pkl and b/src/multiego/atdhisto.pkl differ diff --git a/src/multiego/type_definitions.py b/src/multiego/type_definitions.py index 4eacb5ef..3414ec23 100644 --- a/src/multiego/type_definitions.py +++ b/src/multiego/type_definitions.py @@ -360,7 +360,7 @@ EMAX = 0.14 #maximum epsilon value for the colorbar in the interaction matrix plot -P_TH = 0.46#0.0034#0.46#0.009#0.008#0.12 # if P_TH is None it will be chosen in the InteractionMatrix class to have NL-NL repulsive +P_TH = 0.40#0.0034#0.46#0.009#0.008#0.12 # if P_TH is None it will be chosen in the InteractionMatrix class to have NL-NL repulsive SHOW = False # if SHOW is True the interaction matrix will be plotted and saved in the current directory # PKL = "atdhisto_density.pkl" PKL = "atdhisto.pkl"