diff --git a/DDG4/python/DDG4.py b/DDG4/python/DDG4.py index 558750f6d844dd3fdf2f13ebeef9b876effda876..84a4c67473f034af09ec3b4609e8f99bf2cb6f94 100644 --- a/DDG4/python/DDG4.py +++ b/DDG4/python/DDG4.py @@ -395,9 +395,9 @@ class Geant4: \author M.Frank """ - def addDetectorConstruction(self, name_type, - field=None, field_args=None, - geometry=None, geometry_args=None, + def addDetectorConstruction(self, name_type, + field=None, field_args=None, + geometry=None, geometry_args=None, sensitives=None, sensitives_args=None, allow_threads=False): init_seq = self.master().detectorConstruction(True) diff --git a/DDG4/src/Geant4Converter.cpp b/DDG4/src/Geant4Converter.cpp index 1a8efc9222b9417d2fce6cafa0f30603b8f8278b..ccf36a5e9f64978ffd680ed39f05ed51cf2a3799 100644 --- a/DDG4/src/Geant4Converter.cpp +++ b/DDG4/src/Geant4Converter.cpp @@ -394,7 +394,7 @@ void* Geant4Converter::handleMaterial(const string& name, Material medium) const } stringstream str; str << (*mat); - printout(lvl, "Geant4Converter", "++ Created G4 Material %s", str.str().c_str()); + printout(lvl, "Geant4Converter", "++ Created G4 %s", str.str().c_str()); } data().g4Materials[medium] = mat; } diff --git a/DDG4/src/Geant4PhysicsList.cpp b/DDG4/src/Geant4PhysicsList.cpp index a1208b6abf7798891a83a2661ea74ccad0806083..53668b38961b67f28de56e959eb9d255a7666703 100644 --- a/DDG4/src/Geant4PhysicsList.cpp +++ b/DDG4/src/Geant4PhysicsList.cpp @@ -243,7 +243,7 @@ void Geant4PhysicsList::constructParticles(G4VUserPhysicsList* physics_pointer) except("Failed to create particle type '%s' result=%d", ctor.c_str(), result); } } - info("Constructed Geant4 particle %s",ctor.c_str()); + info("Constructed Geant4 particle %s [using signature long (*)()]",ctor.c_str()); } } diff --git a/examples/ClientTests/scripts/SiliconBlock.py b/examples/ClientTests/scripts/SiliconBlock.py index fedfd1cf4ca8428a28b25695a1cf13272136a590..fc1f5bd2aa3082d23e4e4506fc372458cd2afcce 100644 --- a/examples/ClientTests/scripts/SiliconBlock.py +++ b/examples/ClientTests/scripts/SiliconBlock.py @@ -37,12 +37,18 @@ def run(): generator_output_level = Output.INFO + # Configure G4 geometry setup + seq,act = geant4.addDetectorConstruction("Geant4DetectorGeometryConstruction/ConstructGeo") + act.DebugMaterials = True + act.DebugElements = False + act.DebugVolumes = False + # Configure I/O evt_root = geant4.setupROOTOutput('RootOutput','SiliconBlock_'+time.strftime('%Y-%m-%d_%H-%M')) # Setup particle gun gun = geant4.setupGun("Gun",particle='mu-',energy=20*GeV,multiplicity=1) - gun.output_level = generator_output_level + gun.OutputLevel = generator_output_level # And handle the simulation particles. part = DDG4.GeneratorAction(kernel,"Geant4ParticleHandler/ParticleHandler")