rename member

Sample/Particle/IParticle.cpp

@@ -21,7 +21,7 @@ IParticle::~IParticle() = default;
 
 IFormFactor* IParticle::createFormFactor() const
 {
-    return createSlicedParticle(ZLimits{}).m_slicedff.release();
+    return createSlicedParticle(ZLimits{}).m_sliced_ff.release();
 }
 
 SlicedParticle IParticle::createSlicedParticle(ZLimits) const

Sample/Particle/MesoCrystal.cpp

@@ -59,7 +59,7 @@ SlicedParticle MesoCrystal::createSlicedParticle(ZLimits limits) const
     for (auto& region : regions)
         region.m_volume *= meso_volume;
     SlicedParticle result;
-    result.m_slicedff = std::move(total_ff);
+    result.m_sliced_ff = std::move(total_ff);
     result.m_regions = regions;
     return result;
 }

Sample/Particle/Particle.cpp

@@ -72,7 +72,7 @@ SlicedParticle Particle::createSlicedParticle(ZLimits limits) const
     P_ff->setMaterial(transformed_material);
     SlicedParticle result;
     result.m_regions.push_back({volume, transformed_material});
-    result.m_slicedff = std::move(P_ff);
+    result.m_sliced_ff = std::move(P_ff);
     return result;
 }
 

Sample/Particle/ParticleCoreShell.cpp

@@ -57,13 +57,13 @@ SlicedParticle ParticleCoreShell::createSlicedParticle(ZLimits limits) const
     P_shell->rotate(*P_rotation);
     P_shell->translate(m_position);
     auto sliced_shell = P_shell->createSlicedParticle(limits);
-    if (!sliced_shell.m_slicedff)
+    if (!sliced_shell.m_sliced_ff)
         return {};
 
     SlicedParticle result;
     // if core out of limits, return sliced shell
-    if (!sliced_core.m_slicedff) {
-        result.m_slicedff.reset(sliced_shell.m_slicedff.release());
+    if (!sliced_core.m_sliced_ff) {
+        result.m_sliced_ff.reset(sliced_shell.m_sliced_ff.release());
         result.m_regions.push_back(sliced_shell.m_regions.back());
         return result;
     }
@@ -72,12 +72,12 @@ SlicedParticle ParticleCoreShell::createSlicedParticle(ZLimits limits) const
     if (sliced_shell.m_regions.size() != 1)
         return {};
     auto shell_material = sliced_shell.m_regions[0].m_material;
-    sliced_core.m_slicedff->setAmbientMaterial(shell_material);
+    sliced_core.m_sliced_ff->setAmbientMaterial(shell_material);
 
     // construct sliced particle
     sliced_shell.m_regions.back().m_volume -= sliced_core.m_regions.back().m_volume;
-    result.m_slicedff.reset(new FormFactorCoreShell(sliced_core.m_slicedff.release(),
-                                                    sliced_shell.m_slicedff.release()));
+    result.m_sliced_ff.reset(new FormFactorCoreShell(sliced_core.m_sliced_ff.release(),
+                                                    sliced_shell.m_sliced_ff.release()));
     result.m_regions.push_back(sliced_core.m_regions.back());
     result.m_regions.push_back(sliced_shell.m_regions.back());
 

Sample/Particle/SlicedParticle.h

@@ -31,7 +31,7 @@
 //! @ingroup intern
 
 struct SlicedParticle {
-    std::unique_ptr<IFormFactor> m_slicedff;
+    std::unique_ptr<IFormFactor> m_sliced_ff;
     std::vector<HomogeneousRegion> m_regions;
 };
 

Sample/Slice/SlicedFormFactorList.cpp

@@ -120,7 +120,7 @@ void SlicedFormFactorList::addParticle(IParticle& particle, const SliceStack& sl
         // if particle is contained in this layer, set limits to infinite:
         ZLimits limits = single_layer ? ZLimits() : SlicesZLimits(slices, i);
         auto sliced_particle = particle.createSlicedParticle(limits);
-        m_ff_list.emplace_back(std::move(sliced_particle.m_slicedff), i);
+        m_ff_list.emplace_back(std::move(sliced_particle.m_sliced_ff), i);
         double thickness = slices[i].thicknessOr0();
         if (thickness > 0.0)
             ScaleRegions(sliced_particle.m_regions, 1 / thickness);