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

Import Geant4 10.7.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2020-06-26 10:23:25 +02:00
parent c02c370437
commit 67ba86d073
1871 changed files with 174422 additions and 131884 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/persistency/CMakeLists.txt
+6 -32
View File
@@ -1,41 +1,15 @@
#------------------------------------------------------------------------------
# CMakeLists.txt
# Module : G4persistency
# Package: Geant4.src.G4persistency
#
# Top level CMakeLists.txt for a Geant4 Global Library
# or collection of sublibraries
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
add_subdirectory(ascii)
set(G4persistency_COMPONENTS
ascii/sources.cmake
mctruth/sources.cmake
)
# GDML only if required
if(GEANT4_USE_GDML)
add_subdirectory(gdml)
endif()
add_subdirectory(mctruth)
if(NOT GEANT4_BUILD_GRANULAR_LIBS)
include(Geant4MacroLibraryTargets)
if(GEANT4_USE_GDML)
GEANT4_GLOBAL_LIBRARY_TARGET(NAME G4persistency
COMPONENTS
ascii/sources.cmake
gdml/sources.cmake
mctruth/sources.cmake
)
else()
GEANT4_GLOBAL_LIBRARY_TARGET(NAME G4persistency
COMPONENTS
ascii/sources.cmake
mctruth/sources.cmake
)
endif()
list(APPEND G4persistency_COMPONENTS gdml/sources.cmake)
endif()
geant4_global_library_target(NAME G4persistency COMPONENTS ${G4persistency_COMPONENTS})
source/persistency/History
+4
View File
@@ -15,6 +15,10 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
11 December, 19 B.Morgan (persistency-V10-06-00)
- Cleanup CMake build, removing obsolete granular library options and
explicit include_directories.
5 July, 12 G.Cosmo (persistency-V09-05-02)
- Explicitly use inclusion of headers for system of units and physical
constants, in plan to remove implicit inclusion from globals.hh.
source/persistency/ascii/CMakeLists.txt
-17
View File
@@ -1,17 +0,0 @@
#------------------------------------------------------------------------------
# CMakeLists.txt
# Module : G4geomtext
# Package: Geant4.src.G4persistency.G4geomtext
#
# CMakeLists.txt for building a single granular library.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
if(GEANT4_BUILD_GRANULAR_LIBS)
include(Geant4MacroLibraryTargets)
GEANT4_GRANULAR_LIBRARY_TARGET(COMPONENT sources.cmake)
endif()
source/persistency/ascii/History
+9
View File
@@ -15,6 +15,15 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
4 March 2020 - P.Arce (ascii-V10-06-01)
- G4tgbGeometryDumper.cc: Fix coverity warnings
- G4tgbVolume.cc: Fix coverity warnings
- G4tgbVolumeMgr.cc: Fix coverity warnings
11 December 2019 - B.Morgan (ascii-V10-06-00)
- Cleanup CMake build, removing obsolete granular library options and
explicit include_directories.
30 October 2019 - G.Cosmo (ascii-V10-05-01)
- Fixed printout syntax in G4tgrUtils::GetDouble().
source/persistency/ascii/sources.cmake
+117 -150
View File
@@ -1,161 +1,128 @@
#------------------------------------------------------------------------------
# sources.cmake
# Module : G4geomtext
# Package: Geant4.src.G4persistency.G4geomtext
#
# Sources description for a library.
# Lists the sources and headers of the code explicitely.
# Lists include paths needed.
# Lists the internal granular and global dependencies of the library.
# Source specific properties should be added at the end.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
# List external includes needed.
include_directories(${CLHEP_INCLUDE_DIRS})
# List internal includes needed.
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/divisions/include)
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/management/include)
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/solids/Boolean/include)
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/solids/CSG/include)
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/solids/specific/include)
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/volumes/include)
include_directories(${CMAKE_SOURCE_DIR}/source/global/HEPGeometry/include)
include_directories(${CMAKE_SOURCE_DIR}/source/global/HEPNumerics/include)
include_directories(${CMAKE_SOURCE_DIR}/source/global/HEPRandom/include)
include_directories(${CMAKE_SOURCE_DIR}/source/global/management/include)
include_directories(${CMAKE_SOURCE_DIR}/source/graphics_reps/include)
include_directories(${CMAKE_SOURCE_DIR}/source/intercoms/include)
include_directories(${CMAKE_SOURCE_DIR}/source/materials/include)
include_directories(${CMAKE_SOURCE_DIR}/source/particles/management/include)
#
# Define the Geant4 Module.
#
include(Geant4MacroDefineModule)
GEANT4_DEFINE_MODULE(NAME G4geomtext
HEADERS
G4tgbDetectorBuilder.hh
G4tgbDetectorConstruction.hh
G4tgbElement.hh
G4tgbGeometryDumper.hh
G4tgbIsotope.hh
G4tgbMaterial.hh
G4tgbMaterialMgr.hh
G4tgbMaterialMixture.hh
G4tgbMaterialMixtureByNoAtoms.hh
G4tgbMaterialMixtureByVolume.hh
G4tgbMaterialMixtureByWeight.hh
G4tgbMaterialSimple.hh
G4tgbPlaceParamCircle.hh
G4tgbPlaceParamLinear.hh
G4tgbPlaceParamSquare.hh
G4tgbPlaceParameterisation.hh
G4tgbRotationMatrix.hh
G4tgbRotationMatrixMgr.hh
G4tgbVolume.hh
G4tgbVolumeMgr.hh
G4tgrElement.hh
G4tgrElementFromIsotopes.hh
G4tgrElementSimple.hh
G4tgrEvaluator.hh
G4tgrFileIn.hh
G4tgrFileReader.hh
G4tgrIsotope.hh
G4tgrLineProcessor.hh
G4tgrMaterial.hh
G4tgrMaterialFactory.hh
G4tgrMaterialMixture.hh
G4tgrMaterialSimple.hh
G4tgrMessenger.hh
G4tgrParameterMgr.hh
G4tgrPlace.hh
G4tgrPlaceDivRep.hh
G4tgrPlaceParameterisation.hh
G4tgrPlaceSimple.hh
G4tgrRotationMatrix.hh
G4tgrRotationMatrixFactory.hh
G4tgrSolid.hh
G4tgrSolidBoolean.hh
G4tgrUtils.hh
G4tgrVolume.hh
G4tgrVolumeAssembly.hh
G4tgrVolumeDivision.hh
G4tgrVolumeMgr.hh
SOURCES
G4tgbDetectorBuilder.cc
G4tgbDetectorConstruction.cc
G4tgbElement.cc
G4tgbGeometryDumper.cc
G4tgbIsotope.cc
G4tgbMaterial.cc
G4tgbMaterialMgr.cc
G4tgbMaterialMixture.cc
G4tgbMaterialMixtureByNoAtoms.cc
G4tgbMaterialMixtureByVolume.cc
G4tgbMaterialMixtureByWeight.cc
G4tgbMaterialSimple.cc
G4tgbPlaceParamCircle.cc
G4tgbPlaceParamLinear.cc
G4tgbPlaceParamSquare.cc
G4tgbPlaceParameterisation.cc
G4tgbRotationMatrix.cc
G4tgbRotationMatrixMgr.cc
G4tgbVolume.cc
G4tgbVolumeMgr.cc
G4tgrElement.cc
G4tgrElementFromIsotopes.cc
G4tgrElementSimple.cc
G4tgrEvaluator.cc
G4tgrFileIn.cc
G4tgrFileReader.cc
G4tgrIsotope.cc
G4tgrLineProcessor.cc
G4tgrMaterial.cc
G4tgrMaterialFactory.cc
G4tgrMaterialMixture.cc
G4tgrMaterialSimple.cc
G4tgrMessenger.cc
G4tgrParameterMgr.cc
G4tgrPlace.cc
G4tgrPlaceDivRep.cc
G4tgrPlaceParameterisation.cc
G4tgrPlaceSimple.cc
G4tgrRotationMatrix.cc
G4tgrRotationMatrixFactory.cc
G4tgrSolid.cc
G4tgrSolidBoolean.cc
G4tgrUtils.cc
G4tgrVolume.cc
G4tgrVolumeAssembly.cc
G4tgrVolumeDivision.cc
G4tgrVolumeMgr.cc
GRANULAR_DEPENDENCIES
G4csg
G4geomBoolean
G4geomdivision
G4geometrymng
G4globman
G4graphics_reps
G4hepnumerics
G4intercoms
G4materials
G4partman
G4specsolids
G4volumes
GLOBAL_DEPENDENCIES
G4geometry
G4global
G4graphics_reps
G4intercoms
G4materials
G4particles
LINK_LIBRARIES
geant4_define_module(NAME G4geomtext
HEADERS
G4tgbDetectorBuilder.hh
G4tgbDetectorConstruction.hh
G4tgbElement.hh
G4tgbGeometryDumper.hh
G4tgbIsotope.hh
G4tgbMaterial.hh
G4tgbMaterialMgr.hh
G4tgbMaterialMixture.hh
G4tgbMaterialMixtureByNoAtoms.hh
G4tgbMaterialMixtureByVolume.hh
G4tgbMaterialMixtureByWeight.hh
G4tgbMaterialSimple.hh
G4tgbPlaceParamCircle.hh
G4tgbPlaceParamLinear.hh
G4tgbPlaceParamSquare.hh
G4tgbPlaceParameterisation.hh
G4tgbRotationMatrix.hh
G4tgbRotationMatrixMgr.hh
G4tgbVolume.hh
G4tgbVolumeMgr.hh
G4tgrElement.hh
G4tgrElementFromIsotopes.hh
G4tgrElementSimple.hh
G4tgrEvaluator.hh
G4tgrFileIn.hh
G4tgrFileReader.hh
G4tgrIsotope.hh
G4tgrLineProcessor.hh
G4tgrMaterial.hh
G4tgrMaterialFactory.hh
G4tgrMaterialMixture.hh
G4tgrMaterialSimple.hh
G4tgrMessenger.hh
G4tgrParameterMgr.hh
G4tgrPlace.hh
G4tgrPlaceDivRep.hh
G4tgrPlaceParameterisation.hh
G4tgrPlaceSimple.hh
G4tgrRotationMatrix.hh
G4tgrRotationMatrixFactory.hh
G4tgrSolid.hh
G4tgrSolidBoolean.hh
G4tgrUtils.hh
G4tgrVolume.hh
G4tgrVolumeAssembly.hh
G4tgrVolumeDivision.hh
G4tgrVolumeMgr.hh
SOURCES
G4tgbDetectorBuilder.cc
G4tgbDetectorConstruction.cc
G4tgbElement.cc
G4tgbGeometryDumper.cc
G4tgbIsotope.cc
G4tgbMaterial.cc
G4tgbMaterialMgr.cc
G4tgbMaterialMixture.cc
G4tgbMaterialMixtureByNoAtoms.cc
G4tgbMaterialMixtureByVolume.cc
G4tgbMaterialMixtureByWeight.cc
G4tgbMaterialSimple.cc
G4tgbPlaceParamCircle.cc
G4tgbPlaceParamLinear.cc
G4tgbPlaceParamSquare.cc
G4tgbPlaceParameterisation.cc
G4tgbRotationMatrix.cc
G4tgbRotationMatrixMgr.cc
G4tgbVolume.cc
G4tgbVolumeMgr.cc
G4tgrElement.cc
G4tgrElementFromIsotopes.cc
G4tgrElementSimple.cc
G4tgrEvaluator.cc
G4tgrFileIn.cc
G4tgrFileReader.cc
G4tgrIsotope.cc
G4tgrLineProcessor.cc
G4tgrMaterial.cc
G4tgrMaterialFactory.cc
G4tgrMaterialMixture.cc
G4tgrMaterialSimple.cc
G4tgrMessenger.cc
G4tgrParameterMgr.cc
G4tgrPlace.cc
G4tgrPlaceDivRep.cc
G4tgrPlaceParameterisation.cc
G4tgrPlaceSimple.cc
G4tgrRotationMatrix.cc
G4tgrRotationMatrixFactory.cc
G4tgrSolid.cc
G4tgrSolidBoolean.cc
G4tgrUtils.cc
G4tgrVolume.cc
G4tgrVolumeAssembly.cc
G4tgrVolumeDivision.cc
G4tgrVolumeMgr.cc
GRANULAR_DEPENDENCIES
G4csg
G4geomBoolean
G4geomdivision
G4geometrymng
G4globman
G4graphics_reps
G4hepnumerics
G4intercoms
G4materials
G4partman
G4specsolids
G4volumes
GLOBAL_DEPENDENCIES
G4geometry
G4global
G4graphics_reps
G4intercoms
G4materials
G4particles
)
# List any source specific properties here
source/persistency/ascii/src/G4tgbGeometryDumper.cc
+15 -10
View File
@@ -707,7 +707,11 @@ void G4tgbGeometryDumper::DumpBooleanVolume( const G4String& solidType,
if( displaced )
{
solid1Disp = dynamic_cast<G4DisplacedSolid*>(solid1);
if (solid1Disp) { solid1 = solid1Disp->GetConstituentMovedSolid(); }
if (solid1Disp) {
solid1 = solid1Disp->GetConstituentMovedSolid();
} else {
return;
}
}
DumpSolid( solid0 );
DumpSolid( solid1 );
@@ -1353,15 +1357,16 @@ G4tgbGeometryDumper::Same2G4Isotopes( G4Isotope* isot1, G4Isotope* isot2 )
const G4String& G4tgbGeometryDumper::FindSolidName( G4VSolid* solid )
{
std::map<G4String,G4VSolid*>::const_iterator ite;
for( ite = theSolids.begin(); ite != theSolids.end(); ite++ )
{
if( solid == (*ite).second ) { return (*ite).first; }
}
for( ite = theSolids.begin(); ite != theSolids.end(); ++ite )
{
if( solid == (*ite).second ) { return (*ite).first;
}
}
if( ite == theSolids.end() )
{
G4Exception("G4tgbGeometryDumper::FindSolidName()", "ReadError",
FatalException, "Programming error.");
}
{
G4Exception("G4tgbGeometryDumper::FindSolidName()", "ReadError",
FatalException, "Programming error.");
}
return (*ite).first;
}
source/persistency/ascii/src/G4tgbVolume.cc
+4 -2
View File
@@ -140,6 +140,7 @@ void G4tgbVolume::ConstructG4Volumes( const G4tgrPlace* place,
G4tgbVolumeMgr* g4vmgr = G4tgbVolumeMgr::GetInstance();
G4LogicalVolume* logvol = g4vmgr->FindG4LogVol( GetName() );
G4bool bFirstCopy = false;
G4VPhysicalVolume* physvol = 0;
if( logvol == 0 )
{
bFirstCopy = true;
@@ -159,9 +160,10 @@ void G4tgbVolume::ConstructG4Volumes( const G4tgrPlace* place,
{
return;
}
}
}
//--- Construct PhysVol
G4VPhysicalVolume* physvol = ConstructG4PhysVol( place, logvol, parentLV );
physvol = ConstructG4PhysVol( place, logvol, parentLV );
if( physvol != 0 ) // 0 for G4AssemblyVolumes
{
g4vmgr->RegisterMe( physvol );
source/persistency/ascii/src/G4tgbVolumeMgr.cc
+3 -1
View File
@@ -168,8 +168,10 @@ G4tgbVolume* G4tgbVolumeMgr::FindVolume( const G4String& volname)
G4String ErrMessage = "G4tgbVolume not found: " + volname + " !";
G4Exception("G4tgbVolumeMgr::FindVolume()", "InvalidSetup",
FatalException, ErrMessage);
return (G4tgbVolume*)0;
} else {
return (*cite).second;
}
return (*cite).second;
}
source/persistency/gdml/CMakeLists.txt
-17
View File
@@ -1,17 +0,0 @@
#------------------------------------------------------------------------------
# CMakeLists.txt
# Module : G4gdml
# Package: Geant4.src.G4persistency.G4gdml
#
# CMakeLists.txt for building a single granular library.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
if(GEANT4_BUILD_GRANULAR_LIBS)
include(Geant4MacroLibraryTargets)
GEANT4_GRANULAR_LIBRARY_TARGET(COMPONENT sources.cmake)
endif()
source/persistency/gdml/History
+7
View File
@@ -16,6 +16,13 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
21 February 2020 Witek Pokorski (gdml-V10-06-01)
- Fixed writting out and reading in of const properties of material.
11 December 2019 Ben Morgan (gdml-V10-06-00)
- Cleanup CMake build, removing obsolete granular library options and
explicit include_directories.
13 November 2019 Makoto Asai (gdml-V10-05-09)
- G4GDMLRead.cc : avoid double-definition of units.
source/persistency/gdml/include/G4GDMLWriteMaterials.hh
+3
View File
@@ -48,6 +48,7 @@ class G4Isotope;
class G4Element;
class G4Material;
class G4PhysicsOrderedFreeVector;
class G4MaterialPropertiesTable;
class G4GDMLWriteMaterials : public G4GDMLWriteDefine
{
@@ -76,6 +77,8 @@ class G4GDMLWriteMaterials : public G4GDMLWriteDefine
void PropertyWrite(xercesc::DOMElement*, const G4Material* const);
void PropertyVectorWrite(const G4String&,
const G4PhysicsOrderedFreeVector* const);
void PropertyConstWrite(const G4String&,
const G4double, const G4MaterialPropertiesTable*);
protected:
std::vector<const G4Isotope*> isotopeList;
source/persistency/gdml/sources.cmake
+84 -130
View File
@@ -1,141 +1,95 @@
#------------------------------------------------------------------------------
# sources.cmake
# Module : G4gdml
# Package: Geant4.src.G4persistency.G4gdml
#
# Sources description for a library.
# Lists the sources and headers of the code explicitely.
# Lists include paths needed.
# Lists the internal granular and global dependencies of the library.
# Source specific properties should be added at the end.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
# List external includes needed.
include_directories(${CLHEP_INCLUDE_DIRS})
include_directories(${USOLIDS_INCLUDE_DIRS})
# List internal includes needed.
include_directories(${CMAKE_SOURCE_DIR}/source/digits_hits/digits/include)
include_directories(${CMAKE_SOURCE_DIR}/source/digits_hits/hits/include)
include_directories(${CMAKE_SOURCE_DIR}/source/event/include)
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/divisions/include)
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/management/include)
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/navigation/include)
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/solids/Boolean/include)
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/solids/CSG/include)
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/solids/specific/include)
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/volumes/include)
include_directories(${CMAKE_SOURCE_DIR}/source/global/HEPGeometry/include)
include_directories(${CMAKE_SOURCE_DIR}/source/global/HEPNumerics/include)
include_directories(${CMAKE_SOURCE_DIR}/source/global/HEPRandom/include)
include_directories(${CMAKE_SOURCE_DIR}/source/global/management/include)
include_directories(${CMAKE_SOURCE_DIR}/source/graphics_reps/include)
include_directories(${CMAKE_SOURCE_DIR}/source/intercoms/include)
include_directories(${CMAKE_SOURCE_DIR}/source/materials/include)
include_directories(${CMAKE_SOURCE_DIR}/source/particles/management/include)
include_directories(${CMAKE_SOURCE_DIR}/source/particles/bosons/include)
include_directories(${CMAKE_SOURCE_DIR}/source/particles/hadrons/barions/include)
include_directories(${CMAKE_SOURCE_DIR}/source/particles/leptons/include)
include_directories(${CMAKE_SOURCE_DIR}/source/processes/cuts/include)
include_directories(${CMAKE_SOURCE_DIR}/source/processes/management/include)
include_directories(${CMAKE_SOURCE_DIR}/source/run/include)
include_directories(${CMAKE_SOURCE_DIR}/source/track/include)
include_directories(${CMAKE_SOURCE_DIR}/source/tracking/include)
include_directories(${CMAKE_SOURCE_DIR}/source/digits_hits/detector/include)
#
# Define the Geant4 Module.
#
include(Geant4MacroDefineModule)
GEANT4_DEFINE_MODULE(NAME G4gdml
HEADERS
G4GDMLAuxStructType.hh
G4GDMLEvaluator.hh
G4GDMLMessenger.hh
G4GDMLParameterisation.hh
G4GDMLParser.hh
G4GDMLParser.icc
G4GDMLRead.hh
G4GDMLReadDefine.hh
G4GDMLReadMaterials.hh
G4GDMLReadParamvol.hh
G4GDMLReadSetup.hh
G4GDMLReadSolids.hh
G4GDMLReadStructure.hh
G4GDMLWrite.hh
G4GDMLWriteDefine.hh
G4GDMLWriteMaterials.hh
G4GDMLWriteParamvol.hh
G4GDMLWriteSetup.hh
G4GDMLWriteSolids.hh
G4GDMLWriteStructure.hh
G4STRead.hh
SOURCES
G4GDMLEvaluator.cc
G4GDMLMessenger.cc
G4GDMLParameterisation.cc
G4GDMLParser.cc
G4GDMLRead.cc
G4GDMLReadDefine.cc
G4GDMLReadMaterials.cc
G4GDMLReadParamvol.cc
G4GDMLReadSetup.cc
G4GDMLReadSolids.cc
G4GDMLReadStructure.cc
G4GDMLWrite.cc
G4GDMLWriteDefine.cc
G4GDMLWriteMaterials.cc
G4GDMLWriteParamvol.cc
G4GDMLWriteSetup.cc
G4GDMLWriteSolids.cc
G4GDMLWriteStructure.cc
G4STRead.cc
GRANULAR_DEPENDENCIES
G4csg
G4digits
G4event
G4geomBoolean
G4geomdivision
G4geometrymng
G4globman
G4graphics_reps
G4hepnumerics
G4hits
G4intercoms
G4materials
G4navigation
G4partman
G4baryons
G4bosons
G4leptons
G4procman
G4cuts
G4emutils
G4run
G4specsolids
G4track
G4tracking
G4volumes
GLOBAL_DEPENDENCIES
G4digits_hits
G4event
G4geometry
G4global
G4graphics_reps
G4intercoms
G4materials
G4particles
G4processes
G4run
G4track
G4tracking
LINK_LIBRARIES
XercesC::XercesC
geant4_define_module(NAME G4gdml
HEADERS
G4GDMLAuxStructType.hh
G4GDMLEvaluator.hh
G4GDMLMessenger.hh
G4GDMLParameterisation.hh
G4GDMLParser.hh
G4GDMLParser.icc
G4GDMLRead.hh
G4GDMLReadDefine.hh
G4GDMLReadMaterials.hh
G4GDMLReadParamvol.hh
G4GDMLReadSetup.hh
G4GDMLReadSolids.hh
G4GDMLReadStructure.hh
G4GDMLWrite.hh
G4GDMLWriteDefine.hh
G4GDMLWriteMaterials.hh
G4GDMLWriteParamvol.hh
G4GDMLWriteSetup.hh
G4GDMLWriteSolids.hh
G4GDMLWriteStructure.hh
G4STRead.hh
SOURCES
G4GDMLEvaluator.cc
G4GDMLMessenger.cc
G4GDMLParameterisation.cc
G4GDMLParser.cc
G4GDMLRead.cc
G4GDMLReadDefine.cc
G4GDMLReadMaterials.cc
G4GDMLReadParamvol.cc
G4GDMLReadSetup.cc
G4GDMLReadSolids.cc
G4GDMLReadStructure.cc
G4GDMLWrite.cc
G4GDMLWriteDefine.cc
G4GDMLWriteMaterials.cc
G4GDMLWriteParamvol.cc
G4GDMLWriteSetup.cc
G4GDMLWriteSolids.cc
G4GDMLWriteStructure.cc
G4STRead.cc
GRANULAR_DEPENDENCIES
G4csg
G4digits
G4event
G4geomBoolean
G4geomdivision
G4geometrymng
G4globman
G4graphics_reps
G4hepnumerics
G4hits
G4intercoms
G4materials
G4navigation
G4partman
G4baryons
G4bosons
G4leptons
G4procman
G4cuts
G4emutils
G4run
G4specsolids
G4track
G4tracking
G4volumes
GLOBAL_DEPENDENCIES
G4digits_hits
G4event
G4geometry
G4global
G4graphics_reps
G4intercoms
G4materials
G4particles
G4processes
G4run
G4track
G4tracking
LINK_LIBRARIES
XercesC::XercesC
)
# List any source specific properties here
source/persistency/gdml/src/G4GDMLWriteMaterials.cc
+25 -7
View File
@@ -230,6 +230,22 @@ void G4GDMLWriteMaterials::PropertyVectorWrite(const G4String& key,
defineElement->appendChild(matrixElement);
}
void G4GDMLWriteMaterials::PropertyConstWrite(const G4String& key,
const G4double pval, const G4MaterialPropertiesTable* ptable)
{
const G4String matrixref = GenerateName(key, ptable);
xercesc::DOMElement* matrixElement = NewElement("matrix");
matrixElement->setAttributeNode(NewAttribute("name", matrixref));
matrixElement->setAttributeNode(NewAttribute("coldim", "1"));
std::ostringstream pvalues;
pvalues << pval;
matrixElement->setAttributeNode(NewAttribute("values", pvalues.str()));
defineElement->appendChild(matrixElement);
}
void G4GDMLWriteMaterials::PropertyWrite(xercesc::DOMElement* matElement,
const G4Material* const mat)
{
@@ -276,13 +292,15 @@ void G4GDMLWriteMaterials::PropertyWrite(xercesc::DOMElement* matElement,
propElement = NewElement("property");
propElement->setAttributeNode(NewAttribute("name",
ptable->GetMaterialConstPropertyNames()[cpos->first]));
propElement->setAttributeNode(NewAttribute("ref",
ptable->GetMaterialConstPropertyNames()[cpos->first]));
xercesc::DOMElement* constElement = NewElement("constant");
constElement->setAttributeNode(NewAttribute("name",
ptable->GetMaterialConstPropertyNames()[cpos->first]));
constElement->setAttributeNode(NewAttribute("value", cpos->second));
defineElement->appendChild(constElement);
propElement->
setAttributeNode(NewAttribute("ref",
GenerateName(ptable->GetMaterialConstPropertyNames()[cpos->first],
ptable)));
PropertyConstWrite(ptable->GetMaterialConstPropertyNames()[cpos->first],
cpos->second, ptable);
matElement->appendChild(propElement);
}
}
source/persistency/mctruth/CMakeLists.txt
-17
View File
@@ -1,17 +0,0 @@
#------------------------------------------------------------------------------
# CMakeLists.txt
# Module : G4mctruth
# Package: Geant4.src.G4persistency.G4mctruth
#
# CMakeLists.txt for building a single granular library.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
if(GEANT4_BUILD_GRANULAR_LIBS)
include(Geant4MacroLibraryTargets)
GEANT4_GRANULAR_LIBRARY_TARGET(COMPONENT sources.cmake)
endif()
source/persistency/mctruth/History
+4
View File
@@ -15,6 +15,10 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
11 December, 19 B.Morgan (mctruth-V10-06-00)
- Cleanup CMake build, removing obsolete granular library options and
explicit include_directories.
6 July, 16 G.Cosmo (mctruth-V10-02-00)
- Fixed typo in G4PersistencyCenterMessenger::GetCurrentValue() in
selection of verbose mode.
source/persistency/mctruth/sources.cmake
+70 -98
View File
@@ -1,109 +1,81 @@
#------------------------------------------------------------------------------
# sources.cmake
# Module : G4mctruth
# Package: Geant4.src.G4persistency.G4mctruth
#
# Sources description for a library.
# Lists the sources and headers of the code explicitely.
# Lists include paths needed.
# Lists the internal granular and global dependencies of the library.
# Source specific properties should be added at the end.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
# List external includes needed.
include_directories(${CLHEP_INCLUDE_DIRS})
# List internal includes needed.
include_directories(${CMAKE_SOURCE_DIR}/source/digits_hits/digits/include)
include_directories(${CMAKE_SOURCE_DIR}/source/digits_hits/hits/include)
include_directories(${CMAKE_SOURCE_DIR}/source/event/include)
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/management/include)
include_directories(${CMAKE_SOURCE_DIR}/source/global/HEPGeometry/include)
include_directories(${CMAKE_SOURCE_DIR}/source/global/management/include)
include_directories(${CMAKE_SOURCE_DIR}/source/intercoms/include)
include_directories(${CMAKE_SOURCE_DIR}/source/particles/management/include)
include_directories(${CMAKE_SOURCE_DIR}/source/run/include)
include_directories(${CMAKE_SOURCE_DIR}/source/track/include)
include_directories(${CMAKE_SOURCE_DIR}/source/tracking/include)
#
# Define the Geant4 Module.
#
include(Geant4MacroDefineModule)
GEANT4_DEFINE_MODULE(NAME G4mctruth
HEADERS
G4DCIOcatalog.hh
G4DCIOentryT.hh
G4FileUtilities.hh
G4HCIOcatalog.hh
G4HCIOentryT.hh
G4MCTEvent.hh
G4MCTGenEvent.hh
G4MCTGenParticle.hh
G4MCTSimEvent.hh
G4MCTSimParticle.hh
G4MCTSimVertex.hh
G4PersistencyCenter.hh
G4PersistencyCenterMessenger.hh
G4PersistencyManager.hh
G4PersistencyManagerT.hh
G4Pevent.hh
G4VDCIOentry.hh
G4VHCIOentry.hh
G4VMCTruthIO.hh
G4VPDigitIO.hh
G4VPDigitsCollectionIO.hh
G4VPEventIO.hh
G4VPHitIO.hh
G4VPHitsCollectionIO.hh
G4VTransactionManager.hh
SOURCES
G4DCIOcatalog.cc
G4FileUtilities.cc
G4HCIOcatalog.cc
G4MCTEvent.cc
G4MCTGenEvent.cc
G4MCTSimEvent.cc
G4MCTSimParticle.cc
G4MCTSimVertex.cc
G4PersistencyCenter.cc
G4PersistencyCenterMessenger.cc
G4PersistencyManager.cc
G4Pevent.cc
G4VDCIOentry.cc
G4VHCIOentry.cc
G4VMCTruthIO.cc
G4VPDigitIO.cc
G4VPDigitsCollectionIO.cc
G4VPEventIO.cc
G4VPHitIO.cc
G4VPHitsCollectionIO.cc
GRANULAR_DEPENDENCIES
G4digits
G4event
G4geometrymng
G4globman
G4hits
G4intercoms
G4partman
G4run
G4track
G4tracking
GLOBAL_DEPENDENCIES
G4digits_hits
G4event
G4geometry
G4global
G4intercoms
G4particles
G4run
G4track
G4tracking
LINK_LIBRARIES
geant4_define_module(NAME G4mctruth
HEADERS
G4DCIOcatalog.hh
G4DCIOentryT.hh
G4FileUtilities.hh
G4HCIOcatalog.hh
G4HCIOentryT.hh
G4MCTEvent.hh
G4MCTGenEvent.hh
G4MCTGenParticle.hh
G4MCTSimEvent.hh
G4MCTSimParticle.hh
G4MCTSimVertex.hh
G4PersistencyCenter.hh
G4PersistencyCenterMessenger.hh
G4PersistencyManager.hh
G4PersistencyManagerT.hh
G4Pevent.hh
G4VDCIOentry.hh
G4VHCIOentry.hh
G4VMCTruthIO.hh
G4VPDigitIO.hh
G4VPDigitsCollectionIO.hh
G4VPEventIO.hh
G4VPHitIO.hh
G4VPHitsCollectionIO.hh
G4VTransactionManager.hh
SOURCES
G4DCIOcatalog.cc
G4FileUtilities.cc
G4HCIOcatalog.cc
G4MCTEvent.cc
G4MCTGenEvent.cc
G4MCTSimEvent.cc
G4MCTSimParticle.cc
G4MCTSimVertex.cc
G4PersistencyCenter.cc
G4PersistencyCenterMessenger.cc
G4PersistencyManager.cc
G4Pevent.cc
G4VDCIOentry.cc
G4VHCIOentry.cc
G4VMCTruthIO.cc
G4VPDigitIO.cc
G4VPDigitsCollectionIO.cc
G4VPEventIO.cc
G4VPHitIO.cc
G4VPHitsCollectionIO.cc
GRANULAR_DEPENDENCIES
G4digits
G4event
G4geometrymng
G4globman
G4hits
G4intercoms
G4partman
G4run
G4track
G4tracking
GLOBAL_DEPENDENCIES
G4digits_hits
G4event
G4geometry
G4global
G4intercoms
G4particles
G4run
G4track
G4tracking
LINK_LIBRARIES
)
# List any source specific properties here