lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 9.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 15:16:48 +02:00
parent 75c7fd177d
commit a8e9364cea
6592 changed files with 84274 additions and 69292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/models/de_excitation/handler/src/G4ExcitationHandler.cc
+45 -10
View File
@@ -97,6 +97,7 @@ G4ReactionProductVector * G4ExcitationHandler::BreakItUp(const G4Fragment &theIn
G4FragmentVector * theResult = 0;
G4double exEnergy = theInitialState.GetExcitationEnergy();
// G4cout << " first exEnergy in MeV: " << exEnergy/MeV << G4endl;
G4double A = theInitialState.GetA();
G4int Z = static_cast<G4int>(theInitialState.GetZ());
G4FragmentVector* theTempResult = 0;
@@ -137,6 +138,7 @@ G4ReactionProductVector * G4ExcitationHandler::BreakItUp(const G4Fragment &theIn
for (i = theResultList.begin(); i != theResultList.end(); i++)
{
exEnergy = (*i)->GetExcitationEnergy();
// G4cout << " exEnergy in MeV: " << exEnergy/MeV << G4endl;
if (exEnergy > 0.0)
{
A = (*i)->GetA();
@@ -202,16 +204,25 @@ G4ReactionProductVector * G4ExcitationHandler::BreakItUp(const G4Fragment &theIn
// which are excited.
theTempResult = 0;
std::list<G4Fragment*> theFinalResultList;
//AHtest std::list<G4Fragment*> theFinalPhotonResultList;
std::list<G4Fragment*> theResultList;
std::list<G4Fragment*>::iterator j;
G4FragmentVector::iterator i;
for (i = theResult->begin(); i != theResult->end();i++)
{
theResultList.push_back(*i);
// G4cout << " Before loop list energy in MeV: " << ((*i)->GetExcitationEnergy())/MeV << G4endl;
}
theResult->clear();
for (j = theResultList.begin(); j != theResultList.end(); j++)
for (j = theResultList.begin(); j != theResultList.end(); j++) {
// G4cout << " Test loop list: " << (*j)->GetExcitationEnergy() << " size: " << theResultList.size() << G4endl;
}
// for (j = theResultList.begin(); j != theResultList.end(); j++)
j = theResultList.begin(); //AH
while (j != theResultList.end()) //AH
{
if ((*j)->GetA() > 1 && (*j)->GetExcitationEnergy() > 0.1*eV)
{
@@ -221,11 +232,12 @@ G4ReactionProductVector * G4ExcitationHandler::BreakItUp(const G4Fragment &theIn
if (theTempResult->size() > 1)
{
// Remove excited fragment from the result
delete (*j);
theResultList.erase(j--);
// delete (*j);
// theResultList.erase(j--);
// theResultList.erase(j); don't delete as there's no push back...
// and add theTempResult elements to theResult
for (G4FragmentVector::reverse_iterator ri = theTempResult->rbegin();
ri != theTempResult->rend(); ++ri)
for (G4FragmentVector::reverse_iterator ri = theTempResult->rbegin();
ri != theTempResult->rend(); ++ri)
{
#ifdef PRECOMPOUND_TEST
if ((*ri)->GetA() == 0)
@@ -233,7 +245,9 @@ G4ReactionProductVector * G4ExcitationHandler::BreakItUp(const G4Fragment &theIn
else
(*ri)->SetCreatorModel(G4String("ResidualNucleus"));
#endif
theResultList.push_back(*ri);
theResultList.push_back(*ri);
//AHtest theFinalPhotonResultList.push_back(*ri);
// theFinalResultList.push_back(*ri); don't add to final result as they'll go through the loop
}
delete theTempResult;
}
@@ -271,7 +285,11 @@ G4ReactionProductVector * G4ExcitationHandler::BreakItUp(const G4Fragment &theIn
#ifdef PRECOMPOUND_TEST
theHandlerPhoton->SetCreatorModel("G4ExcitationHandler");
#endif
theResultList.push_back( theHandlerPhoton );
// theFinalPhotonResultList.push_back( theHandlerPhoton );
// G4cout << " adding photon fragment " << G4endl;
theResultList.push_back( theHandlerPhoton );
// theFinalResultList.push_back( theHandlerPhoton );
theFinalResultList.push_back(*j);
#ifdef debugphoton
G4cout << "Emmited photon:\n"
<< theResultList.back() << '\n'
@@ -279,14 +297,31 @@ G4ReactionProductVector * G4ExcitationHandler::BreakItUp(const G4Fragment &theIn
<< *(*j) << '\n'
<< "-----------------------------------------------------------------------\n";
#endif
//test j++; // AH only increment if not erased:
}
}
} else {
//test j++; // AH increment iterator if a proton or excitation energy small
theFinalResultList.push_back(*j);
}
// G4cout << " Inside loop list: " << (*j)->GetExcitationEnergy() << " size: " << theFinalResultList.size() << G4endl;
j++;
}
for (j = theResultList.begin(); j != theResultList.end(); j++)
// for (j = theResultList.begin(); j != theResultList.end(); j++)
for (j = theFinalResultList.begin(); j != theFinalResultList.end(); j++)
{
theResult->push_back(*j);
}
//AHtest for (j = theFinalPhotonResultList.begin(); j != theFinalPhotonResultList.end(); j++)
//AHtest {
//AHtest theResult->push_back(*j);
//AHtest number_results++;
//AHtest }
theResultList.clear();
theFinalResultList.clear();
//AHtest theFinalPhotonResultList.clear();
#ifdef debug