Import Geant4 10.6.2 source tree
This commit is contained in:
@@ -1,9 +1,7 @@
|
||||
# - build library
|
||||
|
||||
# library
|
||||
set(_TARGET pyG4particles)
|
||||
add_library(
|
||||
${_TARGET} SHARED
|
||||
geant4_add_pymodule(pyG4particles
|
||||
pyG4DecayTable.cc
|
||||
pyG4DynamicParticle.cc
|
||||
pyG4ParticleDefinition.cc
|
||||
@@ -14,17 +12,5 @@ add_library(
|
||||
pymodG4particles.cc
|
||||
)
|
||||
|
||||
set_target_properties(${_TARGET} PROPERTIES PREFIX "")
|
||||
set_target_properties(${_TARGET} PROPERTIES OUTPUT_NAME "G4particles")
|
||||
set_target_properties(${_TARGET} PROPERTIES SUFFIX ".so")
|
||||
set_target_properties(${_TARGET}
|
||||
PROPERTIES INSTALL_RPATH
|
||||
${GEANT4_LIBRARY_DIR}
|
||||
BUILD_WITH_INSTALL_RPATH TRUE)
|
||||
|
||||
target_link_libraries (${_TARGET}
|
||||
${GEANT4_LIBRARIES_WITH_VIS} ${BOOST_PYTHON_LIB}
|
||||
${PYTHON_LIBRARIES})
|
||||
|
||||
# install
|
||||
install(TARGETS ${_TARGET} LIBRARY DESTINATION ${G4MODULES_INSTALL_DIR})
|
||||
target_link_libraries(pyG4particles PRIVATE G4particles G4processes)
|
||||
install(TARGETS pyG4particles DESTINATION "${CMAKE_INSTALL_PYTHONDIR}/Geant4")
|
||||
|
||||
@@ -46,14 +46,13 @@ public:
|
||||
|
||||
p_iterator p_begin() {
|
||||
G4ParticleTable* particleTable= G4ParticleTable::GetParticleTable();
|
||||
if(particleTableCache.size() != particleTable-> size() ) {
|
||||
if(particleTableCache.size() != static_cast<size_t>(particleTable-> size()) ) {
|
||||
particleTableCache.clear();
|
||||
G4ParticleTable::G4PTblDicIterator*
|
||||
theParticleIterator= particleTable-> GetIterator();
|
||||
G4ParticleTable::G4PTblDicIterator* theParticleIterator= particleTable-> GetIterator();
|
||||
theParticleIterator-> reset();
|
||||
while( (*theParticleIterator)() ){
|
||||
G4ParticleDefinition* particle= theParticleIterator-> value();
|
||||
particleTableCache.push_back(particle);
|
||||
G4ParticleDefinition* particle= theParticleIterator-> value();
|
||||
particleTableCache.push_back(particle);
|
||||
}
|
||||
}
|
||||
return particleTableCache.begin();
|
||||
@@ -61,14 +60,13 @@ public:
|
||||
|
||||
p_iterator p_end() {
|
||||
G4ParticleTable* particleTable= G4ParticleTable::GetParticleTable();
|
||||
if(particleTableCache.size() != particleTable-> size() ) {
|
||||
if(particleTableCache.size() != static_cast<size_t>(particleTable-> size()) ) {
|
||||
particleTableCache.clear();
|
||||
G4ParticleTable::G4PTblDicIterator*
|
||||
theParticleIterator= particleTable-> GetIterator();
|
||||
G4ParticleTable::G4PTblDicIterator* theParticleIterator= particleTable-> GetIterator();
|
||||
theParticleIterator-> reset();
|
||||
while( (*theParticleIterator)() ){
|
||||
G4ParticleDefinition* particle= theParticleIterator-> value();
|
||||
particleTableCache.push_back(particle);
|
||||
G4ParticleDefinition* particle= theParticleIterator-> value();
|
||||
particleTableCache.push_back(particle);
|
||||
}
|
||||
}
|
||||
return particleTableCache.end();
|
||||
@@ -85,7 +83,7 @@ void export_PyG4ParticleList()
|
||||
{
|
||||
class_<PyG4ParticleList>("PyG4ParticleList", "particle list")
|
||||
.def("__iter__", iterator<PyG4ParticleList::ParticleList>())
|
||||
.add_property("particles", range(&PyG4ParticleList::p_begin,
|
||||
.add_property("particles", range(&PyG4ParticleList::p_begin,
|
||||
&PyG4ParticleList::p_end))
|
||||
;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user