D138.1759140848.diff
No OneTemporary
Actions

Size

22 KB

Referenced Files

None

Subscribers

None

D138.1759140848.diff
View Options

	diff --git a/EvtGenExternal/EvtExternalGenList.hh b/EvtGenExternal/EvtExternalGenList.hh
	--- a/EvtGenExternal/EvtExternalGenList.hh
	+++ b/EvtGenExternal/EvtExternalGenList.hh
	@@ -50,8 +50,11 @@
	const int mode = 2,
	const int useME = 0 );

	+ EvtAbsRadCorr* getVinciaQEDModel( const double infraredCutOff = 1.0e-7 );
	+
	private:
	std::string m_photonType;
	+ std::string m_pythiaXmlDir;

	bool m_useEvtGenRandom;
	};
	diff --git a/EvtGenExternal/EvtExternalGenList.hh b/EvtGenExternal/EvtVinciaQED.hh
	copy from EvtGenExternal/EvtExternalGenList.hh
	copy to EvtGenExternal/EvtVinciaQED.hh
	--- a/EvtGenExternal/EvtExternalGenList.hh
	+++ b/EvtGenExternal/EvtVinciaQED.hh
	@@ -18,42 +18,57 @@
	* along with EvtGen. If not, see <https://www.gnu.org/licenses/>. *
	***********************************************************************/

	-#ifndef EVTEXTERNALGENLIST_HH
	-#define EVTEXTERNALGENLIST_HH
	+#ifdef EVTGEN_VINCIA
	+#ifndef EVTVINCIAQED_HH
	+#define EVTVINCIAQED_HH

	#include "EvtGenBase/EvtAbsRadCorr.hh"
	-#include "EvtGenBase/EvtDecayBase.hh"
	+#include "EvtGenBase/EvtId.hh"
	+#include "EvtGenBase/EvtVector4R.hh"

	-#include <list>
	+#include "EvtGenExternal/EvtPythiaRandom.hh"

	-// Description: A factory type method to create engines for external physics
	-// generators like Pythia.
	+#include "Pythia8/ParticleData.h"
	+#include "Pythia8/Pythia.h"
	+#include "Pythia8/ShowerModel.h"

	-class EvtExternalGenList {
	- public:
	- EvtExternalGenList( bool convertPythiaCodes = false,
	- std::string pythiaXmlDir = "",
	- std::string photonType = "gamma",
	- bool useEvtGenRandom = true,
	- bool seedTauolaFortran = true,
	- bool useTauolaRadiation = false,
	- double infraredCutOffTauola = 1.0e-7 );
	+#include <string>
	+
	+class EvtParticle;

	- virtual ~EvtExternalGenList();
	+/*
	+ * Description: EvtGen's module for generation of
	+ * QED final state radiation using VinciaQED.
	+ */

	- std::list<EvtDecayBase*> getListOfModels();
	+class EvtVinciaQED : public EvtAbsRadCorr {
	+ public:
	+ EvtVinciaQED( std::string xmlDir = "./xmldoc", bool useEvtGenRandom = true,
	+ double infraredCutOff = 1.0e-7 );

	- EvtAbsRadCorr* getPhotosModel( const double infraredCutOff = 1.0e-7,
	- const double maxWtInterference = 64.0 );
	+ void initialise() override;

	- EvtAbsRadCorr* getSherpaPhotonsModel( const double infraredCutOff = 1.0e-7,
	- const int mode = 2,
	- const int useME = 0 );
	+ void doRadCorr( EvtParticle* theParticle ) override;

	private:
	- std::string m_photonType;
	+ void storeDaughterInfo( Pythia8::Event& theEvent, EvtParticle* theParticle,
	+ int startInt, int ancestorId );
	+
	+ // Specify if we are going to use the random number generator (engine) from EvtGen for Pythia 8.
	+ bool m_useEvtGenRandom{ true };
	+
	+ // Minimum photon Energy (infrared cut-off).
	+ double m_infraredCutOff{ 1.0e-7 };

	- bool m_useEvtGenRandom;
	+ EvtId m_gammaId = EvtId( -1, -1 );
	+ long int m_gammaPDG{ 22 };
	+
	+ std::unique_ptr<Pythia8::Pythia> m_vinciaPythiaGen;
	+ std::shared_ptr<EvtPythiaRandom> m_evtgenRandom;
	+
	+ bool m_initialised{ false };
	};

	#endif
	+
	+#endif
	diff --git a/History.md b/History.md
	--- a/History.md
	+++ b/History.md
	@@ -11,6 +11,14 @@
	===
	## R03-00-00-betaX

	+6 May 2025 Fernando Abudinen
	+* D138: Introduced interface to Vincia QED shower for final-state radiation simulation
	+ - Modified EvtExternalGenList to support new EvtGen-Vincia interface.
	+ - Add support for VinciaQED in testing module.
	+ - Added EVTGEN\_VINCIA flag to switch on only for relevant Pythia versions.
	+ - Specify Vincia support for Pythia release 8.313 onwards.
	+ - Added EvtNoRadCorr to case when Vincia is called but not supported.
	+
	23 Jan 2025 Fernando Abudinen
	* D136: Fixed bug with 5th input parameter of BTOXSLL model

	diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
	--- a/src/CMakeLists.txt
	+++ b/src/CMakeLists.txt
	@@ -105,6 +105,11 @@
	endif()
	if(EVTGEN_PYTHIA)
	target_compile_definitions(objlib_ext PRIVATE EVTGEN_PYTHIA)
	+ if(PYTHIA8_VERSION GREATER_EQUAL 313)
	+ set(EVTGEN_VINCIA ON)
	+ target_compile_definitions(objlib_ext PRIVATE EVTGEN_VINCIA)
	+ message(STATUS "EvtGen: Pythia8 version 8.${PYTHIA8_VERSION} found. Enabling use of Vincia for FSR.")
	+ endif()
	if (EVTGEN_SUPPRESS_EXTERNAL_WARNINGS)
	target_include_directories(objlib_ext SYSTEM PRIVATE ${PYTHIA8_INCLUDE_DIRS})
	else()
	@@ -155,6 +160,9 @@
	target_include_directories(EvtGenExternal PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
	if(EVTGEN_PYTHIA)
	target_compile_definitions(EvtGenExternal PUBLIC EVTGEN_PYTHIA)
	+ if(EVTGEN_VINCIA)
	+ target_compile_definitions(EvtGenExternal PUBLIC EVTGEN_VINCIA)
	+ endif()
	target_include_directories(EvtGenExternal PUBLIC ${PYTHIA8_INCLUDE_DIRS})
	target_link_libraries(EvtGenExternal PUBLIC ${PYTHIA8_LIBRARIES})
	endif()
	@@ -225,6 +233,9 @@
	target_include_directories(EvtGenExternalStatic PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
	if(EVTGEN_PYTHIA)
	target_compile_definitions(EvtGenExternalStatic PUBLIC EVTGEN_PYTHIA)
	+ if(EVTGEN_VINCIA)
	+ target_compile_definitions(EvtGenExternalStatic PUBLIC EVTGEN_VINCIA)
	+ endif()
	target_include_directories(EvtGenExternalStatic PUBLIC ${PYTHIA8_INCLUDE_DIRS})
	target_link_libraries(EvtGenExternalStatic PUBLIC ${PYTHIA8_LIBRARIES})
	endif()
	@@ -247,7 +258,7 @@
	target_link_libraries(EvtGenExternalStatic PUBLIC ${HEPMC3_LIB} ${HEPMC3_SEARCH_LIB})
	if(EVTGEN_PHOTOS)
	target_compile_definitions(EvtGenExternalStatic PUBLIC EVTGEN_PHOTOS)
	- target_compile_definitions(EvtGenExternalStatic PUBLIC EVTGEN_PHOTOS_NEWLIBS)
	+ target_compile_definitions(EvtGenExternalStatic PUBLIC EVTGEN_PHOTOS_NEWLIBS)
	target_include_directories(EvtGenExternalStatic PUBLIC ${Photos++_INCLUDE_DIRS})
	# From version 3.64 Photos has HepMC3 support
	target_link_libraries(EvtGenExternalStatic PUBLIC ${Photos++_pp_LIBRARY} ${Photos++_ppHepMC3_LIBRARY})
	@@ -268,7 +279,7 @@
	# so we need to check which one we have
	if(Photos++_pp_FOUND AND Photos++_ppHepMC_FOUND)
	#message(STATUS "EvtGen: PHOTOS has pp and ppHepMC components")
	- target_compile_definitions(EvtGenExternalStatic PUBLIC EVTGEN_PHOTOS_NEWLIBS)
	+ target_compile_definitions(EvtGenExternalStatic PUBLIC EVTGEN_PHOTOS_NEWLIBS)
	target_link_libraries(EvtGenExternalStatic PUBLIC ${Photos++_pp_LIBRARY} ${Photos++_ppHepMC_LIBRARY})
	elseif(Photos++_CxxInterface_FOUND AND Photos++_Fortran_FOUND)
	#message(STATUS "EvtGen: PHOTOS has CxxInterface and Fortran components")
	@@ -305,3 +316,4 @@
	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
	)
	endif()
	+
	diff --git a/src/EvtGenExternal/EvtExternalGenList.cpp b/src/EvtGenExternal/EvtExternalGenList.cpp
	--- a/src/EvtGenExternal/EvtExternalGenList.cpp
	+++ b/src/EvtGenExternal/EvtExternalGenList.cpp
	@@ -27,6 +27,7 @@
	#include "EvtGenExternal/EvtPythia.hh"
	#include "EvtGenExternal/EvtSherpaPhotons.hh"
	#include "EvtGenExternal/EvtTauola.hh"
	+#include "EvtGenExternal/EvtVinciaQED.hh"

	EvtExternalGenList::EvtExternalGenList(
	bool convertPythiaCodes, std::string pythiaXmlDir, std::string photonType,
	@@ -43,14 +44,16 @@
	// xmldoc Pythia directory
	char* pythiaDataDir = getenv( "PYTHIA8DATA" );
	if ( pythiaDataDir != nullptr ) {
	- pythiaXmlDir = pythiaDataDir;
	+ m_pythiaXmlDir = pythiaDataDir;
	}
	+ } else {
	+ m_pythiaXmlDir = pythiaXmlDir;
	}

	- extFactory.definePythiaGenerator( pythiaXmlDir, convertPythiaCodes,
	- useEvtGenRandom );
	+ extFactory.definePythiaGenerator( m_pythiaXmlDir, convertPythiaCodes,
	+ m_useEvtGenRandom );

	- extFactory.defineTauolaGenerator( useEvtGenRandom, seedTauolaFortran,
	+ extFactory.defineTauolaGenerator( m_useEvtGenRandom, seedTauolaFortran,
	useTauolaRadiation, infraredCutOffTauola );
	}

	@@ -106,6 +109,32 @@
	}
	#endif

	+#ifdef EVTGEN_VINCIA
	+EvtAbsRadCorr* EvtExternalGenList::getVinciaQEDModel( const double infraredCutOff )
	+{
	+ // Define the VinciaQED model.
	+ EvtVinciaQED* vinciaQEDModel =
	+ new EvtVinciaQED( m_pythiaXmlDir, m_useEvtGenRandom, infraredCutOff );
	+ return vinciaQEDModel;
	+}
	+#else
	+EvtAbsRadCorr* EvtExternalGenList::getVinciaQEDModel( const double /infraredCutOff/ )
	+{
	+ EvtGenReport( EVTGEN_ERROR, "EvtGen" )
	+ << " Vincia QED shower has been called for FSR simulation, but it is switched off,"
	+#ifdef EVTGEN_PYTHIA
	+ << " because the used Pythia8 version does not support Vincia for FSR."
	+#else
	+ << " because Pythia was not switched on during compilation."
	+#endif
	+ << std::endl;
	+ EvtGenReport( EVTGEN_ERROR, "EvtGen" )
	+ << " The simulation will be generated without FSR." << std::endl;
	+
	+ return new EvtNoRadCorr{};
	+}
	+#endif
	+
	std::list<EvtDecayBase*> EvtExternalGenList::getListOfModels()
	{
	// Create the Pythia and Tauola models, which use their own engine classes.
	diff --git a/src/EvtGenExternal/EvtVinciaQED.cpp b/src/EvtGenExternal/EvtVinciaQED.cpp
	new file mode 100644
	--- /dev/null
	+++ b/src/EvtGenExternal/EvtVinciaQED.cpp
	@@ -0,0 +1,273 @@
	+
	+/***********************************************************************
	+* Copyright 1998-2020 CERN for the benefit of the EvtGen authors *
	+* *
	+* This file is part of EvtGen. *
	+* *
	+* EvtGen is free software: you can redistribute it and/or modify *
	+* it under the terms of the GNU General Public License as published by *
	+* the Free Software Foundation, either version 3 of the License, or *
	+* (at your option) any later version. *
	+* *
	+* EvtGen is distributed in the hope that it will be useful, *
	+* but WITHOUT ANY WARRANTY; without even the implied warranty of *
	+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
	+* GNU General Public License for more details. *
	+* *
	+* You should have received a copy of the GNU General Public License *
	+* along with EvtGen. If not, see <https://www.gnu.org/licenses/>. *
	+***********************************************************************/
	+
	+#ifdef EVTGEN_VINCIA
	+#include "EvtGenExternal/EvtVinciaQED.hh"
	+
	+#include "EvtGenBase/EvtDecayTable.hh"
	+#include "EvtGenBase/EvtPDL.hh"
	+#include "EvtGenBase/EvtParticleFactory.hh"
	+#include "EvtGenBase/EvtPhotonParticle.hh"
	+#include "EvtGenBase/EvtReport.hh"
	+
	+#include "Pythia8/Event.h"
	+#include "Pythia8/ParticleData.h"
	+
	+using std::endl;
	+
	+EvtVinciaQED::EvtVinciaQED( std::string xmlDir, bool useEvtGenRandom,
	+ double infraredCutOff ) :
	+ m_useEvtGenRandom{ useEvtGenRandom }, m_infraredCutOff{ infraredCutOff }
	+{
	+ /*
	+ * Create a Pythia generator to call the Vincia shower model.
	+ */
	+
	+ EvtGenReport( EVTGEN_INFO, "EvtGen" )
	+ << " Setting up Pythia generator to call Vincia generator for FSR."
	+ << endl;
	+ m_vinciaPythiaGen = std::make_unique<Pythia8::Pythia>( xmlDir );
	+
	+ if ( m_useEvtGenRandom ) {
	+ m_evtgenRandom = std::make_shared<EvtPythiaRandom>();
	+ }
	+}
	+
	+void EvtVinciaQED::initialise()
	+{
	+ if ( m_initialised ) {
	+ return;
	+ }
	+
	+ /* Set the random number generator
	+ * Specify if we are going to use the random number generator (engine)
	+ * from EvtGen for Pythia 8.
	+ */
	+ if ( m_useEvtGenRandom ) {
	+ m_vinciaPythiaGen->setRndmEnginePtr( m_evtgenRandom );
	+ }
	+
	+ /* 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..
	+ */
	+ m_vinciaPythiaGen->readString( "ProcessLevel:all = off" );
	+
	+ // Turn off Pythia warnings, e.g. changes to particle properties
	+ m_vinciaPythiaGen->readString( "Print:quiet = on" );
	+
	+ // Setup to use Vincia QED shower
	+ m_vinciaPythiaGen->readString( "PartonShowers:model = 2" );
	+
	+ // This turns off virtual photons splitting into l+l-
	+ m_vinciaPythiaGen->readString( "Vincia:nGammaToLepton = 0" );
	+
	+ /* Sets the infrared cutoff (default at 1e-7)
	+ * Note that the Vincia default is 1e-6, so we are setting it lower
	+ * to equalize with PHOTOS configuration.
	+ */
	+ std::stringstream QminChgL;
	+ QminChgL << "Vincia:QminChgL = " << m_infraredCutOff;
	+ m_vinciaPythiaGen->readString( QminChgL.str() );
	+
	+ m_gammaId = EvtPDL::getId( "gamma" );
	+ m_gammaPDG = EvtPDL::getStdHep( m_gammaId );
	+
	+ m_vinciaPythiaGen->init();
	+
	+ m_initialised = true;
	+}
	+
	+void EvtVinciaQED::doRadCorr( EvtParticle* theParticle )
	+{
	+ if ( !theParticle ) {
	+ return;
	+ }
	+
	+ if ( !m_initialised ) {
	+ this->initialise();
	+ }
	+
	+ const EvtId particleId = theParticle->getId();
	+
	+ const Pythia8::TimeShowerPtr timeShowerPtr =
	+ m_vinciaPythiaGen->getShowerModelPtr()->getTimeShower();
	+
	+ /* Need to use the reference to the Pythia8::Event object,
	+ * otherwise it will just return a new empty, default event object.
	+ */
	+ Pythia8::Event& theEvent = m_vinciaPythiaGen->event;
	+ theEvent.reset();
	+
	+ /* Skip running FSR if the particle has no daughters, since we can't add FSR.
	+ * Also skip FSR if the particle has too many daughters (>= 10) as done for PHOTOS.
	+ */
	+ const int nDaughters( theParticle->getNDaug() );
	+ if ( nDaughters == 0 \|\| nDaughters >= 10 ) {
	+ return;
	+ }
	+
	+ const int PDGCode = EvtPDL::getStdHep( particleId );
	+ // Status = -1 Means that the particle has decayed and is not remaining
	+ const int status( -1 );
	+ const int grandMother1( 0 );
	+ const int grandMother2( 0 );
	+ const int daughter1( 2 );
	+ const int daughter2( nDaughters + 1 );
	+
	+ const int colour( 0 ), anticolour( 0 );
	+ const double px( 0.0 ), py( 0.0 ), pz( 0.0 );
	+ const double m0 = theParticle->mass();
	+ const double E = m0;
	+
	+ theEvent.append( PDGCode, status, grandMother1, grandMother2, daughter1,
	+ daughter2, colour, anticolour, px, py, pz, E, m0 );
	+
	+ // Status = 91 means normal decay product
	+ const int daugStatus( 91 );
	+
	+ // Add all the daughters and keep track of number of photons
	+ for ( int iDaug = 0; iDaug < nDaughters; iDaug++ ) {
	+ const EvtParticle& theDaughter = *theParticle->getDaug( iDaug );
	+ const int daugPDGCode = theDaughter.getPDGId();
	+
	+ // Particle has only one mother in EvtGen, so first mother points to parent Id and second to none.
	+ const int mother1( 1 ), mother2( 0 ), grandDaughter1( 0 ),
	+ grandDaughter2( 0 );
	+
	+ const int daugColour( 0 ), daugAntiColour( 0 );
	+ const double daugPx = theDaughter.getP4().get( 1 );
	+ const double daugPy = theDaughter.getP4().get( 2 );
	+ const double daugPz = theDaughter.getP4().get( 3 );
	+ const double daugE = theDaughter.getP4().get( 0 );
	+ const double daugM0 = theDaughter.mass();
	+
	+ theEvent.append( daugPDGCode, daugStatus, mother1, mother2,
	+ grandDaughter1, grandDaughter2, daugColour,
	+ daugAntiColour, daugPx, daugPy, daugPz, daugE, daugM0 );
	+ }
	+
	+ /* Generate the Vincia QED shower
	+ * It updates the event internally
	+ */
	+ timeShowerPtr->showerQED( daughter1, daughter2, theEvent, m0 );
	+
	+ // Get number of final-state particles
	+ const int nFinal( theEvent.nFinal() );
	+
	+ // Retrieve the event from Pythia if FSR photons were added
	+ if ( nFinal > nDaughters ) {
	+ /* Store the daughters for this particle from the Pythia decay tree.
	+ * This is a recursive function that will continue looping through
	+ * all available daughters until the first set of final-state
	+ * particles are encountered in the Pythia Event structure.
	+ * It will add FSR photons to and update the daughters
	+ * of the (parent) EvtGen particle.
	+ */
	+ this->storeDaughterInfo( theEvent, theParticle, 1, 1 );
	+ }
	+}
	+
	+void EvtVinciaQED::storeDaughterInfo( Pythia8::Event& theEvent,
	+ EvtParticle* theParticle, int startInt,
	+ int ancestorId )
	+{
	+ const std::vector<int> daugList = theEvent.daughterList( startInt );
	+
	+ std::vector<int>::const_iterator daugIter;
	+ for ( daugIter = daugList.begin(); daugIter != daugList.end(); ++daugIter ) {
	+ const int daugInt = *daugIter;
	+
	+ Pythia8::Particle& daughter_part = theEvent[daugInt];
	+
	+ const int statusCode = daughter_part.status();
	+
	+ /* Keep track of the initial final-state daughters
	+ * We need to do so because we have to update the momenta of the EvtGen particles.
	+ * In the Vincia event record, the status of the initial daughters
	+ * is 91 if they did not radiate, or -91 if they did.
	+ * Intermediate or final daughters in the shower record have different status.
	+ * When we loop recursively through the shower record, the (absolute) status of the particles
	+ * identifies whether they are the initial daughters.
	+ * If the current particle is not an initial daughter,
	+ * we do not use the current index, but the provided ancestor index.
	+ */
	+ const int daugId = std::abs( statusCode ) == 91 ? daugInt : ancestorId;
	+
	+ if ( !daughter_part.isFinal() ) {
	+ // Recursively search for correct daughter type
	+ this->storeDaughterInfo( theEvent, theParticle, daugInt, daugId );
	+
	+ } else {
	+ /* We have a daughter that is a final-state particle.
	+ * Make sure we are not double counting particles.
	+ * Set the status flag for any "new" particle to say that we have stored it.
	+ * Use status flag = 1000 (within the user allowed range for Pythia codes).
	+ */
	+
	+ // Check that the status flag for the particle is not equal to 1000
	+ if ( statusCode == 1000 ) {
	+ continue;
	+ }
	+
	+ const int daugPDGInt = daughter_part.id();
	+
	+ const double px = daughter_part.px();
	+ const double py = daughter_part.py();
	+ const double pz = daughter_part.pz();
	+ const double E = daughter_part.e();
	+ const EvtVector4R newP4( E, px, py, pz );
	+
	+ /* Status = 51 means that this is an outgoing particle produced by final-state shower
	+ * Actually, 51 means exactly outgoing produced by parton branching,
	+ * but it is the status used for particles produced by the Vincia QED shower.
	+ */
	+ const bool daugIsFSRphoton =
	+ ( daugPDGInt == m_gammaPDG && statusCode == 51 ) ? true : false;
	+
	+ /* Id of ancestor to correct momenta of existing particles
	+ * Remove offset of 2 due to event header and parent in Pythia
	+ */
	+ const int daugIndex = daugId - 2;
	+
	+ /* Set the status flag for the Pythia particle to let us know
	+ * that we have already considered it to avoid double counting.
	+ */
	+ daughter_part.status( 1000 );
	+
	+ // Update daughters of EvtGen particle and attach new FSR photons
	+ if ( !daugIsFSRphoton ) {
	+ // Update momenta of initial particles
	+ EvtParticle* daugParticle = theParticle->getDaug( daugIndex );
	+ if ( daugParticle ) {
	+ daugParticle->setP4WithFSR( newP4 );
	+ }
	+ } else {
	+ // Create a new photon particle and add it to the list of daughters
	+ EvtPhotonParticle* gamma = new EvtPhotonParticle();
	+ gamma->init( m_gammaId, newP4 );
	+ gamma->setFSRP4toZero();
	+ gamma->setAttribute( "FSR", 1 );
	+ gamma->addDaug( theParticle );
	+ }
	+ }
	+ }
	+}
	+
	+#endif
	diff --git a/test/testDecayModel.hh b/test/testDecayModel.hh
	--- a/test/testDecayModel.hh
	+++ b/test/testDecayModel.hh
	@@ -46,7 +46,8 @@
	PHOTOS, ///< PHOTOS generator
	SherpaPhotons1, ///< Sherpa Photons generator, mode 1
	SherpaPhotons20, ///< Sherpa Photons generator, mode 2, exact ME calculations off
	- SherpaPhotons21 ///< Sherpa Photons generator, mode 2, exact ME calculations on
	+ SherpaPhotons21, ///< Sherpa Photons generator, mode 2, exact ME calculations on
	+ VinciaQED ///< Vincia QED shower generator
	};

	/**
	@@ -119,6 +120,7 @@
	{ FSRGenerator::SherpaPhotons1, "SherpaPhotons1"},
	{FSRGenerator::SherpaPhotons20, "SherpaPhotons20"},
	{FSRGenerator::SherpaPhotons21, "SherpaPhotons21"},
	+ { FSRGenerator::VinciaQED, "VinciaQED"},
	} )

	CUSTOM_NLOHMANN_JSON_SERIALIZE_ENUM( ThreadModel,
	diff --git a/test/testDecayModel.cc b/test/testDecayModel.cc
	--- a/test/testDecayModel.cc
	+++ b/test/testDecayModel.cc
	@@ -570,6 +570,8 @@
	case FSRGenerator::SherpaPhotons21:
	radCorrEngine = genList.getSherpaPhotonsModel( 1e-7, 2, 1 );
	break;
	+ case FSRGenerator::VinciaQED:
	+ radCorrEngine = genList.getVinciaQEDModel( 1.0e-7 );
	}
	extraModels = genList.getListOfModels();
	}

File Metadata

Mime Type: text/plain
Expires: Mon, Sep 29, 11:14 AM (19 h, 49 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 6539993
Default Alt Text: D138.1759140848.diff (22 KB)

D138.1759140848.diffNo OneTemporaryActions

D138.1759140848.diffView Options

File Metadata

Event Timeline

D138.1759140848.diff
No OneTemporary
Actions

D138.1759140848.diff
View Options