Import Geant4 10.3.0.beta source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
$Id: History 93027 2015-09-30 16:07:56Z gcosmo $
|
||||
$Id: History 97800 2016-06-13 12:14:40Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -16,6 +16,12 @@ committal in the CVS repository !
|
||||
----------------------------------------------------------
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
- June 10, 16 Gunter Folger (decay-V10-02-01)
|
||||
- G4Decay::DecayIt(): better format and info on IsOK... in exception DECAY003
|
||||
|
||||
- June 10, 16 Gunter Folger (decay-V10-02-00)
|
||||
- In G4Decay::DecayIt(): add more information in exception DECAY003
|
||||
|
||||
- Sep. 29, 15 Hisaya Kurashige (decay-V10-01-04)
|
||||
- fix problem #1783 of spin treatment for in-filght decay
|
||||
(co-work tags: track-V10-01-10, particles-V10-01-10)
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4Decay.cc 92056 2015-08-14 13:33:43Z gcosmo $
|
||||
// $Id: G4Decay.cc 97800 2016-06-13 12:14:40Z gcosmo $
|
||||
//
|
||||
//
|
||||
// --------------------------------------------------------------
|
||||
@@ -251,9 +251,30 @@ G4VParticleChange* G4Decay::DecayIt(const G4Track& aTrack, const G4Step& )
|
||||
decaychannel = decaytable->SelectADecayChannel(massParent);
|
||||
if ( decaychannel ==0) {
|
||||
// decay channel not found
|
||||
G4Exception("G4Decay::DoIt", "DECAY003", FatalException,
|
||||
" can not determine decay channel ");
|
||||
} else {
|
||||
G4ExceptionDescription ed;
|
||||
ed << "Can not determine decay channel for "
|
||||
<< aParticleDef->GetParticleName() << G4endl
|
||||
<< " mass of dynamic particle: " << massParent/GeV << " (GEV)" << G4endl
|
||||
<< " dacay table has " << decaytable->entries() << " entries" << G4endl;
|
||||
G4double checkedmass=massParent;
|
||||
if (massParent < 0.) {
|
||||
checkedmass=aParticleDef->GetPDGMass();
|
||||
ed << "Using PDG mass ("<<checkedmass/GeV << "(GeV)) in IsOKWithParentMass" << G4endl;
|
||||
}
|
||||
for (G4int ic =0;ic <decaytable->entries();++ic) {
|
||||
G4VDecayChannel * dc= decaytable->GetDecayChannel(ic);
|
||||
ed << ic << ": BR " << dc->GetBR() << ", IsOK? "
|
||||
<< dc->IsOKWithParentMass(checkedmass)
|
||||
<< ", --> ";
|
||||
G4int ndaughters=dc->GetNumberOfDaughters();
|
||||
for (G4int id=0;id<ndaughters;++id) {
|
||||
if (id>0) ed << " + "; // seperator, except for first
|
||||
ed << dc->GetDaughterName(id);
|
||||
}
|
||||
ed << G4endl;
|
||||
}
|
||||
G4Exception("G4Decay::DoIt", "DECAY003", FatalException,ed);
|
||||
} else {
|
||||
// execute DecayIt()
|
||||
#ifdef G4VERBOSE
|
||||
G4int temp = decaychannel->GetVerboseLevel();
|
||||
|
||||
Reference in New Issue
Block a user