diff --git a/Core/Fitting/SimDataPair.cpp b/Core/Fitting/SimDataPair.cpp index 61b016d48a6aa728b739026e8837da1a84fd8f5d..a62c28e66b0dd778a414786d2c2422a9015ae352 100644 --- a/Core/Fitting/SimDataPair.cpp +++ b/Core/Fitting/SimDataPair.cpp @@ -37,7 +37,7 @@ std::unique_ptr<OutputData<double>> initUserWeights(const OutputData<double>& sh return result; } -bool detHasSameDimensions(const IDetector& detector, const OutputData<double>& data) +bool haveSameDimensions(const IDetector& detector, const OutputData<double>& data) { if (data.rank() != detector.dimension()) return false; @@ -55,16 +55,17 @@ bool detHasSameDimensions(const IDetector& detector, const OutputData<double>& d SimulationResult convertData(const ISimulation& simulation, const OutputData<double>& data) { - const ICoordSystem* converter = simulation.createCoordSystem(); - auto roi_data = converter->createOutputData(converter->defaultUnits()); + const ICoordSystem* coordSystem = simulation.createCoordSystem(); + auto roi_data = coordSystem->createOutputData(coordSystem->defaultUnits()); if (roi_data->hasSameDimensions(data)) { // data is already cropped to ROI simulation.detector().iterateOverNonMaskedPoints([&](IDetector::const_iterator it) { (*roi_data)[it.roiIndex()] = data[it.roiIndex()]; }); - } else if (detHasSameDimensions(simulation.detector(), data)) { - // exp data has same shape as the detector, we have to put orig data to smaller roi map + } else if (haveSameDimensions(simulation.detector(), data)) { + // experimental data has same shape as the detector, we have to put orig data to smaller roi + // map simulation.detector().iterateOverNonMaskedPoints([&](IDetector::const_iterator it) { (*roi_data)[it.roiIndex()] = data[it.detectorIndex()]; }); @@ -72,7 +73,7 @@ SimulationResult convertData(const ISimulation& simulation, const OutputData<dou throw std::runtime_error( "FitObject::init_dataset: Detector and experimental data have different shape"); - return SimulationResult(*roi_data, std::move(converter)); + return SimulationResult(*roi_data, std::move(coordSystem)); } } // namespace