Fixed not assigning optical properties to materials when they were set to zero

Author: maureeungaro

g4system/g4materials.cc

@@ -81,12 +81,9 @@ bool G4World::createG4Material(const std::shared_ptr<GMaterial> &gmaterial) {
 			hasOpticalProperties = true;
 		};
 
-		auto addConstantProperty = [&](const char *propertyName, double value) {
-			// default values initialied to zero
-			if (value == 0) { return; }
-
+		auto addConstantProperty = [&](const char *propertyName, double value, bool isSet) {
+			if (!isSet) { return; }
 			materialPropertiesTable->AddConstProperty(propertyName, value);
-
 			hasOpticalProperties = true;
 		};
 
@@ -100,15 +97,20 @@ bool G4World::createG4Material(const std::shared_ptr<GMaterial> &gmaterial) {
 		addProperty("SCINTILLATIONCOMPONENT2", gmaterial->getSlowComponent());
 
 		// scalar properties
-		addConstantProperty("SCINTILLATIONYIELD", gmaterial->getScintillationYield());
-		addConstantProperty("RESOLUTIONSCALE", gmaterial->getResolutionScale());
-
-		addConstantProperty("SCINTILLATIONTIMECONSTANT1", gmaterial->getFasttimeConstant() * CLHEP::ns);
-		addConstantProperty("SCINTILLATIONTIMECONSTANT2", gmaterial->getSlowtimeConstant() * CLHEP::ns);
-		addConstantProperty("SCINTILLATIONYIELD1", gmaterial->getYieldratio());
+		addConstantProperty("SCINTILLATIONYIELD", gmaterial->getScintillationYield(),
+		                    gmaterial->hasScintillationYield());
+		addConstantProperty("RESOLUTIONSCALE", gmaterial->getResolutionScale(),
+		                    gmaterial->hasResolutionScale());
+
+		addConstantProperty("SCINTILLATIONTIMECONSTANT1", gmaterial->getFasttimeConstant() * CLHEP::ns,
+		                    gmaterial->hasFasttimeConstant());
+		addConstantProperty("SCINTILLATIONTIMECONSTANT2", gmaterial->getSlowtimeConstant() * CLHEP::ns,
+		                    gmaterial->hasSlowtimeConstant());
+		addConstantProperty("SCINTILLATIONYIELD1", gmaterial->getYieldratio(),
+		                    gmaterial->hasYieldratio());
 
 		double getBirksConstant = gmaterial->getBirksConstant();
-		if (getBirksConstant != 0) {
+		if (gmaterial->hasBirksConstant()) {
 			g4materialsMap[materialName]->GetIonisation()->SetBirksConstant(getBirksConstant);
 			hasOpticalProperties = true;
 		}

gsystem/gmaterial.cc

@@ -50,12 +50,12 @@ GMaterial::GMaterial(const std::string &s, std::vector<std::string> pars,
 		getMaterialPropertyFromString(pars[i++], "slowcomponent");
 
 		// assign_if_set increment index
-		assign_if_set(pars, i, scintillationyield);
-		assign_if_set(pars, i, resolutionscale);
-		assign_if_set(pars, i, fasttimeconstant);
-		assign_if_set(pars, i, slowtimeconstant);
-		assign_if_set(pars, i, yieldratio);
-		assign_if_set(pars, i, birksConstant);
+		scintillationyieldSet = assign_if_set(pars, i, scintillationyield);
+		resolutionscaleSet    = assign_if_set(pars, i, resolutionscale);
+		fasttimeconstantSet   = assign_if_set(pars, i, fasttimeconstant);
+		slowtimeconstantSet   = assign_if_set(pars, i, slowtimeconstant);
+		yieldratioSet         = assign_if_set(pars, i, yieldratio);
+		birksConstantSet      = assign_if_set(pars, i, birksConstant);
 
 		// Other optical processes: the final vector load triggers cross-vector size validation.
 		getMaterialPropertyFromString(pars[i++], "rayleigh");

gsystem/gmaterial.h

@@ -108,6 +108,13 @@ class GMaterial : public GBase<GMaterial> {
 	double slowtimeconstant{}; ///< Slow scintillation time constant (time units).
 	double yieldratio{}; ///< Fraction of total yield attributed to the fast component.
 	double birksConstant{}; ///< Birks constant for quenching model (units depend on convention).
+
+	bool scintillationyieldSet{}; ///< True when the scalar was explicitly provided.
+	bool resolutionscaleSet{}; ///< True when the scalar was explicitly provided.
+	bool fasttimeconstantSet{}; ///< True when the scalar was explicitly provided.
+	bool slowtimeconstantSet{}; ///< True when the scalar was explicitly provided.
+	bool yieldratioSet{}; ///< True when the scalar was explicitly provided.
+	bool birksConstantSet{}; ///< True when the scalar was explicitly provided.
 	///@}
 
 	/**
@@ -191,6 +198,12 @@ class GMaterial : public GBase<GMaterial> {
 	[[nodiscard]] double getSlowtimeConstant() const { return slowtimeconstant; }
 	[[nodiscard]] double getYieldratio() const { return yieldratio; }
 	[[nodiscard]] double getBirksConstant() const { return birksConstant; }
+	[[nodiscard]] bool hasScintillationYield() const { return scintillationyieldSet; }
+	[[nodiscard]] bool hasResolutionScale() const { return resolutionscaleSet; }
+	[[nodiscard]] bool hasFasttimeConstant() const { return fasttimeconstantSet; }
+	[[nodiscard]] bool hasSlowtimeConstant() const { return slowtimeconstantSet; }
+	[[nodiscard]] bool hasYieldratio() const { return yieldratioSet; }
+	[[nodiscard]] bool hasBirksConstant() const { return birksConstantSet; }
 	///@}
 
 	/// \name Additional optical properties