D58.1759155933.diff
No OneTemporary
Actions

Size

35 KB

Referenced Files

None

Subscribers

None

D58.1759155933.diff
View Options

	diff --git a/EvtGenBase/EvtMassAmp.hh b/EvtGenBase/EvtMassAmp.hh
	--- a/EvtGenBase/EvtMassAmp.hh
	+++ b/EvtGenBase/EvtMassAmp.hh
	@@ -26,6 +26,7 @@
	#include "EvtGenBase/EvtPropBreitWignerRel.hh"
	#include "EvtGenBase/EvtTwoBodyVertex.hh"

	+#include <memory>
	// Relativistic lineshape for a two-body decay of a resonance to two
	// pseudoscalars. The mass dependence of the width and the vertex factors
	// are included in the calculation.
	diff --git a/EvtGenExternal/EvtExternalGenFactory.hh b/EvtGenExternal/EvtExternalGenFactory.hh
	--- a/EvtGenExternal/EvtExternalGenFactory.hh
	+++ b/EvtGenExternal/EvtExternalGenFactory.hh
	@@ -63,8 +63,8 @@
	private:
	EvtExternalGenFactory( const EvtExternalGenFactory& ){};

	- ExtGenMap _extGenMap;
	- ExtGenCommandMap _extGenCommandMap;
	+ ExtGenMap m_extGenMap;
	+ ExtGenCommandMap m_extGenCommandMap;
	};

	#endif
	diff --git a/EvtGenExternal/EvtPHOTOS.hh b/EvtGenExternal/EvtPHOTOS.hh
	--- a/EvtGenExternal/EvtPHOTOS.hh
	+++ b/EvtGenExternal/EvtPHOTOS.hh
	@@ -36,7 +36,7 @@
	void doRadCorr( EvtParticle* p ) override;

	private:
	- EvtAbsExternalGen* _photosEngine = nullptr;
	+ EvtAbsExternalGen* m_photosEngine = nullptr;
	};

	#endif
	diff --git a/EvtGenExternal/EvtPhotosEngine.hh b/EvtGenExternal/EvtPhotosEngine.hh
	--- a/EvtGenExternal/EvtPhotosEngine.hh
	+++ b/EvtGenExternal/EvtPhotosEngine.hh
	@@ -53,11 +53,11 @@
	void initialise() override;

	private:
	- std::string _photonType;
	- EvtId _gammaId;
	- int _gammaPDG;
	- double _mPhoton;
	- bool _initialised;
	+ std::string m_photonType;
	+ EvtId m_gammaId;
	+ int m_gammaPDG;
	+ double m_mPhoton;
	+ bool m_initialised;

	GenParticlePtr createGenParticle( EvtParticle* theParticle, bool incoming );
	int getNumberOfPhotons( const GenVertexPtr theVertex ) const;
	diff --git a/EvtGenExternal/EvtPythia.hh b/EvtGenExternal/EvtPythia.hh
	--- a/EvtGenExternal/EvtPythia.hh
	+++ b/EvtGenExternal/EvtPythia.hh
	@@ -53,11 +53,11 @@
	void command( std::string ) override;

	protected:
	- EvtAbsExternalGen* _pythiaEngine;
	+ EvtAbsExternalGen* m_pythiaEngine;

	private:
	void fixPolarisations( EvtParticle* p );
	- std::vector<std::string> _commandList;
	+ std::vector<std::string> m_commandList;
	};

	#endif
	diff --git a/EvtGenExternal/EvtPythiaEngine.hh b/EvtGenExternal/EvtPythiaEngine.hh
	--- a/EvtGenExternal/EvtPythiaEngine.hh
	+++ b/EvtGenExternal/EvtPythiaEngine.hh
	@@ -70,21 +70,21 @@

	int getModeInt( EvtDecayBase* decayModel );

	- std::unique_ptr<Pythia8::Pythia> _genericPythiaGen;
	- std::unique_ptr<Pythia8::Pythia> _aliasPythiaGen;
	- Pythia8::Pythia* _thePythiaGenerator;
	+ std::unique_ptr<Pythia8::Pythia> m_genericPythiaGen;
	+ std::unique_ptr<Pythia8::Pythia> m_aliasPythiaGen;
	+ Pythia8::Pythia* m_thePythiaGenerator;

	- std::vector<int> _daugPDGVector;
	- std::vector<EvtVector4R> _daugP4Vector;
	+ std::vector<int> m_daugPDGVector;
	+ std::vector<EvtVector4R> m_daugP4Vector;

	typedef std::map<int, std::vector<int>> PythiaModeMap;
	- PythiaModeMap _pythiaModeMap;
	+ PythiaModeMap m_pythiaModeMap;

	- bool _convertPhysCodes, _initialised, _useEvtGenRandom;
	+ bool m_convertPhysCodes, m_initialised, m_useEvtGenRandom;

	- std::unique_ptr<EvtPythiaRandom> _evtgenRandom;
	+ std::unique_ptr<EvtPythiaRandom> m_evtgenRandom;

	- std::map<int, int> _addedPDGCodes;
	+ std::map<int, int> m_addedPDGCodes;
	};

	#endif
	diff --git a/EvtGenExternal/EvtTauola.hh b/EvtGenExternal/EvtTauola.hh
	--- a/EvtGenExternal/EvtTauola.hh
	+++ b/EvtGenExternal/EvtTauola.hh
	@@ -41,7 +41,7 @@
	void decay( EvtParticle* p ) override;

	protected:
	- EvtAbsExternalGen* _tauolaEngine = nullptr;
	+ EvtAbsExternalGen* m_tauolaEngine = nullptr;

	private:
	};
	diff --git a/EvtGenExternal/EvtTauolaEngine.hh b/EvtGenExternal/EvtTauolaEngine.hh
	--- a/EvtGenExternal/EvtTauolaEngine.hh
	+++ b/EvtGenExternal/EvtTauolaEngine.hh
	@@ -58,9 +58,9 @@

	protected:
	private:
	- bool _initialised;
	- int _tauPDG, _nTauolaModes;
	- int _neutPropType, _posPropType, _negPropType;
	+ bool m_initialised;
	+ int m_tauPDG, m_nTauolaModes;
	+ int m_neutPropType, m_posPropType, m_negPropType;

	GenParticlePtr createGenParticle( EvtParticle* theParticle );

	diff --git a/src/EvtGenBase/EvtTwoBodyVertex.cpp b/src/EvtGenBase/EvtTwoBodyVertex.cpp
	--- a/src/EvtGenBase/EvtTwoBodyVertex.cpp
	+++ b/src/EvtGenBase/EvtTwoBodyVertex.cpp
	@@ -24,8 +24,9 @@
	#include "EvtGenBase/EvtPatches.hh"

	#include <assert.h>
	+#include <cmath>
	#include <iostream>
	-#include <math.h>
	+#include <memory>
	using std::endl;
	using std::ostream;

	diff --git a/src/EvtGenExternal/EvtExternalGenFactory.cpp b/src/EvtGenExternal/EvtExternalGenFactory.cpp
	--- a/src/EvtGenExternal/EvtExternalGenFactory.cpp
	+++ b/src/EvtGenExternal/EvtExternalGenFactory.cpp
	@@ -40,18 +40,18 @@

	EvtExternalGenFactory::EvtExternalGenFactory()
	{
	- _extGenMap.clear();
	+ m_extGenMap.clear();
	}

	EvtExternalGenFactory::~EvtExternalGenFactory()
	{
	ExtGenMap::iterator iter;
	- for ( iter = _extGenMap.begin(); iter != _extGenMap.end(); ++iter ) {
	+ for ( iter = m_extGenMap.begin(); iter != m_extGenMap.end(); ++iter ) {
	EvtAbsExternalGen* theGenerator = iter->second;
	delete theGenerator;
	}

	- _extGenMap.clear();
	+ m_extGenMap.clear();
	}

	EvtExternalGenFactory* EvtExternalGenFactory::getInstance()
	@@ -91,7 +91,7 @@

	EvtAbsExternalGen* pythiaGenerator =
	new EvtPythiaEngine( xmlDir, convertPhysCodes, useEvtGenRandom );
	- _extGenMap[genId] = pythiaGenerator;
	+ m_extGenMap[genId] = pythiaGenerator;
	}
	#else
	void EvtExternalGenFactory::definePythiaGenerator( std::string, bool, bool )
	@@ -110,7 +110,7 @@

	EvtAbsExternalGen* photosGenerator = new EvtPhotosEngine( photonType,
	useEvtGenRandom );
	- _extGenMap[genId] = photosGenerator;
	+ m_extGenMap[genId] = photosGenerator;
	}
	#else
	void EvtExternalGenFactory::definePhotosGenerator( std::string, bool )
	@@ -126,7 +126,7 @@
	EvtGenReport( EVTGEN_INFO, "EvtGen" ) << "Defining EvtTauolaEngine." << endl;

	EvtAbsExternalGen* tauolaGenerator = new EvtTauolaEngine( useEvtGenRandom );
	- _extGenMap[genId] = tauolaGenerator;
	+ m_extGenMap[genId] = tauolaGenerator;
	}
	#else
	void EvtExternalGenFactory::defineTauolaGenerator( bool )
	@@ -140,7 +140,7 @@

	ExtGenMap::iterator iter;

	- if ( ( iter = _extGenMap.find( genId ) ) != _extGenMap.end() ) {
	+ if ( ( iter = m_extGenMap.find( genId ) ) != m_extGenMap.end() ) {
	// Retrieve the external generator engine
	theGenerator = iter->second;

	@@ -156,7 +156,7 @@
	void EvtExternalGenFactory::initialiseAllGenerators()
	{
	ExtGenMap::iterator iter;
	- for ( iter = _extGenMap.begin(); iter != _extGenMap.end(); ++iter ) {
	+ for ( iter = m_extGenMap.begin(); iter != m_extGenMap.end(); ++iter ) {
	EvtAbsExternalGen* theGenerator = iter->second;
	if ( theGenerator != 0 ) {
	theGenerator->initialise();
	diff --git a/src/EvtGenExternal/EvtPHOTOS.cpp b/src/EvtGenExternal/EvtPHOTOS.cpp
	--- a/src/EvtGenExternal/EvtPHOTOS.cpp
	+++ b/src/EvtGenExternal/EvtPHOTOS.cpp
	@@ -26,12 +26,12 @@

	void EvtPHOTOS::doRadCorr( EvtParticle* p )
	{
	- if ( !_photosEngine ) {
	- _photosEngine = EvtExternalGenFactory::getInstance()->getGenerator(
	+ if ( !m_photosEngine ) {
	+ m_photosEngine = EvtExternalGenFactory::getInstance()->getGenerator(
	EvtExternalGenFactory::PhotosGenId );
	}

	- if ( _photosEngine ) {
	- _photosEngine->doDecay( p );
	+ if ( m_photosEngine ) {
	+ m_photosEngine->doDecay( p );
	}
	}
	diff --git a/src/EvtGenExternal/EvtPhotosEngine.cpp b/src/EvtGenExternal/EvtPhotosEngine.cpp
	--- a/src/EvtGenExternal/EvtPhotosEngine.cpp
	+++ b/src/EvtGenExternal/EvtPhotosEngine.cpp
	@@ -31,15 +31,16 @@
	#include <iostream>
	#include <sstream>
	#include <vector>
	+#include <memory>

	using std::endl;

	EvtPhotosEngine::EvtPhotosEngine( std::string photonType, bool useEvtGenRandom )
	{
	- _photonType = photonType;
	- _gammaId = EvtId( -1, -1 );
	- _gammaPDG = 22; // default photon pdg integer
	- _mPhoton = 0.0;
	+ m_photonType = photonType;
	+ m_gammaId = EvtId( -1, -1 );
	+ m_gammaPDG = 22; // default photon pdg integer
	+ m_mPhoton = 0.0;

	EvtGenReport( EVTGEN_INFO, "EvtGen" ) << "Setting up PHOTOS." << endl;

	@@ -62,31 +63,31 @@
	// which is appropriate for B decays
	Photospp::Photos::setInfraredCutOff( 1.0e-7 );

	- _initialised = false;
	+ m_initialised = false;
	}

	void EvtPhotosEngine::initialise()
	{
	- if ( _initialised == false ) {
	- _gammaId = EvtPDL::getId( _photonType );
	+ if ( m_initialised == false ) {
	+ m_gammaId = EvtPDL::getId( m_photonType );

	- if ( _gammaId == EvtId( -1, -1 ) ) {
	+ if ( m_gammaId == EvtId( -1, -1 ) ) {
	EvtGenReport( EVTGEN_INFO, "EvtGen" )
	<< "Error in EvtPhotosEngine. Do not recognise the photon type "
	- << _photonType << ". Setting this to \"gamma\". " << endl;
	- _gammaId = EvtPDL::getId( "gamma" );
	+ << m_photonType << ". Setting this to \"gamma\". " << endl;
	+ m_gammaId = EvtPDL::getId( "gamma" );
	}

	- _gammaPDG = EvtPDL::getStdHep( _gammaId );
	- _mPhoton = EvtPDL::getMeanMass( _gammaId );
	+ m_gammaPDG = EvtPDL::getStdHep( m_gammaId );
	+ m_mPhoton = EvtPDL::getMeanMass( m_gammaId );

	- _initialised = true;
	+ m_initialised = true;
	}
	}

	bool EvtPhotosEngine::doDecay( EvtParticle* theMother )
	{
	- if ( _initialised == false ) {
	+ if ( m_initialised == false ) {
	this->initialise();
	}

	@@ -131,7 +132,7 @@

	if ( theDaughter ) {
	int daugId = theDaughter->getPDGId();
	- if ( daugId == _gammaPDG ) {
	+ if ( daugId == m_gammaPDG ) {
	nGamma++;
	}
	}
	@@ -200,15 +201,15 @@
	daugParticle->setP4WithFSR( newP4 );
	}

	- } else if ( pdgId == _gammaPDG ) {
	+ } else if ( pdgId == m_gammaPDG ) {
	// Extra photon particle. Setup the four-momentum object
	- double energy = sqrt( _mPhoton * _mPhoton + px * px + py * py +
	+ double energy = sqrt( m_mPhoton * m_mPhoton + px * px + py * py +
	pz * pz );
	newP4.set( energy, px, py, pz );

	// Create a new photon particle and add it to the list of daughters
	EvtPhotonParticle* gamma = new EvtPhotonParticle();
	- gamma->init( _gammaId, newP4 );
	+ gamma->init( m_gammaId, newP4 );
	// Set the pre-FSR photon momentum to zero
	gamma->setFSRP4toZero();
	// Let the mother know about this new photon
	@@ -296,7 +297,7 @@
	}

	// Keep track of how many photons there are
	- if ( pdgId == _gammaPDG ) {
	+ if ( pdgId == m_gammaPDG ) {
	nPhotons++;
	}
	}
	diff --git a/src/EvtGenExternal/EvtPythia.cpp b/src/EvtGenExternal/EvtPythia.cpp
	--- a/src/EvtGenExternal/EvtPythia.cpp
	+++ b/src/EvtGenExternal/EvtPythia.cpp
	@@ -39,12 +39,12 @@
	// Set the Pythia engine to a null pointer at first.
	// When we do the decay, we retrieve the pointer to the Pythia engine
	// and use that for all decays. All clones will use the same Pythia engine.
	- _pythiaEngine = 0;
	+ m_pythiaEngine = 0;
	}

	EvtPythia::~EvtPythia()
	{
	- _commandList.clear();
	+ m_commandList.clear();
	}

	std::string EvtPythia::getName()
	@@ -77,13 +77,13 @@
	// We check to see if the engine has been created before doing the decay.
	// This should only create the full Pythia engine once, and all clones will point to the same engine.

	- if ( !_pythiaEngine ) {
	- _pythiaEngine = EvtExternalGenFactory::getInstance()->getGenerator(
	+ if ( !m_pythiaEngine ) {
	+ m_pythiaEngine = EvtExternalGenFactory::getInstance()->getGenerator(
	EvtExternalGenFactory::PythiaGenId );
	}

	- if ( _pythiaEngine ) {
	- _pythiaEngine->doDecay( p );
	+ if ( m_pythiaEngine ) {
	+ m_pythiaEngine->doDecay( p );
	}

	this->fixPolarisations( p );
	@@ -148,5 +148,5 @@
	void EvtPythia::command( std::string cmd )
	{
	// Locally store commands in a vector
	- _commandList.push_back( cmd );
	+ m_commandList.push_back( cmd );
	}
	diff --git a/src/EvtGenExternal/EvtPythiaEngine.cpp b/src/EvtGenExternal/EvtPythiaEngine.cpp
	--- a/src/EvtGenExternal/EvtPythiaEngine.cpp
	+++ b/src/EvtGenExternal/EvtPythiaEngine.cpp
	@@ -53,54 +53,54 @@

	EvtGenReport( EVTGEN_INFO, "EvtGen" )
	<< "Creating generic Pythia generator" << endl;
	- _genericPythiaGen = std::make_unique<Pythia8::Pythia>( xmlDir );
	+ m_genericPythiaGen = std::make_unique<Pythia8::Pythia>( xmlDir );

	EvtGenReport( EVTGEN_INFO, "EvtGen" )
	<< "Creating alias Pythia generator" << endl;
	- _aliasPythiaGen = std::make_unique<Pythia8::Pythia>( xmlDir, false );
	+ m_aliasPythiaGen = std::make_unique<Pythia8::Pythia>( xmlDir, false );

	- _thePythiaGenerator = 0;
	- _daugPDGVector.clear();
	- _daugP4Vector.clear();
	+ m_thePythiaGenerator = 0;
	+ m_daugPDGVector.clear();
	+ m_daugP4Vector.clear();

	- _convertPhysCodes = convertPhysCodes;
	+ m_convertPhysCodes = convertPhysCodes;

	// Specify if we are going to use the random number generator (engine)
	// from EvtGen for Pythia 8.
	- _useEvtGenRandom = useEvtGenRandom;
	+ m_useEvtGenRandom = useEvtGenRandom;

	- _evtgenRandom = std::make_unique<EvtPythiaRandom>();
	+ m_evtgenRandom = std::make_unique<EvtPythiaRandom>();

	- _initialised = false;
	+ m_initialised = false;
	}

	EvtPythiaEngine::~EvtPythiaEngine()
	{
	- _thePythiaGenerator = nullptr;
	+ m_thePythiaGenerator = nullptr;
	this->clearDaughterVectors();
	this->clearPythiaModeMap();
	}

	void EvtPythiaEngine::clearDaughterVectors()
	{
	- _daugPDGVector.clear();
	- _daugP4Vector.clear();
	+ m_daugPDGVector.clear();
	+ m_daugP4Vector.clear();
	}

	void EvtPythiaEngine::clearPythiaModeMap()
	{
	PythiaModeMap::iterator iter;
	- for ( iter = _pythiaModeMap.begin(); iter != _pythiaModeMap.end(); ++iter ) {
	+ for ( iter = m_pythiaModeMap.begin(); iter != m_pythiaModeMap.end(); ++iter ) {
	std::vector<int> modeVector = iter->second;
	modeVector.clear();
	}

	- _pythiaModeMap.clear();
	+ m_pythiaModeMap.clear();
	}

	void EvtPythiaEngine::initialise()
	{
	- if ( _initialised ) {
	+ if ( m_initialised ) {
	return;
	}

	@@ -110,26 +110,26 @@

	// Hadron-level processes only (hadronized, string fragmentation and secondary decays).
	// We do not want to generate the full pp or e+e- event structure etc..
	- _genericPythiaGen->readString( "ProcessLevel:all = off" );
	- _aliasPythiaGen->readString( "ProcessLevel:all = off" );
	+ m_genericPythiaGen->readString( "ProcessLevel:all = off" );
	+ m_aliasPythiaGen->readString( "ProcessLevel:all = off" );

	// Turn off Pythia warnings, e.g. changes to particle properties
	- _genericPythiaGen->readString( "Print:quiet = on" );
	- _aliasPythiaGen->readString( "Print:quiet = on" );
	+ m_genericPythiaGen->readString( "Print:quiet = on" );
	+ m_aliasPythiaGen->readString( "Print:quiet = on" );

	// Apply any other physics (or special particle) requirements/cuts etc..
	this->updatePhysicsParameters();

	// Set the random number generator
	- if ( _useEvtGenRandom == true ) {
	- _genericPythiaGen->setRndmEnginePtr( _evtgenRandom.get() );
	- _aliasPythiaGen->setRndmEnginePtr( _evtgenRandom.get() );
	+ if ( m_useEvtGenRandom == true ) {
	+ m_genericPythiaGen->setRndmEnginePtr( m_evtgenRandom.get() );
	+ m_aliasPythiaGen->setRndmEnginePtr( m_evtgenRandom.get() );
	}

	- _genericPythiaGen->init();
	- _aliasPythiaGen->init();
	+ m_genericPythiaGen->init();
	+ m_aliasPythiaGen->init();

	- _initialised = true;
	+ m_initialised = true;
	}

	bool EvtPythiaEngine::doDecay( EvtParticle* theParticle )
	@@ -149,7 +149,7 @@
	// we wanted via the specifications made to the decay.dec file, even though event-by-event
	// the EvtGen decay channel and the Pythia decay channel may be different.

	- if ( _initialised == false ) {
	+ if ( m_initialised == false ) {
	this->initialise();
	}

	@@ -170,12 +170,12 @@
	int isAlias = particleId.isAlias();

	// Choose the generator depending if we have an aliased (parent) particle or not
	- _thePythiaGenerator = ( isAlias == 1 ? _aliasPythiaGen.get()
	- : _genericPythiaGen.get() );
	+ m_thePythiaGenerator = ( isAlias == 1 ? m_aliasPythiaGen.get()
	+ : m_genericPythiaGen.get() );

	// Need to use the reference to the Pythia8::Event object,
	// otherwise it will just return a new empty, default event object.
	- Pythia8::Event& theEvent = _thePythiaGenerator->event;
	+ Pythia8::Event& theEvent = m_thePythiaGenerator->event;
	theEvent.reset();

	// Initialise the event to be the particle rest frame
	@@ -193,7 +193,7 @@
	int iTrial( 0 );
	bool generatedEvent( false );
	for ( iTrial = 0; iTrial < 10; iTrial++ ) {
	- generatedEvent = _thePythiaGenerator->next();
	+ generatedEvent = m_thePythiaGenerator->next();
	if ( generatedEvent ) {
	break;
	}
	@@ -232,7 +232,7 @@

	void EvtPythiaEngine::storeDaughterInfo( EvtParticle* theParticle, int startInt )
	{
	- Pythia8::Event& theEvent = _thePythiaGenerator->event;
	+ Pythia8::Event& theEvent = m_thePythiaGenerator->event;

	std::vector<int> daugList = theEvent.daughterList( startInt );

	@@ -266,8 +266,8 @@
	EvtVector4R daughterP4( E, px, py, pz );

	// Now store the EvtId and 4-momentum in the internal vectors
	- _daugPDGVector.push_back( daugPDGInt );
	- _daugP4Vector.push_back( daughterP4 );
	+ m_daugPDGVector.push_back( daugPDGInt );
	+ m_daugP4Vector.push_back( daughterP4 );

	// Set the status flag for the Pythia particle to let us know
	// that we have already considered it to avoid double counting.
	@@ -291,7 +291,7 @@
	// It would be easier to just use the decay channel number that Pythia chose to use
	// for the particle decay, but this is not accessible from the Pythia interface at present.

	- int nDaughters = _daugPDGVector.size();
	+ int nDaughters = m_daugPDGVector.size();
	std::vector<EvtId> daugAliasIdVect( 0 );

	EvtId particleId = theParent->getId();
	@@ -307,7 +307,7 @@
	pythiaAliasInt = conjPartId.getAlias();
	}

	- std::vector<int> pythiaModes = _pythiaModeMap[pythiaAliasInt];
	+ std::vector<int> pythiaModes = m_pythiaModeMap[pythiaAliasInt];

	// Loop over all available Pythia decay modes and find the channel that matches
	// the daughter ids. Set each daughter id to also use the alias integer.
	@@ -338,7 +338,7 @@
	EvtId daugId = decayModel->getDaug( iModeDaug );
	int daugPDGId = EvtPDL::getStdHep( daugId );
	// Pythia has used the right PDG codes for this decay mode, even for conjugate modes
	- int pythiaPDGId = _daugPDGVector[iModeDaug];
	+ int pythiaPDGId = m_daugPDGVector[iModeDaug];

	if ( daugPDGId == pythiaPDGId ) {
	daugAliasIdVect.push_back( daugId );
	@@ -367,7 +367,7 @@
	// from the Pythia decay result
	int iPyDaug( 0 );
	for ( iPyDaug = 0; iPyDaug < nDaughters; iPyDaug++ ) {
	- int daugPDGCode = _daugPDGVector[iPyDaug];
	+ int daugPDGCode = m_daugPDGVector[iPyDaug];
	EvtId daugPyId = EvtPDL::evtIdFromStdHep( daugPDGCode );
	daugAliasIdVect.push_back( daugPyId );
	}
	@@ -385,7 +385,7 @@
	// Set the correct 4-momentum for each daughter particle.
	if ( theDaughter != 0 ) {
	EvtId theDaugId = daugAliasIdVect[iDaug];
	- const EvtVector4R theDaugP4 = _daugP4Vector[iDaug];
	+ const EvtVector4R theDaugP4 = m_daugP4Vector[iDaug];
	theDaughter->init( theDaugId, theDaugP4 );
	}
	}
	@@ -403,9 +403,9 @@
	int iPDL;
	int nPDL = EvtPDL::entries();

	- // Reset the _addedPDGCodes map that keeps track
	+ // Reset the m_addedPDGCodes map that keeps track
	// of any new particles added to the Pythia input data stream
	- _addedPDGCodes.clear();
	+ m_addedPDGCodes.clear();

	for ( iPDL = 0; iPDL < nPDL; iPDL++ ) {
	EvtId particleId = EvtPDL::getEntry( iPDL );
	@@ -431,9 +431,9 @@
	// the original particleData information from the generator pointer.

	Pythia8::ParticleDataEntry* entry_generic =
	- _genericPythiaGen->particleData.particleDataEntryPtr( PDGCode );
	+ m_genericPythiaGen->particleData.particleDataEntryPtr( PDGCode );
	Pythia8::ParticleDataEntry* entry_alias =
	- _aliasPythiaGen->particleData.particleDataEntryPtr( PDGCode );
	+ m_aliasPythiaGen->particleData.particleDataEntryPtr( PDGCode );

	// Check that the PDG code is not zero/null and exclude other
	// special cases, e.g. those reserved for internal generator use
	@@ -472,14 +472,14 @@

	// Decide what generator to use depending on whether we have
	// an aliased particle or not
	- _thePythiaGenerator = ( isAlias == 1 ? _aliasPythiaGen.get()
	- : _genericPythiaGen.get() );
	+ m_thePythiaGenerator = ( isAlias == 1 ? m_aliasPythiaGen.get()
	+ : m_genericPythiaGen.get() );

	// Find the Pythia particle name given the standard PDG code integer
	- std::string dataName = _thePythiaGenerator->particleData.name(
	+ std::string dataName = m_thePythiaGenerator->particleData.name(
	PDGCode );
	- bool alreadyStored = ( _addedPDGCodes.find( abs( PDGCode ) ) !=
	- _addedPDGCodes.end() );
	+ bool alreadyStored = ( m_addedPDGCodes.find( abs( PDGCode ) ) !=
	+ m_addedPDGCodes.end() );

	if ( dataName == " " && !alreadyStored ) {
	// Particle and its antiparticle do not exist in the Pythia database.
	@@ -604,7 +604,7 @@

	} // Daughter list

	- _thePythiaGenerator->readString( oss.str() );
	+ m_thePythiaGenerator->readString( oss.str() );

	} // is Pythia

	@@ -625,14 +625,14 @@

	} // Loop over modes

	- _pythiaModeMap[aliasInt] = pythiaModes;
	+ m_pythiaModeMap[aliasInt] = pythiaModes;

	// Now, renormalise the decay branching fractions to sum to 1.0
	std::ostringstream rescaleStr;
	rescaleStr.setf( std::ios::scientific );
	rescaleStr << PDGCode << ":rescaleBR = 1.0";

	- _thePythiaGenerator->readString( rescaleStr.str() );
	+ m_thePythiaGenerator->readString( rescaleStr.str() );
	}

	int EvtPythiaEngine::getModeInt( EvtDecayBase* decayModel )
	@@ -648,7 +648,7 @@
	}
	}

	- if ( _convertPhysCodes ) {
	+ if ( m_convertPhysCodes ) {
	// Extra code to convert the old Pythia decay model integer MDME(ICC,2) to the new one.
	// This should be removed eventually after updating decay.dec files to use
	// the new convention.
	@@ -759,14 +759,14 @@
	<< " " << mMin << " " << mMax << " " << tau0;

	// Pass this information to Pythia
	- _thePythiaGenerator->readString( oss.str() );
	+ m_thePythiaGenerator->readString( oss.str() );

	// Also store the absolute value of the PDG entry
	// to keep track of which new particles have been added,
	// which also automatically includes the anti-particle.
	// We need to avoid creating new anti-particles when
	// they already exist when the particle was added.
	- _addedPDGCodes[absPDGCode] = 1;
	+ m_addedPDGCodes[absPDGCode] = 1;
	}

	void EvtPythiaEngine::updatePhysicsParameters()
	@@ -780,13 +780,13 @@

	// Set the multiplicity level for hadronic weak decays
	std::string multiWeakCut( "ParticleDecays:multIncreaseWeak = 2.0" );
	- _genericPythiaGen->readString( multiWeakCut );
	- _aliasPythiaGen->readString( multiWeakCut );
	+ m_genericPythiaGen->readString( multiWeakCut );
	+ m_aliasPythiaGen->readString( multiWeakCut );

	// Set the multiplicity level for all other decays
	std::string multiCut( "ParticleDecays:multIncrease = 4.5" );
	- _genericPythiaGen->readString( multiCut );
	- _aliasPythiaGen->readString( multiCut );
	+ m_genericPythiaGen->readString( multiCut );
	+ m_aliasPythiaGen->readString( multiCut );

	//Now read in any custom configuration entered in the XML
	GeneratorCommands commands =
	@@ -827,7 +827,7 @@
	EvtGenReport( EVTGEN_INFO, "EvtGen" )
	<< "Configuring generic Pythia generator: " << ( *it2 )
	<< endl;
	- _genericPythiaGen->readString( *it2 );
	+ m_genericPythiaGen->readString( *it2 );
	}
	}
	if ( generator == "ALIAS" \|\| generator == "Alias" \|\|
	@@ -838,7 +838,7 @@
	EvtGenReport( EVTGEN_INFO, "EvtGen" )
	<< "Configuring alias Pythia generator: " << ( *it2 )
	<< endl;
	- _aliasPythiaGen->readString( *it2 );
	+ m_aliasPythiaGen->readString( *it2 );
	}
	}
	}
	diff --git a/src/EvtGenExternal/EvtTauola.cpp b/src/EvtGenExternal/EvtTauola.cpp
	--- a/src/EvtGenExternal/EvtTauola.cpp
	+++ b/src/EvtGenExternal/EvtTauola.cpp
	@@ -57,12 +57,12 @@
	// This should only create the full Tauola engine once, and all clones will
	// point to the same engine.

	- if ( !_tauolaEngine ) {
	- _tauolaEngine = EvtExternalGenFactory::getInstance()->getGenerator(
	+ if ( !m_tauolaEngine ) {
	+ m_tauolaEngine = EvtExternalGenFactory::getInstance()->getGenerator(
	EvtExternalGenFactory::TauolaGenId );
	}

	- if ( _tauolaEngine ) {
	- _tauolaEngine->doDecay( p );
	+ if ( m_tauolaEngine ) {
	+ m_tauolaEngine->doDecay( p );
	}
	}
	diff --git a/src/EvtGenExternal/EvtTauolaEngine.cpp b/src/EvtGenExternal/EvtTauolaEngine.cpp
	--- a/src/EvtGenExternal/EvtTauolaEngine.cpp
	+++ b/src/EvtGenExternal/EvtTauolaEngine.cpp
	@@ -43,15 +43,15 @@
	EvtTauolaEngine::EvtTauolaEngine( bool useEvtGenRandom )
	{
	// PDG standard code integer ID for tau particle
	- _tauPDG = 15;
	+ m_tauPDG = 15;
	// Number of possible decay modes in Tauola
	- _nTauolaModes = 22;
	+ m_nTauolaModes = 22;

	EvtGenReport( EVTGEN_INFO, "EvtGen" ) << "Setting up TAUOLA." << endl;

	// These three lines are not really necessary since they are the default.
	// But they are here so that we know what the initial conditions are.
	- Tauolapp::Tauola::setDecayingParticle( _tauPDG ); // tau PDG code
	+ Tauolapp::Tauola::setDecayingParticle( m_tauPDG ); // tau PDG code
	Tauolapp::Tauola::setSameParticleDecayMode(
	Tauolapp::Tauola::All ); // all modes allowed
	Tauolapp::Tauola::setOppositeParticleDecayMode(
	@@ -76,12 +76,12 @@

	// Initialise various default parameters
	// Neutral and charged spin propagator choices
	- _neutPropType = 0;
	- _posPropType = 0;
	- _negPropType = 0;
	+ m_neutPropType = 0;
	+ m_posPropType = 0;
	+ m_negPropType = 0;

	// Set-up possible decay modes _after_ we have read the (user) decay file
	- _initialised = false;
	+ m_initialised = false;
	}

	void EvtTauolaEngine::initialise()
	@@ -92,11 +92,11 @@
	// first to get lists of particle modes and their alias definitions
	// (for creating EvtParticles with the right history information).

	- if ( _initialised == false ) {
	+ if ( m_initialised == false ) {
	this->setUpPossibleTauModes();
	this->setOtherParameters();

	- _initialised = true;
	+ m_initialised = true;
	}
	}

	@@ -120,7 +120,7 @@
	EvtId particleId = EvtPDL::getEntry( iPDL );
	int PDGId = EvtPDL::getStdHep( particleId );

	- if ( abs( PDGId ) == _tauPDG && gotAnyTauolaModes == false ) {
	+ if ( abs( PDGId ) == m_tauPDG && gotAnyTauolaModes == false ) {
	int aliasInt = particleId.getAlias();

	// Get the list of decay modes for this tau particle (alias)
	@@ -130,9 +130,9 @@
	// Vector to store tau mode branching fractions.
	// The size of this vector equals the total number of possible
	// Tauola decay modes. Initialise all BFs to zero.
	- std::vector<double> tauolaModeBFs( _nTauolaModes );
	+ std::vector<double> tauolaModeBFs( m_nTauolaModes );

	- for ( iTauMode = 0; iTauMode < _nTauolaModes; iTauMode++ ) {
	+ for ( iTauMode = 0; iTauMode < m_nTauolaModes; iTauMode++ ) {
	tauolaModeBFs[iTauMode] = 0.0;
	}

	@@ -157,7 +157,7 @@
	double BF = decayModel->getBranchingFraction();
	int modeArrayInt = this->getModeInt( decayModel ) - 1;

	- if ( modeArrayInt >= 0 && modeArrayInt < _nTauolaModes ) {
	+ if ( modeArrayInt >= 0 && modeArrayInt < m_nTauolaModes ) {
	tauolaModeBFs[modeArrayInt] = BF;
	totalTauModeBF += BF;
	}
	@@ -184,7 +184,7 @@
	<< "Setting TAUOLA BF modes using the definitions for the particle "
	<< EvtPDL::name( particleId ) << endl;

	- for ( iTauMode = 0; iTauMode < _nTauolaModes; iTauMode++ ) {
	+ for ( iTauMode = 0; iTauMode < m_nTauolaModes; iTauMode++ ) {
	tauolaModeBFs[iTauMode] /= totalTauModeBF;
	double modeBF = tauolaModeBFs[iTauMode];
	EvtGenReport( EVTGEN_INFO, "EvtGen" )
	@@ -228,20 +228,20 @@
	int iErr( 0 );
	std::string neutPropName = EvtSymTable::get( "TauolaNeutralProp", iErr );
	if ( neutPropName == "Z0" \|\| neutPropName == "Z" ) {
	- _neutPropType = Tauolapp::TauolaParticle::Z0;
	+ m_neutPropType = Tauolapp::TauolaParticle::Z0;
	} else if ( neutPropName == "Gamma" ) {
	- _neutPropType = Tauolapp::TauolaParticle::GAMMA;
	+ m_neutPropType = Tauolapp::TauolaParticle::GAMMA;
	} else if ( neutPropName == "Higgs" ) {
	- _neutPropType = Tauolapp::TauolaParticle::HIGGS;
	+ m_neutPropType = Tauolapp::TauolaParticle::HIGGS;
	} else if ( neutPropName == "PseudoHiggs" ) {
	- _neutPropType = Tauolapp::TauolaParticle::HIGGS_A;
	+ m_neutPropType = Tauolapp::TauolaParticle::HIGGS_A;
	} else if ( neutPropName == "MixedHiggs" ) {
	- _neutPropType = Tauolapp::Tauola::getHiggsScalarPseudoscalarPDG();
	+ m_neutPropType = Tauolapp::Tauola::getHiggsScalarPseudoscalarPDG();
	}

	- if ( _neutPropType != 0 ) {
	+ if ( m_neutPropType != 0 ) {
	EvtGenReport( EVTGEN_INFO, "EvtGen" )
	- << "TAUOLA neutral spin propagator PDG id set to " << _neutPropType
	+ << "TAUOLA neutral spin propagator PDG id set to " << m_neutPropType
	<< endl;
	}

	@@ -249,23 +249,23 @@
	// "W" (default), "Higgs" (H+/H-)
	std::string chargedPropName = EvtSymTable::get( "TauolaChargedProp", iErr );
	if ( chargedPropName == "W" ) {
	- _negPropType = Tauolapp::TauolaParticle::W_MINUS;
	- _posPropType = Tauolapp::TauolaParticle::W_PLUS;
	+ m_negPropType = Tauolapp::TauolaParticle::W_MINUS;
	+ m_posPropType = Tauolapp::TauolaParticle::W_PLUS;
	} else if ( chargedPropName == "Higgs" ) {
	- _negPropType = Tauolapp::TauolaParticle::HIGGS_MINUS;
	- _posPropType = Tauolapp::TauolaParticle::HIGGS_PLUS;
	+ m_negPropType = Tauolapp::TauolaParticle::HIGGS_MINUS;
	+ m_posPropType = Tauolapp::TauolaParticle::HIGGS_PLUS;
	}

	- if ( _negPropType != 0 ) {
	+ if ( m_negPropType != 0 ) {
	EvtGenReport( EVTGEN_INFO, "EvtGen" )
	<< "TAUOLA negative charge spin propagator PDG id set to "
	- << _negPropType << endl;
	+ << m_negPropType << endl;
	}

	- if ( _posPropType != 0 ) {
	+ if ( m_posPropType != 0 ) {
	EvtGenReport( EVTGEN_INFO, "EvtGen" )
	<< "TAUOLA positive charge spin propagator PDG id set to "
	- << _posPropType << endl;
	+ << m_posPropType << endl;
	}

	// 3) TauolaHiggsMixingAngle: Specify the mixing angle between the neutral scalar & pseudoscalar Higgs
	@@ -322,7 +322,7 @@

	bool EvtTauolaEngine::doDecay( EvtParticle* tauParticle )
	{
	- if ( _initialised == false ) {
	+ if ( m_initialised == false ) {
	this->initialise();
	}

	@@ -332,7 +332,7 @@

	// Check that we have a tau particle.
	EvtId partId = tauParticle->getId();
	- if ( abs( EvtPDL::getStdHep( partId ) ) != _tauPDG ) {
	+ if ( abs( EvtPDL::getStdHep( partId ) ) != m_tauPDG ) {
	return false;
	}

	@@ -423,7 +423,7 @@
	EvtId theId = theDaughter->getId();
	int PDGInt = EvtPDL::getStdHep( theId );

	- if ( abs( PDGInt ) == _tauPDG ) {
	+ if ( abs( PDGInt ) == m_tauPDG ) {
	// Delete any siblings for the tau particle
	if ( theDaughter->getNDaug() > 0 ) {
	theDaughter->deleteDaughters( false );
	@@ -440,16 +440,16 @@

	// For the parent particle, artifically set the PDG to a boson with the same 4-momentum
	// so that spin correlations are calculated inside Tauola.
	- // This leaves the original parent _EvtParticle_ unchanged
	+ // This leaves the original parent m_EvtParticle_ unchanged
	if ( nTaus > 0 && hepMCParent ) {
	int parCharge = EvtPDL::chg3( origParentId ) /
	3; // (3*particle charge)/3 = particle charge
	- if ( parCharge == 0 && _neutPropType != 0 ) {
	- hepMCParent->set_pdg_id( _neutPropType );
	- } else if ( parCharge == -1 && _negPropType != 0 ) {
	- hepMCParent->set_pdg_id( _negPropType );
	- } else if ( parCharge == 1 && _posPropType != 0 ) {
	- hepMCParent->set_pdg_id( _posPropType );
	+ if ( parCharge == 0 && m_neutPropType != 0 ) {
	+ hepMCParent->set_pdg_id( m_neutPropType );
	+ } else if ( parCharge == -1 && m_negPropType != 0 ) {
	+ hepMCParent->set_pdg_id( m_negPropType );
	+ } else if ( parCharge == 1 && m_posPropType != 0 ) {
	+ hepMCParent->set_pdg_id( m_posPropType );
	}
	}

	@@ -489,7 +489,7 @@
	HepMC::GenParticle* aParticle = ( *eventIter );
	#endif

	- if ( aParticle && abs( aParticle->pdg_id() ) == _tauPDG ) {
	+ if ( aParticle && abs( aParticle->pdg_id() ) == m_tauPDG ) {
	// Find out what EvtParticle corresponds to the HepMC particle.
	// We need this to create and attach EvtParticle daughters.
	EvtParticle* tauEvtParticle = tauMap[aParticle];

File Metadata

Mime Type: text/plain
Expires: Mon, Sep 29, 3:25 PM (19 h, 18 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 6570148
Default Alt Text: D58.1759155933.diff (35 KB)

D58.1759155933.diffNo OneTemporaryActions

D58.1759155933.diffView Options

File Metadata

Event Timeline

D58.1759155933.diff
No OneTemporary
Actions

D58.1759155933.diff
View Options