Skip to content

Validate optical-property vector sizes once, after parsing, not per token #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maureeungaro merged 1 commit into from
Jun 13, 2026
Merged

Validate optical-property vector sizes once, after parsing, not per token #158

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 47 additions & 44 deletions gemc/gsystem/gmaterial.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,51 +139,54 @@ void GMaterial::getMaterialPropertyFromString(const std::string &parameter, cons
} else if (propertyName == "rayleigh") {
rayleigh.push_back(gutilities::getG4Number(trimmedComponent));
}
}

// validation triggered by rayleigh
if (propertyName == "rayleigh") {
// Rayleigh is loaded last: at this point we can validate that all other optical vectors
// either are empty (not specified) or match the photonEnergy vector length.
//
// If they do not match, behavior is undefined because properties would be evaluated
// at inconsistent energy grids.
unsigned long photonEnergyVectorSize = photonEnergy.size();

if (!indexOfRefraction.empty() && indexOfRefraction.size() != photonEnergyVectorSize) {
log->error(ERR_GMATERIALOPTICALPROPERTYMISMATCH,
"indexOfRefraction size ", indexOfRefraction.size(), " mismatch: photonEnergy has size ",
photonEnergyVectorSize);
}
if (!absorptionLength.empty() && absorptionLength.size() != photonEnergyVectorSize) {
log->error(ERR_GMATERIALOPTICALPROPERTYMISMATCH,
"absorptionLength size ", absorptionLength.size(), " mismatch: photonEnergy has size ",
photonEnergyVectorSize);
}
if (!reflectivity.empty() && reflectivity.size() != photonEnergyVectorSize) {
log->error(ERR_GMATERIALOPTICALPROPERTYMISMATCH,
"reflectivity size ", reflectivity.size(), " mismatch: photonEnergy has size ",
photonEnergyVectorSize);
}
if (!efficiency.empty() && efficiency.size() != photonEnergyVectorSize) {
log->error(ERR_GMATERIALOPTICALPROPERTYMISMATCH,
"efficiency size ", efficiency.size(), " mismatch: photonEnergy has size ",
photonEnergyVectorSize);
}
if (!fastcomponent.empty() && fastcomponent.size() != photonEnergyVectorSize) {
log->error(ERR_GMATERIALOPTICALPROPERTYMISMATCH,
"fastcomponent size ", fastcomponent.size(), " mismatch: photonEnergy has size ",
photonEnergyVectorSize);
}
if (!slowcomponent.empty() && slowcomponent.size() != photonEnergyVectorSize) {
log->error(ERR_GMATERIALOPTICALPROPERTYMISMATCH,
"slowcomponent size ", slowcomponent.size(), " mismatch: photonEnergy has size ",
photonEnergyVectorSize);
}
if (!rayleigh.empty() && rayleigh.size() != photonEnergyVectorSize) {
log->error(ERR_GMATERIALOPTICALPROPERTYMISMATCH,
"rayleigh size ", rayleigh.size(), " mismatch: photonEnergy has size ",
photonEnergyVectorSize);
}
// Validation runs once, after all tokens for this property have been parsed.
// Rayleigh is loaded last, so every other optical vector is fully populated and can be
// cross-checked against photonEnergy here. (Running this inside the token loop fired on
// the very first rayleigh value, before the vector was complete.)
if (propertyName == "rayleigh") {
// Rayleigh is loaded last: at this point we can validate that all other optical vectors
// either are empty (not specified) or match the photonEnergy vector length.
//
// If they do not match, behavior is undefined because properties would be evaluated
// at inconsistent energy grids.
unsigned long photonEnergyVectorSize = photonEnergy.size();

if (!indexOfRefraction.empty() && indexOfRefraction.size() != photonEnergyVectorSize) {
log->error(ERR_GMATERIALOPTICALPROPERTYMISMATCH,
"indexOfRefraction size ", indexOfRefraction.size(), " mismatch: photonEnergy has size ",
photonEnergyVectorSize);
}
if (!absorptionLength.empty() && absorptionLength.size() != photonEnergyVectorSize) {
log->error(ERR_GMATERIALOPTICALPROPERTYMISMATCH,
"absorptionLength size ", absorptionLength.size(), " mismatch: photonEnergy has size ",
photonEnergyVectorSize);
}
if (!reflectivity.empty() && reflectivity.size() != photonEnergyVectorSize) {
log->error(ERR_GMATERIALOPTICALPROPERTYMISMATCH,
"reflectivity size ", reflectivity.size(), " mismatch: photonEnergy has size ",
photonEnergyVectorSize);
}
if (!efficiency.empty() && efficiency.size() != photonEnergyVectorSize) {
log->error(ERR_GMATERIALOPTICALPROPERTYMISMATCH,
"efficiency size ", efficiency.size(), " mismatch: photonEnergy has size ",
photonEnergyVectorSize);
}
if (!fastcomponent.empty() && fastcomponent.size() != photonEnergyVectorSize) {
log->error(ERR_GMATERIALOPTICALPROPERTYMISMATCH,
"fastcomponent size ", fastcomponent.size(), " mismatch: photonEnergy has size ",
photonEnergyVectorSize);
}
if (!slowcomponent.empty() && slowcomponent.size() != photonEnergyVectorSize) {
log->error(ERR_GMATERIALOPTICALPROPERTYMISMATCH,
"slowcomponent size ", slowcomponent.size(), " mismatch: photonEnergy has size ",
photonEnergyVectorSize);
}
if (!rayleigh.empty() && rayleigh.size() != photonEnergyVectorSize) {
log->error(ERR_GMATERIALOPTICALPROPERTYMISMATCH,
"rayleigh size ", rayleigh.size(), " mismatch: photonEnergy has size ",
photonEnergyVectorSize);
}
}
}
Expand Down