Skip to content
Snippets Groups Projects
Commit 93533baf authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

clang-format

parent 092427ee
No related branches found
No related tags found
1 merge request!919copy edit in SampleToCore
...@@ -309,7 +309,7 @@ T* addFormFactorItem(std::variant<ParticleItem*, MesoCrystalItem*> parent) ...@@ -309,7 +309,7 @@ T* addFormFactorItem(std::variant<ParticleItem*, MesoCrystalItem*> parent)
// ************************************************************************************************ // ************************************************************************************************
void GUI::Transform::FromCore::set1DLatticeItem(Interference1DLatticeItem* item, void GUI::Transform::FromCore::set1DLatticeItem(Interference1DLatticeItem* item,
const Interference1DLattice& sample) const Interference1DLattice& sample)
{ {
item->length().set(sample.length()); item->length().set(sample.length());
item->rotationAngle().set(Units::rad2deg(sample.xi())); item->rotationAngle().set(Units::rad2deg(sample.xi()));
...@@ -320,7 +320,7 @@ void GUI::Transform::FromCore::set1DLatticeItem(Interference1DLatticeItem* item, ...@@ -320,7 +320,7 @@ void GUI::Transform::FromCore::set1DLatticeItem(Interference1DLatticeItem* item,
} }
void GUI::Transform::FromCore::set2DLatticeItem(Interference2DLatticeItem* item, void GUI::Transform::FromCore::set2DLatticeItem(Interference2DLatticeItem* item,
const Interference2DLattice& sample) const Interference2DLattice& sample)
{ {
set2DLatticeParameters(item, sample.lattice()); set2DLatticeParameters(item, sample.lattice());
...@@ -332,7 +332,7 @@ void GUI::Transform::FromCore::set2DLatticeItem(Interference2DLatticeItem* item, ...@@ -332,7 +332,7 @@ void GUI::Transform::FromCore::set2DLatticeItem(Interference2DLatticeItem* item,
} }
void GUI::Transform::FromCore::set2DParaCrystalItem(Interference2DParaCrystalItem* item, void GUI::Transform::FromCore::set2DParaCrystalItem(Interference2DParaCrystalItem* item,
const Interference2DParaCrystal& sample) const Interference2DParaCrystal& sample)
{ {
set2DLatticeParameters(item, sample.lattice()); set2DLatticeParameters(item, sample.lattice());
...@@ -352,7 +352,7 @@ void GUI::Transform::FromCore::set2DParaCrystalItem(Interference2DParaCrystalIte ...@@ -352,7 +352,7 @@ void GUI::Transform::FromCore::set2DParaCrystalItem(Interference2DParaCrystalIte
} }
void GUI::Transform::FromCore::setFinite2DLatticeItem(InterferenceFinite2DLatticeItem* item, void GUI::Transform::FromCore::setFinite2DLatticeItem(InterferenceFinite2DLatticeItem* item,
const InterferenceFinite2DLattice& sample) const InterferenceFinite2DLattice& sample)
{ {
set2DLatticeParameters(item, sample.lattice()); set2DLatticeParameters(item, sample.lattice());
...@@ -363,15 +363,15 @@ void GUI::Transform::FromCore::setFinite2DLatticeItem(InterferenceFinite2DLattic ...@@ -363,15 +363,15 @@ void GUI::Transform::FromCore::setFinite2DLatticeItem(InterferenceFinite2DLattic
} }
void GUI::Transform::FromCore::setHardDiskItem(InterferenceHardDiskItem* item, void GUI::Transform::FromCore::setHardDiskItem(InterferenceHardDiskItem* item,
const InterferenceHardDisk& sample) const InterferenceHardDisk& sample)
{ {
item->radius().set(sample.radius()); item->radius().set(sample.radius());
item->density().set(sample.density()); item->density().set(sample.density());
setPositionVariance(item, sample); setPositionVariance(item, sample);
} }
void GUI::Transform::FromCore::setRadialParaCrystalItem( void GUI::Transform::FromCore::setRadialParaCrystalItem(InterferenceRadialParaCrystalItem* item,
InterferenceRadialParaCrystalItem* item, const InterferenceRadialParaCrystal& sample) const InterferenceRadialParaCrystal& sample)
{ {
item->peakDistance().set(sample.peakDistance()); item->peakDistance().set(sample.peakDistance());
item->dampingLength().set(sample.dampingLength()); item->dampingLength().set(sample.dampingLength());
...@@ -384,7 +384,7 @@ void GUI::Transform::FromCore::setRadialParaCrystalItem( ...@@ -384,7 +384,7 @@ void GUI::Transform::FromCore::setRadialParaCrystalItem(
} }
void GUI::Transform::FromCore::setLayerItem(LayerItem* layerItem, const Layer* layer, void GUI::Transform::FromCore::setLayerItem(LayerItem* layerItem, const Layer* layer,
const LayerInterface* top_interface) const LayerInterface* top_interface)
{ {
layerItem->thickness().set(layer->thickness()); layerItem->thickness().set(layer->thickness());
layerItem->clearRoughness(); layerItem->clearRoughness();
...@@ -395,13 +395,13 @@ void GUI::Transform::FromCore::setLayerItem(LayerItem* layerItem, const Layer* l ...@@ -395,13 +395,13 @@ void GUI::Transform::FromCore::setLayerItem(LayerItem* layerItem, const Layer* l
if (GUI::Transform::FromCore::isValidRoughness(roughness)) { if (GUI::Transform::FromCore::isValidRoughness(roughness)) {
layerItem->setBasicRoughness(); layerItem->setBasicRoughness();
GUI::Transform::FromCore::setRoughnessItem(layerItem->roughness().currentItem(), GUI::Transform::FromCore::setRoughnessItem(layerItem->roughness().currentItem(),
*roughness); *roughness);
} }
} }
} }
void GUI::Transform::FromCore::setRoughnessItem(LayerBasicRoughnessItem* item, void GUI::Transform::FromCore::setRoughnessItem(LayerBasicRoughnessItem* item,
const LayerRoughness& sample) const LayerRoughness& sample)
{ {
item->sigma().set(sample.sigma()); item->sigma().set(sample.sigma());
item->hurst().set(sample.hurst()); item->hurst().set(sample.hurst());
...@@ -420,7 +420,7 @@ bool GUI::Transform::FromCore::isValidRoughness(const LayerRoughness* roughness) ...@@ -420,7 +420,7 @@ bool GUI::Transform::FromCore::isValidRoughness(const LayerRoughness* roughness)
} }
void GUI::Transform::FromCore::setGISASBeamItem(BeamItem* beam_item, void GUI::Transform::FromCore::setGISASBeamItem(BeamItem* beam_item,
const ScatteringSimulation& simulation) const ScatteringSimulation& simulation)
{ {
ASSERT(beam_item); ASSERT(beam_item);
const Beam& beam = simulation.beam(); const Beam& beam = simulation.beam();
...@@ -444,7 +444,7 @@ void GUI::Transform::FromCore::setGISASBeamItem(BeamItem* beam_item, ...@@ -444,7 +444,7 @@ void GUI::Transform::FromCore::setGISASBeamItem(BeamItem* beam_item,
} }
void GUI::Transform::FromCore::setOffspecBeamItem(BeamItem* beam_item, void GUI::Transform::FromCore::setOffspecBeamItem(BeamItem* beam_item,
const OffspecSimulation& simulation) const OffspecSimulation& simulation)
{ {
const Beam& beam = simulation.beam(); const Beam& beam = simulation.beam();
...@@ -456,7 +456,7 @@ void GUI::Transform::FromCore::setOffspecBeamItem(BeamItem* beam_item, ...@@ -456,7 +456,7 @@ void GUI::Transform::FromCore::setOffspecBeamItem(BeamItem* beam_item,
} }
void GUI::Transform::FromCore::setSpecularBeamItem(SpecularBeamItem* beam_item, void GUI::Transform::FromCore::setSpecularBeamItem(SpecularBeamItem* beam_item,
const SpecularSimulation& simulation) const SpecularSimulation& simulation)
{ {
const Beam& beam = simulation.beam(); const Beam& beam = simulation.beam();
...@@ -466,8 +466,7 @@ void GUI::Transform::FromCore::setSpecularBeamItem(SpecularBeamItem* beam_item, ...@@ -466,8 +466,7 @@ void GUI::Transform::FromCore::setSpecularBeamItem(SpecularBeamItem* beam_item,
beam_item->setAzimuthalAngle(0.0); // azimuthal angle is hardcoded beam_item->setAzimuthalAngle(0.0); // azimuthal angle is hardcoded
auto* axis_item = beam_item->inclinationAxis(); auto* axis_item = beam_item->inclinationAxis();
GUI::Transform::FromCore::setAxisItem(axis_item, *simulation.coordinateAxis(), GUI::Transform::FromCore::setAxisItem(axis_item, *simulation.coordinateAxis(), 1. / Units::deg);
1. / Units::deg);
setFootprintFactor(simulation.footprintFactor(), beam_item); setFootprintFactor(simulation.footprintFactor(), beam_item);
...@@ -492,7 +491,7 @@ void GUI::Transform::FromCore::setSpecularBeamItem(SpecularBeamItem* beam_item, ...@@ -492,7 +491,7 @@ void GUI::Transform::FromCore::setSpecularBeamItem(SpecularBeamItem* beam_item,
} }
void GUI::Transform::FromCore::updateDetector(Instrument2DItem* instrument_item, void GUI::Transform::FromCore::updateDetector(Instrument2DItem* instrument_item,
const ISimulation2D& simulation) const ISimulation2D& simulation)
{ {
const IDetector& detector = simulation.detector(); const IDetector& detector = simulation.detector();
setDetectorGeometry(instrument_item, detector); setDetectorGeometry(instrument_item, detector);
...@@ -505,7 +504,7 @@ void GUI::Transform::FromCore::updateDetector(Instrument2DItem* instrument_item, ...@@ -505,7 +504,7 @@ void GUI::Transform::FromCore::updateDetector(Instrument2DItem* instrument_item,
} }
void GUI::Transform::FromCore::setDetectorGeometry(Instrument2DItem* instrument_item, void GUI::Transform::FromCore::setDetectorGeometry(Instrument2DItem* instrument_item,
const IDetector& detector) const IDetector& detector)
{ {
if (const auto* det = dynamic_cast<const SphericalDetector*>(&detector)) { if (const auto* det = dynamic_cast<const SphericalDetector*>(&detector)) {
auto* item = instrument_item->setDetectorType<SphericalDetectorItem>(); auto* item = instrument_item->setDetectorType<SphericalDetectorItem>();
...@@ -519,7 +518,7 @@ void GUI::Transform::FromCore::setDetectorGeometry(Instrument2DItem* instrument_ ...@@ -519,7 +518,7 @@ void GUI::Transform::FromCore::setDetectorGeometry(Instrument2DItem* instrument_
} }
void GUI::Transform::FromCore::setDetectorResolution(DetectorItem* detector_item, void GUI::Transform::FromCore::setDetectorResolution(DetectorItem* detector_item,
const IDetector& detector) const IDetector& detector)
{ {
const IDetectorResolution* p_resfunc = detector.detectorResolution(); const IDetectorResolution* p_resfunc = detector.detectorResolution();
...@@ -545,7 +544,7 @@ void GUI::Transform::FromCore::setDetectorResolution(DetectorItem* detector_item ...@@ -545,7 +544,7 @@ void GUI::Transform::FromCore::setDetectorResolution(DetectorItem* detector_item
} }
void GUI::Transform::FromCore::setPolarizerAnalyzer(Instrument2DItem* instrument_item, void GUI::Transform::FromCore::setPolarizerAnalyzer(Instrument2DItem* instrument_item,
const ISimulation2D& simulation) const ISimulation2D& simulation)
{ {
instrument_item->setPolarization(simulation.beam().polVector()); instrument_item->setPolarization(simulation.beam().polVector());
...@@ -562,7 +561,7 @@ void GUI::Transform::FromCore::setPolarizerAnalyzer(Instrument2DItem* instrument ...@@ -562,7 +561,7 @@ void GUI::Transform::FromCore::setPolarizerAnalyzer(Instrument2DItem* instrument
} }
void GUI::Transform::FromCore::setSphericalDetector(SphericalDetectorItem* detectorItem, void GUI::Transform::FromCore::setSphericalDetector(SphericalDetectorItem* detectorItem,
const SphericalDetector& detector) const SphericalDetector& detector)
{ {
// Axes // Axes
const IAxis& phi_axis = detector.axis(0); const IAxis& phi_axis = detector.axis(0);
...@@ -580,7 +579,7 @@ void GUI::Transform::FromCore::setSphericalDetector(SphericalDetectorItem* detec ...@@ -580,7 +579,7 @@ void GUI::Transform::FromCore::setSphericalDetector(SphericalDetectorItem* detec
} }
void GUI::Transform::FromCore::setRectangularDetector(RectangularDetectorItem* detectorItem, void GUI::Transform::FromCore::setRectangularDetector(RectangularDetectorItem* detectorItem,
const RectangularDetector& detector) const RectangularDetector& detector)
{ {
// Axes // Axes
detectorItem->setXSize(detector.getNbinsX()); detectorItem->setXSize(detector.getNbinsX());
...@@ -628,7 +627,7 @@ void GUI::Transform::FromCore::setRectangularDetector(RectangularDetectorItem* d ...@@ -628,7 +627,7 @@ void GUI::Transform::FromCore::setRectangularDetector(RectangularDetectorItem* d
} }
void GUI::Transform::FromCore::setDetectorMasks(DetectorItem* detector_item, void GUI::Transform::FromCore::setDetectorMasks(DetectorItem* detector_item,
const ISimulation& simulation) const ISimulation& simulation)
{ {
const IDetector& detector = simulation.detector(); const IDetector& detector = simulation.detector();
if ((detector.detectorMask() && detector.detectorMask()->hasMasks()) if ((detector.detectorMask() && detector.detectorMask()->hasMasks())
...@@ -638,8 +637,8 @@ void GUI::Transform::FromCore::setDetectorMasks(DetectorItem* detector_item, ...@@ -638,8 +637,8 @@ void GUI::Transform::FromCore::setDetectorMasks(DetectorItem* detector_item,
} }
} }
void GUI::Transform::FromCore::setMaskContainer(MaskItems* destMaskItems, void GUI::Transform::FromCore::setMaskContainer(MaskItems* destMaskItems, const IDetector& detector,
const IDetector& detector, double scale) double scale)
{ {
const auto* detectorMask = detector.detectorMask(); const auto* detectorMask = detector.detectorMask();
for (size_t i_mask = 0; i_mask < detectorMask->numberOfMasks(); ++i_mask) { for (size_t i_mask = 0; i_mask < detectorMask->numberOfMasks(); ++i_mask) {
...@@ -740,7 +739,7 @@ void GUI::Transform::FromCore::setItemFromSample( ...@@ -740,7 +739,7 @@ void GUI::Transform::FromCore::setItemFromSample(
} }
void GUI::Transform::FromCore::setBackground(InstrumentItem* instrument_item, void GUI::Transform::FromCore::setBackground(InstrumentItem* instrument_item,
const ISimulation& simulation) const ISimulation& simulation)
{ {
const auto* p_bg = simulation.background(); const auto* p_bg = simulation.background();
if (const auto* p_constant_bg = dynamic_cast<const ConstantBackground*>(p_bg)) { if (const auto* p_constant_bg = dynamic_cast<const ConstantBackground*>(p_bg)) {
...@@ -752,7 +751,7 @@ void GUI::Transform::FromCore::setBackground(InstrumentItem* instrument_item, ...@@ -752,7 +751,7 @@ void GUI::Transform::FromCore::setBackground(InstrumentItem* instrument_item,
} }
void GUI::Transform::FromCore::setFootprintFactor(const IFootprintFactor* footprint, void GUI::Transform::FromCore::setFootprintFactor(const IFootprintFactor* footprint,
SpecularBeamItem* beam_item) SpecularBeamItem* beam_item)
{ {
if (!footprint) if (!footprint)
return; return;
...@@ -799,7 +798,7 @@ void GUI::Transform::FromCore::setRotation(ItemWithParticles* item, const IRotat ...@@ -799,7 +798,7 @@ void GUI::Transform::FromCore::setRotation(ItemWithParticles* item, const IRotat
} }
void GUI::Transform::FromCore::setInterference(ParticleLayoutItem* layoutItem, void GUI::Transform::FromCore::setInterference(ParticleLayoutItem* layoutItem,
const IInterference* interference) const IInterference* interference)
{ {
if (!interference) if (!interference)
layoutItem->removeInterference(); layoutItem->removeInterference();
...@@ -832,7 +831,7 @@ void GUI::Transform::FromCore::setInterference(ParticleLayoutItem* layoutItem, ...@@ -832,7 +831,7 @@ void GUI::Transform::FromCore::setInterference(ParticleLayoutItem* layoutItem,
} }
void GUI::Transform::FromCore::setFormFactor(std::variant<ParticleItem*, MesoCrystalItem*> parent, void GUI::Transform::FromCore::setFormFactor(std::variant<ParticleItem*, MesoCrystalItem*> parent,
const IFormFactor* iFormFactor) const IFormFactor* iFormFactor)
{ {
if (const auto* formfactor = dynamic_cast<const Pyramid2*>(iFormFactor)) { if (const auto* formfactor = dynamic_cast<const Pyramid2*>(iFormFactor)) {
auto* formfactorItem = addFormFactorItem<Pyramid2Item>(parent); auto* formfactorItem = addFormFactorItem<Pyramid2Item>(parent);
......
...@@ -122,7 +122,7 @@ void copyParticle(const IParticle* iparticle, MaterialItems& matItems, ...@@ -122,7 +122,7 @@ void copyParticle(const IParticle* iparticle, MaterialItems& matItems,
particleCompositionItem->setAbundance(particleComposition->abundance()); particleCompositionItem->setAbundance(particleComposition->abundance());
particleCompositionItem->setPosition(particleComposition->particlePosition()); particleCompositionItem->setPosition(particleComposition->particlePosition());
GUI::Transform::FromCore::setRotation(particleCompositionItem, GUI::Transform::FromCore::setRotation(particleCompositionItem,
particleComposition->rotation()); particleComposition->rotation());
addToParent(particleCompositionItem); addToParent(particleCompositionItem);
for (const auto* p : particleComposition->particles()) for (const auto* p : particleComposition->particles())
......
...@@ -53,13 +53,12 @@ void setParameterDistributionToSimulation(ParameterDistribution::WhichParameter ...@@ -53,13 +53,12 @@ void setParameterDistributionToSimulation(ParameterDistribution::WhichParameter
} }
//! adds DistributionParameters to the ISimulation //! adds DistributionParameters to the ISimulation
void addDistributionParametersToSimulation(const BeamItem& item, void addDistributionParametersToSimulation(const BeamItem& item, ScatteringSimulation& simulation)
ScatteringSimulation& simulation)
{ {
ASSERT(dynamic_cast<const GISASBeamItem*>(&item)); ASSERT(dynamic_cast<const GISASBeamItem*>(&item));
setParameterDistributionToSimulation<BeamWavelengthItem>( setParameterDistributionToSimulation<BeamWavelengthItem>(ParameterDistribution::BeamWavelength,
ParameterDistribution::BeamWavelength, item.wavelengthItem(), simulation); item.wavelengthItem(), simulation);
setParameterDistributionToSimulation<BeamInclinationAngleItem>( setParameterDistributionToSimulation<BeamInclinationAngleItem>(
ParameterDistribution::BeamInclinationAngle, item.inclinationAngleItem(), simulation); ParameterDistribution::BeamInclinationAngle, item.inclinationAngleItem(), simulation);
setParameterDistributionToSimulation<BeamAzimuthalAngleItem>( setParameterDistributionToSimulation<BeamAzimuthalAngleItem>(
...@@ -78,8 +77,7 @@ std::unique_ptr<ScanResolution> createScanResolution(const BeamDistributionItem* ...@@ -78,8 +77,7 @@ std::unique_ptr<ScanResolution> createScanResolution(const BeamDistributionItem*
if (!item) if (!item)
return nullptr; return nullptr;
const auto* distr_item = const auto* distr_item = dynamic_cast<const SymmetricResolutionItem*>(item->distribution());
dynamic_cast<const SymmetricResolutionItem*>(item->distribution());
if (!distr_item) if (!distr_item)
return nullptr; return nullptr;
...@@ -173,8 +171,8 @@ DepthProbeSimulation* createDepthProbeSimulation(std::unique_ptr<MultiLayer> sam ...@@ -173,8 +171,8 @@ DepthProbeSimulation* createDepthProbeSimulation(std::unique_ptr<MultiLayer> sam
std::unique_ptr<ISimulation> std::unique_ptr<ISimulation>
GUI::Transform::ToCore::itemsToSimulation(const MultiLayerItem* sampleItem, GUI::Transform::ToCore::itemsToSimulation(const MultiLayerItem* sampleItem,
const InstrumentItem* instrumentItem, const InstrumentItem* instrumentItem,
const SimulationOptionsItem& optionsItem) const SimulationOptionsItem& optionsItem)
{ {
ASSERT(sampleItem); ASSERT(sampleItem);
ASSERT(instrumentItem); ASSERT(instrumentItem);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment