Ticket #16: herwig3.patch
File herwig3.patch, 2.3 KB (added by , 6 years ago) |
---|
-
Models/General/PrototypeVertex.h
old new 38 38 * @param p1 The first ParticleData object 39 39 * @param p2 The second ParticleData object 40 40 */ 41 bool operator() (tcPDPtr p1, tcPDPtr p2) {41 bool operator() (tcPDPtr p1, tcPDPtr p2) const { 42 42 return abs(p1->id()) > abs(p2->id()) || 43 43 ( abs(p1->id()) == abs(p2->id()) && p1->id() > p2->id() ) || 44 44 ( p1->id() == p2->id() && p1->fullName() > p2->fullName() ); -
Decay/Radiation/QEDRadiationHandler.cc
old new 37 37 * @param p1 The first ParticleData object 38 38 * @param p2 The second ParticleData object 39 39 */ 40 bool operator()(cPDPtr p1, cPDPtr p2) {40 bool operator()(cPDPtr p1, cPDPtr p2) const { 41 41 return abs(p1->id()) > abs(p2->id()) || 42 42 ( abs(p1->id()) == abs(p2->id()) && p1->id() > p2->id() ) || 43 43 ( p1->id() == p2->id() && p1->fullName() > p2->fullName() ); -
Models/General/ModelGenerator.cc
old new 451 451 452 452 namespace { 453 453 struct DecayModeOrdering { 454 bool operator()(tcDMPtr m1, tcDMPtr m2) {454 bool operator()(tcDMPtr m1, tcDMPtr m2) const { 455 455 if(m1->brat()!=m2->brat()) { 456 456 return m1->brat()>m2->brat(); 457 457 } -
Shower/ShowerHandler.cc
old new 1094 1094 * @param p2 The second ParticleData object 1095 1095 */ 1096 1096 1097 bool ShowerHandler::ParticleOrdering::operator() (tcPDPtr p1, tcPDPtr p2) {1097 bool ShowerHandler::ParticleOrdering::operator() (tcPDPtr p1, tcPDPtr p2) const { 1098 1098 return abs(p1->id()) > abs(p2->id()) || 1099 1099 ( abs(p1->id()) == abs(p2->id()) && p1->id() > p2->id() ) || 1100 1100 ( p1->id() == p2->id() && p1->fullName() > p2->fullName() ); -
Shower/ShowerHandler.h
old new 161 161 162 162 struct ParticleOrdering { 163 163 164 bool operator() (tcPDPtr p1, tcPDPtr p2) ;164 bool operator() (tcPDPtr p1, tcPDPtr p2) const; 165 165 166 166 }; 167 167