diff --git a/src/MatchingCondition.cc b/src/MatchingCondition.cc index e742940..17c136d 100644 --- a/src/MatchingCondition.cc +++ b/src/MatchingCondition.cc @@ -39,14 +39,18 @@ MatchingCondition::MatchingCondition( entry2_ = entry2; // check version - if (version != "exact" && version != "improved" && version != "original" && version != "blumline") { - cout << "Error: version must be 'exact', 'improved', 'blumline' or 'original'! Got " + if (version != "exact" && version != "improved" && version != "original" + && version != "blumline") { + cout << "Error: version must be 'exact', 'improved', 'blumline' or " + "'original'! Got " << version << endl; exit(-1); } if (entry2 == 'q' && (version == "improved" || version == "blumline")) { - cout << "Error: quark channel doesn't have 'improved' or 'blumline' version!" << endl; + cout << "Error: quark channel doesn't have 'improved' or 'blumline' " + "version!" + << endl; exit(-1); } @@ -295,10 +299,12 @@ double MatchingCondition::a_Qg_30(double x, int v) const { double L3 = L2 * L; double L4 = L3 * L; double L5 = L4 * L; - return - 5882.68 + 8956.65 / x + 10318.5 * x - 8363.19 * x * x + 737.165 * L1 - - 332.537 * L12 + 4.3802 * L13 - 8.20988 * L14 + 3.7037 * L15 + 11013.4 * L - + (1548.89 * L) / x + 6558.74 * x * L - 720.048 * L2 + 514.091 * L3 - 21.7593 * L4 - + 4.84444 * L5 - 274.207 * (-L1 + L) - 274.207 * (-1 + x - x * L1 + x * L); + return -5882.68 + 8956.65 / x + 10318.5 * x - 8363.19 * x * x + + 737.165 * L1 - 332.537 * L12 + 4.3802 * L13 - 8.20988 * L14 + + 3.7037 * L15 + 11013.4 * L + (1548.89 * L) / x + + 6558.74 * x * L - 720.048 * L2 + 514.091 * L3 - 21.7593 * L4 + + 4.84444 * L5 - 274.207 * (-L1 + L) + - 274.207 * (-1 + x - x * L1 + x * L); } else { cout << "Error in MatchingCondition::a_Qg_30: Choose either v=0, v=1, " "v=-1, v=-12 or v=2"