diff --git a/multi-ego-basic.ff/aminoacids.rtp b/multi-ego-basic.ff/aminoacids.rtp index e9ff6c39..50daed1f 100644 --- a/multi-ego-basic.ff/aminoacids.rtp +++ b/multi-ego-basic.ff/aminoacids.rtp @@ -58,7 +58,7 @@ N N 0.000 0 H H 0.000 0 CA CAH 0.000 0 - CB CH3 0.000 0 + CB CH3b 0.000 0 C C 0.000 0 O O 0.000 0 [ bonds ] @@ -98,7 +98,7 @@ N N 0.000 0 H H 0.000 0 CA CAH 0.000 0 - CB CH2 0.000 0 + CB CH2b 0.000 0 CG CH2 0.000 0 CD CH2t 0.000 0 NE NE 0.000 0 @@ -162,7 +162,7 @@ N N 0.000 0 H H 0.000 0 CA CAH 0.000 0 - CB CH2 0.000 0 + CB CH2b 0.000 0 CG CS 0.000 0 OD1 OS 0.000 0 ND2 NT 0.000 0 @@ -215,7 +215,7 @@ N N 0.000 0 H H 0.000 0 CA CAH 0.000 0 - CB CH2 0.000 0 + CB CH2b 0.000 0 CG CS 0.000 0 OD1 OM 0.000 0 OD2 OM 0.000 0 @@ -354,7 +354,7 @@ N N 0.000 0 H H 0.000 0 CA CAH 0.000 0 - CB CH2 0.000 0 + CB CH2b 0.000 0 CG CH2 0.000 0 CD CS 0.000 0 OE1 OS 0.000 0 @@ -410,7 +410,7 @@ N N 0.000 0 H H 0.000 0 CA CAH 0.000 0 - CB CH2 0.000 0 + CB CH2b 0.000 0 CG CH2 0.000 0 CD CS 0.000 0 OE1 OM 0.000 0 @@ -499,7 +499,7 @@ N N 0.000 0 H H 0.000 0 CA CAH 0.000 0 - CB CH2 0.000 0 + CB CH2b 0.000 0 CG CR 0.000 0 ND1 NR 0.000 0 CD2 CH 0.000 0 @@ -566,7 +566,7 @@ N N 0.000 0 H H 0.000 0 CA CAH 0.000 0 - CB CH1 0.000 0 + CB CH1b 0.000 0 CG1 CH2 0.000 0 CG2 CH3 0.000 0 CD CH3 0.000 0 @@ -619,7 +619,7 @@ N N 0.000 0 H H 0.000 0 CA CAH 0.000 0 - CB CH2 0.000 0 + CB CH2b 0.000 0 CG CH1 0.000 0 CD1 CH3 0.000 0 CD2 CH3 0.000 0 @@ -671,7 +671,7 @@ N N 0.000 0 H H 0.000 0 CA CAH 0.000 0 - CB CH2 0.000 0 + CB CH2b 0.000 0 CG CH2 0.000 0 CD CH2 0.000 0 CE CH2t 0.000 0 @@ -727,7 +727,7 @@ N N 0.000 0 H H 0.000 0 CA CAH 0.000 0 - CB CH2 0.000 0 + CB CH2b 0.000 0 CG CH2 0.000 0 SD SM 0.000 0 CE CH3t 0.000 0 @@ -778,7 +778,7 @@ N N 0.000 0 H H 0.000 0 CA CAH 0.000 0 - CB CH2 0.000 0 + CB CH2b 0.000 0 CG CR 0.000 0 CD1 CH 0.000 0 CD2 CH 0.000 0 @@ -991,7 +991,7 @@ N N 0.000 0 H H 0.000 0 CA CAH 0.000 0 - CB CH2 0.000 0 + CB CH2b 0.000 0 CG CR 0.000 0 CD1 CH 0.000 0 CD2 CR 0.000 0 @@ -1083,7 +1083,7 @@ N N 0.000 0 H H 0.000 0 CA CAH 0.000 0 - CB CH2 0.000 0 + CB CH2b 0.000 0 CG CR 0.000 0 CD1 CH 0.000 0 CD2 CH 0.000 0 @@ -1159,7 +1159,7 @@ N N 0.000 0 H H 0.000 0 CA CAH 0.000 0 - CB CH1 0.000 0 + CB CH1b 0.000 0 CG1 CH3 0.000 0 CG2 CH3 0.000 0 C C 0.000 0 diff --git a/multi-ego-basic.ff/atomtypes.atp b/multi-ego-basic.ff/atomtypes.atp index 5839cc08..55d8c665 100644 --- a/multi-ego-basic.ff/atomtypes.atp +++ b/multi-ego-basic.ff/atomtypes.atp @@ -17,12 +17,15 @@ CS 12.01100 ; aromatic C CAH 12.01100 ; aliphatic or sugar CH-group CH1 13.01900 ; aliphatic or sugar CH-group + CH1b 13.01900 ; aliphatic or sugar CH-group CH1t 13.01900 ; aliphatic or sugar CH-group CH2 14.02700 ; aliphatic or sugar CH2-group + CH2b 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 + CH3b 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 4d2648a5..5841872d 100644 --- a/multi-ego-basic.ff/ffnonbonded.itp +++ b/multi-ego-basic.ff/ffnonbonded.itp @@ -18,12 +18,15 @@ H 1 0.000 0.000 A 0.0000000000 3.239247e-09 CAH 6 0.000 0.000 A 0.0000000000 6.555574e-05 CH1 6 0.000 0.000 A 0.0000000000 6.555574e-05 + CH1b 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 + CH2b 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 + CH3b 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 c12133b4..e4bfcce2 100644 --- a/src/multiego/Minimum_CUTOFF_Manual_modif.csv +++ b/src/multiego/Minimum_CUTOFF_Manual_modif.csv @@ -1,6 +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 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 @@ -15,13 +15,16 @@ O CS 7.013840414318058e-07 4.339756224213911e-07 8.269390364517911e-07 # O CZ 8.454178454694858e-07 0.0 8.269390364517911e-07 #atdhisto_c12 O CH 9.271725969950735e-07 7.703205086354507e-07 8.269390364517911e-07 #atdhisto_c12 O CH1 1.4558184529108867e-06 1.59011205135462e-06 4.153527511548878e-06 #atdhisto_c12 +O CH1b 1.4558184529108867e-06 1.59011205135462e-06 4.153527511548878e-06 #atdhisto_c12 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 CH2b 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 CH3b 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 @@ -42,13 +45,16 @@ OS CS 7.013840414318058e-07 4.339756224213911e-07 8.269390364517911e-07 # 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 CH1b 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 CH2b 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 CH3b 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 @@ -68,13 +74,16 @@ OM CS 9.271725969950735e-07 1.0115434594394737e-07 6.693984235369761e-07 # OM CZ 7.013840414318058e-07 0.0 6.693984235369761e-07 #atdhisto_c12 OM CH 7.013840414318058e-07 9.05167362258012e-08 6.693984235369761e-07 #atdhisto_c12 OM CH1 2.448580108078591e-06 1.3319957855440268e-06 3.3622366895124407e-06 #atdhisto_c12 +OM CH1b 2.448580108078591e-06 1.3319957855440268e-06 3.3622366895124407e-06 #atdhisto_c12 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 CH2b 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 CH3b 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 @@ -93,13 +102,16 @@ OA CS 7.013840414318058e-07 0.0 1.1419425300144831e-06 # OA CZ 1.1128214538294811e-06 0.0 1.1419425300144831e-06 #atdhisto_c12 OA CH 9.271725969950735e-07 0.0 1.1419425300144831e-06 #atdhisto_c12 OA CH1 3.149574184402289e-06 0.0 5.735718724048164e-06 #atdhisto_c12 +OA CH1b 3.149574184402289e-06 0.0 5.735718724048164e-06 #atdhisto_c12 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 CH2b 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 CH3b 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 @@ -117,13 +129,16 @@ N CS 2.248809725327641e-06 8.454178454694858e-07 1.508127506152659e-06 # N CZ 4.737322988859966e-06 0.0 1.508127506152659e-06 #atdhisto_c12 N CH 2.6644993987597274e-06 6.381454827742098e-07 1.508127506152659e-06 #atdhisto_c12 N CH1 3.473598766179243e-05 2.897745766558051e-06 7.574982932969631e-06 #atdhisto_c12 +N CH1b 3.473598766179243e-05 2.897745766558051e-06 7.574982932969631e-06 #atdhisto_c12 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 CH2b 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 CH3b 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 @@ -140,13 +155,16 @@ NT CS 1.4558184529108867e-06 0.0 2.5973446899834983e-06 # NT CZ 1.7356754565546296e-06 0.0 2.5973446899834983e-06 #atdhisto_c12 NT CH 1.2178965067259558e-06 0.0 2.5973446899834983e-06 #atdhisto_c12 NT CH1 7.030422589392208e-06 0.0001113988439841668 1.3045874183315057e-05 #atdhisto_c12 +NT CH1b 7.030422589392208e-06 0.0001113988439841668 1.3045874183315057e-05 #atdhisto_c12 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 CH2b 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 CH3b 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 @@ -162,13 +180,16 @@ NL CS 9.271725969950735e-07 4.78449438233876e-07 1.508127506152659e-06 # NL CZ 2.248809725327641e-06 0.0 1.508127506152659e-06 #atdhisto_c12 NL CH 1.7356754565546296e-06 6.381454827742098e-07 1.508127506152659e-06 #atdhisto_c12 NL CH1 1.4922176228398963e-05 7.175626843968198e-05 7.574982932969631e-06 #atdhisto_c12 +NL CH1b 1.4922176228398963e-05 7.175626843968198e-05 7.574982932969631e-06 #atdhisto_c12 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 CH2b 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 CH3b 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 @@ -183,13 +204,16 @@ NR CS 1.1128214538294811e-06 0.0 1.9784349673759017e-06 # NR CZ 1.4558184529108867e-06 0.0 1.9784349673759017e-06 #atdhisto_c12 NR CH 1.4558184529108867e-06 8.855373008130008e-06 1.9784349673759017e-06 #atdhisto_c12 NR CH1 7.030422589392208e-06 0.0 9.937230804903689e-06 #atdhisto_c12 +NR CH1b 7.030422589392208e-06 0.0 9.937230804903689e-06 #atdhisto_c12 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 CH2b 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 CH3b 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 @@ -203,13 +227,16 @@ NZ CS 1.0161170406288952e-06 0.0 1.508127506152659e-06 # NZ CZ 1.0161170406288952e-06 0.0 1.508127506152659e-06 #atdhisto_c12 NZ CH 1.1128214538294811e-06 0.0 1.508127506152659e-06 #atdhisto_c12 NZ CH1 6.012808612204707e-06 0.0 7.574982932969631e-06 #atdhisto_c12 +NZ CH1b 6.012808612204707e-06 0.0 7.574982932969631e-06 #atdhisto_c12 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 CH2b 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 CH3b 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 @@ -222,13 +249,16 @@ NE CS 1.2178965067259558e-06 0.0 1.508127506152659e-06 # NE CZ 1.59011205135462e-06 0.0 1.508127506152659e-06 #atdhisto_c12 NE CH 1.59011205135462e-06 0.0 1.508127506152659e-06 #atdhisto_c12 NE CH1 1.110557678004124e-05 0.0 7.574982932969631e-06 #atdhisto_c12 +NE CH1b 1.110557678004124e-05 0.0 7.574982932969631e-06 #atdhisto_c12 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 CH2b 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 CH3b 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 @@ -240,13 +270,16 @@ C CS 1.110557678004124e-05 2.897745766558051e-06 2.598523946232985e-06 # C CZ 8.20374377950018e-06 0.0 2.598523946232985e-06 #atdhisto_c12 C CH 4.030347871778446e-06 9.271725969950735e-07 2.598523946232985e-06 #atdhisto_c12 C CH1 2.1373642831810142e-05 5.556363657234973e-06 1.3051797320401952e-05 #atdhisto_c12 +C CH1b 2.1373642831810142e-05 5.556363657234973e-06 1.3051797320401952e-05 #atdhisto_c12 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 CH2b 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-07 2.064082678151929e-06 4.726053914163474e-06 #atdhisto_c12 C CH3t 7.030422589392208e-06 2.064082678151929e-06 4.726053914163474e-06 #atdhisto_c12 +C CH3b 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 @@ -257,13 +290,16 @@ CR CS 4.737322988859966e-06 0.0 2.598523946232985e-06 # CR CZ 2.448580108078591e-06 0.0 2.598523946232985e-06 #atdhisto_c12 CR CH 2.6644993987597274e-06 1.110557678004124e-05 2.598523946232985e-06 #atdhisto_c12 CR CH1 1.853615051555947e-05 0.0 1.3051797320401952e-05 #atdhisto_c12 +CR CH1b 1.853615051555947e-05 0.0 1.3051797320401952e-05 #atdhisto_c12 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 CH2b 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 CH3b 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 @@ -273,13 +309,16 @@ CS CS 5.556363657234973e-06 0.0 2.598523946232985e-06 # CS CZ 6.012808612204707e-06 0.0 2.598523946232985e-06 #atdhisto_c12 CS CH 2.897745766558051e-06 0.0 2.598523946232985e-06 #atdhisto_c12 CS CH1 1.2884910181278791e-05 0.0 1.3051797320401952e-05 #atdhisto_c12 +CS CH1b 1.2884910181278791e-05 0.0 1.3051797320401952e-05 #atdhisto_c12 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 CH2b 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 CH3b 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 @@ -288,13 +327,16 @@ CS H 4.543781405690857e-08 3.578500073173326e-08 4.8757952426321354e-08 # CZ CZ 1.8933619871479337e-06 0.0 2.598523946232985e-06 #atdhisto_c12 CZ CH 1.7356754565546296e-06 0.0 2.598523946232985e-06 #atdhisto_c12 CZ CH1 1.110557678004124e-05 0.0 1.3051797320401952e-05 #atdhisto_c12 +CZ CH1b 1.110557678004124e-05 0.0 1.3051797320401952e-05 #atdhisto_c12 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 CH2b 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 CH3b 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 @@ -302,38 +344,61 @@ CZ SH 2.064082678151929e-06 0.0 2.6605634662742835e-06 # CZ H 4.543781405690857e-08 0.0 4.8757952426321354e-08 #atdhisto_c12 CH CH 2.248809725327641e-06 3.244654392818015e-05 2.598523946232985e-06 #atdhisto_c12 CH CH1 8.855373008130008e-06 0.0 1.3051797320401952e-05 #atdhisto_c12 +CH CH1b 8.855373008130008e-06 0.0 1.3051797320401952e-05 #atdhisto_c12 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 CH2b 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 CH3b 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 CH SH 2.248809725327641e-06 0.0 2.6605634662742835e-06 #atdhisto_c12 CH H 8.091373121174105e-08 1.0115434594394737e-07 4.8757952426321354e-08 #atdhisto_c12 CH1 CH1 6.309156472163408e-05 0.0002285006226144959 6.555622223139519e-05 #atdhisto_c12 +CH1 CH1b 6.309156472163408e-05 0.0002285006226144959 6.555622223139519e-05 #atdhisto_c12 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 CH2b 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 CH3b 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 CH1 SH 8.20374377950018e-06 0.0 1.3363407780104616e-05 #atdhisto_c12 CH1 H 1.0161170406288952e-06 1.736919907132888e-07 2.44900153315381e-07 #atdhisto_c12 +CH1b CH1b 6.309156472163408e-05 0.0002285006226144959 6.555622223139519e-05 #atdhisto_c12 +CH1b CH1t 4.8569470248707706e-05 0.00020331351930370572 6.555622223139519e-05 #atdhisto_c12 +CH1b CAH 5.187980929466614e-05 3.473598766179243e-05 6.555622223139519e-05 #atdhisto_c12 +CH1b CH2 2.6382245451254078e-05 0.0001806952059302513 3.181351786802196e-05 #atdhisto_c12 +CH1b CH2b 2.6382245451254078e-05 0.0001806952059302513 3.181351786802196e-05 #atdhisto_c12 +CH1b CH2t 2.6382245451254078e-05 0.0001806952059302513 3.181351786802196e-05 #atdhisto_c12 +CH1b CAH2 2.1373642831810142e-05 3.473598766179243e-05 3.181351786802196e-05 #atdhisto_c12 +CH1b CH3 1.4922176228398963e-05 0.0001806952059302513 2.3737898549049355e-05 #atdhisto_c12 +CH1b CH3t 1.4922176228398963e-05 0.0001806952059302513 2.3737898549049355e-05 #atdhisto_c12 +CH1b CH3b 1.4922176228398963e-05 0.0001806952059302513 2.3737898549049355e-05 #atdhisto_c12 +CH1b CH2r 2.2936907742668513e-05 2.448580108078591e-06 2.797690277700976e-05 #atdhisto_c12 +CH1b S 1.3363407780104616e-05 0.0 1.3363407780104616e-05 #rc12 +CH1b SM 1.110557678004124e-05 0.0 1.3363407780104616e-05 #atdhisto_c12 +CH1b SH 8.20374377950018e-06 0.0 1.3363407780104616e-05 #atdhisto_c12 +CH1b H 1.0161170406288952e-06 1.736919907132888e-07 2.44900153315381e-07 #atdhisto_c12 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 CH2b 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 CH3b 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 @@ -341,29 +406,45 @@ 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 CH2b 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-06 2.4604350727657302e-05 2.3737898549049355e-05 #atdhisto_c12 CAH CH3t 1.4922176228398963e-05 2.4604350727657302e-05 2.3737898549049355e-05 #atdhisto_c12 +CAH CH3b 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 CH2b 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 CH3b 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 +CH2b CH2b 1.110557678004124e-05 0.0001113988439841668 1.5438655320413708e-05 #atdhisto_c12 +CH2b CH2t 1.110557678004124e-05 0.0001113988439841668 1.5438655320413708e-05 #atdhisto_c12 +CH2b CAH2 8.20374377950018e-06 2.827720357903463e-05 1.5438655320413708e-05 #atdhisto_c12 +CH2b CH3 5.556363657234973e-06 0.00013386004153335797 1.151967019963228e-05 #atdhisto_c12 +CH2b CH3t 5.556363657234973e-06 0.00013386004153335797 1.151967019963228e-05 #atdhisto_c12 +CH2b CH3b 5.556363657234973e-06 0.00013386004153335797 1.151967019963228e-05 #atdhisto_c12 +CH2b CH2r 7.596342311330096e-06 1.7356754565546296e-06 1.3576799670467695e-05 #atdhisto_c12 +CH2b S 6.485074913093783e-06 0.0 6.485074913093783e-06 #rc12 +CH2b SM 4.030347871778446e-06 0.0 6.485074913093783e-06 #atdhisto_c12 +CH2b SH 3.421320847663108e-06 0.0 6.485074913093783e-06 #atdhisto_c12 +CH2b 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 CH3b 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 @@ -372,12 +453,14 @@ CH2t H 2.9137432184408464e-07 1.1292692029579082e-07 1.1884661956083523e-07 # 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 CH3b 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 CH3b 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 @@ -385,11 +468,18 @@ CH3 SM 3.7144078137182355e-06 0.0 4.8388880163656295e-06 # 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 CH3b 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 +CH3b CH3b 3.7144078137182355e-06 0.00017027339638628222 8.5954896170802e-06 #atdhisto_c12 +CH3b CH2r 4.737322988859966e-06 1.7356754565546296e-06 1.0130432432380583e-05 #atdhisto_c12 +CH3b S 4.8388880163656295e-06 0.0 4.8388880163656295e-06 #rc12 +CH3b SM 3.7144078137182355e-06 0.0 4.8388880163656295e-06 #atdhisto_c12 +CH3b SH 3.149574184402289e-06 0.0 4.8388880163656295e-06 #atdhisto_c12 +CH3b 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 c1dce0b0..cd213c77 100644 Binary files a/src/multiego/atdhisto.pkl and b/src/multiego/atdhisto.pkl differ diff --git a/src/multiego/interaction_matrix.py b/src/multiego/interaction_matrix.py index 9c4402fe..25f1b717 100644 --- a/src/multiego/interaction_matrix.py +++ b/src/multiego/interaction_matrix.py @@ -75,7 +75,7 @@ def plot_energy_matrix(self, out_path = None, show = False): bkbnd_atoms = ["C", "O", "N", "CAH", "CAH2", "H"] attype_ordering_charged = [ "OM", "NL", "NZ"] 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"] + attype_ordering_apolar = ["CH1", "CR", "CH", "CH2", "CH3", "CH3b", "CH2b", "CH1b"] @@ -160,15 +160,21 @@ def read_pickle_file(self, filename): kde = [] tot_reps = [] sum_probs = [] + r2 = [] for key in data.keys(): # probs.append(data[key].p_repeats_n2) - probs.append(data[key].p_density) + # probs.append(data[key].p_density) + probs.append(data[key].p_density_allpdbs) dists.append(data[key].exp_aver) cutoffs.append(data[key].cutoff) bins.append(data[key].xbins) kde.append(data[key].kde) tot_reps.append(data[key].tot_repeats) sum_probs.append(np.sum(data[key].sum_probs)) + if hasattr(data[key], "r2"): + r2.append(data[key].r2) + else: + r2.append(None) atmat["probability"] = np.array(probs) atmat["exp_aver"] = np.array(dists) atmat["attype1"] = atmat["atom_pair"].str.split("_").str[0] @@ -178,6 +184,7 @@ def read_pickle_file(self, filename): atmat["kde"] = kde atmat["tot_repeats"] = tot_reps atmat["sum_probs"] = sum_probs + atmat["r2"] = r2 # fill nan values in probability with 0 atmat["probability"] = atmat["probability"].fillna(0) return atmat @@ -212,17 +219,10 @@ def build_matrix_dataframe(self, filename, filename2=None, r2_corr_sb=None): 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] - + atmat.at[index, "r2"] = sb_row["r2"].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] + if filename2 != None: + atmat.loc[atmat["r2"].notnull(), "probability"] -= atmat.loc[atmat["r2"].notnull(), "probability"] * atmat.loc[atmat["r2"].notnull(), "r2"] return atmat def define_special_nonlocal_dict(self): diff --git a/src/multiego/type_definitions.py b/src/multiego/type_definitions.py index ede65635..740fdb72 100644 --- a/src/multiego/type_definitions.py +++ b/src/multiego/type_definitions.py @@ -60,13 +60,16 @@ "CZ", "CH", "CH1", + "CH1b", "CH1t", "CAH", "CH2", + "CH2b", "CH2t", "CAH2", "CH3", "CH3t", + "CH3b", "CH2r", "S", "SM", @@ -78,7 +81,7 @@ "H", "C0", ], - "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], + "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, 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 @@ -96,12 +99,15 @@ 2.5 * 0.317248**12, # "CZ", 2.598570e-06 2.5 * 0.317248**12, # "CH", 2.598570e-06 2.5 * 0.415167**12, # "CH1", 6.555574e-05 + 2.5 * 0.415167**12, # "CH1b", 6.555574e-05 2.5 * 0.415167**12, # "CH1t", 6.555574e-05 2.5 * 0.415167**12, # "CAH", 6.555574e-05 2.5 * 0.368035**12, # "CH2", 1.543890e-05 + 2.5 * 0.368035**12, # "CH2b", 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.350505**12, # "CH3b", 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 @@ -132,13 +138,16 @@ 4.0 * 0.35812**12 * eps_CZ, # "CZ", sig=0.35812 4.0 * 0.35812**12 * eps_CH, # "CH", sig=0.35812 4.0 * 0.44592**12 * eps_CH1, # "CH1", sig=0.50192 + 4.0 * 0.44592**12 * eps_CH1, # "CH1b", sig=0.50192 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, # "CH2b", 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.37479**12 * eps_CH3, # "CH3b", 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 @@ -167,13 +176,16 @@ 4.0 * 0.35812**6 * eps_CZ, # "CZ", 4.0 * 0.35812**6 * eps_CH, # "CH" 4.0 * 0.44592**6 * eps_CH1, # "CH1" + 4.0 * 0.44592**6 * eps_CH1, # "CH1b" 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, # "CH2b" 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.37479**6 * eps_CH3, # "CH3b" 4.0 * 0.39547**6 * eps_CH2r, # "CH2r" 4.0 * 0.33077**6 * eps_S, # "S", 4.0 * 0.33077**6 * eps_S, # "S", @@ -380,9 +392,9 @@ 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 +P_TH = 0.55/2 +P_TH_SC_BKBN = 0.010 +P_TH_BKBN = 0.4/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 @@ -391,10 +403,11 @@ PKL = "atdhisto.pkl" # 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 = "sb_atdhisto_2res.pkl" +PKL_SB = "atdhisto.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_) +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