|
Lines 410-417
void G4ParticleHPInelasticCompFS::CompositeApply(const G4HadProjectile& theTrack
Link Here
|
| 410 |
// QI introudced since G4NDL3.15 |
410 |
// QI introudced since G4NDL3.15 |
| 411 |
// G4double QM=(incidReactionProduct.GetMass()+targetMass)-(aHadron.GetMass()+residualMass); |
411 |
// G4double QM=(incidReactionProduct.GetMass()+targetMass)-(aHadron.GetMass()+residualMass); |
| 412 |
// eExcitation = QM-QI[it]; |
412 |
// eExcitation = QM-QI[it]; |
| 413 |
eExcitation = QI[0] - QI[it]; // Bug fix #1838 |
413 |
eExcitation = std::max(0.,QI[0] - QI[it]); // Bug fix #1838 |
| 414 |
if(eExcitation < 20*CLHEP::keV) eExcitation = 0; |
|
|
| 415 |
// Re-evluate iLevel based on this eExcitation |
414 |
// Re-evluate iLevel based on this eExcitation |
| 416 |
iLevel = 0; |
415 |
iLevel = 0; |
|
Lines 598-605
void G4ParticleHPInelasticCompFS::CompositeApply(const G4HadProjectile& theTrack
Link Here
|
| 598 |
// Next 12 lines are Emilio's replacement |
597 |
// Next 12 lines are Emilio's replacement |
| 599 |
// G4double QM=(incidReactionProduct.GetMass()+targetMass)-(aHadron.GetMass()+residualMass); |
598 |
// G4double QM=(incidReactionProduct.GetMass()+targetMass)-(aHadron.GetMass()+residualMass); |
| 600 |
// G4double eExcitation = QM-QI[it]; |
599 |
// G4double eExcitation = QM-QI[it]; |
| 601 |
G4double eExcitation = QI[0] - QI[it]; // Fix of bug #1838 |
600 |
G4double eExcitation = std::max(0.,QI[0] - QI[it]); // Fix of bug #1838 |
| 602 |
if(eExcitation<20*CLHEP::keV){eExcitation=0;} |
|
|
| 603 |
two_body_reaction(&incidReactionProduct,&theTarget,&aHadron,eExcitation); |
601 |
two_body_reaction(&incidReactionProduct,&theTarget,&aHadron,eExcitation); |
| 604 |
if(thePhotons==0 && eExcitation>0){ |
602 |
if(thePhotons==0 && eExcitation>0){ |
| 605 |
for(iLevel=theGammas.GetNumberOfLevels()-1; iLevel>=0; iLevel--) |
603 |
for(iLevel=theGammas.GetNumberOfLevels()-1; iLevel>=0; iLevel--) |
