reload run fixed for different variations with the caviat that optical properties must be carried across reload

Author: maureeungaro

examples/optical/cherenkov/cherenkov.py

@@ -70,17 +70,18 @@
 for variation, material in variation_material.items():
     cfg.init_variation(variation)
 
-    mat = GMaterial(material_definitions[material]["name"])
-    mat.description = material_definitions[material]["description"]
-    mat.density = material_definitions[material]["density"]
-
-    for element, natoms in material_definitions[material]["atoms"]:
-        mat.addNAtoms(element, natoms)
-
-    mat.photonEnergy = photon_energy
-    mat.indexOfRefraction = rindex[material]
-    mat.absorptionLength = absorption[material]
-    mat.publish(cfg)
+    for material_name, definition in material_definitions.items():
+        mat = GMaterial(definition["name"])
+        mat.description = definition["description"]
+        mat.density = definition["density"]
+
+        for element, natoms in definition["atoms"]:
+            mat.addNAtoms(element, natoms)
+
+        mat.photonEnergy = photon_energy
+        mat.indexOfRefraction = rindex[material_name]
+        mat.absorptionLength = absorption[material_name]
+        mat.publish(cfg)
 
     # World
     world = GVolume("root")

gdetector/gdetectorConstruction.cc

@@ -336,12 +336,13 @@ void GDetectorConstruction::prepare_geometry_for_run() {
 		GVisManagerGuard::set(nullptr);
 		// Geometry is being rebuilt: ensure loadDigitizationPlugins() runs inside Initialize().
 		digiplugins_need_reload = true;
+		rm->ReinitializeGeometry(true, true);
+		rm->GeometryHasBeenModified();
 		// Optical processes such as G4Cerenkov cache material-property tables by
 		// material index. A setup-tab reload can introduce a different variation's
-		// optical material, so force physics tables to rebuild with the new material set.
+		// optical material, so force physics tables to rebuild after the new
+		// geometry/material set has been installed.
 		rm->PhysicsHasBeenModified();
-		rm->ReinitializeGeometry(false, true);
-		rm->GeometryHasBeenModified();
 		rm->Initialize();
 		GVisManagerGuard::set(visManager);
 	} else { log->error(1, "GDetectorConstruction::prepare_geometry_for_run", "Geant4 Run manager not found."); }