From 4ec1b1697b9f66da5f1b416f3544928f08f0d385 Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Tue, 1 Apr 2014 15:32:14 -0400 Subject: [PATCH 01/15] Minor fixes to intra_H_migration family Found using checkWellFormed -Cs_H_out_Cs2 adjList in rules changed to match group.py. group.py adjList was more consistent with siblings. -in R3H_SS_S, some atoms changed from R to R!H. The atoms had two bonds or a radical, so they had to be by definition -Cs_H_out_H/OneDe LogicOr was replaced with an AdjList. This was a strange case where the parent and children were both Groups (Usually I would expect a given LogicOr group to have LogicOr parent. With the new flexibility that we have we have programmed into AdjList, I'm not even sure we need LogicOr anymore). I'm not sure if we should never have this weird sandwiched LogicOr, but in this case I found I could come up with an AdjList that fulfills all the correct relationships. --- input/kinetics/families/intra_H_migration/groups.py | 12 +++++++++--- input/kinetics/families/intra_H_migration/rules.py | 10 ++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/input/kinetics/families/intra_H_migration/groups.py b/input/kinetics/families/intra_H_migration/groups.py index ed03fcfb1d..81f1a0f697 100644 --- a/input/kinetics/families/intra_H_migration/groups.py +++ b/input/kinetics/families/intra_H_migration/groups.py @@ -327,9 +327,9 @@ label = "R3H_SS_S", group = """ -1 *1 R 1 {2,S} +1 *1 R!H 1 {2,S} 2 *4 Ss 0 {1,S} {3,S} -3 *2 R 0 {2,S} {4,S} +3 *2 R!H 0 {2,S} {4,S} 4 *3 H 0 {3,S} """, kinetics = None, @@ -4702,7 +4702,13 @@ entry( index = 243, label = "Cs_H_out_H/OneDe", - group = "OR{Cs_H_out_H/Cd, Cs_H_out_H/Ct, Cs_H_out_H/CO, Cs_H_out_H/CS}", + group = +""" +1 *2 Cs 0 {2,S} {3,S} {4,S} +2 *3 H 0 {1,S} +3 {Cd,Ct,CS,CO} 0 {1,S} +4 H 0 {1,S} +""", kinetics = None, shortDesc = u"""""", longDesc = diff --git a/input/kinetics/families/intra_H_migration/rules.py b/input/kinetics/families/intra_H_migration/rules.py index 00d6f927c9..5cfd662e23 100644 --- a/input/kinetics/families/intra_H_migration/rules.py +++ b/input/kinetics/families/intra_H_migration/rules.py @@ -11894,11 +11894,10 @@ """, group3 = """ -1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} 2 *3 H 0 {1,S} -3 *4 Cs 0 {1,S} +3 Cs 0 {1,S} 4 Cs 0 {1,S} -5 H 0 {1,S} """, kinetics = ArrheniusEP( A = (7e-08, 's^-1'), @@ -12230,11 +12229,10 @@ """, group3 = """ -1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} 2 *3 H 0 {1,S} -3 *4 Cs 0 {1,S} +3 Cs 0 {1,S} 4 Cs 0 {1,S} -5 H 0 {1,S} """, kinetics = ArrheniusEP( A = (172000000.0, 's^-1', '+|-', 2), From c3d4069c1c7173d3446e088a4d6383277289fd69 Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Tue, 1 Apr 2014 15:35:53 -0400 Subject: [PATCH 02/15] Fix bug with Leave one out test Previously was calculating Q using natural log, but I want to use log base 10 so that I get orders of magnitude for my comparisons. Also I was using an averaged temperature of the rule's range for calculating k. This was when I wanted to calculated the Leave-one-out value vs the rule's value. Now, I'm pretty sure I want to compare node to node for future things, so I've just simplified it so that I calculate everything at 1000K. --- EvaluateKinetics.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/EvaluateKinetics.py b/EvaluateKinetics.py index a99ffef980..5f365d6187 100644 --- a/EvaluateKinetics.py +++ b/EvaluateKinetics.py @@ -107,10 +107,10 @@ def getKineticsLeaveOneOut(family, missingGroups): #returns the average temperature for the range given by the kinetic model def getAverageTemp(kineticModel): - try: - return (kineticModel.Tmin.value + kineticModel.Tmax.value)/2 - except AttributeError: - return 1000 +# try: +# return (kineticModel.Tmin.value + kineticModel.Tmax.value)/2 +# except AttributeError: + return 1000 #calculates the parity values for each def calculateParity(exactKineticModel, approxKineticModel, T): @@ -130,7 +130,7 @@ def analyzeForParity(exactKinetics, approxKinetics, T=None, cutoff=0): exact=exactKinetics[key].getRateCoefficient(T) approx=approxKinetics[key].getRateCoefficient(T) dataPoint=[exact, approx] - if cutoff!=0 and math.log((float(exact)/float(approx)))**2 > cutoff**2: + if cutoff!=0 and math.log10((float(exact)/float(approx)))**2 > cutoff**2: continue parityData[key]=dataPoint @@ -143,7 +143,7 @@ def analyzeForParity(exactKinetics, approxKinetics, T=None, cutoff=0): def calculateQ(parityData): Q=0 for key, value in parityData.iteritems(): - Q+=(math.log(value[0]/value[1]))**2 + Q+=(math.log10(value[0]/value[1]))**2 return (Q/len(parityData))**0.5 def createParityPlot(parityData): From 624322019bee46673ecfac63c3c7dd03eeea78fe Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Tue, 1 Apr 2014 18:07:12 -0400 Subject: [PATCH 03/15] Minor corrections to in 1,2 Insertion family A few children errors: -Changed C to Cs in Cs_H and all its (numerous) descendants -Changed C to Cd in Cd_H and all its descedents --- .../kinetics/families/1,2_Insertion/groups.py | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/input/kinetics/families/1,2_Insertion/groups.py b/input/kinetics/families/1,2_Insertion/groups.py index 52d565d308..2c01d8532a 100644 --- a/input/kinetics/families/1,2_Insertion/groups.py +++ b/input/kinetics/families/1,2_Insertion/groups.py @@ -194,7 +194,7 @@ label = "Cd_H", group = """ -1 *2 C 0 {2,D} {3,S} {4,S} +1 *2 Cd 0 {2,D} {3,S} {4,S} 2 C 0 {1,D} 3 *3 H 0 {1,S} 4 R 0 {1,S} @@ -212,7 +212,7 @@ label = "Cd_pri", group = """ -1 *2 C 0 {2,D} {3,S} {4,S} +1 *2 Cd 0 {2,D} {3,S} {4,S} 2 C 0 {1,D} 3 *3 H 0 {1,S} 4 H 0 {1,S} @@ -230,8 +230,8 @@ label = "ethene", group = """ -1 *2 C 0 {2,D} {3,S} {4,S} -2 C 0 {1,D} {5,S} {6,S} +1 *2 Cd 0 {2,D} {3,S} {4,S} +2 Cd 0 {1,D} {5,S} {6,S} 3 *3 H 0 {1,S} 4 H 0 {1,S} 5 H 0 {2,S} @@ -250,7 +250,7 @@ label = "Cd_sec", group = """ -1 *2 C 0 {2,D} {3,S} {4,S} +1 *2 Cd 0 {2,D} {3,S} {4,S} 2 C 0 {1,D} 3 *3 H 0 {1,S} 4 R!H 0 {1,S} @@ -268,7 +268,7 @@ label = "Cd/H/NonDeC", group = """ -1 *2 C 0 {2,D} {3,S} {4,S} +1 *2 Cd 0 {2,D} {3,S} {4,S} 2 C 0 {1,D} 3 *3 H 0 {1,S} 4 Cs 0 {1,S} @@ -286,7 +286,7 @@ label = "Cd/H/NonDeO", group = """ -1 *2 C 0 {2,D} {3,S} {4,S} +1 *2 Cd 0 {2,D} {3,S} {4,S} 2 C 0 {1,D} 3 *3 H 0 {1,S} 4 O 0 {1,S} @@ -304,7 +304,7 @@ label = "Cd/H/OneDe", group = """ -1 *2 C 0 {2,D} {3,S} {4,S} +1 *2 Cd 0 {2,D} {3,S} {4,S} 2 C 0 {1,D} 3 *3 H 0 {1,S} 4 {Cd,Ct,Cb,CO} 0 {1,S} @@ -340,7 +340,7 @@ label = "Cs_H", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 R 0 {1,S} 4 R 0 {1,S} @@ -359,7 +359,7 @@ label = "C_methane", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 H 0 {1,S} @@ -378,7 +378,7 @@ label = "C_pri", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 H 0 {1,S} @@ -397,7 +397,7 @@ label = "C_pri/NonDeC", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 H 0 {1,S} @@ -416,7 +416,7 @@ label = "C_pri/NonDeO", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 H 0 {1,S} @@ -435,7 +435,7 @@ label = "C_pri/De", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 H 0 {1,S} @@ -454,7 +454,7 @@ label = "C_pri/Cd", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 H 0 {1,S} @@ -473,7 +473,7 @@ label = "C_pri/Ct", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 H 0 {1,S} @@ -492,7 +492,7 @@ label = "C_sec", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 R!H 0 {1,S} @@ -511,7 +511,7 @@ label = "C/H2/NonDeC", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 Cs 0 {1,S} @@ -530,7 +530,7 @@ label = "C/H2/NonDeO", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 O 0 {1,S} @@ -549,7 +549,7 @@ label = "C/H2/CsO", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 O 0 {1,S} @@ -568,7 +568,7 @@ label = "C/H2/O2", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 O 0 {1,S} @@ -587,7 +587,7 @@ label = "C/H2/OneDe", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 {Cd,Ct,CO,Cb} 0 {1,S} @@ -606,7 +606,7 @@ label = "C/H2/OneDeC", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 {Cd,Ct,CO,Cb} 0 {1,S} @@ -625,7 +625,7 @@ label = "C/H2/OneDeO", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 {Cd,Ct,CO,Cb} 0 {1,S} @@ -644,7 +644,7 @@ label = "C/H2/TwoDe", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 {Cd,Ct,CO,Cb} 0 {1,S} @@ -663,7 +663,7 @@ label = "C_ter", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 R!H 0 {1,S} 4 R!H 0 {1,S} @@ -682,7 +682,7 @@ label = "C/H/NonDeC", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 {Cs,O} 0 {1,S} 4 {Cs,O} 0 {1,S} @@ -701,7 +701,7 @@ label = "C/H/Cs3", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 Cs 0 {1,S} 4 Cs 0 {1,S} @@ -720,7 +720,7 @@ label = "C/H/NDMustO", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 O 0 {1,S} 4 {Cs,O} 0 {1,S} @@ -739,7 +739,7 @@ label = "C/H/OneDe", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 {Cd,Ct,Cb,CO} 0 {1,S} 4 {Cs,O} 0 {1,S} @@ -758,7 +758,7 @@ label = "C/H/Cs2", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 {Cd,Ct,Cb,CO} 0 {1,S} 4 Cs 0 {1,S} @@ -777,7 +777,7 @@ label = "C/H/ODMustO", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 {Cd,Ct,Cb,CO} 0 {1,S} 4 O 0 {1,S} @@ -796,7 +796,7 @@ label = "C/H/TwoDe", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 {Cd,Ct,Cb,CO} 0 {1,S} 4 {Cd,Ct,Cb,CO} 0 {1,S} @@ -815,7 +815,7 @@ label = "C/H/Cs", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 {Cd,Ct,Cb,CO} 0 {1,S} 4 {Cd,Ct,Cb,CO} 0 {1,S} @@ -834,7 +834,7 @@ label = "C/H/TDMustO", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 {Cd,Ct,Cb,CO} 0 {1,S} 4 {Cd,Ct,Cb,CO} 0 {1,S} @@ -853,7 +853,7 @@ label = "C/H/ThreeDe", group = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 {Cd,Ct,Cb,CO} 0 {1,S} 4 {Cd,Ct,Cb,CO} 0 {1,S} From bffaac0fc16596917547e7b966889d9f10a24500 Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Wed, 9 Apr 2014 01:24:28 -0400 Subject: [PATCH 04/15] Added suggested solutions to name errors in checkWellFormed Additional lines of output given for checkWellFormed family. One error we check for is if a label in rules.py is misnamed, i.e. if any part of the label is not a group in group.py. There a decent amount of these errors due to the recent Java/Py database merge. To make my life database debugging life easier, I added a new feature which tells me if there is a group which matches the misnamed label. For example, let's say we have a rule label, A;B. Somebody changed the name of A to C in groups.py, but left it unchanged in rules.py. The new feature would suggest C as the correct name for A, by comparing adj lists of the rule and those in groups.py Unfortunately, there is a bug I can't figure out. If somebody changed A to C AND B to D, it suggest C for A and C for B. The manual work around is to visually verify which one adjList C matches, make the fix, and run checkWellFormed again. It will then suggest D for B. I feel like this isn't worth fixing because it will be unable to suggest groups with the upgrade to universal database (once all adjlists are removed from rules.py) --- EvaluateKinetics.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/EvaluateKinetics.py b/EvaluateKinetics.py index 5f365d6187..3ddf9ba126 100644 --- a/EvaluateKinetics.py +++ b/EvaluateKinetics.py @@ -435,9 +435,16 @@ def checkFamilies(FullDatabase): if True in problemsExist: outputFile.write(family + '\n') if problemsExist[0]: - outputFile.write('\n' + 'These groups exist in rules.py but not groups.py:' + '\n') - for group in problems[0]: - outputFile.write(group + '\n') + outputFile.write('\n' + 'These groups exist in rules.py but not groups.py:' + '\n' + "A suggested match could be incorrect, but if 'No match' is written, it is true (and most unfortunate)" + '\n') + for group, matchedGroups in problems[0].iteritems(): + outputFile.write(group + ', Suggested match from groups.py: ') + for matchedGroup in matchedGroups: + if matchedGroup==matchedGroups[-1]: + if len(matchedGroups)>1: + outputFile.write('and ') + outputFile.write(matchedGroup + '\n') + else: + outputFile.write(matchedGroup +', ' ) if problemsExist[1]: outputFile.write('\n' + 'These groups do not match the definition in the rule' + '\n') for rule, groups in problems[1].iteritems(): From 2bf5bb6c95fed1b2524c73514ff9dcd39c311f5b Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Wed, 9 Apr 2014 01:54:39 -0400 Subject: [PATCH 05/15] Fixes to R_Addition_MultipleBond family These were found by the checkWellFormed function. Changes to rule labels rules.py. For template A-->B (x occurences). 'A' did not exist in groups.py, so the name was changed to the group 'B' with a matching adjList. 'x' is the number of rules which used 'A'. -O_sec_rad --> OJ_sec (1 occurance) -H_rad does --> HJ (5 occurrences) -N3t_Ct/H --> N3t_Ct-H (1 occurrence) -O_pri_rad --> OJ_pri (6 occurrences) -O_rad/NonDeO --> OJ-Os (13 occurrences) -Ct/H_N3t --> Ct-H_N3t (2 occurrences) -N3d/H_N3d/H --> N3d-H_N3d-H (1 occurrence) -N3d/H_Cds/H2 --> N3d-H_Cds-HH (1 occurrence) -Cds/H2_N3d --> Cds-HH_N3d (1 occurrence) -N3t_CtH --> N3t_Ct-H (1 occurrence) Change to adj lists in rules.py -Changed radical from 3 to 3Q in "N3t_N3t;CH_quartet" to match group definition. (CH_quartet only appears in one rule by bbuesser). -For the top node R_R;YJ, the definitions of R_R and YJ? were both updated to the more inclusive definition in groups.py (effects top node) -Ct-Ct_Ct-Cs was found to be wrongly defined in groups.py and rules.py, so changed all occurrences to the correct definition (19 occurrences) -Ct-Ct_Ct-H was found to be wrongly defined in groups.py and rules.py, so changed all occurrences to the correct definition (19 occurrences) Change to adjlist in groups.py -CH2_triplet changed to only allow 2T instead of 2S in N3t_N3t;CH2_triplet (effects 1 rule by bbuesser) -Ct-Ct_Ct-Cs adj list was definitely wrong. Found because it was a duplicate of Ct-Cd_Ct-Cs. Changed the Cd in the adj list to a Ct. (appears in 19 rules) -Ct-Ct_Ct-H adj list was definitely wrong. Found because it was a duplicate of Ct-Cd_Ct-H. Changed the Cd in the adj list to a Ct. (appears in 19 rules) -Changed Ss atom to more general S atom in SJ. It had the same adj list as it's only child SsJ. (no rules use Ss) --- .../R_Addition_MultipleBond/groups.py | 16 +- .../families/R_Addition_MultipleBond/rules.py | 210 +++++++++--------- 2 files changed, 113 insertions(+), 113 deletions(-) diff --git a/input/kinetics/families/R_Addition_MultipleBond/groups.py b/input/kinetics/families/R_Addition_MultipleBond/groups.py index 5d8330074b..f7491acc10 100644 --- a/input/kinetics/families/R_Addition_MultipleBond/groups.py +++ b/input/kinetics/families/R_Addition_MultipleBond/groups.py @@ -17500,9 +17500,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, kinetics = None, shortDesc = u"""""", @@ -17592,9 +17592,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, kinetics = None, shortDesc = u"""""", @@ -20670,9 +20670,9 @@ label = "CH2_triplet", group = """ -1 *3 C {2S,2T} {2,S} {3,S} -2 H 0 {1,S} -3 H 0 {1,S} +1 *3 C 2T {2,S} {3,S} +2 H 0 {1,S} +3 H 0 {1,S} """, kinetics = None, shortDesc = u"""""", @@ -20687,7 +20687,7 @@ label = "SJ", group = """ -1 *3 Ss 1 {2,S} +1 *3 S 1 {2,S} 2 R 0 {1,S} """, kinetics = None, diff --git a/input/kinetics/families/R_Addition_MultipleBond/rules.py b/input/kinetics/families/R_Addition_MultipleBond/rules.py index e8725b3461..dd714fcdf2 100644 --- a/input/kinetics/families/R_Addition_MultipleBond/rules.py +++ b/input/kinetics/families/R_Addition_MultipleBond/rules.py @@ -78741,9 +78741,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -78775,9 +78775,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -78809,9 +78809,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -78843,9 +78843,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -78877,9 +78877,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -78912,9 +78912,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -78947,9 +78947,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -78982,9 +78982,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -79018,9 +79018,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -79054,9 +79054,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -79088,9 +79088,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -79122,9 +79122,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -79156,9 +79156,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -79190,9 +79190,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -79224,9 +79224,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -79258,9 +79258,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -79293,9 +79293,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -79328,9 +79328,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -80613,9 +80613,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -80647,9 +80647,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -80681,9 +80681,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -80715,9 +80715,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -80749,9 +80749,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -80784,9 +80784,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -80819,9 +80819,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -80854,9 +80854,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -80890,9 +80890,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -80926,9 +80926,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -80960,9 +80960,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -80994,9 +80994,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -81028,9 +81028,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -81062,9 +81062,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -81096,9 +81096,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -81130,9 +81130,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -81165,9 +81165,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -81200,9 +81200,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -88445,9 +88445,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 Cs 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -88539,9 +88539,9 @@ """ 1 *1 Ct 0 {2,T} {3,S} 2 *2 Ct 0 {1,T} {4,S} -3 Cd 0 {1,S} {5,D} +3 Ct 0 {1,S} {5,T} 4 H 0 {2,S} -5 C 0 {3,D} +5 Ct 0 {3,T} """, group2 = """ @@ -89560,8 +89560,8 @@ entry( index = 3000, label = "R_R;YJ", - group1 = "OR{Cd_R, Ct_R, Od_R, Sd_R}", - group2 = "OR{HJ, CJ, O_rad, SJ, Y_1centerbirad}", + group1 = "OR{Cd_R, Ct_R, Od_R, Sd_R, Nd_R, Nt_R}", + group2 = "OR{HJ, CJ, OJ, SJ, NJ, Y_1centerbirad, Y_1centertrirad, Y_1centerquadrad}", kinetics = ArrheniusEP( A = (10000000000000.0, 'cm^3/(mol*s)'), n = 0, @@ -90053,7 +90053,7 @@ entry( index = 3015, - label = "Cds-HH_Cds-HH;O_pri_rad", + label = "Cds-HH_Cds-HH;OJ_pri", group1 = """ 1 *1 Cd 0 {2,D} {3,S} {4,S} @@ -91272,7 +91272,7 @@ entry( index = 3052, - label = "Ct-H_Ct-H;O_pri_rad", + label = "Ct-H_Ct-H;OJ_pri", group1 = """ 1 *1 Ct 0 {2,T} {3,S} @@ -91303,7 +91303,7 @@ entry( index = 3053, - label = "Ct-H_Ct-H;O_pri_rad", + label = "Ct-H_Ct-H;OJ_pri", group1 = """ 1 *1 Ct 0 {2,T} {3,S} @@ -91334,7 +91334,7 @@ entry( index = 3054, - label = "Ct-H_Ct-H;O_sec_rad", + label = "Ct-H_Ct-H;OJ_sec", group1 = """ 1 *1 Ct 0 {2,T} {3,S} @@ -91400,7 +91400,7 @@ entry( index = 3056, - label = "CO/H/Nd_O;O_rad/NonDeO", + label = "CO/H/Nd_O;OJ-Os", group1 = """ 1 *1 CO 0 {2,D} {3,S} {4,S} @@ -91431,7 +91431,7 @@ entry( index = 3057, - label = "CO/Nd2_O;O_rad/NonDeO", + label = "CO/Nd2_O;OJ-Os", group1 = """ 1 *1 CO 0 {2,D} {3,S} {4,S} @@ -91462,7 +91462,7 @@ entry( index = 3058, - label = "CO/H2_O;O_rad/NonDeO", + label = "CO/H2_O;OJ-Os", group1 = """ 1 *1 CO 0 {2,D} {3,S} {4,S} @@ -91493,7 +91493,7 @@ entry( index = 3059, - label = "CO/Nd2_O;O_rad/NonDeO", + label = "CO/Nd2_O;OJ-Os", group1 = """ 1 *1 CO 0 {2,D} {3,S} {4,S} @@ -91524,7 +91524,7 @@ entry( index = 3060, - label = "Cds-HH_Cds-HH;O_rad/NonDeO", + label = "Cds-HH_Cds-HH;OJ-Os", group1 = """ 1 *1 Cd 0 {2,D} {3,S} {4,S} @@ -91557,7 +91557,7 @@ entry( index = 3061, - label = "Cds-HH_Cds-CsH;O_rad/NonDeO", + label = "Cds-HH_Cds-CsH;OJ-Os", group1 = """ 1 *1 Cd 0 {2,D} {3,S} {4,S} @@ -91590,7 +91590,7 @@ entry( index = 3062, - label = "Cds-HH_Cds-CsCs;O_rad/NonDeO", + label = "Cds-HH_Cds-CsCs;OJ-Os", group1 = """ 1 *1 Cd 0 {2,D} {3,S} {4,S} @@ -91623,7 +91623,7 @@ entry( index = 3063, - label = "Cds-CsH_Cds-HH;O_rad/NonDeO", + label = "Cds-CsH_Cds-HH;OJ-Os", group1 = """ 1 *1 Cd 0 {2,D} {3,S} {4,S} @@ -91656,7 +91656,7 @@ entry( index = 3064, - label = "Cds-CsH_Cds-CsH;O_rad/NonDeO", + label = "Cds-CsH_Cds-CsH;OJ-Os", group1 = """ 1 *1 Cd 0 {2,D} {3,S} {4,S} @@ -91689,7 +91689,7 @@ entry( index = 3065, - label = "Cds-CsH_Cds-CsCs;O_rad/NonDeO", + label = "Cds-CsH_Cds-CsCs;OJ-Os", group1 = """ 1 *1 Cd 0 {2,D} {3,S} {4,S} @@ -91722,7 +91722,7 @@ entry( index = 3066, - label = "Cds-CsCs_Cds-HH;O_rad/NonDeO", + label = "Cds-CsCs_Cds-HH;OJ-Os", group1 = """ 1 *1 Cd 0 {2,D} {3,S} {4,S} @@ -91755,7 +91755,7 @@ entry( index = 3067, - label = "Cds-CsCs_Cds-CsH;O_rad/NonDeO", + label = "Cds-CsCs_Cds-CsH;OJ-Os", group1 = """ 1 *1 Cd 0 {2,D} {3,S} {4,S} @@ -91788,7 +91788,7 @@ entry( index = 3068, - label = "Cds-CsCs_Cds-CsCs;O_rad/NonDeO", + label = "Cds-CsCs_Cds-CsCs;OJ-Os", group1 = """ 1 *1 Cd 0 {2,D} {3,S} {4,S} @@ -91821,7 +91821,7 @@ entry( index = 3069, - label = "Cds-HH_Cds-CsH;O_pri_rad", + label = "Cds-HH_Cds-CsH;OJ_pri", group1 = """ 1 *1 Cd 0 {2,D} {3,S} {4,S} @@ -93277,7 +93277,7 @@ entry( index = 3119, - label = "Cds-HH_Cds-Cs\H3/H;O_pri_rad", + label = "Cds-HH_Cds-Cs\H3/H;OJ_pri", group1 = """ 1 C 0 {2,S} {4,S} {5,S} {6,S} @@ -93737,7 +93737,7 @@ """, group2 = """ -1 *3 Cs 3 {2,S} +1 *3 Cs 3Q {2,S} 2 H 0 {1,S} """, kinetics = ArrheniusEP( @@ -93758,7 +93758,7 @@ entry( index = 3202, - label = "N3d/H_N3d/H;H_rad", + label = "N3d-H_N3d-H;HJ", group1 = """ 1 *1 N3d 0 {2,D} {3,S} @@ -93788,7 +93788,7 @@ entry( index = 3203, - label = "Ct/H_N3t;O_pri_rad", + label = "Ct-H_N3t;OJ_pri", group1 = """ 1 *1 Ct 0 {2,T} {3,S} @@ -93818,7 +93818,7 @@ entry( index = 3204, - label = "Ct/H_N3t;H_rad", + label = "Ct-H_N3t;HJ", group1 = """ 1 *1 Ct 0 {2,T} {3,S} @@ -93847,7 +93847,7 @@ entry( index = 3205, - label = "N3t_CtH;H_rad", + label = "N3t_Ct-H;HJ", group1 = """ 1 *1 N3t 0 {2,T} @@ -93876,7 +93876,7 @@ entry( index = 3206, - label = "Cds/H2_N3d;H_rad", + label = "Cds-HH_N3d;HJ", group1 = """ 1 *1 Cd 0 {2,D} {3,S} {4,S} @@ -93906,7 +93906,7 @@ entry( index = 3207, - label = "N3d/H_Cds/H2;H_rad", + label = "N3d-H_Cds-HH;HJ", group1 = """ 1 *1 N3d 0 {2,D} {5,S} @@ -93937,7 +93937,7 @@ entry( index = 3208, - label = "N3t_Ct/H;O_atom_triplet", + label = "N3t_Ct-H;O_atom_triplet", group1 = """ 1 *1 N3t 0 {2,T} From 9440c56a9128153ee6a779f20f654af619d96763 Mon Sep 17 00:00:00 2001 From: Richard West Date: Wed, 9 Apr 2014 19:21:49 -0400 Subject: [PATCH 06/15] Fixes to EvaluateKinetics.py database testing script. 1) Path was hard-coded to C:\RMG-database. It now runs on whatever folder the EvaluateKinetics.py script itself is in. 2) We weren't specifying which kineticsFamilies to load, which is now a requirement of the 'load' method (perhaps there should be a default?) --- EvaluateKinetics.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/EvaluateKinetics.py b/EvaluateKinetics.py index 3ddf9ba126..aff76734be 100644 --- a/EvaluateKinetics.py +++ b/EvaluateKinetics.py @@ -482,7 +482,7 @@ def checkFamilies(FullDatabase): outputFile.write('\n\n') if __name__ == '__main__': - + databaseProjectRootPath = os.path.dirname( os.path.abspath( __file__ )) #Thermo stuff # ThermoDatabase=ThermoDatabase() # ThermoDatabase.load(path) @@ -490,9 +490,9 @@ def checkFamilies(FullDatabase): # ThermoDatabase.save(path) FullDatabase=RMGDatabase() # path=r'C:\RMG-database\input\thermo' - path='C:\RMG-database\input' + path = os.path.join(databaseProjectRootPath, 'input') # FullDatabase.load(thermoLibraries=) - FullDatabase.load(path) + FullDatabase.load(path, kineticsFamilies='all') checkFamilies(FullDatabase) # trialDir=r'C:\Users\User1\Dropbox\Research\RMG\kinetics\LeaveOneOut\test' # trialDir=r'C:\RMG-database\input_test' From 60c438d8f0f94dfc6579f9714b599e7af0cf9da2 Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Fri, 11 Apr 2014 14:50:10 -0400 Subject: [PATCH 07/15] More fixes to R_Addition Multiple Bond These were found using the checkWellFormed function. -changed CtJ's had an atom C, that I've changed to so that it's children can include nitrogen (1 occurrence in rules.py, The original paper looks like it only consider C, so I changed the rule from Ct-H_Ct-H;CtJ to Ct-H_Ct-H;CtJ_Ct -changed OdR had an atom {C,S} changed to Od-R!H, to include nitrogen in children (no rules affected) -reordered atoms in CsJ-OneDeNsCs. Doesn't change graph, but makes Adjlist more obviously a subgroup of parent -added nitrogen atoms N3s and N5s into set of possible atoms for CsJ-OneDe -changed O to Os in OJ-Os. Adj list restricts the atom to Os (and it's in the name) (also changed in 13 rules) -changed some C atoms to Cd or Cs according to definition in Cds-HH_Cds-Cs\H3/H. Also reordered pretty much the entire adj list so it matched up with it's parent's ordering. (also changed in 3 rules) -O_atom_triplet allows 2S and 2T. Changed it to only 2T. -CH_quartet changed to from C 3Q --> Cs 3Q. There were two groups named CH_quartet, I clarified one of them and deleted the other. -Two definitions of Y_1centerbirad. Deleted one of them (kept one that allows nitrogen) -Removed group N3_atom_quartet which was a duplicate from merge (same as N_atom_quartet) -Deleted one instance of OJ-OneDe (they were identical) -O_rad/OneDe was previously both renamed to OJ-OneDe and the adjlist was changed to include nitrogen. However, the rule that uses it was created using AGvandeputte's GAV value without nitrogen. As such, I've re-created a group O_rad/OneDe with no nitrogen and made it a child of the more general OJ-OneDe. Name is kinda non-descriptive though...Also gave it a random index, which are all screwed up anyway. - Same history and solution as above for O_rad/NonDe to OJ-NonDe. Also had to move some of children around to preserve correct relationships. Changes to tree: -L6: Cds-NonDe2_N3d changed to L5. Clearly a typo based on positioning, name, and comparing adj list with relatives. -Added O_atom_singlet, NH_singlet, and CH2_singlet under Y_1centerbirad. They had definitions but did not appear in the tree -Changed level of CtJ_Ct and CtJ_N3t from L3: to L4. They actually are the child of one of their siblings CtJ! That sounds like the plot of a crappy novel. --- .../R_Addition_MultipleBond/groups.py | 142 +++++++----------- .../families/R_Addition_MultipleBond/rules.py | 84 +++++------ 2 files changed, 100 insertions(+), 126 deletions(-) diff --git a/input/kinetics/families/R_Addition_MultipleBond/groups.py b/input/kinetics/families/R_Addition_MultipleBond/groups.py index f7491acc10..34a2d653ec 100644 --- a/input/kinetics/families/R_Addition_MultipleBond/groups.py +++ b/input/kinetics/families/R_Addition_MultipleBond/groups.py @@ -3202,15 +3202,15 @@ label = "Cds-HH_Cds-Cs\H3/H", group = """ -1 C 0 {2,S} {4,S} {5,S} {6,S} -2 *2 C 0 {1,S} {3,D} {7,S} -3 *1 C 0 {2,D} {8,S} {9,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} +3 H 0 {1,S} 4 H 0 {1,S} -5 H 0 {1,S} -6 H 0 {1,S} -7 H 0 {2,S} -8 H 0 {3,S} -9 H 0 {3,S} +5 Cs 0 {2,S} {7,S} {8,S} {9,S} +6 H 0 {2,S} +7 H 0 {5,S} +8 H 0 {5,S} +9 H 0 {5,S} """, kinetics = None, shortDesc = u"""""", @@ -17742,7 +17742,7 @@ group = """ 1 *1 Od 0 {2,D} -2 *2 {C,S} 0 {1,D} +2 *2 R!H 0 {1,D} """, kinetics = None, shortDesc = u"""""", @@ -18551,7 +18551,7 @@ group = """ 1 *3 Ct 1 {2,T} -2 C 0 {1,T} +2 R 0 {1,T} """, kinetics = None, shortDesc = u"""""", @@ -19147,8 +19147,8 @@ """ 1 *3 C 1 {2,S} {3,S} {4,S} 2 {Cd,Ct,Cb,CO,N3d,N5d} 0 {1,S} -3 {H,Cs,Os,Ss} 0 {1,S} -4 {H,Cs,Os,Ss} 0 {1,S} +3 {H,Cs,Os,Ss,N3s,N5s} 0 {1,S} +4 {H,Cs,Os,Ss,N3s,N5s} 0 {1,S} """, kinetics = None, shortDesc = u"""""", @@ -20578,23 +20578,7 @@ group = """ 1 *3 O 1 {2,S} -2 O 0 {1,S} -""", - kinetics = None, - shortDesc = u"""""", - longDesc = -u""" - -""", -) - -entry( - index = 1031, - label = "OJ-OneDe", - group = -""" -1 *3 O 1 {2,S} -2 {Cd,Ct,Cb,CO,N3d,N5d} 0 {1,S} +2 Os 0 {1,S} """, kinetics = None, shortDesc = u"""""", @@ -20620,27 +20604,12 @@ """, ) -entry( - index = 1033, - label = "Y_1centerbirad", - group = -""" -1 *3 {Cs,Cd,O,S} {2S,2T} -""", - kinetics = None, - shortDesc = u"""""", - longDesc = -u""" - -""", -) - entry( index = 1034, label = "O_atom_triplet", group = """ -1 *3 O {2S,2T} +1 *3 O 2T """, kinetics = None, shortDesc = u"""""", @@ -21645,37 +21614,6 @@ """, ) -entry( - index = 345, - label = "N3_atom_quartet", - group = -""" -1 *3 N3s 3 -""", - kinetics = None, - shortDesc = u"""""", - longDesc = -u""" - -""", -) - -entry( - index = 346, - label = "CH_quartet", - group = -""" -1 *3 Cs 3 {2,S} -2 H 0 {1,S} -""", - kinetics = None, - shortDesc = u"""""", - longDesc = -u""" - -""", -) - entry( index = 350, label = "Y_1centerbirad", @@ -21880,8 +21818,8 @@ group = """ 1 *3 C 1 {2,S} {3,S} {4,S} -2 Cs 0 {1,S} -3 {Cd,Ct,Cb,CO,N3d,N5d} 0 {1,S} +2 {Cd,Ct,Cb,CO,N3d,N5d} 0 {1,S} +3 Cs 0 {1,S} 4 {N3s,N5s} 0 {1,S} """, kinetics = None, @@ -22247,7 +22185,7 @@ label = "CH_quartet", group = """ -1 *3 C 3Q {2,S} +1 *3 Cs 3Q {2,S} 2 H 0 {1,S} """, kinetics = None, @@ -22350,6 +22288,37 @@ """, ) +entry( + index = 3950, + label = "O_rad/OneDe", + group = +""" +1 *3 O 1 {2,S} +2 {Cd,Ct,Cb,CO} 0 {1,S} +""", + kinetics = None, + shortDesc = u"""""", + longDesc = +u""" + +""", +) + +entry( + index = 3960, + label = "O_rad/NonDe", + group = +""" +1 *3 O 1 {2,S} +2 {Cs,Os,Ss} 0 {1,S} +""", + kinetics = None, + shortDesc = u"""""", + longDesc = +u""" + +""", +) tree( """ L1: R_R @@ -22518,7 +22487,7 @@ L4: Cds_N3d L5: Cds-HH_N3d L5: Cds-NonDeH_N3d - L6: Cds-NonDe2_N3d + L5: Cds-NonDe2_N3d L3: Cds_Cds L4: Cds-HH_Cds L5: Cds-HH_Cds-HH @@ -23317,8 +23286,8 @@ L2: CJ L3: CbJ L3: CtJ - L4: CtJ_Ct - L4: CtJ_N3t + L4: CtJ_Ct + L4: CtJ_N3t L3: C2b L3: C=SJ L4: C=SJ-H @@ -23433,10 +23402,12 @@ L3: OJ_pri L3: OJ_sec L4: OJ-NonDe - L5: OJ-Cs - L5: OJ-Os + L5: O_rad/NonDe + L6: OJ-Cs + L6: OJ-Os L5: OJ-Ns L4: OJ-OneDe + L5: O_rad/OneDe L5: OJ-OneDeN L6: OJ-NO L3: O2b @@ -23468,6 +23439,9 @@ L5: N3dJ_O L5: N3dJ_N L2: Y_1centerbirad + L3: O_atom_singlet + L3: NH_singlet + L3: CH2_singlet L3: O_atom_triplet L3: SJJ L3: CH2_triplet diff --git a/input/kinetics/families/R_Addition_MultipleBond/rules.py b/input/kinetics/families/R_Addition_MultipleBond/rules.py index dd714fcdf2..e1501f97df 100644 --- a/input/kinetics/families/R_Addition_MultipleBond/rules.py +++ b/input/kinetics/families/R_Addition_MultipleBond/rules.py @@ -91241,7 +91241,7 @@ entry( index = 3051, - label = "Ct-H_Ct-H;CtJ", + label = "Ct-H_Ct-H;CtJ_Ct", group1 = """ 1 *1 Ct 0 {2,T} {3,S} @@ -91252,7 +91252,7 @@ group2 = """ 1 *3 Ct 1 {2,T} -2 C 0 {1,T} +2 Ct 0 {1,T} """, kinetics = ArrheniusEP( A = (5000000000000.0, 'cm^3/(mol*s)'), @@ -91411,7 +91411,7 @@ group2 = """ 1 *3 O 1 {2,S} -2 O 0 {1,S} +2 Os 0 {1,S} """, kinetics = ArrheniusEP( A = (0.04245, 'cm^3/(mol*s)'), @@ -91442,7 +91442,7 @@ group2 = """ 1 *3 O 1 {2,S} -2 O 0 {1,S} +2 Os 0 {1,S} """, kinetics = ArrheniusEP( A = (0.04245, 'cm^3/(mol*s)'), @@ -91473,7 +91473,7 @@ group2 = """ 1 *3 O 1 {2,S} -2 O 0 {1,S} +2 Os 0 {1,S} """, kinetics = ArrheniusEP( A = (0.04245, 'cm^3/(mol*s)'), @@ -91504,7 +91504,7 @@ group2 = """ 1 *3 O 1 {2,S} -2 O 0 {1,S} +2 Os 0 {1,S} """, kinetics = ArrheniusEP( A = (0.04245, 'cm^3/(mol*s)'), @@ -91537,7 +91537,7 @@ group2 = """ 1 *3 O 1 {2,S} -2 O 0 {1,S} +2 Os 0 {1,S} """, kinetics = ArrheniusEP( A = (35.6, 'cm^3/(mol*s)'), @@ -91570,7 +91570,7 @@ group2 = """ 1 *3 O 1 {2,S} -2 O 0 {1,S} +2 Os 0 {1,S} """, kinetics = ArrheniusEP( A = (791, 'cm^3/(mol*s)'), @@ -91603,7 +91603,7 @@ group2 = """ 1 *3 O 1 {2,S} -2 O 0 {1,S} +2 Os 0 {1,S} """, kinetics = ArrheniusEP( A = (1350, 'cm^3/(mol*s)'), @@ -91636,7 +91636,7 @@ group2 = """ 1 *3 O 1 {2,S} -2 O 0 {1,S} +2 Os 0 {1,S} """, kinetics = ArrheniusEP( A = (10.6, 'cm^3/(mol*s)'), @@ -91669,7 +91669,7 @@ group2 = """ 1 *3 O 1 {2,S} -2 O 0 {1,S} +2 Os 0 {1,S} """, kinetics = ArrheniusEP( A = (46.2, 'cm^3/(mol*s)'), @@ -91702,7 +91702,7 @@ group2 = """ 1 *3 O 1 {2,S} -2 O 0 {1,S} +2 Os 0 {1,S} """, kinetics = ArrheniusEP( A = (186, 'cm^3/(mol*s)'), @@ -91735,7 +91735,7 @@ group2 = """ 1 *3 O 1 {2,S} -2 O 0 {1,S} +2 Os 0 {1,S} """, kinetics = ArrheniusEP( A = (0.337, 'cm^3/(mol*s)'), @@ -91768,7 +91768,7 @@ group2 = """ 1 *3 O 1 {2,S} -2 O 0 {1,S} +2 Os 0 {1,S} """, kinetics = ArrheniusEP( A = (0.172, 'cm^3/(mol*s)'), @@ -91801,7 +91801,7 @@ group2 = """ 1 *3 O 1 {2,S} -2 O 0 {1,S} +2 Os 0 {1,S} """, kinetics = ArrheniusEP( A = (1.69, 'cm^3/(mol*s)'), @@ -92761,7 +92761,7 @@ """, group2 = """ -1 *3 O {2S,2T} +1 *3 O 2T """, kinetics = ArrheniusEP( A = (44200000.0, 'cm^3/(mol*s)'), @@ -92793,7 +92793,7 @@ """, group2 = """ -1 *3 O {2S,2T} +1 *3 O 2T """, kinetics = ArrheniusEP( A = (41700000.0, 'cm^3/(mol*s)'), @@ -92825,7 +92825,7 @@ """, group2 = """ -1 *3 O {2S,2T} +1 *3 O 2T """, kinetics = ArrheniusEP( A = (106000000.0, 'cm^3/(mol*s)'), @@ -93080,15 +93080,15 @@ label = "Cds-HH_Cds-Cs\H3/H;HJ", group1 = """ -1 C 0 {2,S} {4,S} {5,S} {6,S} -2 *2 C 0 {1,S} {3,D} {7,S} -3 *1 C 0 {2,D} {8,S} {9,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} +3 H 0 {1,S} 4 H 0 {1,S} -5 H 0 {1,S} -6 H 0 {1,S} -7 H 0 {2,S} -8 H 0 {3,S} -9 H 0 {3,S} +5 Cs 0 {2,S} {7,S} {8,S} {9,S} +6 H 0 {2,S} +7 H 0 {5,S} +8 H 0 {5,S} +9 H 0 {5,S} """, group2 = """ @@ -93147,15 +93147,15 @@ label = "Cds-HH_Cds-Cs\H3/H;CsJ-OsHH", group1 = """ -1 C 0 {2,S} {4,S} {5,S} {6,S} -2 *2 C 0 {1,S} {3,D} {7,S} -3 *1 C 0 {2,D} {8,S} {9,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} +3 H 0 {1,S} 4 H 0 {1,S} -5 H 0 {1,S} -6 H 0 {1,S} -7 H 0 {2,S} -8 H 0 {3,S} -9 H 0 {3,S} +5 Cs 0 {2,S} {7,S} {8,S} {9,S} +6 H 0 {2,S} +7 H 0 {5,S} +8 H 0 {5,S} +9 H 0 {5,S} """, group2 = """ @@ -93280,15 +93280,15 @@ label = "Cds-HH_Cds-Cs\H3/H;OJ_pri", group1 = """ -1 C 0 {2,S} {4,S} {5,S} {6,S} -2 *2 C 0 {1,S} {3,D} {7,S} -3 *1 C 0 {2,D} {8,S} {9,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} +3 H 0 {1,S} 4 H 0 {1,S} -5 H 0 {1,S} -6 H 0 {1,S} -7 H 0 {2,S} -8 H 0 {3,S} -9 H 0 {3,S} +5 Cs 0 {2,S} {7,S} {8,S} {9,S} +6 H 0 {2,S} +7 H 0 {5,S} +8 H 0 {5,S} +9 H 0 {5,S} """, group2 = """ From 90768bc7873f6bf5c1df90dd9b20c0d6dcab7644 Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Fri, 11 Apr 2014 15:41:18 -0400 Subject: [PATCH 08/15] Removed biradical singlets from R_MultipleBond Addition After discussing with bbuesser and agvandeputte, we concluded a singlet biradical would react much faster as a 1,2_cycloaddition than a regular addition. There were no rules which used singlet biradicals (probably because they do not react through this channel). I am only restricting singlet biradicals for *3 atoms, I still allow them in R_R tree. Groups were found by searching for the regex '\*3 .*2', which returned all lines with *3 atoms that were birad (there were only 9 of them). Then I manually searched them for biradical singlets. Removed the following groups: O_atom_singlet CH2_singlet NH_singlet Changed *3 atom from 2 to 2T in the following groups: Y_1centerbirad CO_birad --- .../R_Addition_MultipleBond/groups.py | 55 +------------------ 1 file changed, 2 insertions(+), 53 deletions(-) diff --git a/input/kinetics/families/R_Addition_MultipleBond/groups.py b/input/kinetics/families/R_Addition_MultipleBond/groups.py index 34a2d653ec..d27f4700c5 100644 --- a/input/kinetics/families/R_Addition_MultipleBond/groups.py +++ b/input/kinetics/families/R_Addition_MultipleBond/groups.py @@ -21619,7 +21619,7 @@ label = "Y_1centerbirad", group = """ -1 *3 R!H 2 +1 *3 R!H 2T """, kinetics = None, shortDesc = u"""""", @@ -21634,7 +21634,7 @@ label = "CO_birad", group = """ -1 *3 C 2 {2,D} +1 *3 C 2T {2,D} 2 Od 0 {1,D} """, kinetics = None, @@ -22212,54 +22212,6 @@ """, ) -entry( - index = 390, - label = "O_atom_singlet", - group = -""" -1 *3 O 2S -""", - kinetics = None, - shortDesc = u"""""", - longDesc = -u""" - -""", -) - -entry( - index = 391, - label = "CH2_singlet", - group = -""" -1 *3 C 2S {2,S} {3,S} -2 H 0 {1,S} -3 H 0 {1,S} -""", - kinetics = None, - shortDesc = u"""""", - longDesc = -u""" - -""", -) - -entry( - index = 392, - label = "NH_singlet", - group = -""" -1 *3 N 2S {2,S} -2 H 0 {1,S} -""", - kinetics = None, - shortDesc = u"""""", - longDesc = -u""" - -""", -) - entry( index = 393, label = "Y_1centerquadrad", @@ -23439,9 +23391,6 @@ L5: N3dJ_O L5: N3dJ_N L2: Y_1centerbirad - L3: O_atom_singlet - L3: NH_singlet - L3: CH2_singlet L3: O_atom_triplet L3: SJJ L3: CH2_triplet From 10ebf2d8627fa22bba7240e47a9ae63cd9e736cb Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Fri, 11 Apr 2014 17:36:04 -0400 Subject: [PATCH 09/15] Fixes to rule adj lists in Intra_R_Add_Endocyclic There has been some confusion as to whether Cdd is a specific case of Cd. In the current builds, they are exclusive. Thus many groups have had atoms changed from Cd to {Cd, Cdd}. Here, I have copied over all the changes which appeared in groups.py to the proper adj lists in rules.py. The groups that changed were: R5_SS_D (168 changes in rules) R4_S_D (168 changes in rules) R6_SMS_D (168 changes in rules) R5_SD_D (1 change in rules) R6_SSS_D (168 changes in rules) R3_D (1 change in rules) A few of the more general groups had the above change and nitrogen added to their definition: R3_D (1 change in rules) top node, multiplebond_intra changed to include N and Cdd --- .../families/Intra_R_Add_Endocyclic/rules.py | 1356 ++++++++--------- 1 file changed, 678 insertions(+), 678 deletions(-) diff --git a/input/kinetics/families/Intra_R_Add_Endocyclic/rules.py b/input/kinetics/families/Intra_R_Add_Endocyclic/rules.py index 290b69631f..dd3f2ec830 100644 --- a/input/kinetics/families/Intra_R_Add_Endocyclic/rules.py +++ b/input/kinetics/families/Intra_R_Add_Endocyclic/rules.py @@ -12,8 +12,8 @@ group1 = "OR{R3, R4, R5, R6, R7, R8, R9}", group2 = """ -1 *2 {Cd,Ct,CO} 0 {2,{D,T}} -2 *3 {Cd,Ct,Od,Sd} 0 {1,{D,T}} +1 *2 {Cd,Cdd,Ct,CO,N} 0 {2,{D,T}} +2 *3 {Cd,Ct,Od,Sd,Cdd,N} 0 {1,{D,T}} """, group3 = """ @@ -44,7 +44,7 @@ 2 *4 Cd 0 {1,S} {3,D} 3 *5 Cd 0 {2,D} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -83,7 +83,7 @@ """ 1 *1 R!H 1 {2,S} 2 *2 Cd 0 {1,S} {3,D} -3 *3 Cd 0 {2,D} +3 *3 {Cd,Cdd} 0 {2,D} """, group2 = """ @@ -162,7 +162,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -204,7 +204,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -246,7 +246,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -288,7 +288,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -330,7 +330,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -372,7 +372,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -414,7 +414,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -456,7 +456,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -497,7 +497,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -539,7 +539,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -581,7 +581,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -623,7 +623,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -665,7 +665,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -707,7 +707,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -749,7 +749,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -791,7 +791,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -832,7 +832,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -874,7 +874,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -916,7 +916,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -958,7 +958,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1000,7 +1000,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1042,7 +1042,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1084,7 +1084,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1126,7 +1126,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1167,7 +1167,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1209,7 +1209,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1251,7 +1251,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1293,7 +1293,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1335,7 +1335,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1377,7 +1377,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1419,7 +1419,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1461,7 +1461,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1502,7 +1502,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1544,7 +1544,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1586,7 +1586,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1628,7 +1628,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1670,7 +1670,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1712,7 +1712,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1754,7 +1754,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1796,7 +1796,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1837,7 +1837,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1879,7 +1879,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1921,7 +1921,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -1963,7 +1963,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -2005,7 +2005,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -2047,7 +2047,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -2089,7 +2089,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -2131,7 +2131,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -2172,7 +2172,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -2214,7 +2214,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -2256,7 +2256,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -2298,7 +2298,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -2340,7 +2340,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -2382,7 +2382,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -2424,7 +2424,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -2466,7 +2466,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -2505,7 +2505,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -2545,7 +2545,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -2585,7 +2585,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -2625,7 +2625,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -2665,7 +2665,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -2705,7 +2705,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -2745,7 +2745,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -2785,7 +2785,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -2824,7 +2824,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -2864,7 +2864,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -2904,7 +2904,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -2944,7 +2944,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -2984,7 +2984,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3024,7 +3024,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3064,7 +3064,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3104,7 +3104,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3143,7 +3143,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3183,7 +3183,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3223,7 +3223,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3263,7 +3263,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3303,7 +3303,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3343,7 +3343,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3383,7 +3383,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3423,7 +3423,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3462,7 +3462,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3502,7 +3502,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3542,7 +3542,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3582,7 +3582,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3622,7 +3622,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3662,7 +3662,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3702,7 +3702,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3742,7 +3742,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3781,7 +3781,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3821,7 +3821,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3861,7 +3861,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3901,7 +3901,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3941,7 +3941,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -3981,7 +3981,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4021,7 +4021,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4061,7 +4061,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4100,7 +4100,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4140,7 +4140,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4180,7 +4180,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4220,7 +4220,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4260,7 +4260,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4300,7 +4300,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4340,7 +4340,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4380,7 +4380,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4419,7 +4419,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4459,7 +4459,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4499,7 +4499,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4539,7 +4539,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4579,7 +4579,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4619,7 +4619,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4659,7 +4659,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4699,7 +4699,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -4739,7 +4739,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -4780,7 +4780,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -4821,7 +4821,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -4862,7 +4862,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -4903,7 +4903,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -4944,7 +4944,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -4985,7 +4985,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5026,7 +5026,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5066,7 +5066,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5107,7 +5107,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5148,7 +5148,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5189,7 +5189,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5230,7 +5230,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5271,7 +5271,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5312,7 +5312,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5353,7 +5353,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5393,7 +5393,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5434,7 +5434,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5475,7 +5475,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5516,7 +5516,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5557,7 +5557,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5598,7 +5598,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5639,7 +5639,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5680,7 +5680,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5720,7 +5720,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5761,7 +5761,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5802,7 +5802,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5843,7 +5843,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5884,7 +5884,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5925,7 +5925,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -5966,7 +5966,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6007,7 +6007,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6047,7 +6047,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6088,7 +6088,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6129,7 +6129,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6170,7 +6170,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6211,7 +6211,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6252,7 +6252,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6293,7 +6293,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6334,7 +6334,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6374,7 +6374,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6415,7 +6415,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6456,7 +6456,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6497,7 +6497,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6538,7 +6538,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6579,7 +6579,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6620,7 +6620,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6661,7 +6661,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6701,7 +6701,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6742,7 +6742,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6783,7 +6783,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6824,7 +6824,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6865,7 +6865,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6906,7 +6906,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6947,7 +6947,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -6988,7 +6988,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -7029,7 +7029,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7071,7 +7071,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7113,7 +7113,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7155,7 +7155,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7197,7 +7197,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7239,7 +7239,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7281,7 +7281,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7323,7 +7323,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7364,7 +7364,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7406,7 +7406,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7448,7 +7448,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7490,7 +7490,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7532,7 +7532,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7574,7 +7574,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7616,7 +7616,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7658,7 +7658,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7699,7 +7699,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7741,7 +7741,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7783,7 +7783,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7825,7 +7825,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7867,7 +7867,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7909,7 +7909,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7951,7 +7951,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -7993,7 +7993,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8034,7 +8034,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8076,7 +8076,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8118,7 +8118,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8160,7 +8160,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8202,7 +8202,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8244,7 +8244,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8286,7 +8286,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8328,7 +8328,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8369,7 +8369,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8411,7 +8411,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8453,7 +8453,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8495,7 +8495,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8537,7 +8537,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8579,7 +8579,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8621,7 +8621,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8663,7 +8663,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8704,7 +8704,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8746,7 +8746,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8788,7 +8788,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8830,7 +8830,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8872,7 +8872,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8914,7 +8914,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8956,7 +8956,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -8998,7 +8998,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9039,7 +9039,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9081,7 +9081,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9123,7 +9123,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9165,7 +9165,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9207,7 +9207,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9249,7 +9249,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9291,7 +9291,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9333,7 +9333,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9374,7 +9374,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9416,7 +9416,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9458,7 +9458,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9500,7 +9500,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9542,7 +9542,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9584,7 +9584,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9626,7 +9626,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9668,7 +9668,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9709,7 +9709,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9751,7 +9751,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9793,7 +9793,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9835,7 +9835,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9877,7 +9877,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9919,7 +9919,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -9961,7 +9961,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10003,7 +10003,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10044,7 +10044,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10086,7 +10086,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10128,7 +10128,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10170,7 +10170,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10212,7 +10212,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10254,7 +10254,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10296,7 +10296,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10338,7 +10338,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10379,7 +10379,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10421,7 +10421,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10463,7 +10463,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10505,7 +10505,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10547,7 +10547,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10589,7 +10589,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10631,7 +10631,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10673,7 +10673,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10714,7 +10714,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10756,7 +10756,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10798,7 +10798,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10840,7 +10840,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10882,7 +10882,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10924,7 +10924,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -10966,7 +10966,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -11008,7 +11008,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -11049,7 +11049,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -11091,7 +11091,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -11133,7 +11133,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -11175,7 +11175,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -11217,7 +11217,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -11259,7 +11259,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -11301,7 +11301,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -11343,7 +11343,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -11384,7 +11384,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -11426,7 +11426,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -11468,7 +11468,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -11510,7 +11510,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -11552,7 +11552,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -11594,7 +11594,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -11636,7 +11636,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -11678,7 +11678,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -11717,7 +11717,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -11757,7 +11757,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -11797,7 +11797,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -11837,7 +11837,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -11877,7 +11877,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -11917,7 +11917,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -11957,7 +11957,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -11997,7 +11997,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12036,7 +12036,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12076,7 +12076,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12116,7 +12116,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12156,7 +12156,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12196,7 +12196,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12236,7 +12236,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12276,7 +12276,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12316,7 +12316,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12355,7 +12355,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12395,7 +12395,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12435,7 +12435,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12475,7 +12475,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12515,7 +12515,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12555,7 +12555,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12595,7 +12595,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12635,7 +12635,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12674,7 +12674,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12714,7 +12714,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12754,7 +12754,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12794,7 +12794,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12834,7 +12834,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12874,7 +12874,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12914,7 +12914,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12954,7 +12954,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -12993,7 +12993,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13033,7 +13033,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13073,7 +13073,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13113,7 +13113,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13153,7 +13153,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13193,7 +13193,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13233,7 +13233,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13273,7 +13273,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13312,7 +13312,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13352,7 +13352,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13392,7 +13392,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13432,7 +13432,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13472,7 +13472,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13512,7 +13512,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13552,7 +13552,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13592,7 +13592,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13631,7 +13631,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13671,7 +13671,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13711,7 +13711,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13751,7 +13751,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13791,7 +13791,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13831,7 +13831,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13871,7 +13871,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13911,7 +13911,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -13951,7 +13951,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -13992,7 +13992,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14033,7 +14033,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14074,7 +14074,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14115,7 +14115,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14156,7 +14156,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14197,7 +14197,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14238,7 +14238,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14278,7 +14278,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14319,7 +14319,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14360,7 +14360,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14401,7 +14401,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14442,7 +14442,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14483,7 +14483,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14524,7 +14524,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14565,7 +14565,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14605,7 +14605,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14646,7 +14646,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14687,7 +14687,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14728,7 +14728,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14769,7 +14769,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14810,7 +14810,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14851,7 +14851,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14892,7 +14892,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14932,7 +14932,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -14973,7 +14973,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15014,7 +15014,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15055,7 +15055,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15096,7 +15096,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15137,7 +15137,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15178,7 +15178,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15219,7 +15219,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15259,7 +15259,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15300,7 +15300,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15341,7 +15341,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15382,7 +15382,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15423,7 +15423,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15464,7 +15464,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15505,7 +15505,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15546,7 +15546,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15586,7 +15586,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15627,7 +15627,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15668,7 +15668,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15709,7 +15709,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15750,7 +15750,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15791,7 +15791,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15832,7 +15832,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15873,7 +15873,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15913,7 +15913,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15954,7 +15954,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -15995,7 +15995,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -16036,7 +16036,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -16077,7 +16077,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -16118,7 +16118,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -16159,7 +16159,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -16200,7 +16200,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -16241,7 +16241,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -16283,7 +16283,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -16325,7 +16325,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -16367,7 +16367,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -16409,7 +16409,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -16451,7 +16451,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -16493,7 +16493,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -16535,7 +16535,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -16576,7 +16576,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -16618,7 +16618,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -16660,7 +16660,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -16702,7 +16702,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -16744,7 +16744,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -16786,7 +16786,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -16828,7 +16828,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -16870,7 +16870,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -16911,7 +16911,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -16953,7 +16953,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -16995,7 +16995,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17037,7 +17037,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17079,7 +17079,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17121,7 +17121,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17163,7 +17163,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17205,7 +17205,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17246,7 +17246,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17288,7 +17288,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17330,7 +17330,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17372,7 +17372,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17414,7 +17414,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17456,7 +17456,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17498,7 +17498,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17540,7 +17540,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17581,7 +17581,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17623,7 +17623,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17665,7 +17665,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17707,7 +17707,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17749,7 +17749,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17791,7 +17791,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17833,7 +17833,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17875,7 +17875,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17916,7 +17916,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -17958,7 +17958,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18000,7 +18000,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18042,7 +18042,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18084,7 +18084,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18126,7 +18126,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18168,7 +18168,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18210,7 +18210,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18251,7 +18251,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18293,7 +18293,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18335,7 +18335,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18377,7 +18377,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18419,7 +18419,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18461,7 +18461,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18503,7 +18503,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18545,7 +18545,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18586,7 +18586,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18628,7 +18628,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18670,7 +18670,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18712,7 +18712,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18754,7 +18754,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18796,7 +18796,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18838,7 +18838,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18880,7 +18880,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18921,7 +18921,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -18963,7 +18963,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19005,7 +19005,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19047,7 +19047,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19089,7 +19089,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19131,7 +19131,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19173,7 +19173,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19215,7 +19215,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19256,7 +19256,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19298,7 +19298,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19340,7 +19340,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19382,7 +19382,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19424,7 +19424,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19466,7 +19466,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19508,7 +19508,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19550,7 +19550,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19591,7 +19591,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19633,7 +19633,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19675,7 +19675,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19717,7 +19717,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19759,7 +19759,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19801,7 +19801,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19843,7 +19843,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19885,7 +19885,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19926,7 +19926,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -19968,7 +19968,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20010,7 +20010,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20052,7 +20052,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20094,7 +20094,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20136,7 +20136,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20178,7 +20178,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20220,7 +20220,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20261,7 +20261,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20303,7 +20303,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20345,7 +20345,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20387,7 +20387,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20429,7 +20429,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20471,7 +20471,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20513,7 +20513,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20555,7 +20555,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20596,7 +20596,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20638,7 +20638,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20680,7 +20680,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20722,7 +20722,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20764,7 +20764,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20806,7 +20806,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20848,7 +20848,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20890,7 +20890,7 @@ 3 *6 R!H 0 {2,S} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -20929,7 +20929,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -20969,7 +20969,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21009,7 +21009,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21049,7 +21049,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21089,7 +21089,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21129,7 +21129,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21169,7 +21169,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21209,7 +21209,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21248,7 +21248,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21288,7 +21288,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21328,7 +21328,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21368,7 +21368,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21408,7 +21408,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21448,7 +21448,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21488,7 +21488,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21528,7 +21528,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21567,7 +21567,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21607,7 +21607,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21647,7 +21647,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21687,7 +21687,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21727,7 +21727,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21767,7 +21767,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21807,7 +21807,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21847,7 +21847,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21886,7 +21886,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21926,7 +21926,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -21966,7 +21966,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22006,7 +22006,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22046,7 +22046,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22086,7 +22086,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22126,7 +22126,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22166,7 +22166,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22205,7 +22205,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22245,7 +22245,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22285,7 +22285,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22325,7 +22325,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22365,7 +22365,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22405,7 +22405,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22445,7 +22445,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22485,7 +22485,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22524,7 +22524,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22564,7 +22564,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22604,7 +22604,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22644,7 +22644,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22684,7 +22684,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22724,7 +22724,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22764,7 +22764,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22804,7 +22804,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22843,7 +22843,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22883,7 +22883,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22923,7 +22923,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -22963,7 +22963,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -23003,7 +23003,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -23043,7 +23043,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -23083,7 +23083,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -23123,7 +23123,7 @@ 1 *1 R!H 1 {2,S} 2 *4 R!H 0 {1,S} {3,S} 3 *2 Cd 0 {2,S} {4,D} -4 *3 Cd 0 {3,D} +4 *3 {Cd,Cdd} 0 {3,D} """, group2 = """ @@ -23163,7 +23163,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23204,7 +23204,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23245,7 +23245,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23286,7 +23286,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23327,7 +23327,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23368,7 +23368,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23409,7 +23409,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23450,7 +23450,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23490,7 +23490,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23531,7 +23531,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23572,7 +23572,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23613,7 +23613,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23654,7 +23654,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23695,7 +23695,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23736,7 +23736,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23777,7 +23777,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23817,7 +23817,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23858,7 +23858,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23899,7 +23899,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23940,7 +23940,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -23981,7 +23981,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24022,7 +24022,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24063,7 +24063,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24104,7 +24104,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24144,7 +24144,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24185,7 +24185,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24226,7 +24226,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24267,7 +24267,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24308,7 +24308,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24349,7 +24349,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24390,7 +24390,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24431,7 +24431,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24471,7 +24471,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24512,7 +24512,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24553,7 +24553,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24594,7 +24594,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24635,7 +24635,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24676,7 +24676,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24717,7 +24717,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24758,7 +24758,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24798,7 +24798,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24839,7 +24839,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24880,7 +24880,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24921,7 +24921,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -24962,7 +24962,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -25003,7 +25003,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -25044,7 +25044,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -25085,7 +25085,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -25125,7 +25125,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -25166,7 +25166,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -25207,7 +25207,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -25248,7 +25248,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -25289,7 +25289,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -25330,7 +25330,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -25371,7 +25371,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -25412,7 +25412,7 @@ 2 *4 R!H 0 {1,S} {3,S} 3 *5 R!H 0 {2,S} {4,S} 4 *2 Cd 0 {3,S} {5,D} -5 *3 Cd 0 {4,D} +5 *3 {Cd,Cdd} 0 {4,D} """, group2 = """ @@ -25453,7 +25453,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -25495,7 +25495,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -25537,7 +25537,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -25579,7 +25579,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -25621,7 +25621,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -25663,7 +25663,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -25705,7 +25705,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -25747,7 +25747,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -25788,7 +25788,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -25830,7 +25830,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -25872,7 +25872,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -25914,7 +25914,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -25956,7 +25956,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -25998,7 +25998,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26040,7 +26040,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26082,7 +26082,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26123,7 +26123,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26165,7 +26165,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26207,7 +26207,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26249,7 +26249,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26291,7 +26291,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26333,7 +26333,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26375,7 +26375,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26417,7 +26417,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26458,7 +26458,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26500,7 +26500,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26542,7 +26542,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26584,7 +26584,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26626,7 +26626,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26668,7 +26668,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26710,7 +26710,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26752,7 +26752,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26793,7 +26793,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26835,7 +26835,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26877,7 +26877,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26919,7 +26919,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -26961,7 +26961,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27003,7 +27003,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27045,7 +27045,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27087,7 +27087,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27128,7 +27128,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27170,7 +27170,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27212,7 +27212,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27254,7 +27254,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27296,7 +27296,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27338,7 +27338,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27380,7 +27380,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27422,7 +27422,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27463,7 +27463,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27505,7 +27505,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27547,7 +27547,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27589,7 +27589,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27631,7 +27631,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27673,7 +27673,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27715,7 +27715,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27757,7 +27757,7 @@ 3 *6 {Cd,Ct,Cb} 0 {2,{D,T,B}} {4,S} 4 *5 R!H 0 {3,S} {5,S} 5 *2 Cd 0 {4,S} {6,D} -6 *3 Cd 0 {5,D} +6 *3 {Cd,Cdd} 0 {5,D} """, group2 = """ @@ -27800,8 +27800,8 @@ 5 *8 R!H 0 {4,S} {6,S} 6 *9 R!H 0 {5,S} {7,D} 7 *5 R!H 0 {6,D} {8,S} -8 *2 {Cd,Ct,CO} 0 {7,S} {9,{D,T}} -9 *3 {Cd,Ct,Od,Sd} 0 {8,{D,T}} +8 *2 {Cd,Ct,CO,N} 0 {7,S} {9,{D,T}} +9 *3 {Cd,Ct,Od,Sd,Cdd,N} 0 {8,{D,T}} """, group2 = """ From 67b0376590417d5e17b5328a95f220ad1628a77e Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Mon, 14 Apr 2014 13:41:50 -0400 Subject: [PATCH 10/15] Fixes to group definitions in Intra_R_Add_Endocylic -R6_RSR was missing a label, *6, on one of it's atoms. Its parent and all it's children had the *6 label, so I'm fairly sure it was just a typo. (0 rules affected) -carbonyl_intra atom changed from O {1,D} to Od {1,D}. Same fix for all its children: carbonyl_intra_H, carbonyl_intra_Nd, carbonyl_intra_De (0 rules for all groups affected) --- .../kinetics/families/Intra_R_Add_Endocyclic/groups.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/input/kinetics/families/Intra_R_Add_Endocyclic/groups.py b/input/kinetics/families/Intra_R_Add_Endocyclic/groups.py index c299079213..47c2e3679f 100644 --- a/input/kinetics/families/Intra_R_Add_Endocyclic/groups.py +++ b/input/kinetics/families/Intra_R_Add_Endocyclic/groups.py @@ -1148,7 +1148,7 @@ """ 1 *1 R!H 1 {2,{S,D,T,B}} 2 *4 R!H 0 {1,{S,D,T,B}} {3,S} -3 R!H 0 {2,S} {4,{S,D,T,B}} +3 *6 R!H 0 {2,S} {4,{S,D,T,B}} 4 *5 R!H 0 {3,{S,D,T,B}} {5,S} 5 *2 {Cd,Ct,CO,N} 0 {4,S} {6,{D,T}} 6 *3 {Cd,Ct,Od,Sd,Cdd,N} 0 {5,{D,T}} @@ -2944,7 +2944,7 @@ group = """ 1 *2 CO 0 {2,D} -2 *3 O 0 {1,D} +2 *3 Od 0 {1,D} """, kinetics = None, shortDesc = u"""""", @@ -2960,7 +2960,7 @@ group = """ 1 *2 CO 0 {2,D} {3,S} -2 *3 O 0 {1,D} +2 *3 Od 0 {1,D} 3 H 0 {1,S} """, kinetics = None, @@ -2977,7 +2977,7 @@ group = """ 1 *2 CO 0 {2,D} {3,S} -2 *3 O 0 {1,D} +2 *3 Od 0 {1,D} 3 {Cs,O,S} 0 {1,S} """, kinetics = None, @@ -2994,7 +2994,7 @@ group = """ 1 *2 CO 0 {2,D} {3,S} -2 *3 O 0 {1,D} +2 *3 Od 0 {1,D} 3 {Cd,Ct,Cb,CO} 0 {1,S} """, kinetics = None, From bf66929db8c6c3fc3ff9df5c9fce9233a1f760d6 Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Mon, 14 Apr 2014 17:17:59 -0400 Subject: [PATCH 11/15] Fixes to Disproportionation family -For three rules: changed atom from C to Ct for group Ct_rad/Ct. -For rule Ct_rad;O_Csrad, the original rule was for C2H + CH2OH --> C2H2 + CH2O, but the group has been changed to be inclusive for nitrogen. Since we have an original reaction, I decided to make a training reaction and remove this rule. I found the last error serendipitously because the rule's adjList was mismatched with the groups. I don't have a systematic check for when rules may not be applicable to expanding rules. --- .../families/Disproportionation/rules.py | 52 ++---------------- .../families/Disproportionation/training.py | 55 +++++++++++++++++++ 2 files changed, 61 insertions(+), 46 deletions(-) diff --git a/input/kinetics/families/Disproportionation/rules.py b/input/kinetics/families/Disproportionation/rules.py index 19f50eac40..375ab0c630 100644 --- a/input/kinetics/families/Disproportionation/rules.py +++ b/input/kinetics/families/Disproportionation/rules.py @@ -518,8 +518,8 @@ label = "Ct_rad/Ct;Cmethyl_Csrad", group1 = """ -1 *1 C 1 {2,T} -2 C 0 {1,T} +1 *1 Ct 1 {2,T} +2 Ct 0 {1,T} """, group2 = """ @@ -1075,8 +1075,8 @@ label = "Ct_rad/Ct;C/H2/Nd_Csrad", group1 = """ -1 *1 C 1 {2,T} -2 C 0 {1,T} +1 *1 Ct 1 {2,T} +2 Ct 0 {1,T} """, group2 = """ @@ -1200,8 +1200,8 @@ label = "Ct_rad/Ct;C/H/NdNd_Csrad", group1 = """ -1 *1 C 1 {2,T} -2 C 0 {1,T} +1 *1 Ct 1 {2,T} +2 Ct 0 {1,T} """, group2 = """ @@ -2640,46 +2640,6 @@ """, ) -entry( - index = 548, - label = "Ct_rad;O_Csrad", - group1 = -""" -1 *1 C 1 {2,T} -2 C 0 {1,T} -""", - group2 = -""" -1 *2 O 0 {2,S} {3,S} -2 *3 Cs 1 {1,S} -3 *4 H 0 {1,S} -""", - kinetics = ArrheniusEP( - A = (36100000000000.0, 'cm^3/(mol*s)', '*|/', 5), - n = 0, - alpha = 0, - E0 = (0, 'kcal/mol'), - Tmin = (300, 'K'), - Tmax = (2500, 'K'), - ), - rank = 4, - shortDesc = u"""Tsang [90] Literature review.""", - longDesc = -u""" -[90] Tsang, W.; Journal of Physical and Chemical Reference Data (1987), 16(3), 471-508. -Literature review: C2H + CH2OH --> C2H2 + CH2O - -pg. 504: Discussion on evaluated data - -Entry 39,21 (a): CH2OH + C2H --> C2H2 + CH2O - -Author suggest a disproportionation rate coefficient of 6.0x10^-11 cm3/molecule/s, due - -to very exothermic rxn. No data available at the time. -MRH 30-Aug-2009 -""", -) - entry( index = 549, label = "CO_pri_rad;O_Csrad", diff --git a/input/kinetics/families/Disproportionation/training.py b/input/kinetics/families/Disproportionation/training.py index 9c77ba454c..8e7ef7db9c 100644 --- a/input/kinetics/families/Disproportionation/training.py +++ b/input/kinetics/families/Disproportionation/training.py @@ -7,3 +7,58 @@ Put kinetic parameters for reactions to use as a training set for fitting group additivity values in this file. """ +entry( + index = 001, + reactant1 = +""" +1 *1 C 1 0 {2,T} +2 C 0 0 {1,T} {3,S} +3 H 0 0 {2,S} +""", + reactant2 = +""" +1 *3 C 1 0 {2,S} {3,S} {4,S} +2 *2 O 0 2 {1,S} {5,S} +3 H 0 0 {1,S} +4 H 0 0 {1,S} +5 *4 H 0 0 {2,S} +""", + product1 = +""" +1 *1 C 0 0 {2,T} {3,S} +2 C 0 0 {1,T} {4,S} +3 *4 H 0 0 {1,S} +4 H 0 0 {2,S} +""", + product2 = +""" +1 *3 C 0 0 {2,D} {3,S} {4,S} +2 *2 O 0 2 {1,D} +3 H 0 0 {1,S} +4 H 0 0 {1,S} +""", + kinetics = ArrheniusEP( + A = (36100000000000.0, 'cm^3/(mol*s)', '*|/', 5), + n = 0, + alpha = 0, + E0 = (0, 'kcal/mol'), + Tmin = (300, 'K'), + Tmax = (2500, 'K'), + ), + rank = 4, + shortDesc = u"""Tsang [90] Literature review.""", + longDesc = +u""" +[90] Tsang, W.; Journal of Physical and Chemical Reference Data (1987), 16(3), 471-508. +Literature review: C2H + CH2OH --> C2H2 + CH2O + +pg. 504: Discussion on evaluated data + +Entry 39,21 (a): CH2OH + C2H --> C2H2 + CH2O + +Author suggest a disproportionation rate coefficient of 6.0x10^-11 cm3/molecule/s, due + +to very exothermic rxn. No data available at the time. +MRH 30-Aug-2009 +""", +) \ No newline at end of file From 61f1ec9f8152edf7d3bfdde98442c839e81908fd Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Mon, 14 Apr 2014 18:08:05 -0400 Subject: [PATCH 12/15] Fixes to adjLists of 1,3_Insertion_RSR The following groups had their *1 and *2 atom changed from C to Cd. This is always true based on their adjList. Unless stated, the group appeared in 0 rules: Cd/Nd2_Cd/Nd/De Cd/Nd2_Cd/H/De Cd/De2_Cd/H/Nd Cd/H/Nd_Cd/H/Nd Cd/H/De_Cd/Nd2 Cd/Nd/De_Cd/H/Nd Cd/H/De_Cd/H/De Cd/H/Nd_Cd/H/De Cd/Nd2_Cd/Nd/De Cd/H/De_Cd/H2 Cd/NdDe_Cd/H2 Cd/Nd2_Cd/De2 Cd/De2_Cd/H/De Cd/H/Nd_Cd/Nd2 Cd/Nd/De_Cd/H/De Cd/Nd/De_Cd/Nd2 Cd/H2_Cd/H/Nd (3 rules) Cd/H2_Cd/H/De Cd/De2_Cd/Nd2 Cd/Nd2_Cd/H/Nd Cd/H2_Cd/De2 Cd/H/De_Cd/Nd/De Cd/H2_Cd/Nd/De Cd/Nd/De_Cd/De2 Cd/H/Nd_Cd/Nd/De Cd/De2_Cd/De2 Cd/H2_Cd/Nd2 Cd/De2_Cd/H2 Cd/Nd2_Cd/H2 Cd/Nd2_Cd/Nd2 Cd/De2_Cd/Nd/De Cd/H/De_Cd/H/Nd Cd/H2_Cd/Cs2 (3 rules) Cd/H/Nd_Cd/H/Os (1 rule) Cd/H/Nd_Cd/H2 (2 rules) --- .../families/1,3_Insertion_RSR/groups.py | 148 +++++++++--------- .../families/1,3_Insertion_RSR/rules.py | 36 ++--- 2 files changed, 92 insertions(+), 92 deletions(-) diff --git a/input/kinetics/families/1,3_Insertion_RSR/groups.py b/input/kinetics/families/1,3_Insertion_RSR/groups.py index 14469be1ed..84586b06c5 100644 --- a/input/kinetics/families/1,3_Insertion_RSR/groups.py +++ b/input/kinetics/families/1,3_Insertion_RSR/groups.py @@ -369,8 +369,8 @@ label = "Cd/H2_Cd/H/Nd", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 H 0 {1,S} 5 H 0 {2,S} @@ -389,8 +389,8 @@ label = "Cd/H2_Cd/H/De", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 H 0 {1,S} 5 H 0 {2,S} @@ -429,8 +429,8 @@ label = "Cd/H/Nd_Cd/H2", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 {Cs,O,S} 0 {1,S} 5 H 0 {2,S} @@ -449,8 +449,8 @@ label = "Cd/H/De_Cd/H2", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 {Cd,Ct,Cb,CO,CS} 0 {1,S} 5 H 0 {2,S} @@ -489,8 +489,8 @@ label = "Cd/H2_Cd/Nd2", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 H 0 {1,S} 5 {Cs,O,S} 0 {2,S} @@ -509,8 +509,8 @@ label = "Cd/H2_Cd/Cs2", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 H 0 {1,S} 5 Cs 0 {2,S} @@ -529,8 +529,8 @@ label = "Cd/H2_Cd/Nd/De", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 H 0 {1,S} 5 {Cs,O,S} 0 {2,S} @@ -549,8 +549,8 @@ label = "Cd/H2_Cd/De2", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 H 0 {1,S} 5 {Cd,Ct,Cb,CO,CS} 0 {2,S} @@ -589,8 +589,8 @@ label = "Cd/Nd2_Cd/H2", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 {Cs,O,S} 0 {1,S} 4 {Cs,O,S} 0 {1,S} 5 H 0 {2,S} @@ -609,8 +609,8 @@ label = "Cd/NdDe_Cd/H2", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 {Cs,O,S} 0 {1,S} 4 {Cd,Ct,Cb,CO,CS} 0 {1,S} 5 H 0 {2,S} @@ -629,8 +629,8 @@ label = "Cd/De2_Cd/H2", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 {Cd,Ct,Cb,CO,CS} 0 {1,S} 4 {Cd,Ct,Cb,CO,CS} 0 {1,S} 5 H 0 {2,S} @@ -669,8 +669,8 @@ label = "Cd/H/Nd_Cd/H/Nd", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 {Cs,O,S} 0 {1,S} 5 H 0 {2,S} @@ -689,8 +689,8 @@ label = "Cd/H/Nd_Cd/H/Os", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 {Cs,O,S} 0 {1,S} 5 H 0 {2,S} @@ -709,8 +709,8 @@ label = "Cd/H/Nd_Cd/H/De", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 {Cs,O,S} 0 {1,S} 5 H 0 {2,S} @@ -729,8 +729,8 @@ label = "Cd/H/De_Cd/H/Nd", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 {Cd,Ct,Cb,CO,CS} 0 {1,S} 5 H 0 {2,S} @@ -749,8 +749,8 @@ label = "Cd/H/De_Cd/H/De", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 {Cd,Ct,Cb,CO,CS} 0 {1,S} 5 H 0 {2,S} @@ -789,8 +789,8 @@ label = "Cd/H/Nd_Cd/Nd2", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 {Cs,O,S} 0 {1,S} 5 {Cs,O,S} 0 {2,S} @@ -809,8 +809,8 @@ label = "Cd/H/Nd_Cd/Nd/De", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 {Cs,O,S} 0 {1,S} 5 {Cs,O,S} 0 {2,S} @@ -829,8 +829,8 @@ label = "Cd/H/Nd_Cd/De2", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 {Cs,O,S} 0 {1,S} 5 {Cd,Ct,Cb,CO,CS} 0 {2,S} @@ -849,8 +849,8 @@ label = "Cd/H/De_Cd/Nd2", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 {Cd,Ct,Cb,CO,CS} 0 {1,S} 5 {Cs,O,S} 0 {2,S} @@ -869,8 +869,8 @@ label = "Cd/H/De_Cd/Nd/De", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 {Cd,Ct,Cb,CO,CS} 0 {1,S} 5 {Cs,O,S} 0 {2,S} @@ -889,8 +889,8 @@ label = "Cd/H/De_Cd/De2", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 {Cd,Ct,Cb,CO,CS} 0 {1,S} 5 {Cd,Ct,Cb,CO,CS} 0 {2,S} @@ -929,8 +929,8 @@ label = "Cd/Nd2_Cd/H/Nd", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 {Cs,O,S} 0 {1,S} 4 {Cs,O,S} 0 {1,S} 5 H 0 {2,S} @@ -949,8 +949,8 @@ label = "Cd/Nd2_Cd/H/De", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 {Cs,O,S} 0 {1,S} 4 {Cs,O,S} 0 {1,S} 5 H 0 {2,S} @@ -969,8 +969,8 @@ label = "Cd/De2_Cd/H/Nd", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 {Cd,Ct,Cb,CO,CS} 0 {1,S} 4 {Cd,Ct,Cb,CO,CS} 0 {1,S} 5 H 0 {2,S} @@ -989,8 +989,8 @@ label = "Cd/De2_Cd/H/De", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 {Cd,Ct,Cb,CO,CS} 0 {1,S} 4 {Cd,Ct,Cb,CO,CS} 0 {1,S} 5 H 0 {2,S} @@ -1009,8 +1009,8 @@ label = "Cd/Nd/De_Cd/H/Nd", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 {Cs,O,S} 0 {1,S} 4 {Cd,Ct,Cb,CO,CS} 0 {1,S} 5 H 0 {2,S} @@ -1029,8 +1029,8 @@ label = "Cd/Nd/De_Cd/H/De", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 {Cs,O,S} 0 {1,S} 4 {Cd,Ct,Cb,CO,CS} 0 {1,S} 5 H 0 {2,S} @@ -1069,8 +1069,8 @@ label = "Cd/Nd2_Cd/Nd2", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 {Cs,O,S} 0 {1,S} 4 {Cs,O,S} 0 {1,S} 5 {Cs,O,S} 0 {2,S} @@ -1089,8 +1089,8 @@ label = "Cd/Nd2_Cd/Nd/De", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 {Cs,O,S} 0 {1,S} 4 {Cs,O,S} 0 {1,S} 5 {Cs,O,S} 0 {2,S} @@ -1109,8 +1109,8 @@ label = "Cd/Nd2_Cd/De2", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 {Cs,O,S} 0 {1,S} 4 {Cs,O,S} 0 {1,S} 5 {Cd,Ct,Cb,CO,CS} 0 {2,S} @@ -1129,8 +1129,8 @@ label = "Cd/Nd/De_Cd/Nd2", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 {Cs,O,S} 0 {1,S} 4 {Cd,Ct,Cb,CO,CS} 0 {1,S} 5 {Cs,O,S} 0 {2,S} @@ -1149,8 +1149,8 @@ label = "Cd/Nd/De_Cd/Nd/De", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 {Cs,O,S} 0 {1,S} 4 {Cd,Ct,Cb,CO,CS} 0 {1,S} 5 {Cs,O,S} 0 {2,S} @@ -1169,8 +1169,8 @@ label = "Cd/Nd/De_Cd/De2", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 {Cs,O,S} 0 {1,S} 4 {Cd,Ct,Cb,CO,CS} 0 {1,S} 5 {Cd,Ct,Cb,CO,CS} 0 {2,S} @@ -1189,8 +1189,8 @@ label = "Cd/De2_Cd/Nd2", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 {Cd,Ct,Cb,CO,CS} 0 {1,S} 4 {Cd,Ct,Cb,CO,CS} 0 {1,S} 5 {Cs,O,S} 0 {2,S} @@ -1209,8 +1209,8 @@ label = "Cd/De2_Cd/Nd/De", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 {Cd,Ct,Cb,CO,CS} 0 {1,S} 4 {Cd,Ct,Cb,CO,CS} 0 {1,S} 5 {Cs,O,S} 0 {2,S} @@ -1229,8 +1229,8 @@ label = "Cd/De2_Cd/De2", group = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 {Cd,Ct,Cb,CO,CS} 0 {1,S} 4 {Cd,Ct,Cb,CO,CS} 0 {1,S} 5 {Cd,Ct,Cb,CO,CS} 0 {2,S} diff --git a/input/kinetics/families/1,3_Insertion_RSR/rules.py b/input/kinetics/families/1,3_Insertion_RSR/rules.py index d602dce3a3..b43e0dbd68 100644 --- a/input/kinetics/families/1,3_Insertion_RSR/rules.py +++ b/input/kinetics/families/1,3_Insertion_RSR/rules.py @@ -130,8 +130,8 @@ label = "Cd/H2_Cd/H/Nd;H_SH", group1 = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 H 0 {1,S} 5 H 0 {2,S} @@ -164,8 +164,8 @@ label = "Cd/H/Nd_Cd/H2;H_SH", group1 = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 {Cs,O,S} 0 {1,S} 5 H 0 {2,S} @@ -198,8 +198,8 @@ label = "Cd/H/Nd_Cd/H2;H_SCs", group1 = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 {Cs,O,S} 0 {1,S} 5 H 0 {2,S} @@ -298,8 +298,8 @@ label = "Cd/H2_Cd/H/Nd;H_SH", group1 = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 H 0 {1,S} 5 H 0 {2,S} @@ -332,8 +332,8 @@ label = "Cd/H2_Cd/Cs2;H_SH", group1 = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 H 0 {1,S} 5 Cs 0 {2,S} @@ -403,8 +403,8 @@ label = "Cd/H2_Cd/H/Nd;H_SCs(HHH)", group1 = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 H 0 {1,S} 5 H 0 {2,S} @@ -440,8 +440,8 @@ label = "Cd/H2_Cd/Cs2;H_SCs(HHH)", group1 = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 H 0 {1,S} 5 Cs 0 {2,S} @@ -477,8 +477,8 @@ label = "Cd/H2_Cd/Cs2;H_SCs(CsCsCs)", group1 = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 H 0 {1,S} 5 Cs 0 {2,S} @@ -583,8 +583,8 @@ label = "Cd/H/Nd_Cd/H/Os;H_SH", group1 = """ -1 *1 C 0 {2,D} {3,S} {4,S} -2 *2 C 0 {1,D} {5,S} {6,S} +1 *1 Cd 0 {2,D} {3,S} {4,S} +2 *2 Cd 0 {1,D} {5,S} {6,S} 3 H 0 {1,S} 4 {Cs,O,S} 0 {1,S} 5 H 0 {2,S} From 8355edad39bf5086938c07489a8c39f9dfebcdb7 Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Fri, 9 May 2014 10:19:56 -0400 Subject: [PATCH 13/15] Fixes to R_Addition_CSm using checkWellFormed C atoms changed to Cs in CSm;CH2CH3 rule to match the CH2CH3 group --- input/kinetics/families/R_Addition_CSm/rules.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/input/kinetics/families/R_Addition_CSm/rules.py b/input/kinetics/families/R_Addition_CSm/rules.py index e843af0af8..382d22da8b 100644 --- a/input/kinetics/families/R_Addition_CSm/rules.py +++ b/input/kinetics/families/R_Addition_CSm/rules.py @@ -103,10 +103,10 @@ """, group2 = """ -1 *2 C 1 {2,S} {3,S} {4,S} +1 *2 Cs 1 {2,S} {3,S} {4,S} 2 H 0 {1,S} 3 H 0 {1,S} -4 C 0 {1,S} {5,S} {6,S} {7,S} +4 Cs 0 {1,S} {5,S} {6,S} {7,S} 5 H 0 {4,S} 6 H 0 {4,S} 7 H 0 {4,S} From 935bdc1f10a18b1f1e181226e83d0364a2519622 Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Fri, 9 May 2014 15:22:01 -0400 Subject: [PATCH 14/15] Fix errors in 1,2_Insertion found with databaseTester -Moved a comment at the top to the longDesc of the nodes it affects. They were originally referenced by index, but who knows when that might get reshuffled/changed -replaced C with Cs in all instances of 'carbene' -Many groups had their *2 atom (therefore always in group2 for group1;group2) changed from C to Cs or Cd to match the definition in groups.py. Listed below is all the rules affected: CO_birad;C_pri/NonDeC carbene;C_pri/Ct carbene;C_pri/Cd carbene;Cd/H/OneDe carbene;Cd_pri carbene;C_pri/Ct carbene;ethene (2 atoms changed from C to Cd) CO_birad;C/H2/NonDeC carbene;Cd/H/NonDeC CO_birad;C_methane --- .../kinetics/families/1,2_Insertion/groups.py | 4 +- .../kinetics/families/1,2_Insertion/rules.py | 59 ++++++++++--------- 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/input/kinetics/families/1,2_Insertion/groups.py b/input/kinetics/families/1,2_Insertion/groups.py index 2c01d8532a..4744e021d1 100644 --- a/input/kinetics/families/1,2_Insertion/groups.py +++ b/input/kinetics/families/1,2_Insertion/groups.py @@ -63,7 +63,7 @@ label = "carbene", group = """ -1 *1 C 2S {2,S} {3,S} +1 *1 Cs 2S {2,S} {3,S} 2 H 0 {1,S} 3 H 0 {1,S} """, @@ -304,7 +304,7 @@ label = "Cd/H/OneDe", group = """ -1 *2 Cd 0 {2,D} {3,S} {4,S} +1 *2 Cd 0 {2,D} {3,S} {4,S} 2 C 0 {1,D} 3 *3 H 0 {1,S} 4 {Cd,Ct,Cb,CO} 0 {1,S} diff --git a/input/kinetics/families/1,2_Insertion/rules.py b/input/kinetics/families/1,2_Insertion/rules.py index 9dfb751ba1..71baedbe3a 100644 --- a/input/kinetics/families/1,2_Insertion/rules.py +++ b/input/kinetics/families/1,2_Insertion/rules.py @@ -4,9 +4,6 @@ name = "1,2_Insertion/rules" shortDesc = u"" longDesc = u""" -553 - 559 Some of the tortional motions in the alkyl part of the - -transition states are treated as free rotations as they are relatively loose TSs. """ entry( index = 553, @@ -29,7 +26,8 @@ shortDesc = u"""Default""", longDesc = u""" - +Some of the tortional motions in the alkyl part of the +transition states are treated as free rotations as they are relatively loose TSs. """, ) @@ -64,7 +62,8 @@ shortDesc = u"""[87]CBS-QB3 calculations from Sumathi 2003.""", longDesc = u""" - +Some of the tortional motions in the alkyl part of the +transition states are treated as free rotations as they are relatively loose TSs. """, ) @@ -93,7 +92,8 @@ shortDesc = u"""[87]CBS-QB3 calculations from Sumathi 2003.""", longDesc = u""" - +Some of the tortional motions in the alkyl part of the +transition states are treated as free rotations as they are relatively loose TSs. """, ) @@ -107,7 +107,7 @@ """, group2 = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 H 0 {1,S} @@ -125,7 +125,8 @@ shortDesc = u"""[87]CBS-QB3 calculations from Sumathi 2003.""", longDesc = u""" - +Some of the tortional motions in the alkyl part of the +transition states are treated as free rotations as they are relatively loose TSs. """, ) @@ -139,7 +140,7 @@ """, group2 = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 H 0 {1,S} @@ -157,7 +158,8 @@ shortDesc = u"""[87]CBS-QB3 calculations from Sumathi 2003.""", longDesc = u""" - +Some of the tortional motions in the alkyl part of the +transition states are treated as free rotations as they are relatively loose TSs. """, ) @@ -171,7 +173,7 @@ """, group2 = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 Cs 0 {1,S} @@ -189,7 +191,8 @@ shortDesc = u"""[87]CBS-QB3 calculations from Sumathi 2003.""", longDesc = u""" - +Some of the tortional motions in the alkyl part of the +transition states are treated as free rotations as they are relatively loose TSs. """, ) @@ -203,7 +206,7 @@ """, group2 = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 Cs 0 {1,S} 4 Cs 0 {1,S} @@ -261,14 +264,14 @@ label = "carbene;ethene", group1 = """ -1 *1 C 2S {2,S} {3,S} +1 *1 Cs 2S {2,S} {3,S} 2 H 0 {1,S} 3 H 0 {1,S} """, group2 = """ -1 *2 C 0 {2,D} {3,S} {4,S} -2 C 0 {1,D} {5,S} {6,S} +1 *2 Cd 0 {2,D} {3,S} {4,S} +2 Cd 0 {1,D} {5,S} {6,S} 3 *3 H 0 {1,S} 4 H 0 {1,S} 5 H 0 {2,S} @@ -295,13 +298,13 @@ label = "carbene;Cd_pri", group1 = """ -1 *1 C 2S {2,S} {3,S} +1 *1 Cs 2S {2,S} {3,S} 2 H 0 {1,S} 3 H 0 {1,S} """, group2 = """ -1 *2 C 0 {2,D} {3,S} {4,S} +1 *2 Cd 0 {2,D} {3,S} {4,S} 2 C 0 {1,D} 3 *3 H 0 {1,S} 4 H 0 {1,S} @@ -327,7 +330,7 @@ label = "carbene;acetylene", group1 = """ -1 *1 C 2S {2,S} {3,S} +1 *1 Cs 2S {2,S} {3,S} 2 H 0 {1,S} 3 H 0 {1,S} """, @@ -359,7 +362,7 @@ label = "carbene;Ct_H", group1 = """ -1 *1 C 2S {2,S} {3,S} +1 *1 Cs 2S {2,S} {3,S} 2 H 0 {1,S} 3 H 0 {1,S} """, @@ -389,13 +392,13 @@ label = "carbene;C_pri/Cd", group1 = """ -1 *1 C 2S {2,S} {3,S} +1 *1 Cs 2S {2,S} {3,S} 2 H 0 {1,S} 3 H 0 {1,S} """, group2 = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 H 0 {1,S} @@ -422,13 +425,13 @@ label = "carbene;C_pri/Ct", group1 = """ -1 *1 C 2S {2,S} {3,S} +1 *1 Cs 2S {2,S} {3,S} 2 H 0 {1,S} 3 H 0 {1,S} """, group2 = """ -1 *2 C 0 {2,S} {3,S} {4,S} {5,S} +1 *2 Cs 0 {2,S} {3,S} {4,S} {5,S} 2 *3 H 0 {1,S} 3 H 0 {1,S} 4 H 0 {1,S} @@ -455,13 +458,13 @@ label = "carbene;Cd/H/NonDeC", group1 = """ -1 *1 C 2S {2,S} {3,S} +1 *1 Cs 2S {2,S} {3,S} 2 H 0 {1,S} 3 H 0 {1,S} """, group2 = """ -1 *2 C 0 {2,D} {3,S} {4,S} +1 *2 Cd 0 {2,D} {3,S} {4,S} 2 C 0 {1,D} 3 *3 H 0 {1,S} 4 Cs 0 {1,S} @@ -487,13 +490,13 @@ label = "carbene;Cd/H/OneDe", group1 = """ -1 *1 C 2S {2,S} {3,S} +1 *1 Cs 2S {2,S} {3,S} 2 H 0 {1,S} 3 H 0 {1,S} """, group2 = """ -1 *2 C 0 {2,D} {3,S} {4,S} +1 *2 Cd 0 {2,D} {3,S} {4,S} 2 C 0 {1,D} 3 *3 H 0 {1,S} 4 {Cd,Ct,Cb,CO} 0 {1,S} From 82fe3165c9d1e40cc01fc5a6c89fb3e06309da31 Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Mon, 12 May 2014 17:11:42 -0400 Subject: [PATCH 15/15] Fixes to H-Abstraction family: Part 1 First of many changes to H-Abstraction family found by the databaseTester. -Group definition (groups.py) of C/H/CtCt somehow got mixed up to: '1 *3 R!H 2'. Changed back to correct definition based on its rules and java's definition -"Cd_pri" was previously changed to include N. A child underneath it "Cd/H2/NonDeC", is it's previous definition without N. 48 rules had their label changed from Cd_pri;X, to Cd/H2/NonDeC;X. I checked the source for all the rules and they shouldn't have N. -"Ct_pri" was previously changed to include N. A child underneath it "Ct_rad/Ct"", is it's previous definition without N. 7 rules had their label changed from X;Ct_pri, to X;Ct_rad/Ct. I checked the source for all the rules, and they shouldn't have N. -Also in the rules with Ct_rad/Ct, I changed C to Ct, which is true by definition -Changed definition of "N3d/H/NonDeC" in the rules to match the group's definition. The groups.py definition was more specific and corresponded better with the label. (affected 5 rules) -Created new group O_rad/OneDeC, underneath O_rad/OneDe because O_rad/OneDe was expanded to include N, but there are rules that only use C. Changed the name on the relevant rules, and moved some children (O_rad/Cd and all it's children) underneath the new O_rad/OneDeC node -Because of above change, O_rad/Cd and all it's children had C atoms changed to Cd or {Cd,Cdd} --- .../kinetics/families/H_Abstraction/groups.py | 117 +++++++----- .../kinetics/families/H_Abstraction/rules.py | 174 +++++++++--------- 2 files changed, 161 insertions(+), 130 deletions(-) diff --git a/input/kinetics/families/H_Abstraction/groups.py b/input/kinetics/families/H_Abstraction/groups.py index 788e116771..049216deb6 100644 --- a/input/kinetics/families/H_Abstraction/groups.py +++ b/input/kinetics/families/H_Abstraction/groups.py @@ -3211,7 +3211,11 @@ label = "C/H/CtCt", group = """ -1 *3 R!H 2 +1 *1 C 0 {2,S} {3,S} {4,S} {5,S} +2 *2 H 0 {1,S} +3 Ct 0 {1,S} +4 Ct 0 {1,S} +5 Cs 0 {1,S} """, kinetics = None, shortDesc = u"""""", @@ -3910,9 +3914,9 @@ label = "O_rad/Cd", group = """ -1 *3 O 1 {2,S} -2 C 0 {1,S} {3,D} -3 C 0 {2,D} +1 *3 O 1 {2,S} +2 Cd 0 {1,S} {3,D} +3 {Cd,Cdd} 0 {2,D} """, kinetics = None, shortDesc = u"""""", @@ -3927,12 +3931,12 @@ label = "O_rad/Cd\H_Cd\H2", group = """ -1 *3 O 1 {2,S} -2 C 0 {1,S} {3,D} {4,S} -3 C 0 {2,D} {5,S} {6,S} -4 H 0 {2,S} -5 H 0 {3,S} -6 H 0 {3,S} +1 *3 O 1 {2,S} +2 Cd 0 {1,S} {3,D} {4,S} +3 Cd 0 {2,D} {5,S} {6,S} +4 H 0 {2,S} +5 H 0 {3,S} +6 H 0 {3,S} """, kinetics = None, shortDesc = u"""""", @@ -3947,12 +3951,12 @@ label = "O_rad/Cd\H_Cd\H\Cs", group = """ -1 *3 O 1 {2,S} -2 C 0 {1,S} {3,D} {4,S} -3 C 0 {2,D} {5,S} {6,S} -4 H 0 {2,S} -5 Cs 0 {3,S} -6 H 0 {3,S} +1 *3 O 1 {2,S} +2 Cd 0 {1,S} {3,D} {4,S} +3 Cd 0 {2,D} {5,S} {6,S} +4 H 0 {2,S} +5 Cs 0 {3,S} +6 H 0 {3,S} """, kinetics = None, shortDesc = u"""""", @@ -3967,12 +3971,12 @@ label = "O_rad/Cd\H_Cd\Cs2", group = """ -1 *3 O 1 {2,S} -2 C 0 {1,S} {3,D} {4,S} -3 C 0 {2,D} {5,S} {6,S} -4 H 0 {2,S} -5 Cs 0 {3,S} -6 Cs 0 {3,S} +1 *3 O 1 {2,S} +2 Cd 0 {1,S} {3,D} {4,S} +3 Cd 0 {2,D} {5,S} {6,S} +4 H 0 {2,S} +5 Cs 0 {3,S} +6 Cs 0 {3,S} """, kinetics = None, shortDesc = u"""""", @@ -3987,12 +3991,12 @@ label = "O_rad/Cd\Cs_Cd\H2", group = """ -1 *3 O 1 {2,S} -2 C 0 {1,S} {3,D} {4,S} -3 C 0 {2,D} {5,S} {6,S} -4 Cs 0 {2,S} -5 H 0 {3,S} -6 H 0 {3,S} +1 *3 O 1 {2,S} +2 Cd 0 {1,S} {3,D} {4,S} +3 Cd 0 {2,D} {5,S} {6,S} +4 Cs 0 {2,S} +5 H 0 {3,S} +6 H 0 {3,S} """, kinetics = None, shortDesc = u"""""", @@ -4007,12 +4011,12 @@ label = "O_rad/Cd\Cs_Cd\H\Cs", group = """ -1 *3 O 1 {2,S} -2 C 0 {1,S} {3,D} {4,S} -3 C 0 {2,D} {5,S} {6,S} -4 Cs 0 {2,S} -5 Cs 0 {3,S} -6 H 0 {3,S} +1 *3 O 1 {2,S} +2 Cd 0 {1,S} {3,D} {4,S} +3 Cd 0 {2,D} {5,S} {6,S} +4 Cs 0 {2,S} +5 Cs 0 {3,S} +6 H 0 {3,S} """, kinetics = None, shortDesc = u"""""", @@ -4027,12 +4031,12 @@ label = "O_rad/Cd\Cs_Cd\Cs2", group = """ -1 *3 O 1 {2,S} -2 C 0 {1,S} {3,D} {4,S} -3 C 0 {2,D} {5,S} {6,S} -4 Cs 0 {2,S} -5 Cs 0 {3,S} -6 Cs 0 {3,S} +1 *3 O 1 {2,S} +2 Cd 0 {1,S} {3,D} {4,S} +3 Cd 0 {2,D} {5,S} {6,S} +4 Cs 0 {2,S} +5 Cs 0 {3,S} +6 Cs 0 {3,S} """, kinetics = None, shortDesc = u"""""", @@ -8742,7 +8746,23 @@ """, ) - + +entry( + index = 491, + label = "O_rad/OneDeC", + group = +""" +1 *3 O 1 {2,S} +2 {Cd,Ct,Cb,CO} 0 {1,S} +""", + kinetics = None, + shortDesc = u"""""", + longDesc = +u""" + +""", +) + tree( """ L1: X_H_or_Xrad_H_Xbirad_H_Xtrirad_H @@ -9015,13 +9035,14 @@ L6: OOC L5: O_rad/NonDeN L5: O_rad/OneDe - L6: O_rad/Cd - L7: O_rad/Cd\H_Cd\H2 - L7: O_rad/Cd\H_Cd\H\Cs - L7: O_rad/Cd\H_Cd\Cs2 - L7: O_rad/Cd\Cs_Cd\H2 - L7: O_rad/Cd\Cs_Cd\H\Cs - L7: O_rad/Cd\Cs_Cd\Cs2 + L6: O_rad/OneDeC + L7: O_rad/Cd + L8: O_rad/Cd\H_Cd\H2 + L8: O_rad/Cd\H_Cd\H\Cs + L8: O_rad/Cd\H_Cd\Cs2 + L8: O_rad/Cd\Cs_Cd\H2 + L8: O_rad/Cd\Cs_Cd\H\Cs + L8: O_rad/Cd\Cs_Cd\Cs2 L6: InChI=1S/NO3/c2-1(3)4 L6: O_rad/OneDeN L3: S_rad diff --git a/input/kinetics/families/H_Abstraction/rules.py b/input/kinetics/families/H_Abstraction/rules.py index e6edecbe29..ea7521610a 100644 --- a/input/kinetics/families/H_Abstraction/rules.py +++ b/input/kinetics/families/H_Abstraction/rules.py @@ -1017,7 +1017,7 @@ entry( index = 161, - label = "H2;Ct_rad", + label = "H2;Ct_rad/Ct", group1 = """ 1 *1 H 0 {2,S} @@ -1025,8 +1025,8 @@ """, group2 = """ -1 *3 C 1 {2,T} -2 C 0 {1,T} +1 *3 Ct 1 {2,T} +2 Ct 0 {1,T} """, kinetics = ArrheniusEP( A = (5400000000000.0, 'cm^3/(mol*s)', '*|/', 3.16), @@ -1380,7 +1380,7 @@ entry( index = 170, - label = "C_methane;Ct_rad", + label = "C_methane;Ct_rad/Ct", group1 = """ 1 *1 C 0 {2,S} {3,S} {4,S} {5,S} @@ -1391,8 +1391,8 @@ """, group2 = """ -1 *3 C 1 {2,T} -2 C 0 {1,T} +1 *3 Ct 1 {2,T} +2 Ct 0 {1,T} """, kinetics = ArrheniusEP( A = (453000000000.0, 'cm^3/(mol*s)', '*|/', 10), @@ -1795,7 +1795,7 @@ entry( index = 180, - label = "C/H3/Cs;Ct_rad", + label = "C/H3/Cs;Ct_rad/Ct", group1 = """ 1 *1 C 0 {2,S} {3,S} {4,S} {5,S} @@ -1806,8 +1806,8 @@ """, group2 = """ -1 *3 C 1 {2,T} -2 C 0 {1,T} +1 *3 Ct 1 {2,T} +2 Ct 0 {1,T} """, kinetics = ArrheniusEP( A = (602000000000.0, 'cm^3/(mol*s)', '*|/', 3), @@ -2365,7 +2365,7 @@ entry( index = 193, - label = "C/H2/NonDeC;Ct_rad", + label = "C/H2/NonDeC;Ct_rad/Ct", group1 = """ 1 *1 C 0 {2,S} {3,S} {4,S} {5,S} @@ -2376,8 +2376,8 @@ """, group2 = """ -1 *3 C 1 {2,T} -2 C 0 {1,T} +1 *3 Ct 1 {2,T} +2 Ct 0 {1,T} """, kinetics = ArrheniusEP( A = (605000000000.0, 'cm^3/(mol*s)', '*|/', 3), @@ -2780,7 +2780,7 @@ entry( index = 202, - label = "C/H/Cs3;Ct_rad", + label = "C/H/Cs3;Ct_rad/Ct", group1 = """ 1 *1 C 0 {2,S} {3,S} {4,S} {5,S} @@ -2791,8 +2791,8 @@ """, group2 = """ -1 *3 C 1 {2,T} -2 C 0 {1,T} +1 *3 Ct 1 {2,T} +2 Ct 0 {1,T} """, kinetics = ArrheniusEP( A = (662000000000.0, 'cm^3/(mol*s)', '*|/', 3), @@ -3013,7 +3013,7 @@ entry( index = 207, - label = "Cd_pri;O2b", + label = "Cd/H2/NonDeC;O2b", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -3067,7 +3067,7 @@ entry( index = 209, - label = "Cd_pri;O_atom_triplet", + label = "Cd/H2/NonDeC;O_atom_triplet", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -3098,7 +3098,7 @@ entry( index = 210, - label = "Cd_pri;C_rad/H2/Cs", + label = "Cd/H2/NonDeC;C_rad/H2/Cs", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -3144,7 +3144,7 @@ entry( index = 211, - label = "Cd_pri;O_pri_rad", + label = "Cd/H2/NonDeC;O_pri_rad", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -3377,7 +3377,7 @@ entry( index = 216, - label = "Cd/H/NonDeC;Ct_rad", + label = "Cd/H/NonDeC;Ct_rad/Ct", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -3387,8 +3387,8 @@ """, group2 = """ -1 *3 C 1 {2,T} -2 C 0 {1,T} +1 *3 Ct 1 {2,T} +2 Ct 0 {1,T} """, kinetics = ArrheniusEP( A = (1210000000000.0, 'cm^3/(mol*s)', '*|/', 5), @@ -5368,7 +5368,7 @@ entry( index = 266, - label = "O/H/NonDeC;Ct_rad", + label = "O/H/NonDeC;Ct_rad/Ct", group1 = """ 1 *1 O 0 {2,S} {3,S} @@ -5377,8 +5377,8 @@ """, group2 = """ -1 *3 C 1 {2,T} -2 C 0 {1,T} +1 *3 Ct 1 {2,T} +2 Ct 0 {1,T} """, kinetics = ArrheniusEP( A = (1210000000000.0, 'cm^3/(mol*s)', '*|/', 5), @@ -7182,12 +7182,12 @@ """, group2 = """ -1 *3 O 1 {2,S} -2 C 0 {1,S} {3,D} {4,S} -3 C 0 {2,D} {5,S} {6,S} -4 H 0 {2,S} -5 Cs 0 {3,S} -6 H 0 {3,S} +1 *3 O 1 {2,S} +2 Cd 0 {1,S} {3,D} {4,S} +3 Cd 0 {2,D} {5,S} {6,S} +4 H 0 {2,S} +5 Cs 0 {3,S} +6 H 0 {3,S} """, kinetics = ArrheniusEP( A = (7.52e-08, 'cm^3/(mol*s)'), @@ -7648,7 +7648,7 @@ entry( index = 535, - label = "H2O2;O_rad/OneDe", + label = "H2O2;O_rad/OneDeC", group1 = """ 1 *1 O 0 {2,S} {3,S} @@ -7673,7 +7673,7 @@ shortDesc = u"""MHS CBS-QB3 w/1dHR calculations, see node 534.""", longDesc = u""" -Rxn family nodes: H2O2 + O_rad/OneDe +Rxn family nodes: H2O2 + O_rad/OneDeC The rate coefficient for this node was taken from node 534 (H2O2 + InChI=1/C4H7O/c1-2-3-4-5/h3-4H,2H2,1H3) by analogy: HOOH + *O-C=R. Discussed with MRH. @@ -8958,7 +8958,7 @@ entry( index = 1195, - label = "S_pri;O_rad/OneDe", + label = "S_pri;O_rad/OneDeC", group1 = """ 1 *1 S 0 {2,S} {3,S} @@ -44117,7 +44117,7 @@ entry( index = 4793, - label = "Cd_pri;C_methyl", + label = "Cd/H2/NonDeC;C_methyl", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44150,7 +44150,7 @@ entry( index = 4794, - label = "Cd_pri;C_rad/H2/Cs", + label = "Cd/H2/NonDeC;C_rad/H2/Cs", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44183,7 +44183,7 @@ entry( index = 4795, - label = "Cd_pri;C_rad/H/NonDeC", + label = "Cd/H2/NonDeC;C_rad/H/NonDeC", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44216,7 +44216,7 @@ entry( index = 4796, - label = "Cd_pri;C_rad/Cs3", + label = "Cd/H2/NonDeC;C_rad/Cs3", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44249,7 +44249,7 @@ entry( index = 4797, - label = "Cd_pri;C_rad/H2/Cd", + label = "Cd/H2/NonDeC;C_rad/H2/Cd", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44283,7 +44283,7 @@ entry( index = 4798, - label = "Cd_pri;C_rad/H/CdCs", + label = "Cd/H2/NonDeC;C_rad/H/CdCs", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44317,7 +44317,7 @@ entry( index = 4799, - label = "Cd_pri;C_rad/CdCs2", + label = "Cd/H2/NonDeC;C_rad/CdCs2", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44351,7 +44351,7 @@ entry( index = 4800, - label = "Cd_pri;C_rad/H/CdCd", + label = "Cd/H2/NonDeC;C_rad/H/CdCd", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44386,7 +44386,7 @@ entry( index = 4801, - label = "Cd_pri;C_rad/CdCdCs", + label = "Cd/H2/NonDeC;C_rad/CdCdCs", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44421,7 +44421,7 @@ entry( index = 4802, - label = "Cd_pri;C_rad/H2/Ct", + label = "Cd/H2/NonDeC;C_rad/H2/Ct", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44454,7 +44454,7 @@ entry( index = 4803, - label = "Cd_pri;C_rad/H/CtCs", + label = "Cd/H2/NonDeC;C_rad/H/CtCs", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44487,7 +44487,7 @@ entry( index = 4804, - label = "Cd_pri;C_rad/CtCs2", + label = "Cd/H2/NonDeC;C_rad/CtCs2", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44520,7 +44520,7 @@ entry( index = 4805, - label = "Cd_pri;C_rad/H/CtCt", + label = "Cd/H2/NonDeC;C_rad/H/CtCt", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44553,7 +44553,7 @@ entry( index = 4806, - label = "Cd_pri;C_rad/CtCtCs", + label = "Cd/H2/NonDeC;C_rad/CtCtCs", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44586,7 +44586,7 @@ entry( index = 4807, - label = "Cd_pri;C_rad/H2/Cb", + label = "Cd/H2/NonDeC;C_rad/H2/Cb", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44619,7 +44619,7 @@ entry( index = 4808, - label = "Cd_pri;C_rad/H/CbCs", + label = "Cd/H2/NonDeC;C_rad/H/CbCs", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44652,7 +44652,7 @@ entry( index = 4809, - label = "Cd_pri;C_rad/CbCs2", + label = "Cd/H2/NonDeC;C_rad/CbCs2", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44685,7 +44685,7 @@ entry( index = 4810, - label = "Cd_pri;Cd_pri_rad", + label = "Cd/H2/NonDeC;Cd_pri_rad", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44717,7 +44717,7 @@ entry( index = 4811, - label = "Cd_pri;Cd_rad/NonDeC", + label = "Cd/H2/NonDeC;Cd_rad/NonDeC", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44749,7 +44749,7 @@ entry( index = 4812, - label = "Cd_pri;Cd_rad/Cd", + label = "Cd/H2/NonDeC;Cd_rad/Cd", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44782,7 +44782,7 @@ entry( index = 4813, - label = "Cd_pri;Cb_rad", + label = "Cd/H2/NonDeC;Cb_rad", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44814,7 +44814,7 @@ entry( index = 4814, - label = "Cd_pri;Cd_rad/Ct", + label = "Cd/H2/NonDeC;Cd_rad/Ct", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44846,7 +44846,7 @@ entry( index = 4815, - label = "Cd_pri;C_rad/H2/S", + label = "Cd/H2/NonDeC;C_rad/H2/S", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44879,7 +44879,7 @@ entry( index = 4816, - label = "Cd_pri;C_rad/H/CsS", + label = "Cd/H2/NonDeC;C_rad/H/CsS", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44912,7 +44912,7 @@ entry( index = 4817, - label = "Cd_pri;C_rad/Cs2S", + label = "Cd/H2/NonDeC;C_rad/Cs2S", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44945,7 +44945,7 @@ entry( index = 4818, - label = "Cd_pri;C_rad/H2/CS", + label = "Cd/H2/NonDeC;C_rad/H2/CS", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -44979,7 +44979,7 @@ entry( index = 4819, - label = "Cd_pri;C_rad/H/CSCs", + label = "Cd/H2/NonDeC;C_rad/H/CSCs", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -45013,7 +45013,7 @@ entry( index = 4820, - label = "Cd_pri;C_rad/CSCs2", + label = "Cd/H2/NonDeC;C_rad/CSCs2", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -45047,7 +45047,7 @@ entry( index = 4821, - label = "Cd_pri;Cd_rad/NonDeS", + label = "Cd/H2/NonDeC;Cd_rad/NonDeS", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -45079,7 +45079,7 @@ entry( index = 4822, - label = "Cd_pri;Cd_rad/CS", + label = "Cd/H2/NonDeC;Cd_rad/CS", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -45112,7 +45112,7 @@ entry( index = 4823, - label = "Cd_pri;C_rad/H/CdS", + label = "Cd/H2/NonDeC;C_rad/H/CdS", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -45146,7 +45146,7 @@ entry( index = 4824, - label = "Cd_pri;C_rad/CdCsS", + label = "Cd/H2/NonDeC;C_rad/CdCsS", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -45180,7 +45180,7 @@ entry( index = 4825, - label = "Cd_pri;C_rad/H/CSS", + label = "Cd/H2/NonDeC;C_rad/H/CSS", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -45214,7 +45214,7 @@ entry( index = 4826, - label = "Cd_pri;C_rad/CSCsS", + label = "Cd/H2/NonDeC;C_rad/CSCsS", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -45248,7 +45248,7 @@ entry( index = 4827, - label = "Cd_pri;C_rad/H/CtS", + label = "Cd/H2/NonDeC;C_rad/H/CtS", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -45281,7 +45281,7 @@ entry( index = 4828, - label = "Cd_pri;C_rad/CtCsS", + label = "Cd/H2/NonDeC;C_rad/CtCsS", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -45314,7 +45314,7 @@ entry( index = 4829, - label = "Cd_pri;C_rad/H/CbS", + label = "Cd/H2/NonDeC;C_rad/H/CbS", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -45347,7 +45347,7 @@ entry( index = 4830, - label = "Cd_pri;C_rad/CbCsS", + label = "Cd/H2/NonDeC;C_rad/CbCsS", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -45380,7 +45380,7 @@ entry( index = 4831, - label = "Cd_pri;CS_pri_rad", + label = "Cd/H2/NonDeC;CS_pri_rad", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -45412,7 +45412,7 @@ entry( index = 4832, - label = "Cd_pri;CS_rad/Cs", + label = "Cd/H2/NonDeC;CS_rad/Cs", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -45444,7 +45444,7 @@ entry( index = 4833, - label = "Cd_pri;CS_rad/S", + label = "Cd/H2/NonDeC;CS_rad/S", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -45476,7 +45476,7 @@ entry( index = 4834, - label = "Cd_pri;CS_rad/Cd", + label = "Cd/H2/NonDeC;CS_rad/Cd", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -45509,7 +45509,7 @@ entry( index = 4835, - label = "Cd_pri;CS_rad/Ct", + label = "Cd/H2/NonDeC;CS_rad/Ct", group1 = """ 1 *1 C 0 {2,D} {3,S} {4,S} @@ -95042,7 +95042,9 @@ """ 1 *1 N3d 0 {2,S} {3,D} 2 *2 H 0 {1,S} -3 Cs 0 {1,D} +3 Cd 0 {1,D} {4,S} {5,S} +4 R 0 {3,S} +5 R 0 {3,S} """, group2 = """ @@ -95071,7 +95073,9 @@ """ 1 *1 N3d 0 {2,S} {3,D} 2 *2 H 0 {1,S} -3 Cs 0 {1,D} +3 Cd 0 {1,D} {4,S} {5,S} +4 R 0 {3,S} +5 R 0 {3,S} """, group2 = """ @@ -95100,7 +95104,9 @@ """ 1 *1 N3d 0 {2,S} {3,D} 2 *2 H 0 {1,S} -3 Cs 0 {1,D} +3 Cd 0 {1,D} {4,S} {5,S} +4 R 0 {3,S} +5 R 0 {3,S} """, group2 = """ @@ -95130,7 +95136,9 @@ """ 1 *1 N3d 0 {2,S} {3,D} 2 *2 H 0 {1,S} -3 Cs 0 {1,D} +3 Cd 0 {1,D} {4,S} {5,S} +4 R 0 {3,S} +5 R 0 {3,S} """, group2 = """ @@ -95162,7 +95170,9 @@ """ 1 *1 N3d 0 {2,S} {3,D} 2 *2 H 0 {1,S} -3 Cs 0 {1,D} +3 Cd 0 {1,D} {4,S} {5,S} +4 R 0 {3,S} +5 R 0 {3,S} """, group2 = """