Skip to content
Snippets Groups Projects
Commit cd760c87 authored by John Chapman's avatar John Chapman
Browse files

fix compilation issues

parent 909136cf
No related branches found
No related tags found
No related merge requests found
......@@ -529,12 +529,12 @@ ISF::ISFParticleVector iFatras::G4HadIntProcessor::getHadState(const ISF::ISFPar
//Let's make sure the new ISFParticles get a valid TruthBinding
// FIXME check that this does not cause problems in the TruthSvc
ISF::TruthBinding& truthBinding = *(parent->getTruthBinding());
const ISF::TruthBinding *truthBinding = parent->getTruthBinding();
if (truthBinding) {
ATH_MSG_VERBOSE("Could retrieve TruthBinding from original ISFParticle");
for (unsigned int i=0; i<children.size(); i++) {
if (!children[i]->getTruthBinding()) {
children[i]->setTruthBinding(new ISF::TruthBinding(truthBinding));
children[i]->setTruthBinding(new ISF::TruthBinding(*truthBinding));
}
}
}
......
......@@ -225,19 +225,18 @@ void iFatras::G4ParticleDecayHelper::handleDecayParticles(const ISF::ISFParticle
std::ostringstream productSummaryString;
productSummaryString << "[ decay ] products:";
ISF::ISFParticleVector::const_iterator decayProductsItr = decayProducts.begin();
for (; decayProductsItr != decayProducts.end(); ++decayProductsItr) {
productSummaryString << " - " << (**decayProductsItr) << '\n';
for (ISF::ISFParticle *decayProduct : decayProducts) {
productSummaryString << " - " << (*decayProduct) << '\n';
// in the validation mode, add process info
if (m_validationMode) {
ISF::ParticleUserInformation* validInfo = new ISF::ParticleUserInformation();
validInfo->setProcess(process);
if (particle.getUserInformation()) validInfo->setGeneration(particle.getUserInformation()->generation()+1);
else validInfo->setGeneration(1); // assume parent is a primary track
(*decayProductsItr)->setUserInformation(validInfo);
decayProduct->setUserInformation(validInfo);
}
// register next geo (is current), next flavor can be defined by filter
(*decayProductsItr)->setNextGeoID( particle.nextGeoID() );
decayProduct->setNextGeoID( particle.nextGeoID() );
}//loop over all decay products
// register TruthIncident
......@@ -252,10 +251,9 @@ void iFatras::G4ParticleDecayHelper::handleDecayParticles(const ISF::ISFParticle
truth.updateChildParticleProperties();
// simulate the tracks of the daughter particles ------- run over decay products
ISF::ISFParticleVector::const_iterator decayProductsItr = decayProducts.begin();
for (; decayProductsItr != decayProducts.end(); ++decayProductsItr) {
for (ISF::ISFParticle *decayProduct : decayProducts) {
// feed it the particle broker with parent information
m_particleBroker->push(*decayProductsItr, &particle);
m_particleBroker->push(decayProduct, &particle);
}//loop over all decay products
ATH_MSG_VERBOSE( productSummaryString.str() );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment