diff --git a/multi-ego-basic.ff/aminoacids.rtp b/multi-ego-basic.ff/aminoacids.rtp index ca9d9dc0..e9ff6c39 100644 --- a/multi-ego-basic.ff/aminoacids.rtp +++ b/multi-ego-basic.ff/aminoacids.rtp @@ -100,7 +100,7 @@ CA CAH 0.000 0 CB CH2 0.000 0 CG CH2 0.000 0 - CD CH2 0.000 0 + CD CH2t 0.000 0 NE NE 0.000 0 CZ CZ 0.000 0 NH1 NZ 0.000 0 @@ -164,7 +164,7 @@ CA CAH 0.000 0 CB CH2 0.000 0 CG CS 0.000 0 - OD1 O 0.000 0 + OD1 OS 0.000 0 ND2 NT 0.000 0 C C 0.000 0 O O 0.000 0 @@ -267,7 +267,7 @@ N N 0.000 0 H H 0.000 0 CA CAH 0.000 0 - CB CH2 0.000 0 + CB CH2t 0.000 0 SG SH 0.000 0 C C 0.000 0 O O 0.000 0 @@ -310,7 +310,7 @@ N N 0.000 0 H H 0.000 0 CA CAH 0.000 0 - CB CH2 0.000 0 + CB CH2t 0.000 0 SG S 0.000 0 C C 0.000 0 O O 0.000 0 @@ -357,7 +357,7 @@ CB CH2 0.000 0 CG CH2 0.000 0 CD CS 0.000 0 - OE1 O 0.000 0 + OE1 OS 0.000 0 NE2 NT 0.000 0 C C 0.000 0 O O 0.000 0 @@ -674,7 +674,7 @@ CB CH2 0.000 0 CG CH2 0.000 0 CD CH2 0.000 0 - CE CH2 0.000 0 + CE CH2t 0.000 0 NZ NL 0.000 0 C C 0.000 0 O O 0.000 0 @@ -730,7 +730,7 @@ CB CH2 0.000 0 CG CH2 0.000 0 SD SM 0.000 0 - CE CH3 0.000 0 + CE CH3t 0.000 0 C C 0.000 0 O O 0.000 0 [ bonds ] @@ -898,7 +898,7 @@ N N 0.000 0 H H 0.000 0 CA CAH 0.000 0 - CB CH2 0.000 0 + CB CH2t 0.000 0 OG OA 0.000 0 C C 0.000 0 O O 0.000 0 diff --git a/multi-ego-basic.ff/atomtypes.atp b/multi-ego-basic.ff/atomtypes.atp index 5c565f5e..5839cc08 100644 --- a/multi-ego-basic.ff/atomtypes.atp +++ b/multi-ego-basic.ff/atomtypes.atp @@ -1,4 +1,5 @@ O 15.99940 ; carbonyl oxygen (C=O) + OS 15.99940 ; carbonyl oxygen (C=O) OM 15.99940 ; carboxyl oxygen (CO-) OA 16.99940 ; hydroxyl, sugar or ester oxygen ; N 15.00670 ; peptide nitrogen (N or NH) @@ -18,8 +19,10 @@ CH1 13.01900 ; aliphatic or sugar CH-group CH1t 13.01900 ; aliphatic or sugar CH-group CH2 14.02700 ; aliphatic or sugar CH2-group + CH2t 14.02700 ; aliphatic or sugar CH2-group CAH2 14.02700 ; aliphatic or sugar CH2-group CH3 15.03500 ; aliphatic CH3-group + CH3t 15.03500 ; aliphatic CH3-group CH2r 14.02700 ; CH2-group in a ring S 32.06000 ; sulfur SM 32.06000 ; sulfur MET diff --git a/multi-ego-basic.ff/ffnonbonded.itp b/multi-ego-basic.ff/ffnonbonded.itp index 37331400..4d2648a5 100644 --- a/multi-ego-basic.ff/ffnonbonded.itp +++ b/multi-ego-basic.ff/ffnonbonded.itp @@ -1,6 +1,7 @@ [ atomtypes ] ;name at.num mass charge ptype c6 c12 O 8 0.000 0.000 A 0.0000000000 2.631580e-07 + OS 8 0.000 0.000 A 0.0000000000 2.631580e-07 OM 8 0.000 0.000 A 0.0000000000 1.724403e-07 OA 8 0.000 0.000 A 0.0000000000 5.018430e-07 N 7 0.000 0.000 A 0.0000000000 8.752940e-07 @@ -19,8 +20,10 @@ CH1 6 0.000 0.000 A 0.0000000000 6.555574e-05 CH1t 6 0.000 0.000 A 0.0000000000 6.555574e-05 CH2 6 0.000 0.000 A 0.0000000000 1.543890e-05 + CH2t 6 0.000 0.000 A 0.0000000000 1.543890e-05 CAH2 6 0.000 0.000 A 0.0000000000 1.543890e-05 CH3 6 0.000 0.000 A 0.0000000000 8.595562e-06 + CH3t 6 0.000 0.000 A 0.0000000000 8.595562e-06 CH2r 6 0.000 0.000 A 0.0000000000 1.193966e-05 S 16 0.000 0.000 A 0.0000000000 2.724050e-06 SM 16 0.000 0.000 A 0.0000000000 2.724050e-06 diff --git a/src/multiego/Minimum_CUTOFF_Manual_modif.csv b/src/multiego/Minimum_CUTOFF_Manual_modif.csv index d9506452..c12133b4 100644 --- a/src/multiego/Minimum_CUTOFF_Manual_modif.csv +++ b/src/multiego/Minimum_CUTOFF_Manual_modif.csv @@ -1,5 +1,6 @@ atp1 atp2 c12 c12_45 old_rc12 source O O 7.703205086354507e-07 5.801734210627211e-07 2.6316023410103466e-07 #atdhisto_c12 +O OS 7.703205086354507e-07 5.801734210627211e-07 2.6316023410103466e-07 #atdhisto_c12 O OM 6.381454827742098e-07 3.2228956345557457e-07 2.13025432443863e-07 #atdhisto_c12 O OA 5.1110687858211906e-08 2.9137432184408464e-07 3.6340510035416444e-07 #atdhisto_c12 O N 1.0115434594394737e-07 3.9332116172143173e-07 4.799376617607296e-07 #atdhisto_c12 @@ -17,13 +18,42 @@ O CH1 1.4558184529108867e-06 1.59011205135462e-06 4.153527511548878e-06 # O CH1t 1.0161170406288952e-06 2.064082678151929e-06 4.153527511548878e-06 #atdhisto_c12 O CAH 1.3319957855440268e-06 1.110557678004124e-05 4.153527511548878e-06 #atdhisto_c12 O CH2 8.454178454694858e-07 8.454178454694858e-07 2.015648815722931e-06 #atdhisto_c12 +O CH2t 8.454178454694858e-07 8.454178454694858e-07 2.015648815722931e-06 #atdhisto_c12 O CAH2 6.381454827742098e-07 1.4922176228398963e-05 2.015648815722931e-06 #atdhisto_c12 O CH3 1.1128214538294811e-06 5.27066068361103e-07 1.503991708701826e-06 #atdhisto_c12 +O CH3t 1.1128214538294811e-06 5.27066068361103e-07 1.503991708701826e-06 #atdhisto_c12 O CH2r 9.271725969950735e-07 1.2178965067259558e-06 1.7725675979630829e-06 #atdhisto_c12 O S 8.466821298334225e-07 0.0 8.466821298334225e-07 #rc12 O SM 1.8933619871479337e-06 1.0161170406288952e-06 8.466821298334225e-07 #atdhisto_c12 O SH 8.454178454694858e-07 1.0161170406288952e-06 8.466821298334225e-07 #atdhisto_c12 O H 4.826394797699592e-10 1.003911895429072e-08 1.5516445117711974e-08 #atdhisto_c12 +OS OS 7.703205086354507e-07 5.801734210627211e-07 2.6316023410103466e-07 #atdhisto_c12 +OS OM 6.381454827742098e-07 3.2228956345557457e-07 2.13025432443863e-07 #atdhisto_c12 +OS OA 5.1110687858211906e-08 2.9137432184408464e-07 3.6340510035416444e-07 #atdhisto_c12 +OS N 1.0115434594394737e-07 3.9332116172143173e-07 4.799376617607296e-07 #atdhisto_c12 +OS NT 1.1292692029579082e-07 5.801734210627211e-07 8.265637568519653e-07 #atdhisto_c12 +OS NL 6.444980961093803e-08 5.742618275042624e-08 4.799376617607296e-07 #atdhisto_c12 +OS NR 1.2594349761073345e-07 5.27066068361103e-07 6.296055527893412e-07 #atdhisto_c12 +OS NZ 8.091373121174105e-08 0.0 4.799376617607296e-07 #atdhisto_c12 +OS NE 1.2594349761073345e-07 0.0 4.799376617607296e-07 #atdhisto_c12 +OS C 2.064082678151929e-06 1.5619221473243766e-07 8.269390364517911e-07 #atdhisto_c12 +OS CR 1.7356754565546296e-06 7.013840414318058e-07 8.269390364517911e-07 #atdhisto_c12 +OS CS 7.013840414318058e-07 4.339756224213911e-07 8.269390364517911e-07 #atdhisto_c12 +OS CZ 8.454178454694858e-07 0.0 8.269390364517911e-07 #atdhisto_c12 +OS CH 9.271725969950735e-07 7.703205086354507e-07 8.269390364517911e-07 #atdhisto_c12 +OS CH1 1.4558184529108867e-06 1.59011205135462e-06 4.153527511548878e-06 #atdhisto_c12 +OS CH1t 1.0161170406288952e-06 2.064082678151929e-06 4.153527511548878e-06 #atdhisto_c12 +OS CAH 1.3319957855440268e-06 1.110557678004124e-05 4.153527511548878e-06 #atdhisto_c12 +OS CH2 8.454178454694858e-07 8.454178454694858e-07 2.015648815722931e-06 #atdhisto_c12 +OS CH2t 8.454178454694858e-07 8.454178454694858e-07 2.015648815722931e-06 #atdhisto_c12 +OS CAH2 6.381454827742098e-07 1.4922176228398963e-05 2.015648815722931e-06 #atdhisto_c12 +OS CH3 1.1128214538294811e-06 5.27066068361103e-07 1.503991708701826e-06 #atdhisto_c12 +OS CH3t 1.1128214538294811e-06 5.27066068361103e-07 1.503991708701826e-06 #atdhisto_c12 +OS CH2r 9.271725969950735e-07 1.2178965067259558e-06 1.7725675979630829e-06 #atdhisto_c12 +OS S 8.466821298334225e-07 0.0 8.466821298334225e-07 #rc12 +OS SM 1.8933619871479337e-06 1.0161170406288952e-06 8.466821298334225e-07 #atdhisto_c12 +OS SH 8.454178454694858e-07 1.0161170406288952e-06 8.466821298334225e-07 #atdhisto_c12 +OS H 4.826394797699592e-10 1.003911895429072e-08 1.5516445117711974e-08 #atdhisto_c12 OM OM 3.9332116172143173e-07 1.5619221473243766e-07 1.7244183956179423e-07 #atdhisto_c12 OM OA 2.4782805153887164e-08 6.444980961093803e-08 2.941725938179918e-07 #atdhisto_c12 OM N 9.05167362258012e-08 1.2594349761073345e-07 3.885044725390518e-07 #atdhisto_c12 @@ -41,8 +71,10 @@ OM CH1 2.448580108078591e-06 1.3319957855440268e-06 3.3622366895124407e-06 # OM CH1t 7.703205086354507e-07 0.0 3.3622366895124407e-06 #atdhisto_c12 OM CAH 1.59011205135462e-06 7.013840414318058e-07 3.3622366895124407e-06 #atdhisto_c12 OM CH2 8.454178454694858e-07 1.5619221473243766e-07 1.6316464457144573e-06 #atdhisto_c12 +OM CH2t 8.454178454694858e-07 1.5619221473243766e-07 1.6316464457144573e-06 #atdhisto_c12 OM CAH2 7.013840414318058e-07 1.2884910181278791e-05 1.6316464457144573e-06 #atdhisto_c12 OM CH3 1.1128214538294811e-06 4.543781405690857e-08 1.2174654169641174e-06 #atdhisto_c12 +OM CH3t 1.1128214538294811e-06 4.543781405690857e-08 1.2174654169641174e-06 #atdhisto_c12 OM CH2r 8.454178454694858e-07 1.3319957855440268e-06 1.4348747651101918e-06 #atdhisto_c12 OM S 6.853802492857207e-07 0.0 6.853802492857207e-07 #rc12 OM SM 1.4558184529108867e-06 2.6644993987597274e-06 6.853802492857207e-07 #atdhisto_c12 @@ -64,8 +96,10 @@ OA CH1 3.149574184402289e-06 0.0 5.735718724048164e-06 # OA CH1t 1.59011205135462e-06 0.0 5.735718724048164e-06 #atdhisto_c12 OA CAH 2.248809725327641e-06 1.4922176228398963e-05 5.735718724048164e-06 #atdhisto_c12 OA CH2 1.1128214538294811e-06 6.729619205961802e-05 2.7834640847572668e-06 #atdhisto_c12 +OA CH2t 1.1128214538294811e-06 6.729619205961802e-05 2.7834640847572668e-06 #atdhisto_c12 OA CAH2 7.703205086354507e-07 1.1964957655417957e-05 2.7834640847572668e-06 #atdhisto_c12 OA CH3 1.2178965067259558e-06 0.0 2.076902916961151e-06 #atdhisto_c12 +OA CH3t 1.2178965067259558e-06 0.0 2.076902916961151e-06 #atdhisto_c12 OA CH2r 1.2178965067259558e-06 6.381454827742098e-07 2.4477866423199905e-06 #atdhisto_c12 OA S 1.1692063028111693e-06 0.0 1.1692063028111693e-06 #rc12 OA SM 1.1128214538294811e-06 0.0 1.1692063028111693e-06 #atdhisto_c12 @@ -86,8 +120,10 @@ N CH1 3.473598766179243e-05 2.897745766558051e-06 7.574982932969631e-06 # N CH1t 8.855373008130008e-06 7.648582556837471e-05 7.574982932969631e-06 #atdhisto_c12 N CAH 2.827720357903463e-05 1.2884910181278791e-05 7.574982932969631e-06 #atdhisto_c12 N CH2 9.554138546078327e-06 2.448580108078591e-06 3.6760332838792072e-06 #atdhisto_c12 +N CH2t 9.554138546078327e-06 2.448580108078591e-06 3.6760332838792072e-06 #atdhisto_c12 N CAH2 8.20374377950018e-06 1.1964957655417957e-05 3.6760332838792072e-06 #atdhisto_c12 N CH3 4.737322988859966e-06 9.271725969950735e-07 2.742900219889418e-06 #atdhisto_c12 +N CH3t 4.737322988859966e-06 9.271725969950735e-07 2.742900219889418e-06 #atdhisto_c12 N CH2r 6.503393009784176e-06 8.454178454694858e-07 3.2327146659727425e-06 #atdhisto_c12 N S 1.544133911550011e-06 0.0 1.544133911550011e-06 #rc12 N SM 2.064082678151929e-06 2.448580108078591e-06 1.544133911550011e-06 #atdhisto_c12 @@ -107,8 +143,10 @@ NT CH1 7.030422589392208e-06 0.0001113988439841668 1.3045874183315057e-05 # NT CH1t 3.7144078137182355e-06 0.00015106392932930527 1.3045874183315057e-05 #atdhisto_c12 NT CAH 6.503393009784176e-06 1.8933619871479337e-06 1.3045874183315057e-05 #atdhisto_c12 NT CH2 2.6644993987597274e-06 5.539580762888729e-05 6.330980299168271e-06 #atdhisto_c12 +NT CH2t 2.6644993987597274e-06 5.539580762888729e-05 6.330980299168271e-06 #atdhisto_c12 NT CAH2 2.064082678151929e-06 3.0296190868820765e-05 6.330980299168271e-06 #atdhisto_c12 NT CH3 1.8933619871479337e-06 3.7172653432882377e-05 4.723909147084545e-06 #atdhisto_c12 +NT CH3t 1.8933619871479337e-06 3.7172653432882377e-05 4.723909147084545e-06 #atdhisto_c12 NT CH2r 2.248809725327641e-06 1.0161170406288952e-06 5.567483012968901e-06 #atdhisto_c12 NT S 2.6593560553903825e-06 0.0 2.6593560553903825e-06 #rc12 NT SM 1.3319957855440268e-06 0.0 2.6593560553903825e-06 #atdhisto_c12 @@ -127,8 +165,10 @@ NL CH1 1.4922176228398963e-05 7.175626843968198e-05 7.574982932969631e-06 # NL CH1t 4.030347871778446e-06 5.539580762888729e-05 7.574982932969631e-06 #atdhisto_c12 NL CAH 8.855373008130008e-06 2.2936907742668513e-05 7.574982932969631e-06 #atdhisto_c12 NL CH2 3.421320847663108e-06 8.855373008130008e-06 3.6760332838792072e-06 #atdhisto_c12 +NL CH2t 3.421320847663108e-06 8.855373008130008e-06 3.6760332838792072e-06 #atdhisto_c12 NL CAH2 4.030347871778446e-06 1.1964957655417957e-05 3.6760332838792072e-06 #atdhisto_c12 NL CH3 2.897745766558051e-06 1.2178965067259558e-06 2.742900219889418e-06 #atdhisto_c12 +NL CH3t 2.897745766558051e-06 1.2178965067259558e-06 2.742900219889418e-06 #atdhisto_c12 NL CH2r 3.7144078137182355e-06 2.631995597129722e-07 3.2327146659727425e-06 #atdhisto_c12 NL S 1.544133911550011e-06 0.0 1.544133911550011e-06 #rc12 NL SM 1.1128214538294811e-06 7.703205086354507e-07 1.544133911550011e-06 #atdhisto_c12 @@ -146,8 +186,10 @@ NR CH1 7.030422589392208e-06 0.0 9.937230804903689e-06 # NR CH1t 2.6644993987597274e-06 0.0 9.937230804903689e-06 #atdhisto_c12 NR CAH 6.503393009784176e-06 2.4604350727657302e-05 9.937230804903689e-06 #atdhisto_c12 NR CH2 2.448580108078591e-06 0.0 4.822399140917269e-06 #atdhisto_c12 +NR CH2t 2.448580108078591e-06 0.0 4.822399140917269e-06 #atdhisto_c12 NR CAH2 1.8933619871479337e-06 0.0 4.822399140917269e-06 #atdhisto_c12 NR CH3 2.064082678151929e-06 0.0 3.598269831239962e-06 #atdhisto_c12 +NR CH3t 2.064082678151929e-06 0.0 3.598269831239962e-06 #atdhisto_c12 NR CH2r 2.064082678151929e-06 0.0 4.2408322297796346e-06 #atdhisto_c12 NR S 2.0256699201216162e-06 0.0 2.0256699201216162e-06 #rc12 NR SM 1.7356754565546296e-06 0.0 2.0256699201216162e-06 #atdhisto_c12 @@ -164,8 +206,10 @@ NZ CH1 6.012808612204707e-06 0.0 7.574982932969631e-06 # NZ CH1t 3.421320847663108e-06 0.0 7.574982932969631e-06 #atdhisto_c12 NZ CAH 3.7144078137182355e-06 0.0 7.574982932969631e-06 #atdhisto_c12 NZ CH2 2.064082678151929e-06 1.1128214538294811e-06 3.6760332838792072e-06 #atdhisto_c12 +NZ CH2t 2.064082678151929e-06 1.1128214538294811e-06 3.6760332838792072e-06 #atdhisto_c12 NZ CAH2 1.59011205135462e-06 0.0 3.6760332838792072e-06 #atdhisto_c12 NZ CH3 1.4558184529108867e-06 0.0 2.742900219889418e-06 #atdhisto_c12 +NZ CH3t 1.4558184529108867e-06 0.0 2.742900219889418e-06 #atdhisto_c12 NZ CH2r 1.7356754565546296e-06 0.0 3.2327146659727425e-06 #atdhisto_c12 NZ S 1.544133911550011e-06 0.0 1.544133911550011e-06 #rc12 NZ SM 1.2178965067259558e-06 0.0 1.544133911550011e-06 #atdhisto_c12 @@ -181,8 +225,10 @@ NE CH1 1.110557678004124e-05 0.0 7.574982932969631e-06 # NE CH1t 6.012808612204707e-06 0.0 7.574982932969631e-06 #atdhisto_c12 NE CAH 1.0303119972742315e-05 7.030422589392208e-06 7.574982932969631e-06 #atdhisto_c12 NE CH2 4.030347871778446e-06 0.0 3.6760332838792072e-06 #atdhisto_c12 +NE CH2t 4.030347871778446e-06 0.0 3.6760332838792072e-06 #atdhisto_c12 NE CAH2 3.149574184402289e-06 0.0 3.6760332838792072e-06 #atdhisto_c12 NE CH3 2.448580108078591e-06 0.0 2.742900219889418e-06 #atdhisto_c12 +NE CH3t 2.448580108078591e-06 0.0 2.742900219889418e-06 #atdhisto_c12 NE CH2r 3.421320847663108e-06 0.0 3.2327146659727425e-06 #atdhisto_c12 NE S 1.544133911550011e-06 0.0 1.544133911550011e-06 #rc12 NE SM 2.064082678151929e-06 0.0 1.544133911550011e-06 #atdhisto_c12 @@ -197,8 +243,10 @@ C CH1 2.1373642831810142e-05 5.556363657234973e-06 1.3051797320401952e-05 # C CH1t 1.853615051555947e-05 4.2522323000155225e-05 1.3051797320401952e-05 #atdhisto_c12 C CAH 2.6382245451254078e-05 2.2936907742668513e-05 1.3051797320401952e-05 #atdhisto_c12 C CH2 1.2884910181278791e-05 3.421320847663108e-06 6.333854714763538e-06 #atdhisto_c12 +C CH2t 1.2884910181278791e-05 3.421320847663108e-06 6.333854714763538e-06 #atdhisto_c12 C CAH2 9.554138546078327e-06 2.2936907742668513e-05 6.333854714763538e-06 #atdhisto_c12 -C CH3 7.030422589392208e-06 2.064082678151929e-06 4.726053914163474e-06 #atdhisto_c12 +C CH3 7.030422589392208e-07 2.064082678151929e-06 4.726053914163474e-06 #atdhisto_c12 +C CH3t 7.030422589392208e-06 2.064082678151929e-06 4.726053914163474e-06 #atdhisto_c12 C CH2r 6.503393009784176e-06 1.7356754565546296e-06 5.570010782641626e-06 #atdhisto_c12 C S 2.6605634662742835e-06 0.0 2.6605634662742835e-06 #rc12 C SM 4.37074965270138e-06 4.737322988859966e-06 2.6605634662742835e-06 #atdhisto_c12 @@ -212,8 +260,10 @@ CR CH1 1.853615051555947e-05 0.0 1.3051797320401952e-05 # CR CH1t 1.3869290966783295e-05 0.0 1.3051797320401952e-05 #atdhisto_c12 CR CAH 1.4922176228398963e-05 2.6382245451254078e-05 1.3051797320401952e-05 #atdhisto_c12 CR CH2 4.737322988859966e-06 0.0 6.333854714763538e-06 #atdhisto_c12 +CR CH2t 4.737322988859966e-06 0.0 6.333854714763538e-06 #atdhisto_c12 CR CAH2 3.149574184402289e-06 2.4604350727657302e-05 6.333854714763538e-06 #atdhisto_c12 CR CH3 3.7144078137182355e-06 0.0 4.726053914163474e-06 #atdhisto_c12 +CR CH3t 3.7144078137182355e-06 0.0 4.726053914163474e-06 #atdhisto_c12 CR CH2r 3.421320847663108e-06 1.3319957855440268e-06 5.570010782641626e-06 #atdhisto_c12 CR S 2.6605634662742835e-06 0.0 2.6605634662742835e-06 #rc12 CR SM 4.37074965270138e-06 0.0 2.6605634662742835e-06 #atdhisto_c12 @@ -226,8 +276,10 @@ CS CH1 1.2884910181278791e-05 0.0 1.3051797320401952e-05 # CS CH1t 8.855373008130008e-06 0.0 1.3051797320401952e-05 #atdhisto_c12 CS CAH 1.3869290966783295e-05 3.7172653432882377e-05 1.3051797320401952e-05 #atdhisto_c12 CS CH2 5.556363657234973e-06 0.0 6.333854714763538e-06 #atdhisto_c12 +CS CH2t 5.556363657234973e-06 0.0 6.333854714763538e-06 #atdhisto_c12 CS CAH2 3.7144078137182355e-06 3.7172653432882377e-05 6.333854714763538e-06 #atdhisto_c12 CS CH3 3.7144078137182355e-06 0.0 4.726053914163474e-06 #atdhisto_c12 +CS CH3t 3.7144078137182355e-06 0.0 4.726053914163474e-06 #atdhisto_c12 CS CH2r 4.737322988859966e-06 2.6644993987597274e-06 5.570010782641626e-06 #atdhisto_c12 CS S 2.6605634662742835e-06 0.0 2.6605634662742835e-06 #rc12 CS SM 3.7144078137182355e-06 0.0 2.6605634662742835e-06 #atdhisto_c12 @@ -239,8 +291,10 @@ CZ CH1 1.110557678004124e-05 0.0 1.3051797320401952e-05 # CZ CH1t 1.2884910181278791e-05 0.0 1.3051797320401952e-05 #atdhisto_c12 CZ CAH 1.0303119972742315e-05 5.187980929466614e-05 1.3051797320401952e-05 #atdhisto_c12 CZ CH2 4.737322988859966e-06 2.448580108078591e-06 6.333854714763538e-06 #atdhisto_c12 +CZ CH2t 4.737322988859966e-06 2.448580108078591e-06 6.333854714763538e-06 #atdhisto_c12 CZ CAH2 3.7144078137182355e-06 0.0 6.333854714763538e-06 #atdhisto_c12 CZ CH3 2.448580108078591e-06 0.0 4.726053914163474e-06 #atdhisto_c12 +CZ CH3t 2.448580108078591e-06 0.0 4.726053914163474e-06 #atdhisto_c12 CZ CH2r 3.421320847663108e-06 0.0 5.570010782641626e-06 #atdhisto_c12 CZ S 2.6605634662742835e-06 0.0 2.6605634662742835e-06 #rc12 CZ SM 2.248809725327641e-06 0.0 2.6605634662742835e-06 #atdhisto_c12 @@ -251,8 +305,10 @@ CH CH1 8.855373008130008e-06 0.0 1.3051797320401952e-05 # CH CH1t 6.012808612204707e-06 0.0 1.3051797320401952e-05 #atdhisto_c12 CH CAH 7.596342311330096e-06 1.9908604884064596e-05 1.3051797320401952e-05 #atdhisto_c12 CH CH2 3.149574184402289e-06 1.6047872836151582e-05 6.333854714763538e-06 #atdhisto_c12 +CH CH2t 3.149574184402289e-06 1.6047872836151582e-05 6.333854714763538e-06 #atdhisto_c12 CH CAH2 2.248809725327641e-06 0.0 6.333854714763538e-06 #atdhisto_c12 CH CH3 2.897745766558051e-06 0.0 4.726053914163474e-06 #atdhisto_c12 +CH CH3t 2.897745766558051e-06 0.0 4.726053914163474e-06 #atdhisto_c12 CH CH2r 2.897745766558051e-06 0.0 5.570010782641626e-06 #atdhisto_c12 CH S 2.6605634662742835e-06 0.0 2.6605634662742835e-06 #rc12 CH SM 3.149574184402289e-06 0.0 2.6605634662742835e-06 #atdhisto_c12 @@ -262,8 +318,10 @@ CH1 CH1 6.309156472163408e-05 0.0002285006226144959 6.555622223139519e-05 # CH1 CH1t 4.8569470248707706e-05 0.00020331351930370572 6.555622223139519e-05 #atdhisto_c12 CH1 CAH 5.187980929466614e-05 3.473598766179243e-05 6.555622223139519e-05 #atdhisto_c12 CH1 CH2 2.6382245451254078e-05 0.0001806952059302513 3.181351786802196e-05 #atdhisto_c12 +CH1 CH2t 2.6382245451254078e-05 0.0001806952059302513 3.181351786802196e-05 #atdhisto_c12 CH1 CAH2 2.1373642831810142e-05 3.473598766179243e-05 3.181351786802196e-05 #atdhisto_c12 CH1 CH3 1.4922176228398963e-05 0.0001806952059302513 2.3737898549049355e-05 #atdhisto_c12 +CH1 CH3t 1.4922176228398963e-05 0.0001806952059302513 2.3737898549049355e-05 #atdhisto_c12 CH1 CH2r 2.2936907742668513e-05 2.448580108078591e-06 2.797690277700976e-05 #atdhisto_c12 CH1 S 1.3363407780104616e-05 0.0 1.3363407780104616e-05 #rc12 CH1 SM 1.110557678004124e-05 0.0 1.3363407780104616e-05 #atdhisto_c12 @@ -272,8 +330,10 @@ CH1 H 1.0161170406288952e-06 1.736919907132888e-07 2.44900153315381e-07 # CH1t CH1t 2.827720357903463e-05 0.00015106392932930527 6.555622223139519e-05 #atdhisto_c12 CH1t CAH 3.7172653432882377e-05 2.4604350727657302e-05 6.555622223139519e-05 #atdhisto_c12 CH1t CH2 1.9908604884064596e-05 0.00013386004153335797 3.181351786802196e-05 #atdhisto_c12 +CH1t CH2t 1.9908604884064596e-05 0.00013386004153335797 3.181351786802196e-05 #atdhisto_c12 CH1t CAH2 1.2884910181278791e-05 2.6382245451254078e-05 3.181351786802196e-05 #atdhisto_c12 CH1t CH3 1.110557678004124e-05 0.00015106392932930527 2.3737898549049355e-05 #atdhisto_c12 +CH1t CH3t 1.110557678004124e-05 0.00015106392932930527 2.3737898549049355e-05 #atdhisto_c12 CH1t CH2r 1.6047872836151582e-05 1.3319957855440268e-06 2.797690277700976e-05 #atdhisto_c12 CH1t S 1.3363407780104616e-05 0.0 1.3363407780104616e-05 #rc12 CH1t SM 7.030422589392208e-06 0.0 1.3363407780104616e-05 #atdhisto_c12 @@ -281,34 +341,55 @@ CH1t SH 5.556363657234973e-06 0.0 1.3363407780104616e-05 # CH1t H 1.9297259151556835e-07 1.1292692029579082e-07 2.44900153315381e-07 #atdhisto_c12 CAH CAH 8.68129884517691e-05 0.0 6.555622223139519e-05 #atdhisto_c12 CAH CH2 2.6382245451254078e-05 2.827720357903463e-05 3.181351786802196e-05 #atdhisto_c12 +CAH CH2t 2.6382245451254078e-05 2.827720357903463e-05 3.181351786802196e-05 #atdhisto_c12 CAH CAH2 3.0296190868820765e-05 0.0 3.181351786802196e-05 #atdhisto_c12 -CAH CH3 1.4922176228398963e-05 2.4604350727657302e-05 2.3737898549049355e-05 #atdhisto_c12 +CAH CH3 1.4922176228398963e-06 2.4604350727657302e-05 2.3737898549049355e-05 #atdhisto_c12 +CAH CH3t 1.4922176228398963e-05 2.4604350727657302e-05 2.3737898549049355e-05 #atdhisto_c12 CAH CH2r 1.853615051555947e-05 2.2936907742668513e-05 2.797690277700976e-05 #atdhisto_c12 CAH S 1.3363407780104616e-05 0.0 1.3363407780104616e-05 #rc12 CAH SM 6.503393009784176e-06 0.0 1.3363407780104616e-05 #atdhisto_c12 CAH SH 7.030422589392208e-06 3.0296190868820765e-05 1.3363407780104616e-05 #atdhisto_c12 CAH H 1.3319957855440268e-06 3.7144078137182355e-06 2.44900153315381e-07 #atdhisto_c12 CH2 CH2 1.110557678004124e-05 0.0001113988439841668 1.5438655320413708e-05 #atdhisto_c12 +CH2 CH2t 1.110557678004124e-05 0.0001113988439841668 1.5438655320413708e-05 #atdhisto_c12 CH2 CAH2 8.20374377950018e-06 2.827720357903463e-05 1.5438655320413708e-05 #atdhisto_c12 CH2 CH3 5.556363657234973e-06 0.00013386004153335797 1.151967019963228e-05 #atdhisto_c12 +CH2 CH3t 5.556363657234973e-06 0.00013386004153335797 1.151967019963228e-05 #atdhisto_c12 CH2 CH2r 7.596342311330096e-06 1.7356754565546296e-06 1.3576799670467695e-05 #atdhisto_c12 CH2 S 6.485074913093783e-06 0.0 6.485074913093783e-06 #rc12 CH2 SM 4.030347871778446e-06 0.0 6.485074913093783e-06 #atdhisto_c12 CH2 SH 3.421320847663108e-06 0.0 6.485074913093783e-06 #atdhisto_c12 CH2 H 2.9137432184408464e-07 1.1292692029579082e-07 1.1884661956083523e-07 #atdhisto_c12 +CH2t CH2t 1.110557678004124e-05 0.0001113988439841668 1.5438655320413708e-05 #atdhisto_c12 +CH2t CAH2 8.20374377950018e-06 2.827720357903463e-05 1.5438655320413708e-05 #atdhisto_c12 +CH2t CH3 5.556363657234973e-06 0.00013386004153335797 1.151967019963228e-05 #atdhisto_c12 +CH2t CH3t 5.556363657234973e-06 0.00013386004153335797 1.151967019963228e-05 #atdhisto_c12 +CH2t CH2r 7.596342311330096e-06 1.7356754565546296e-06 1.3576799670467695e-05 #atdhisto_c12 +CH2t S 6.485074913093783e-06 0.0 6.485074913093783e-06 #rc12 +CH2t SM 4.030347871778446e-06 0.0 6.485074913093783e-06 #atdhisto_c12 +CH2t SH 3.421320847663108e-06 0.0 6.485074913093783e-06 #atdhisto_c12 +CH2t H 2.9137432184408464e-07 1.1292692029579082e-07 1.1884661956083523e-07 #atdhisto_c12 CAH2 CAH2 7.030422589392208e-06 0.0 1.5438655320413708e-05 #atdhisto_c12 CAH2 CH3 4.030347871778446e-06 2.4604350727657302e-05 1.151967019963228e-05 #atdhisto_c12 +CAH2 CH3t 4.030347871778446e-06 2.4604350727657302e-05 1.151967019963228e-05 #atdhisto_c12 CAH2 CH2r 5.556363657234973e-06 1.9908604884064596e-05 1.3576799670467695e-05 #atdhisto_c12 CAH2 S 6.485074913093783e-06 0.0 6.485074913093783e-06 #rc12 CAH2 SM 2.897745766558051e-06 0.0 6.485074913093783e-06 #atdhisto_c12 CAH2 SH 2.448580108078591e-06 3.0296190868820765e-05 6.485074913093783e-06 #atdhisto_c12 CAH2 H 7.703205086354507e-07 9.271725969950735e-07 1.1884661956083523e-07 #atdhisto_c12 CH3 CH3 3.7144078137182355e-06 0.00017027339638628222 8.5954896170802e-06 #atdhisto_c12 +CH3 CH3t 3.7144078137182355e-06 0.00017027339638628222 8.5954896170802e-06 #atdhisto_c12 CH3 CH2r 4.737322988859966e-06 1.7356754565546296e-06 1.0130432432380583e-05 #atdhisto_c12 CH3 S 4.8388880163656295e-06 0.0 4.8388880163656295e-06 #rc12 CH3 SM 3.7144078137182355e-06 0.0 4.8388880163656295e-06 #atdhisto_c12 CH3 SH 3.149574184402289e-06 0.0 4.8388880163656295e-06 #atdhisto_c12 CH3 H 3.2228956345557457e-07 1.0115434594394737e-07 8.86783099478706e-08 #atdhisto_c12 +CH3t CH3t 3.7144078137182355e-06 0.00017027339638628222 8.5954896170802e-06 #atdhisto_c12 +CH3t CH2r 4.737322988859966e-06 1.7356754565546296e-06 1.0130432432380583e-05 #atdhisto_c12 +CH3t S 4.8388880163656295e-06 0.0 4.8388880163656295e-06 #rc12 +CH3t SM 3.7144078137182355e-06 0.0 4.8388880163656295e-06 #atdhisto_c12 +CH3t SH 3.149574184402289e-06 0.0 4.8388880163656295e-06 #atdhisto_c12 +CH3t H 3.2228956345557457e-07 1.0115434594394737e-07 8.86783099478706e-08 #atdhisto_c12 CH2r CH2r 6.012808612204707e-06 1.7356754565546296e-06 1.1939478242530793e-05 #atdhisto_c12 CH2r S 5.702994277398676e-06 0.0 5.702994277398676e-06 #rc12 CH2r SM 3.7144078137182355e-06 0.0 5.702994277398676e-06 #atdhisto_c12 diff --git a/src/multiego/atdhisto.pkl b/src/multiego/atdhisto.pkl index cc349d72..c1dce0b0 100644 Binary files a/src/multiego/atdhisto.pkl and b/src/multiego/atdhisto.pkl differ diff --git a/src/multiego/atdhisto_nosimm.pkl b/src/multiego/atdhisto_nosimm.pkl new file mode 100644 index 00000000..71a12bd1 Binary files /dev/null and b/src/multiego/atdhisto_nosimm.pkl differ diff --git a/src/multiego/fileio.py b/src/multiego/fileio.py index 1b3dda08..b99842e9 100644 --- a/src/multiego/fileio.py +++ b/src/multiego/fileio.py @@ -12,6 +12,7 @@ from . import _term +from . import type_definitions def strip_gz_h5_suffix(filename): @@ -391,6 +392,16 @@ def write_output_readme(meGO_LJ, parameters, output_dir, stat_str): f.write("\nContact parameters:\n") f.write(stat_str) + if parameters.egos == "mg": + f.write("\nInternal parameters:\n") + # write contents of the internal parameters file from type_definitions.py + f.write(f" - EMAX: {type_definitions.EMAX}\n") + f.write(f" - P_TH: {type_definitions.P_TH}\n") + f.write(f" - EMAX_BKBN: {type_definitions.EMAX_BKBN}\n") + f.write(f" - P_TH_BKBN: {type_definitions.P_TH_BKBN}\n") + f.write(f" - P_TH_SC_BKBN: {type_definitions.P_TH_SC_BKBN}\n") + f.write(f" - EMAX_SC_BKBN: {type_definitions.EMAX_SC_BKBN}\n") + f.write(f" - OM_SCALEDOWN: {type_definitions.OM_SCALEDOWN}\n") def save_matrix_png(output_path): # import matrix from type definition and use the class function to plot it diff --git a/src/multiego/interaction_matrix.py b/src/multiego/interaction_matrix.py index 414831e6..9c4402fe 100644 --- a/src/multiego/interaction_matrix.py +++ b/src/multiego/interaction_matrix.py @@ -1,3 +1,5 @@ +from fileinput import filename + import numpy as np import pandas as pd import matplotlib.pyplot as plt @@ -6,6 +8,10 @@ from matplotlib.colors import LinearSegmentedColormap, TwoSlopeNorm, Normalize from matplotlib.cm import ScalarMappable +bkbn_attypes = ["H", "O", "N", "C", "CAH"]#, "CAH2"] +H_interactions = ["O", "H", "OA", "OM", "OS"] + +noplot = ["C0", "CH3p", "CR1", "OE", "P"] class AttrDict(dict): def __getattr__(self, key): @@ -21,14 +27,19 @@ def find_class(self, module, name): class InteractionMatrix: - def __init__(self, pkl_file, emax=0.16, c12_rep_df=None, pth=None, show=False, pth_bkbn=None, emax_bkbn=None): - self.atmat = self.read_pickle_file(pkl_file) + def __init__(self, pkl_file, emax=0.16, c12_rep_df=None, pth=None, show=False, pth_bkbn=None, emax_bkbn=None, pth_sc_bkbn=None, emax_sc_bkbn=None, om_scaledown=None, pkl_file2=None, r2_corr_sb=None): + self.atmat = self.build_matrix_dataframe(pkl_file, filename2=pkl_file2, r2_corr_sb=r2_corr_sb) self.emax = emax self.emax_bkbn = emax_bkbn if emax_bkbn is not None else emax + self.emax_sc_bkbn = emax_sc_bkbn if emax_sc_bkbn is not None else self.emax_bkbn self.pth = pth self.pth_bkbn = pth_bkbn if pth_bkbn is not None else pth + self.pth_sc_bkbn = pth_sc_bkbn if pth_sc_bkbn is not None else (self.pth + self.pth_bkbn) / 2 + self.om_scaledown = om_scaledown + self.r2_corr_sb = r2_corr_sb self.c12_rep_df = c12_rep_df - self.define_p_threshold() + + # self.define_p_threshold() self.nonlocal_matrix() if show: self.plot_energy_matrix(show=show) @@ -52,7 +63,7 @@ def regall(self, ps, preference, emax, pth): e /= np.max(e) e = np.where(e==-np.inf, -2, e) e = np.where(e > 0.0, 0.07 + e* (emax-0.07), e) - e = np.array([self.roundPartial(ei) for ei in e]) + # e = np.array([self.roundPartial(ei) for ei in e]) return e def plot_energy_matrix(self, out_path = None, show = False): @@ -63,8 +74,8 @@ def plot_energy_matrix(self, out_path = None, show = False): # TODO read them by gromos to avoid hardcoding them here bkbnd_atoms = ["C", "O", "N", "CAH", "CAH2", "H"] attype_ordering_charged = [ "OM", "NL", "NZ"] - attype_ordering_polar = [ "NE", "NR", "NT", "OA", "CZ", "S", "SM", "SH", "CH2r", "CH1t"] - attype_ordering_apolar = ["CH1","CR", "CH", "CH2", "CH3", "CS"] + attype_ordering_polar = [ "NE", "NR", "NT", "OA","OS", "CZ", "CS", "CH1t", "CH2r", "CH2t", "CH3t", "S", "SM", "SH"] + attype_ordering_apolar = ["CH1", "CR", "CH", "CH2", "CH3"] @@ -72,7 +83,6 @@ def plot_energy_matrix(self, out_path = None, show = False): list_atom2 = np.sort(np.array(self.atmat["attype2"].unique())) # TODO read them by gromos to avoid hardcoding them here - noplot = ["C0", "CH3p", "CR1", "OE", "P"] # remove from list_atom1 and list_atom2 the atoms in noplot list_atom1 = [at for at in list_atom1 if at not in noplot] list_atom2 = [at for at in list_atom2 if at not in noplot] @@ -87,8 +97,8 @@ def plot_energy_matrix(self, out_path = None, show = False): if at1 in noplot or at2 in noplot: continue energy = self.atmat.loc[((self.atmat["attype1"]==at1) & (self.atmat["attype2"]==at2)) | ((self.atmat["attype1"]==at2) & (self.atmat["attype2"]==at1)), "energy"].values - if (at1 == "H" and at2 not in ["O", "H", "OA", "OM"]) or (at2 == "H" and at1 not in ["O", "H", "OA", "OM"]): - energies.append(-2) + if (at1 == "H" and at2 not in H_interactions) or (at2 == "H" and at1 not in H_interactions): + energies.append(-np.inf) # force repulsion for H interactions with non-interaction-H atoms continue if len(energy) > 0: energy = energy[0] @@ -130,17 +140,7 @@ def plot_energy_matrix(self, out_path = None, show = False): if show: plt.show() - def read_pickle_file(self, filename): - """ - Read atdhito data from pikle file per atomtype pair and return a pandas dataframe with the following columns: - - atom_pair: atomtype pair - - probability: probability of the atomtype pair - - exp_aver: expected average distance of the atomtype pair - - attype1: first atomtype - - attype2: second atomtype - - cutoff: cutoff distance of the atomtype pair - """ _this_dir = os.path.dirname(os.path.abspath(__file__)) pikle_path = os.path.join(_this_dir, filename) @@ -180,53 +180,50 @@ def read_pickle_file(self, filename): atmat["sum_probs"] = sum_probs # fill nan values in probability with 0 atmat["probability"] = atmat["probability"].fillna(0) - - # # for all bkbn atom pairs set multiply the probability by a factor f_bkbn to compansate for the different statistics - # bkbn_pairs = ["O_H", "O_O", "N_N", "C_C", "CAH_CAH", "CAH2_CAH2", "O_N", "O_C", "O_CAH","O_CAH2", "N_C","N_CAH", "C_CAH", "N_CAH2", "C_CAH2", "CAH_CAH2"] - # #bkbn_pairs = ["O_H", "O_O", "N_N", "C_C", "CAH_CAH", "O_N", "O_C", "O_CAH", "N_C","N_CAH", "C_CAH" ] - # for pair in bkbn_pairs: - # atmat.loc[atmat["atom_pair"]==pair, "probability"] *= self.f_bkbn - # where O-H set distance to 0.195 - # atmat.loc[atmat["atom_pair"]=="O_H", "exp_aver"] = 0.195 - # atmat.loc[atmat["atom_pair"]=="O_N", "exp_aver"] = 0.29 - # atmat.loc[atmat["atom_pair"]=="C_N", "exp_aver"] = 0.41 - return atmat - - def define_p_threshold(self): + def build_matrix_dataframe(self, filename, filename2=None, r2_corr_sb=None): """ - Define p_threshold used to split attractive and repulsive interactions + Read atdhito data from pikle file per atomtype pair and return a pandas dataframe with the following columns: + - atom_pair: atomtype pair + - probability: probability of the atomtype pair + - exp_aver: expected average distance of the atomtype pair + - attype1: first atomtype + - attype2: second atomtype + - cutoff: cutoff distance of the atomtype pair """ - if self.pth is None: - print("Neither atpairref nor pth provided, or both provided. Optimizing pth to best fit KL_SCALE.") - # find the minimum pth such that the following atom-pairs have energy < 0 - # OM_OM, O_O, NL_NL, O_OM - pth = 0.001 # Initialize with a default value - dp = 0.001 - while True: - self.atmat["energy"] = np.array(self.regall(self.atmat["probability"].to_numpy(), 1, self.emax, pth)) - if (self.atmat.loc[self.atmat["atom_pair"]=="NL_NL", "energy"].values[0] < 0): - # self.atmat.loc[self.atmat["atom_pair"]=="OM_OM", "energy"].values[0] < 0 and - # self.atmat.loc[self.atmat["atom_pair"]=="O_O", "energy"].values[0] < 0 and - # self.atmat.loc[self.atmat["atom_pair"]=="OA_OA", "energy"].values[0] < 0): - break - pth += dp - # find also the maximum pth such that the following atom-pairs have energy > 0 - # OM_NZ - self.pth = pth - pth_max = pth - while True: - self.atmat["energy"] = np.array(self.regall(self.atmat["probability"].to_numpy(), 1, self.emax, pth_max)) - if self.atmat.loc[self.atmat["atom_pair"]=="CH_CH", "energy"].values[0] < 0: - break - pth_max += dp - pth_max -= dp - print(f"Minimum pth: {pth}, Maximum pth: {pth_max}") - self.pth_max = pth_max - else: - self.pth_max = self.pth - print(f"Using provided pth: {self.pth}") + _this_dir = os.path.dirname(os.path.abspath(__file__)) + + atmat = self.read_pickle_file(filename) + + if filename2 != None: + atmat_sb = self.read_pickle_file(filename2) + + # use exp_aver and probability from atmat_sb for atom pairs where one of the atomtypes is in bkbn_attypes and the other is not + if filename2 != None: + for index, row in atmat.iterrows(): + at1 = row["attype1"] + at2 = row["attype2"] + if (at1 in bkbn_attypes and at2 not in bkbn_attypes) or (at2 in bkbn_attypes and at1 not in bkbn_attypes): + # find the corresponding row in atmat_sb + sb_row = atmat_sb.loc[(atmat_sb["attype1"]==at1) & (atmat_sb["attype2"]==at2)] + if len(sb_row) == 0: + sb_row = atmat_sb.loc[(atmat_sb["attype1"]==at2) & (atmat_sb["attype2"]==at1)] + if len(sb_row) > 0: + atmat.at[index, "exp_aver"] = sb_row["exp_aver"].values[0] + atmat.at[index, "probability"] = sb_row["probability"].values[0] + + # read sc-bkbn correction: + if r2_corr_sb is not None: + corr = pd.read_csv(os.path.join(_this_dir, r2_corr_sb), sep=r"\s+") + for index, row in atmat.iterrows(): + atpair = row["atom_pair"] + corr_row = corr.loc[(corr["atom_pair"]==atpair)] + if len(corr_row) == 0: + corr_row = corr.loc[(corr["atom_pair"]==atpair)] + if len(corr_row) > 0: + atmat.at[index, "probability"] = atmat.at[index, "probability"] - atmat.at[index, "probability"] *corr_row["r2"].values[0] + return atmat def define_special_nonlocal_dict(self): """ @@ -237,7 +234,7 @@ def define_special_nonlocal_dict(self): for atom_pair in self.atmat["atom_pair"].unique(): atp1, atp2 = atom_pair.split("_") # write only H-O interaction, skip all the rest - if (atp1 == "H" and atp2 not in ["O", "H"]) or (atp2 == "H" and atp1 not in ["O", "H"]): + if (atp1 == "H" and atp2 not in H_interactions) or (atp2 == "H" and atp1 not in H_interactions): continue energy = self.atmat.loc[self.atmat["atom_pair"]==atom_pair, "energy"].values[0] sigma = self.atmat.loc[self.atmat["atom_pair"]==atom_pair, "exp_aver"].values[0] / 2**(1/6) @@ -258,23 +255,17 @@ def define_special_nonlocal_dict(self): return special_nonlocal_dict def nonlocal_matrix(self): + """ + Calculate the energy values for the atomtype pairs based on the probability values and the p_threshold. + """ + # sc-sc + condition_sc_sc = ~(self.atmat["attype1"].isin(bkbn_attypes) | self.atmat["attype2"].isin(bkbn_attypes)) + self.atmat.loc[condition_sc_sc, "energy"] = np.array(self.regall(self.atmat.loc[condition_sc_sc, "probability"].to_numpy(), 1, self.emax, self.pth)) + # sc-bkbn + condition_sc_bkbn = (self.atmat["attype1"].isin(bkbn_attypes) & ~self.atmat["attype2"].isin(bkbn_attypes)) | (self.atmat["attype2"].isin(bkbn_attypes) & ~self.atmat["attype1"].isin(bkbn_attypes)) + self.atmat.loc[condition_sc_bkbn, "energy"] = np.array(self.regall(self.atmat.loc[condition_sc_bkbn, "probability"].to_numpy(), 1, self.emax_sc_bkbn, self.pth_sc_bkbn)) + # bkbn-bkbn + condition_bkbn_bkbn = self.atmat["attype1"].isin(bkbn_attypes) & self.atmat["attype2"].isin(bkbn_attypes) + self.atmat.loc[ condition_bkbn_bkbn, "energy"] = np.array(self.regall(self.atmat.loc[condition_bkbn_bkbn, "probability"].to_numpy(), 1, self.emax_bkbn, self.pth_bkbn)) - bkbn_pairs = [ "H_H", "O_O", "N_N", "C_C", "CAH_CAH", "CAH2_CAH2", - "O_N", "O_C", "O_CAH","O_CAH2", "O_H", - "N_C","N_CAH", "N_CAH2", - "C_CAH","C_CAH2", - "CAH_CAH2"] - # check that all bkbn_pairs are in the atmat dataframe - for pair in bkbn_pairs: - if pair not in self.atmat["atom_pair"].values: - raise ValueError(f"Atom pair {pair} not found in atmat dataframe.") - - # where bkbn_pairs set probability pth to pth_bkbn and else to pth - self.atmat.loc[self.atmat["atom_pair"].isin(bkbn_pairs), "energy"] = np.array(self.regall(self.atmat.loc[self.atmat["atom_pair"].isin(bkbn_pairs), "probability"].to_numpy(), 1, self.emax_bkbn, self.pth_bkbn)) - self.atmat.loc[~self.atmat["atom_pair"].isin(bkbn_pairs), "energy"] = np.array(self.regall(self.atmat.loc[~self.atmat["atom_pair"].isin(bkbn_pairs), "probability"].to_numpy(), 1, self.emax, self.pth)) - #self.atmat["energy"] = np.array(self.regall(self.atmat["probability"].to_numpy(), 1, self.emax, self.pth)) - self.special_nonlocal_dict = self.define_special_nonlocal_dict() - - - diff --git a/src/multiego/sb_atdhisto_2res.pkl b/src/multiego/sb_atdhisto_2res.pkl new file mode 100644 index 00000000..4af01857 Binary files /dev/null and b/src/multiego/sb_atdhisto_2res.pkl differ diff --git a/src/multiego/sb_atdhisto_3res.pkl b/src/multiego/sb_atdhisto_3res.pkl new file mode 100644 index 00000000..5ab8574e Binary files /dev/null and b/src/multiego/sb_atdhisto_3res.pkl differ diff --git a/src/multiego/scbk_correction_2res.csv b/src/multiego/scbk_correction_2res.csv new file mode 100644 index 00000000..5b8234d5 --- /dev/null +++ b/src/multiego/scbk_correction_2res.csv @@ -0,0 +1,116 @@ +atom_pair sc_type bk_type status x_used n_valid n_proteins raw slope intercept r2 x_mean x_ref delta corrected slope_std corr_std +O_OS OS O ok type 3235 3235 0.338457 0.748159 0.0115597 0.859436 0.403671 0 -0.30201 0.0364473 0.0583883 0.0207783 +O_OM OM O ok type 3293 3293 0.320283 0.487129 -0.0118106 0.896021 0.575403 0 -0.280296 0.039987 0.0183863 0.0118571 +O_OA OA O ok type 3227 3227 0.446498 0.748459 0.017707 0.783153 0.487601 0.000891346 -0.364282 0.0822156 0.0831478 0.0360543 +O_NT NT O ok type 3243 3243 0.384968 0.902877 -0.00446483 0.839681 0.432082 0 -0.384968 0 0.067768 0.0162792 +O_NL NL O ok type 3281 3281 0.209188 0.842326 0.0144024 0.747791 0.266387 0 -0.209188 0 0.131506 0.0163377 +O_NR NR O ok type 3128 3128 0.238691 0.296706 0.0740758 0.543352 0.535405 0 -0.158858 0.0798333 0.0709758 0.0362194 +O_NZ NZ O ok type 3176 3176 0.513853 0.799929 -0.0353962 0.794525 0.752367 0.0479514 -0.513853 0 0.110714 0.0313759 +O_NE NE O ok type 3176 3176 0.168354 0.296139 0.0492543 0.582408 0.431589 0 -0.12781 0.0405444 0.0297324 0.0117905 +O_CR CR O ok type 3234 3234 0.523724 0.78407 -0.0241861 0.941391 0.588541 0.088487 -0.392077 0.131647 0.0301236 0.0178483 +O_CS CS O ok type 3269 3269 0.306479 0.596919 -0.00401502 0.902482 0.455996 0 -0.272192 0.0342865 0.0244412 0.0126718 +O_CZ CZ O ok type 3176 3176 0.372968 0.721886 0.00273188 0.843971 0.530494 0.0132413 -0.372968 0 0.0467363 0.0174397 +O_CH CH O ok type 3234 3234 0.523817 0.540214 -0.0186508 0.949733 0.978633 0.190138 -0.425956 0.0978607 0.024232 0.0185086 +O_CH1 CH1 O ok type 3268 3268 0.716413 0.770695 -0.0177158 0.963499 0.850055 0.00586288 -0.650614 0.0657987 0.0166661 0.0155552 +O_CH1t CH1t O ok type 3162 3162 0.652575 0.984441 0.0443724 0.88216 0.531254 0.0734399 -0.450691 0.201884 0.0798789 0.0352345 +O_CH2 CH2 O ok type 3286 3286 0.650278 1.08421 0.0234324 0.917477 0.476661 0 -0.5168 0.133478 0.0436286 0.0217564 +O_CH2t CH2t O ok type 3247 3247 0.461558 0.800823 0.0504762 0.89855 0.466569 0.107989 -0.287159 0.1744 0.0770807 0.0276185 +O_CAH2 CAH2 O ok type 3218 3218 0.72133 1.25596 0.0188876 0.891053 0.457332 0 -0.57439 0.146939 0.0458781 0.0233917 +O_CH3 CH3 O ok type 3278 3278 0.561369 0.680006 -0.0165601 0.94818 0.784934 0 -0.533759 0.0276093 0.0179421 0.0136004 +O_CH3t CH3t O ok type 1977 1977 0.327612 0.491868 0.00969055 0.853415 0.657969 0 -0.323634 0.00397818 0.0434522 0.0210036 +O_CH2r CH2r O ok type 3139 3139 0.307756 0.607616 0.0390286 0.854558 0.414611 0 -0.251924 0.0558316 0.0417407 0.0159537 +O_S S O skipped: type: 0 proteins < 2; global: 0 proteins < 2 0 0 0 +O_SM SM O ok type 1977 1977 0.348223 0.517461 0.0322096 0.839649 0.638609 0 -0.330455 0.017767 0.0846729 0.0455254 +O_SH SH O ok type 2206 2206 0.674669 0.615813 0.066199 0.760528 0.920983 0 -0.567154 0.107515 0.0607893 0.0513591 +OS_N OS N ok type 3229 3229 0.188479 0.509671 -0.012526 0.588013 0.404421 0 -0.188479 0 0.138853 0.0213449 +OS_C OS C ok type 3235 3235 0.309196 0.695142 0.0181883 0.807176 0.403671 0 -0.280609 0.0285871 0.0950009 0.0291789 +OS_CAH OS CAH ok type 3235 3235 0.283283 0.699822 -0.00329812 0.824065 0.403671 0 -0.282498 0.000784455 0.100639 0.020507 +OS_H OS H ok type 3229 3229 0.473069 1.11642 0.0352904 0.634315 0.404421 0 -0.451504 0.0215649 0.19922 0.0517588 +OM_N OM N ok type 3290 3290 0.233338 0.437992 -0.00943019 0.841089 0.575928 0 -0.233338 0 0.0280528 0.00380255 +OM_C OM C ok type 3293 3293 0.319548 0.529346 -0.0109414 0.922989 0.575403 0 -0.304588 0.0149608 0.0255672 0.0128379 +OM_CAH OM CAH ok type 3292 3292 0.333718 0.56704 -0.00323233 0.938797 0.575578 0 -0.326376 0.0073422 0.0243783 0.0105892 +OM_H OM H ok type 3290 3290 0.670899 1.36939 -0.069745 0.830075 0.575928 0 -0.670899 0 0.104939 0.00181328 +OA_N OA N ok type 3229 3229 0.204525 0.355953 0.0276242 0.731258 0.487299 0 -0.173455 0.0310693 0.0771208 0.025005 +OA_C OA C ok type 3229 3229 0.40897 0.708061 0.0357556 0.858246 0.487299 0 -0.345037 0.0639322 0.088113 0.03719 +OA_CAH OA CAH ok type 3229 3229 0.41706 0.743043 0.0325557 0.916297 0.487299 0 -0.362084 0.0549765 0.0765655 0.0324245 +OA_H OA H ok type 3229 3229 0.385222 0.643066 0.0222074 0.592623 0.487299 0 -0.313365 0.0718572 0.162845 0.0554972 +N_NT NT N ok type 3238 3238 0.239613 0.576845 0.000424946 0.858893 0.432749 0 -0.239613 0 0.0325281 0.00529516 +N_NL NL N ok type 3283 3283 0.1411 0.622124 -0.0285826 0.833208 0.266225 0 -0.1411 0 0.0864259 0.00642929 +N_NR NR N ok type 3129 3129 0.138784 0.216722 0.021922 0.634431 0.535234 0 -0.115997 0.0227874 0.0329044 0.0139529 +N_NZ NZ N ok type 3176 3176 0.36662 0.473692 0.0162128 0.857076 0.752367 0.0479514 -0.333676 0.0329443 0.0258094 0.0176461 +N_NE NE N ok type 3176 3176 0.162747 0.295067 0.0316036 0.65247 0.431589 0 -0.127347 0.0353995 0.0420406 0.017047 +N_CR CR N ok type 3236 3236 0.191899 0.334529 -0.00860072 0.906561 0.588177 0.079925 -0.170025 0.0218738 0.00995902 0.00608309 +N_CS CS N ok type 3261 3261 0.196088 0.466119 -0.0193453 0.910233 0.457114 0 -0.196088 0 0.0340854 0.00235562 +N_CZ CZ N ok type 3176 3176 0.199801 0.3399 0.0178702 0.832638 0.530494 0.0132413 -0.175814 0.0239868 0.015474 0.00784796 +N_CH CH N ok type 3236 3236 0.365493 0.388998 -0.0125341 0.937765 0.978028 0.181396 -0.309888 0.0556049 0.0158289 0.0125008 +N_CH1 CH1 N ok type 3268 3268 0.608765 0.699875 -0.0176521 0.971521 0.850055 0.00586288 -0.590829 0.0179369 0.0209028 0.016221 +N_CH1t CH1t N ok type 3163 3163 0.391346 0.606318 0.0513723 0.856257 0.531086 0.0712107 -0.278831 0.112516 0.0791237 0.0348696 +N_CH2 CH2 N ok type 3283 3283 0.334555 0.628463 0.00384575 0.983717 0.477097 0 -0.299838 0.0347177 0.00784113 0.00552405 +N_CH2t CH2t N ok type 3248 3248 0.290213 0.544831 0.0319382 0.888732 0.466425 0.106655 -0.196014 0.0941987 0.0730147 0.0247172 +N_CAH2 CAH2 N ok type 3219 3219 0.493762 1.05949 -0.0349468 0.936956 0.45719 0 -0.484389 0.00937263 0.0580299 0.0209291 +N_CH3 CH3 N ok type 3279 3279 0.342847 0.446759 -0.01709 0.950039 0.784694 0 -0.342847 0 0.014845 0.00448418 +N_CH3t CH3t N ok type 1977 1977 0.281538 0.482238 -0.0400155 0.870895 0.657969 0 -0.281538 0 0.0508765 0.00966239 +N_CH2r CH2r N ok type 3140 3140 0.198777 0.470816 -0.000631226 0.900088 0.414479 0 -0.195143 0.00363422 0.0335357 0.0113085 +N_S S N skipped: type: 0 proteins < 2; global: 0 proteins < 2 0 0 0 +N_SM SM N ok type 1977 1977 0.198581 0.451413 -0.0903532 0.799224 0.638609 0 -0.198581 0 0.120236 0.0222901 +N_SH SH N ok type 2206 2206 0.345535 0.310447 0.0640155 0.560775 0.920983 0 -0.285916 0.0596188 0.0390872 0.0322389 +NT_C NT C ok type 3244 3244 0.326739 0.749661 0.00500125 0.885904 0.431949 0 -0.323815 0.00292419 0.0392101 0.0102538 +NT_CAH NT CAH ok type 3244 3244 0.394274 0.882978 0.0123006 0.911677 0.431949 0 -0.381401 0.0128726 0.0475017 0.0148724 +NT_H NT H ok type 3238 3238 0.0375508 0.0519212 0.0177073 0.0770227 0.432749 0 -0.0224689 0.0150819 0.0164801 0.00596085 +NL_C NL C ok type 3283 3283 0.162201 0.645449 -0.000388567 0.849656 0.266225 0 -0.162201 0 0.0566766 0.00697573 +NL_CAH NL CAH ok type 3282 3282 0.211686 0.855756 -0.0104787 0.908202 0.266306 0 -0.211686 0 0.0680978 0.00647323 +NL_H NL H ok type 3283 3283 0.00870983 0.0133546 0.00330637 0.0267236 0.266225 0 -0.00355533 0.0051545 0.00524788 0.00163177 +NR_C NR C ok type 3130 3130 0.286132 0.468943 0.0320844 0.849576 0.535063 0 -0.250914 0.035218 0.0240462 0.0123539 +NR_CAH NR CAH ok type 3130 3130 0.347247 0.564822 0.0458512 0.883583 0.535063 0 -0.302215 0.0450318 0.0390656 0.0196268 +NR_H NR H ok type 3129 3129 0.0452208 0.173327 -0.039308 0.35007 0.535234 0 -0.0452208 0 0.0773612 0.0072045 +NZ_C NZ C ok type 3176 3176 0.45563 0.608485 0.00973118 0.864991 0.752367 0.0479514 -0.428626 0.0270035 0.0488014 0.0296058 +NZ_CAH NZ CAH ok type 3176 3176 0.523512 0.676652 0.0216854 0.893078 0.752367 0.0479514 -0.476644 0.0468675 0.0374315 0.0248973 +NZ_H NZ H ok type 3176 3176 0.10713 0.154895 -0.00740695 0.438128 0.752367 0.0479514 -0.10713 0 0.0277655 0.00679604 +NE_C NE C ok type 3176 3176 0.262149 0.472471 0.0438629 0.742392 0.431589 0 -0.203913 0.058236 0.049919 0.0214479 +NE_CAH NE CAH ok type 3176 3176 0.320204 0.597377 0.0511201 0.829562 0.431589 0 -0.257821 0.0623827 0.053964 0.0224144 +NE_H NE H ok type 3176 3176 0.00479021 0.0108316 0.00133577 0.042755 0.431589 0 -0.00467478 0.000115432 0.00717524 0.00102341 +C_CR CR C ok type 3237 3237 0.414627 0.663636 -0.0186492 0.956906 0.587996 0.0689494 -0.344458 0.0701692 0.0207072 0.0117293 +C_CS CS C ok type 3269 3269 0.342951 0.723221 -0.0077052 0.950213 0.455996 0 -0.329786 0.0131655 0.0225699 0.00969238 +C_CZ CZ C ok type 3176 3176 0.356989 0.633118 0.0186013 0.877919 0.530494 0.0132413 -0.327482 0.029507 0.0234739 0.012812 +C_CH CH C ok type 3237 3237 0.502727 0.520062 -0.0142211 0.960329 0.977726 0.179189 -0.415289 0.0874385 0.0159188 0.0124171 +C_CH1 CH1 C ok type 3269 3269 0.60211 0.681642 -0.0123964 0.980237 0.849794 0 -0.579256 0.0228544 0.0110165 0.00970413 +C_CH1t CH1t C ok type 3163 3163 0.485648 0.795765 0.0373409 0.927806 0.531086 0.0712107 -0.365953 0.119695 0.0608237 0.0265956 +C_CH2 CH2 C ok type 3286 3286 0.477481 0.866034 0.00860646 0.9648 0.476661 0 -0.412805 0.0646759 0.0225729 0.0112977 +C_CH2t CH2t C ok type 3249 3249 0.382817 0.680287 0.0453737 0.909374 0.466282 0.103296 -0.246935 0.135882 0.0747326 0.0259771 +C_CAH2 CAH2 C ok type 3219 3219 0.509465 1.02772 -0.0172893 0.934982 0.45719 0 -0.469865 0.0395995 0.0448401 0.0197373 +C_CH3 CH3 C ok type 3280 3280 0.492139 0.616555 -0.0146812 0.959298 0.784455 0 -0.48366 0.00847895 0.0163501 0.0102069 +C_CH3t CH3t C ok type 1979 1979 0.351545 0.591909 -0.0388156 0.892838 0.657304 0 -0.351545 0 0.0651281 0.0166553 +C_CH2r CH2r C ok type 3140 3140 0.251328 0.524851 0.0243761 0.891367 0.414479 0 -0.21754 0.0337881 0.0275891 0.0103339 +C_S S C skipped: type: 0 proteins < 2; global: 0 proteins < 2 0 0 0 +C_SM SM C ok type 1979 1979 0.301692 0.515656 -0.0193066 0.824687 0.637964 0 -0.301692 0 0.102057 0.0406656 +C_SH SH C ok type 2207 2207 0.655583 0.552165 0.114319 0.77653 0.920566 0 -0.508304 0.147279 0.036828 0.0322692 +CR_CAH CR CAH ok type 3237 3237 0.461905 0.734399 -0.00544861 0.968522 0.587996 0.0689494 -0.381187 0.0807188 0.0229814 0.0116718 +CR_H CR H ok type 3236 3236 0.02952 0.0475033 0.00315051 0.310855 0.588177 0.079925 -0.0241436 0.00537634 0.010678 0.00502887 +CS_CAH CS CAH ok type 3269 3269 0.349885 0.765202 -0.013323 0.960403 0.455996 0 -0.348929 0.000956053 0.0245389 0.00730486 +CS_H CS H ok type 3261 3261 0.235489 0.550675 -0.00939291 0.866004 0.457114 0 -0.235489 0 0.0311825 0.00408325 +CZ_CAH CZ CAH ok type 3176 3176 0.347935 0.606005 0.0243386 0.87212 0.530494 0.0132413 -0.313458 0.0344768 0.0317581 0.0143588 +CZ_H CZ H ok type 3176 3176 0.0110181 0.0154453 0.00335468 0.0566879 0.530494 0.0132413 -0.00798912 0.00302896 0.00731786 0.00239709 +CH_CAH CH CAH ok type 3237 3237 0.628025 0.648415 -0.0167045 0.976572 0.977726 0.179189 -0.517784 0.110241 0.0154154 0.0119773 +CH_H CH H ok type 3236 3236 0.100958 0.109551 -0.00222603 0.801005 0.978028 0.181396 -0.0872721 0.0136859 0.00620853 0.00564099 +CH1_CAH CH1 CAH ok type 3269 3269 0.720789 0.831668 -0.0166286 0.986675 0.849794 0 -0.706747 0.0140427 0.0162162 0.0131346 +CH1_H CH1 H ok type 3268 3268 0.153658 0.206751 -0.0205206 0.775975 0.850055 0.00586288 -0.153658 0 0.0228309 0.00473194 +CH1t_CAH CH1t CAH ok type 3163 3163 0.530301 0.837222 0.061667 0.932616 0.531086 0.0712107 -0.385017 0.145284 0.0829037 0.0365792 +CH1t_H CH1t H ok type 3163 3163 0.184877 0.255535 0.0388818 0.529426 0.531086 0.0712107 -0.117514 0.0673629 0.067112 0.02822 +CAH_CH2 CH2 CAH ok type 3286 3286 0.48947 0.929651 0.00693023 0.986307 0.476661 0 -0.443129 0.0463416 0.0143003 0.00713897 +CAH_CH2t CH2t CAH ok type 3249 3249 0.424651 0.807693 0.0316121 0.952634 0.466282 0.103296 -0.293181 0.13147 0.0617901 0.0211582 +CAH_CAH2 CAH2 CAH ok type 3218 3218 0.563507 1.11297 0.00961818 0.960529 0.457332 0 -0.508998 0.0545085 0.0326193 0.0138765 +CAH_CH3 CH3 CAH ok type 3280 3280 0.598742 0.754477 -0.0115017 0.974127 0.784455 0 -0.591853 0.00688878 0.0168323 0.00951461 +CAH_CH3t CH3t CAH ok type 1979 1979 0.458859 0.772317 -0.0496945 0.90291 0.657304 0 -0.458859 0 0.096488 0.0276322 +CAH_CH2r CH2r CAH ok type 3140 3140 0.315435 0.706383 0.0148098 0.945895 0.414479 0 -0.292781 0.0226538 0.0258812 0.00898495 +CAH_S S CAH skipped: type: 0 proteins < 2; global: 0 proteins < 2 0 0 0 +CAH_SM SM CAH ok type 1979 1979 0.347789 0.625876 -0.0455488 0.836936 0.637964 0 -0.347789 0 0.127765 0.0436574 +CAH_SH SH CAH ok type 2207 2207 0.727548 0.638891 0.114011 0.788525 0.920566 0 -0.588141 0.139407 0.0722647 0.0604501 +CH2_H CH2 H ok type 3283 3283 0.119528 0.255008 -0.00494892 0.85333 0.477097 0 -0.119528 0 0.0186766 0.00371906 +CH2t_H CH2t H ok type 3248 3248 0.117275 0.207619 0.0200208 0.698815 0.466425 0.106655 -0.074695 0.0425799 0.0393005 0.0133286 +CAH2_H CAH2 H ok type 3218 3218 0.524109 1.03637 -0.0270342 0.891989 0.457332 0 -0.473965 0.0501442 0.0521354 0.0231841 +CH3_H CH3 H ok type 3279 3279 0.133064 0.183442 -0.00699878 0.852597 0.784694 0 -0.133064 0 0.0097471 0.00126411 +CH3t_H CH3t H ok type 1977 1977 0.139977 0.262586 -0.0333759 0.670444 0.657969 0 -0.139977 0 0.0605477 0.0156175 +CH2r_H CH2r H ok type 3140 3140 0.107019 0.287993 -0.0174167 0.816333 0.414479 0 -0.107019 0 0.0450619 0.0091275 +S_H S H skipped: type: 0 proteins < 2; global: 0 proteins < 2 0 0 0 +SM_H SM H ok type 1977 1977 0.0435934 0.140184 -0.0491278 0.491308 0.638609 0 -0.0435934 0 0.0560231 0.0078235 +SH_H SH H ok type 2206 2206 0.168544 0.0677114 0.0902162 0.0393973 0.920983 0 -0.062361 0.106183 0.0316656 0.0269516 diff --git a/src/multiego/scbk_correction_3res.csv b/src/multiego/scbk_correction_3res.csv new file mode 100644 index 00000000..7903246c --- /dev/null +++ b/src/multiego/scbk_correction_3res.csv @@ -0,0 +1,116 @@ +atom_pair sc_type bk_type status x_used n_valid n_proteins raw slope intercept r2 x_mean x_ref delta corrected slope_std corr_std +O_OS OS O ok type 3229 3229 0.287777 0.760384 0.0101627 0.849786 0.334597 0 -0.254422 0.0333549 0.0418875 0.0131362 +O_OM OM O ok type 3291 3291 0.2637 0.453231 -0.00381261 0.867536 0.484389 0 -0.21954 0.04416 0.0181038 0.0115516 +O_OA OA O ok type 3226 3226 0.338883 0.589327 0.0344245 0.750914 0.428835 0 -0.252724 0.0861588 0.0861657 0.035563 +O_NT NT O ok type 3238 3238 0.35758 0.938147 0.00120117 0.838427 0.37383 0 -0.350708 0.00687252 0.0632375 0.0153672 +O_NL NL O ok type 3274 3274 0.195844 0.881752 0.0118279 0.773551 0.236428 0 -0.195844 0 0.120761 0.0133296 +O_NR NR O ok type 3127 3127 0.220941 0.281016 0.0708 0.495344 0.509306 0 -0.143123 0.0778173 0.0796287 0.039221 +O_NZ NZ O ok type 3176 3176 0.496538 0.873637 -0.0408772 0.825429 0.650257 0 -0.496538 0 0.102638 0.0173306 +O_NE NE O ok type 3176 3176 0.159291 0.31335 0.0437142 0.602095 0.386524 0 -0.121117 0.0381739 0.0304624 0.0115694 +O_CR CR O ok type 3231 3231 0.391011 0.648992 -0.0159297 0.934569 0.553859 0.00119067 -0.358677 0.0323342 0.0320115 0.0186362 +O_CS CS O ok type 3261 3261 0.249648 0.559065 0.00545591 0.871596 0.380344 0 -0.212637 0.0370113 0.0269823 0.0110789 +O_CZ CZ O ok type 3176 3176 0.354243 0.756252 0.00627397 0.847523 0.462399 0 -0.34969 0.00455325 0.0356197 0.0146732 +O_CH CH O ok type 3231 3231 0.482656 0.513272 -0.00963417 0.944542 0.936341 0.106501 -0.425934 0.0567213 0.0238138 0.0187157 +O_CH1 CH1 O ok type 3263 3263 0.527512 0.637991 -0.0127551 0.959171 0.766599 0 -0.489083 0.0384291 0.0198133 0.0165195 +O_CH1t CH1t O ok type 3162 3162 0.45044 0.791995 0.0525287 0.867408 0.443948 0 -0.351605 0.0988349 0.0680034 0.0284685 +O_CH2 CH2 O ok type 3283 3283 0.431925 0.852767 0.0187731 0.944984 0.408768 0 -0.348584 0.083341 0.027195 0.0128909 +O_CH2t CH2t O ok type 3245 3245 0.360049 0.70178 0.0527709 0.903719 0.406181 0.068814 -0.236757 0.123292 0.0758344 0.0244674 +O_CAH2 CAH2 O ok type 3219 3219 0.490514 1.07057 0.00315917 0.901511 0.382749 0 -0.409759 0.0807549 0.047511 0.0185534 +O_CH3 CH3 O ok type 3276 3276 0.462083 0.608962 -0.0143744 0.958071 0.733563 0 -0.446713 0.0153709 0.0179393 0.0122441 +O_CH3t CH3t O ok type 1975 1975 0.310347 0.512439 -0.00124147 0.853079 0.610421 0 -0.310347 0 0.046869 0.0199423 +O_CH2r CH2r O ok type 3140 3140 0.256622 0.60032 0.0198743 0.880402 0.374037 0 -0.224542 0.0320804 0.0311403 0.0110118 +O_S S O skipped: type: 0 proteins < 2; global: 0 proteins < 2 0 0 0 +O_SM SM O ok type 1975 1975 0.325111 0.504602 0.0346629 0.834151 0.586467 0 -0.295933 0.029178 0.0898698 0.0470301 +O_SH SH O ok type 2205 2205 0.605028 0.607753 0.0394629 0.780031 0.882471 0 -0.536324 0.068704 0.0631052 0.047863 +OS_N OS N ok type 3215 3215 0.12004 0.410263 -0.00658595 0.536978 0.336054 0 -0.12004 0 0.119658 0.0150908 +OS_C OS C ok type 3230 3230 0.258718 0.712146 0.0123598 0.843731 0.334493 0 -0.238208 0.0205098 0.0715837 0.0191642 +OS_CAH OS CAH ok type 3230 3230 0.203969 0.672597 -0.0160725 0.827979 0.334493 0 -0.203969 0 0.0917078 0.0086985 +OS_H OS H ok type 3215 3215 0.278547 0.791094 0.0566004 0.499024 0.336054 0 -0.26585 0.0126971 0.160097 0.0328382 +OM_N OM N ok type 3283 3283 0.146733 0.326189 0.000879581 0.776119 0.48557 0 -0.146733 0 0.0205422 0.00298993 +OM_C OM C ok type 3291 3291 0.26744 0.51416 -0.00693681 0.915901 0.484389 0 -0.249054 0.0183867 0.0251806 0.0121594 +OM_CAH OM CAH ok type 3290 3290 0.222703 0.466367 -0.00196259 0.92199 0.484536 0 -0.222703 0 0.0145855 0.00349142 +OM_H OM H ok type 3283 3283 0.40864 0.986877 -0.000385996 0.761913 0.48557 0 -0.40864 0 0.0592278 0.00123926 +OA_N OA N ok type 3226 3226 0.118595 0.276011 0.0148363 0.760438 0.428835 0 -0.118363 0.000231662 0.0442513 0.0070159 +OA_C OA C ok type 3227 3227 0.310008 0.587916 0.0456582 0.844708 0.428702 0 -0.252041 0.0579668 0.0869279 0.0332252 +OA_CAH OA CAH ok type 3227 3227 0.27921 0.578346 0.0405285 0.902916 0.428702 0 -0.247939 0.0312713 0.0636659 0.0214305 +OA_H OA H ok type 3226 3226 0.142484 0.37009 0.00782503 0.668925 0.428835 0 -0.142484 0 0.0381381 0.00156662 +N_NT NT N ok type 3223 3223 0.186759 0.548307 -0.00465021 0.827146 0.37557 0 -0.186759 0 0.0349784 0.00236157 +N_NL NL N ok type 3282 3282 0.122374 0.635939 -0.0275838 0.830192 0.235852 0 -0.122374 0 0.0910294 0.0048302 +N_NR NR N ok type 3127 3127 0.117994 0.194591 0.0232827 0.597812 0.509306 0 -0.0991063 0.0188877 0.0321941 0.0130076 +N_NZ NZ N ok type 3175 3175 0.291133 0.458035 0.0116824 0.826613 0.650462 0 -0.291133 0 0.023891 0.0079513 +N_NE NE N ok type 3175 3175 0.118558 0.267111 0.0220508 0.646514 0.386646 0 -0.103277 0.0152803 0.0300179 0.00917863 +N_CR CR N ok type 3233 3233 0.165933 0.314501 -0.00683798 0.892044 0.553516 0 -0.165933 0 0.00689549 0.00082259 +N_CS CS N ok type 3247 3247 0.115228 0.34095 -0.00802242 0.843513 0.381984 0 -0.115228 0 0.0289433 0.00101582 +N_CZ CZ N ok type 3175 3175 0.145733 0.298935 0.0179574 0.777756 0.462544 0 -0.138271 0.0074626 0.0210708 0.00593672 +N_CH CH N ok type 3233 3233 0.335949 0.370808 -0.00532331 0.925466 0.935762 0.0798518 -0.317378 0.0185714 0.0153847 0.0121553 +N_CH1 CH1 N ok type 3266 3266 0.464119 0.613388 -0.0191746 0.943997 0.765894 0 -0.464119 0 0.0268984 0.0114795 +N_CH1t CH1t N ok type 3162 3162 0.25272 0.528148 0.0296649 0.825793 0.443948 0 -0.23447 0.0182491 0.0454023 0.0126552 +N_CH2 CH2 N ok type 3283 3283 0.205118 0.483153 0.000254904 0.930276 0.408768 0 -0.197498 0.00762074 0.0118805 0.00602853 +N_CH2t CH2t N ok type 3244 3244 0.202888 0.454606 0.0288373 0.84225 0.406135 0.0688118 -0.153349 0.0495385 0.0713181 0.0225113 +N_CAH2 CAH2 N ok type 3219 3219 0.348774 0.943076 -0.0361807 0.916537 0.382749 0 -0.348774 0 0.0657468 0.0122475 +N_CH3 CH3 N ok type 3276 3276 0.265089 0.399796 -0.0217113 0.932804 0.733563 0 -0.265089 0 0.017614 0.0004685 +N_CH3t CH3t N ok type 1975 1975 0.252337 0.486884 -0.0475674 0.842262 0.610421 0 -0.252337 0 0.0708256 0.0140341 +N_CH2r CH2r N ok type 3139 3139 0.164735 0.4289 0.00288934 0.876544 0.374156 0 -0.160476 0.00425932 0.0297518 0.00910776 +N_S S N skipped: type: 0 proteins < 2; global: 0 proteins < 2 0 0 0 +N_SM SM N ok type 1975 1975 0.168147 0.388777 -0.0557813 0.753996 0.586467 0 -0.168147 0 0.112722 0.0277596 +N_SH SH N ok type 2203 2203 0.29805 0.263946 0.0742924 0.491056 0.883272 0 -0.233136 0.0649139 0.0368803 0.0294054 +NT_C NT C ok type 3238 3238 0.288153 0.763259 0.00601718 0.875152 0.37383 0 -0.285329 0.00282378 0.0476507 0.0102636 +NT_CAH NT CAH ok type 3238 3238 0.311679 0.827089 0.0111793 0.909902 0.37383 0 -0.309191 0.00248765 0.0406645 0.00922364 +NT_H NT H ok type 3223 3223 0.026988 0.0426441 0.0163976 0.0698825 0.37557 0 -0.0160158 0.0109722 0.0153552 0.00477184 +NL_C NL C ok type 3282 3282 0.152353 0.652928 0.00319698 0.846661 0.235852 0 -0.152353 0 0.0633169 0.00941208 +NL_CAH NL CAH ok type 3281 3281 0.179979 0.847719 -0.0129344 0.898811 0.235924 0 -0.179979 0 0.0766487 0.00576896 +NL_H NL H ok type 3281 3281 0.00645922 0.0138236 0.00223546 0.0287175 0.235924 0 -0.00326131 0.00319791 0.00598603 0.00143603 +NR_C NR C ok type 3127 3127 0.261969 0.460189 0.0272123 0.82908 0.509306 0 -0.234377 0.0275914 0.0227658 0.0108292 +NR_CAH NR CAH ok type 3127 3127 0.315578 0.564483 0.0330551 0.884804 0.509306 0 -0.287495 0.0280837 0.035907 0.0159766 +NR_H NR H ok type 3127 3127 0.0285182 0.104021 -0.0155544 0.239411 0.509306 0 -0.0285182 0 0.0400589 0.00351755 +NZ_C NZ C ok type 3176 3176 0.42196 0.654085 -0.000864539 0.875286 0.650257 0 -0.42196 0 0.0386835 0.0163048 +NZ_CAH NZ CAH ok type 3176 3176 0.437681 0.677454 0.00957039 0.891635 0.650257 0 -0.437681 0 0.0314928 0.0133058 +NZ_H NZ H ok type 3175 3175 0.101873 0.170755 -0.0108642 0.431214 0.650462 0 -0.101873 0 0.03421 0.00493719 +NE_C NE C ok type 3176 3176 0.22714 0.480915 0.0323953 0.774029 0.386524 0 -0.185885 0.0412549 0.0472614 0.0177795 +NE_CAH NE CAH ok type 3176 3176 0.236066 0.541129 0.033143 0.847778 0.386524 0 -0.209159 0.0269068 0.0387869 0.0130114 +NE_H NE H ok type 3175 3175 0.004618 0.0121824 0.00101125 0.0462943 0.386646 0 -0.004618 0 0.00884648 0.000981291 +C_CR CR C ok type 3233 3233 0.329228 0.581797 -0.014135 0.946908 0.553516 0 -0.322034 0.00719391 0.0206449 0.0102274 +C_CS CS C ok type 3262 3262 0.248219 0.644892 -0.00386969 0.949279 0.380227 0 -0.245206 0.00301369 0.0238702 0.00685481 +C_CZ CZ C ok type 3176 3176 0.309126 0.629417 0.0187033 0.876298 0.462399 0 -0.291042 0.0180848 0.0195949 0.00938744 +C_CH CH C ok type 3233 3233 0.474858 0.504161 -0.00730264 0.95694 0.935762 0.0798518 -0.431517 0.0433413 0.0156589 0.0135033 +C_CH1 CH1 C ok type 3267 3267 0.473289 0.608337 -0.0111018 0.974636 0.76566 0 -0.465779 0.00750974 0.013836 0.00961412 +C_CH1t CH1t C ok type 3162 3162 0.373365 0.722952 0.0381496 0.907248 0.443948 0 -0.320953 0.0524121 0.054306 0.0212549 +C_CH2 CH2 C ok type 3284 3284 0.330936 0.731938 0.00291356 0.981879 0.408644 0 -0.299102 0.031834 0.00974592 0.00510469 +C_CH2t CH2t C ok type 3246 3246 0.304806 0.619911 0.042957 0.90861 0.406056 0.0632834 -0.212488 0.0923178 0.0761721 0.0249339 +C_CAH2 CAH2 C ok type 3219 3219 0.368489 0.948472 -0.0298443 0.924779 0.382749 0 -0.363027 0.00546269 0.0558744 0.0158908 +C_CH3 CH3 C ok type 3277 3277 0.410888 0.565574 -0.0153429 0.964049 0.73334 0 -0.410888 0 0.0145619 0.00588914 +C_CH3t CH3t C ok type 1975 1975 0.325333 0.596412 -0.042045 0.891562 0.610421 0 -0.325333 0 0.0653421 0.0144457 +C_CH2r CH2r C ok type 3140 3140 0.214502 0.526641 0.0104141 0.897202 0.374037 0 -0.196984 0.017519 0.0265895 0.00950374 +C_S S C skipped: type: 0 proteins < 2; global: 0 proteins < 2 0 0 0 +C_SM SM C ok type 1975 1975 0.280387 0.507889 -0.0150019 0.821819 0.586467 0 -0.280387 0 0.101296 0.0381382 +C_SH SH C ok type 2205 2205 0.570244 0.514685 0.0973793 0.761633 0.882471 0 -0.454195 0.116049 0.0448918 0.0369377 +CR_CAH CR CAH ok type 3233 3233 0.372409 0.6537 -0.00355044 0.955143 0.553516 0 -0.361834 0.010575 0.0264155 0.0123799 +CR_H CR H ok type 3232 3232 0.0203709 0.0356447 0.00465419 0.211468 0.553687 0 -0.019736 0.000634818 0.00797896 0.00232507 +CS_CAH CS CAH ok type 3262 3262 0.239762 0.649904 -0.00838477 0.955964 0.380227 0 -0.239762 0 0.0251013 0.00333174 +CS_H CS H ok type 3247 3247 0.134649 0.374511 0.007805 0.771356 0.381984 0 -0.134649 0 0.0232655 0.00229349 +CZ_CAH CZ CAH ok type 3176 3176 0.281242 0.57882 0.0194007 0.879646 0.462399 0 -0.267646 0.013596 0.0235196 0.00878251 +CZ_H CZ H ok type 3175 3175 0.0102461 0.0166864 0.00310403 0.0553308 0.462544 0 -0.0077182 0.00252788 0.00978286 0.00231973 +CH_CAH CH CAH ok type 3233 3233 0.588061 0.628217 -0.00956301 0.972649 0.935762 0.0798518 -0.537698 0.0503632 0.0156214 0.0132482 +CH_H CH H ok type 3232 3232 0.0925545 0.10588 -0.0010173 0.77632 0.936052 0.103899 -0.0881081 0.00444638 0.00781397 0.00488675 +CH1_CAH CH1 CAH ok type 3267 3267 0.59462 0.7739 -0.01653 0.981524 0.76566 0 -0.592544 0.00207562 0.02028 0.0112798 +CH1_H CH1 H ok type 3266 3266 0.142871 0.212976 -0.0233759 0.776073 0.765894 0 -0.142871 0 0.0247581 0.00517374 +CH1t_CAH CH1t CAH ok type 3162 3162 0.407167 0.776116 0.0536067 0.915964 0.443948 0 -0.344555 0.0626114 0.0695241 0.0282236 +CH1t_H CH1t H ok type 3162 3162 0.0827902 0.154102 0.025805 0.480097 0.443948 0 -0.0684135 0.0143768 0.0336962 0.00964916 +CAH_CH2 CH2 CAH ok type 3284 3284 0.353884 0.811066 0.00129614 0.988854 0.408644 0 -0.331437 0.0224477 0.00911982 0.00436083 +CAH_CH2t CH2t CAH ok type 3246 3246 0.320068 0.722792 0.0268668 0.946766 0.406056 0.0632834 -0.247753 0.0723149 0.0565933 0.0185786 +CAH_CAH2 CAH2 CAH ok type 3218 3218 0.393054 0.991004 0.000502131 0.94433 0.382868 0 -0.379424 0.0136306 0.0443131 0.0144676 +CAH_CH3 CH3 CAH ok type 3277 3277 0.493608 0.689219 -0.0119703 0.973542 0.73334 0 -0.493608 0 0.0148833 0.00250692 +CAH_CH3t CH3t CAH ok type 1975 1975 0.414154 0.752432 -0.0445642 0.907242 0.610421 0 -0.414154 0 0.0844919 0.0202963 +CAH_CH2r CH2r CAH ok type 3140 3140 0.266426 0.670873 0.0113273 0.944656 0.374037 0 -0.250932 0.0154939 0.01994 0.00744193 +CAH_S S CAH skipped: type: 0 proteins < 2; global: 0 proteins < 2 0 0 0 +CAH_SM SM CAH ok type 1975 1975 0.295319 0.586234 -0.0426 0.832469 0.586467 0 -0.295319 0 0.12474 0.0382079 +CAH_SH SH CAH ok type 2205 2205 0.61612 0.607275 0.0736003 0.775035 0.882471 0 -0.535902 0.0802176 0.0767803 0.0569682 +CH2_H CH2 H ok type 3282 3282 0.0846638 0.195989 0.000513102 0.809493 0.408893 0 -0.0801384 0.00452536 0.0121222 0.00485384 +CH2t_H CH2t H ok type 3244 3244 0.0734927 0.150699 0.0162596 0.632399 0.406135 0.0688118 -0.0508342 0.0226585 0.023478 0.00734001 +CAH2_H CAH2 H ok type 3218 3218 0.340697 0.859947 -0.0346698 0.897674 0.382868 0 -0.329246 0.0114508 0.0523548 0.0170697 +CH3_H CH3 H ok type 3276 3276 0.123833 0.184744 -0.00993754 0.848121 0.733563 0 -0.123833 0 0.0111071 0.00152515 +CH3t_H CH3t H ok type 1975 1975 0.133346 0.277585 -0.039057 0.67397 0.610421 0 -0.133346 0 0.0664146 0.0150448 +CH2r_H CH2r H ok type 3139 3139 0.0784307 0.207026 0.000109144 0.733157 0.374156 0 -0.0774601 0.000970619 0.0228611 0.0061344 +S_H S H skipped: type: 0 proteins < 2; global: 0 proteins < 2 0 0 0 +SM_H SM H ok type 1975 1975 0.0313685 0.140588 -0.0563797 0.49121 0.586467 0 -0.0313685 0 0.0638791 0.00584432 +SH_H SH H ok type 2203 2203 0.0974001 0.0411607 0.0585578 0.0248313 0.883272 0 -0.0363561 0.0610441 0.0231492 0.0181354 diff --git a/src/multiego/type_definitions.py b/src/multiego/type_definitions.py index 6dc263f4..ede65635 100644 --- a/src/multiego/type_definitions.py +++ b/src/multiego/type_definitions.py @@ -45,6 +45,7 @@ { "name": [ "O", + "OS", "OM", "OA", "N", @@ -62,8 +63,10 @@ "CH1t", "CAH", "CH2", + "CH2t", "CAH2", "CH3", + "CH3t", "CH2r", "S", "SM", @@ -75,9 +78,10 @@ "H", "C0", ], - "at.num": [8, 8, 8, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 16, 16, 16, 6, 15, 8, 6, 1, 20], + "at.num": [8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 16, 16, 16, 6, 15, 8, 6, 1, 20], "rc_c12": [ 2.5 * 0.262134**12, # "O", 2.631580e-07 + 2.5 * 0.262134**12, # "OS", 2.631580e-07 2.5 * 0.253061**12, # "OM", 1.724403e-07 2.5 * 0.276621**12, # "OA", 5.018430e-07 2.5 * 0.289746**12, # "N", 8.752940e-07 @@ -97,6 +101,8 @@ 2.5 * 0.368035**12, # "CH2", 1.543890e-05 2.5 * 0.368035**12, # "CAH2",1.543890e-05 2.5 * 0.350505**12, # "CH3", 8.595562e-06 + 2.5 * 0.350505**12, # "CH3t", 8.595562e-06 + 2.5 * 0.368035**12, # "CH2t",1.543890e-05 2.5 * 0.360236**12, # "CH2r",1.193966e-05 2.5 * 0.318498**12, # "S", 2.724050e-06 2.5 * 0.318498**12, # "SM", 2.724050e-06 @@ -111,6 +117,7 @@ # all to ch2 except ch e ch3 "mg_c12": [ 4.0 * 0.27601**12 * eps_O, # "O", sig=0.27601 + 4.0 * 0.27601**12 * eps_O, # "OS", sig=0.27601 4.0 * 0.26259**12 * eps_OM, # "OM", sig=0.26259 4.0 * 0.29548**12 * eps_OA, # "OA", sig=0.29548 4.0 * 0.31365**12 * eps_N, # "N", sig=0.31365 @@ -128,8 +135,10 @@ 4.0 * 0.44592**12 * eps_CH1t, # "CH1t", sig=0.50192 4.0 * 0.44592**12 * eps_CAH, # "CAH", sig=0.50192 4.0 * 0.40704**12 * eps_CH2, # "CH2", sig=0.40704 + 4.0 * 0.40704**12 * eps_CH2, # "CH2t", sig=0.40704 4.0 * 0.40704**12 * eps_CAH2, # "CAH2", sig=0.40704 4.0 * 0.37479**12 * eps_CH3, # "CH3", sig=0.37479 + 4.0 * 0.37479**12 * eps_CH3, # "CH3t", sig=0.37479 4.0 * 0.39547**12 * eps_CH2r, # "CH2r", sig=0.39547 4.0 * 0.33077**12 * eps_S, # "S", sig=0.33077 4.0 * 0.33077**12 * eps_S, # "S", sig=0.33077 @@ -143,6 +152,7 @@ ], "mg_c6": [ 4.0 * 0.27601**6 * eps_O, # "O", + 4.0 * 0.27601**6 * eps_O, # "OS", 4.0 * 0.26259**6 * eps_OM, # "OM", 4.0 * 0.29548**6 * eps_OA, # "OA", 4.0 * 0.31365**6 * eps_N, # "N", @@ -160,8 +170,10 @@ 4.0 * 0.44592**6 * eps_CH1t, # "CH1t" 4.0 * 0.44592**6 * eps_CAH, # "CAH" 4.0 * 0.40704**6 * eps_CH2, # "CH2" + 4.0 * 0.40704**6 * eps_CH2, # "CH2t" 4.0 * 0.40704**6 * eps_CAH2, # "CAH2" 4.0 * 0.37479**6 * eps_CH3, # "CH3" + 4.0 * 0.37479**6 * eps_CH3, # "CH3t" 4.0 * 0.39547**6 * eps_CH2r, # "CH2r" 4.0 * 0.33077**6 * eps_S, # "S", 4.0 * 0.33077**6 * eps_S, # "S", @@ -352,7 +364,7 @@ if not os.path.exists(_csv_path): _csv_path = os.path.join(_this_dir, "..", "src", "multiego", "Minimum_CUTOFF_Manual_modif.csv") try: - _c12_df = pd.read_csv(_csv_path, sep="\s+") + _c12_df = pd.read_csv(_csv_path, sep=r'\s+') except Exception: # If file not found or parsing fails, expose an empty list so other code @@ -362,15 +374,27 @@ "Please ensure the file exists and is formatted correctly." ) +# Energies of atomtype interaction matrix +SCALE = 1 +EMAX = 0.19 * SCALE +EMAX_SC_BKBN = 0.16 * SCALE +EMAX_BKBN = 0.20 * SCALE +# Threshold probability for contact matrix, they define the energy scaling and rep vs attraction atomtype itneraction +P_TH = 0.5/2 +P_TH_SC_BKBN = 0.015 +P_TH_BKBN = 0.5/2 +# OM atomtype scaling factor. Probability is reduced by a factor to account for the protonation simmetry-breaking that can be found in protein cores +OM_SCALEDOWN = 1 -EMAX = 0.14 #maximum epsilon value for the colorbar in the interaction matrix plot -P_TH = 0.55#0.65#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 -EMAX_BKBN = EMAX -P_TH_BKBN = 0.35 -SHOW = False # if SHOW is True the interaction matrix will be plotted and saved in the current directory +SHOW = False PKL = "atdhisto.pkl" -matrix = InteractionMatrix(pkl_file=PKL, emax = EMAX, c12_rep_df = _c12_df, pth=P_TH, pth_bkbn=P_TH_BKBN, show=SHOW, emax_bkbn=EMAX_BKBN) +# PKL = "atdhisto_nosimm.pkl" + +PKL_SB = "sb_atdhisto_3res.pkl" +R2_CORR_SB_= "scbk_correction_3res.csv" # Correction for sc-bkbn interactions # TODO merge the r2 in pkl file or viceversa +# PKL_SB = None#"atdhisto_sb.pkl" +matrix = InteractionMatrix(pkl_file=PKL, emax = EMAX, c12_rep_df = _c12_df, pth=P_TH, pth_bkbn=P_TH_BKBN, show=SHOW, emax_bkbn=EMAX_BKBN, pth_sc_bkbn=P_TH_SC_BKBN, emax_sc_bkbn=EMAX_SC_BKBN, om_scaledown=OM_SCALEDOWN, pkl_file2=PKL_SB, r2_corr_sb=R2_CORR_SB_) special_non_local = matrix.special_nonlocal_dict # Verify that every attractive special interaction carries an epsilon at least