fix reload geometry argument

Author: maureeungaro

gdetector/examples/gdetector_example.cc

@@ -150,7 +150,8 @@ int main(int argc, char* argv[]) {
 	runManager->SetUserInitialization(physicsList);
 
 	auto gdetector = std::make_shared<GDetectorConstruction>(gopts);
-	gdetector->reload_geometry();
+	auto gsystems = gsystem::getSystems(gopts);
+	gdetector->reload_geometry(gsystems);
 
 	auto runDat = run_simulation_in_threads(nevents, nthreads, gopts, log, gdetector);
 

gdetector/gdetectorConstruction.cc

@@ -22,9 +22,7 @@ G4ThreadLocal GMagneto* GDetectorConstruction::gmagneto = nullptr;
 GDetectorConstruction::GDetectorConstruction(std::shared_ptr<GOptions> gopts)
 	: GBase(gopts, GDETECTOR_LOGGER),
 	  G4VUserDetectorConstruction(), // Geant4 base class.
-	  gopt(gopts) {
-	digitization_routines_map = std::make_shared<gdynamicdigitization::dRoutinesMap>();
-}
+	  gopt(gopts) { digitization_routines_map = std::make_shared<gdynamicdigitization::dRoutinesMap>(); }
 
 G4VPhysicalVolume* GDetectorConstruction::Construct() {
 	log->debug(NORMAL, FUNCTION_NAME);
@@ -42,8 +40,14 @@ G4VPhysicalVolume* GDetectorConstruction::Construct() {
 
 	// - if no systems are provided, we just launched gemc: create from options
 	// - otherwise, it's a geometry re-load. use existing systems.
-	if (gsystems.empty()) { gworld = std::make_shared<GWorld>(gopt); }
-	else { gworld = std::make_shared<GWorld>(gopt, gsystems); }
+	if (gsystems.empty()) {
+		log->debug(NORMAL, FUNCTION_NAME, "creating world from options");
+		gworld = std::make_shared<GWorld>(gopt);
+	}
+	else {
+		log->debug(NORMAL, FUNCTION_NAME, "creating world from a gsystem vector of size ", gsystems.size());
+		gworld = std::make_shared<GWorld>(gopt, gsystems);
+	}
 
 	// Build Geant4 world (solids, logical and physical volumes) based on the GEMC world.
 	g4world = std::make_shared<G4World>(gworld.get(), gopt);
@@ -148,6 +152,7 @@ void GDetectorConstruction::loadDigitizationPlugins() {
 
 
 void GDetectorConstruction::reload_geometry(SystemList sl) {
+
 	// it could be empty for tests
 	if (!sl.empty()) {
 		// Use vector assignment to update the local systems.
@@ -163,6 +168,5 @@ void GDetectorConstruction::reload_geometry(SystemList sl) {
 		rm->DefineWorldVolume(Construct());
 		ConstructSDandField();
 	}
-
 	else { log->error(1, "GDetectorConstruction::reload_geometry", "Geant4 Run manager not found."); }
 }

gdetector/gdetectorConstruction.h

@@ -37,7 +37,7 @@ class GDetectorConstruction : public GBase<GDetectorConstruction>, public G4VUse
 	 * Reloads the geometry using a new vector of GSystem objects.
 	 * @param sl new vector of gsystem pointers.
 	 */
-	void reload_geometry(SystemList sl = {nullptr});
+	void reload_geometry(SystemList sl);
 
 	std::shared_ptr<GDynamicDigitization> get_digitization_routines_for_sdname(const std::string &sd_name) const {
 		return digitization_routines_map->at(sd_name);

gdetector/meson.build

@@ -4,6 +4,10 @@ verbosities = ['-verbosity.plugins=2',
                '-debug.plugins=true',
                '-verbosity.gsystem=2',
                '-debug.gsystem=true',
+               '-verbosity.gworld=2',
+               '-debug.gworld=true',
+               '-verbosity.gvolume=2',
+               '-debug.gvolume=true',
                '-verbosity.g4system=2',
                '-debug.g4system=true',
                '-verbosity.g4system=2',

gsystem/gworld.cc

@@ -33,6 +33,7 @@ GWorld::GWorld(const std::shared_ptr<GOptions>& g, SystemList gsystems)
 	: GBase(g, GWORLD_LOGGER),
 	  gopts(g) {
 	log->debug(NORMAL, SFUNCTION_NAME, "From SystemList");
+
 	// create the gsystem map
 	create_gsystemsMap(gsystems);
 

gsystem/gworld.h

@@ -34,7 +34,7 @@ class GWorld : public GBase<GWorld> {
 	 * @param gopts Pointer to options.
 	 */
 	explicit GWorld(const std::shared_ptr<GOptions>& gopts);
-	GWorld(const std::shared_ptr<GOptions>& gopts, SystemList systems);
+	explicit GWorld(const std::shared_ptr<GOptions>& gopts, SystemList systems);
 
 	/// Returns the map of GSystem objects.
 	[[nodiscard]] SystemMap* getSystemsMap() const { return gsystemsMap.get(); }