Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
489574b3
Commit
489574b3
authored
2 years ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
rename member variable -> ReLyout::m_particles
parent
911963d6
No related branches found
No related tags found
1 merge request
!1057
simplify slicing: get rid of slice2admixtures
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Resample/Processed/ReLayout.cpp
+2
-2
2 additions, 2 deletions
Resample/Processed/ReLayout.cpp
Resample/Processed/ReLayout.h
+3
-3
3 additions, 3 deletions
Resample/Processed/ReLayout.h
auto/Wrap/doxygenResample.i
+1
-1
1 addition, 1 deletion
auto/Wrap/doxygenResample.i
with
6 additions
and
6 deletions
Resample/Processed/ReLayout.cpp
+
2
−
2
View file @
489574b3
...
...
@@ -25,10 +25,10 @@ namespace {
// class implementation
// ************************************************************************************************
ReLayout
::
ReLayout
(
double
surface_density
,
OwningVector
<
const
CoheringSubparticles
>&&
formfactor
s
,
ReLayout
::
ReLayout
(
double
surface_density
,
OwningVector
<
const
CoheringSubparticles
>&&
particle
s
,
const
IInterference
*
iff
,
std
::
map
<
size_t
,
Admixtures
>&&
slice2admixtures
)
:
m_surface_density
(
surface_density
)
,
m_
formfactor
s
(
std
::
move
(
formfactor
s
))
,
m_
particle
s
(
std
::
move
(
particle
s
))
,
m_iff
(
iff
)
,
m_slice2admixtures
(
std
::
move
(
slice2admixtures
))
{
...
...
This diff is collapsed.
Click to expand it.
Resample/Processed/ReLayout.h
+
3
−
3
View file @
489574b3
...
...
@@ -34,20 +34,20 @@ class Admixtures;
class
ReLayout
{
public:
ReLayout
(
double
surface_density
,
OwningVector
<
const
CoheringSubparticles
>&&
formfactor
s
,
ReLayout
(
double
surface_density
,
OwningVector
<
const
CoheringSubparticles
>&&
particle
s
,
const
IInterference
*
iff
,
std
::
map
<
size_t
,
Admixtures
>&&
slice2admixtures
);
ReLayout
(
ReLayout
&&
other
);
~
ReLayout
();
double
surfaceDensity
()
const
{
return
m_surface_density
;
}
const
OwningVector
<
const
CoheringSubparticles
>&
formfactorList
()
const
{
return
m_
formfactor
s
;
}
const
OwningVector
<
const
CoheringSubparticles
>&
formfactorList
()
const
{
return
m_
particle
s
;
}
const
IInterference
*
interferenceFunction
()
const
{
return
m_iff
.
get
();
}
const
std
::
map
<
size_t
,
Admixtures
>&
slice2admixtures
()
const
{
return
m_slice2admixtures
;
}
private
:
const
double
m_surface_density
;
OwningVector
<
const
CoheringSubparticles
>
m_
formfactor
s
;
OwningVector
<
const
CoheringSubparticles
>
m_
particle
s
;
std
::
unique_ptr
<
const
IInterference
>
m_iff
;
std
::
map
<
size_t
,
Admixtures
>
m_slice2admixtures
;
};
...
...
This diff is collapsed.
Click to expand it.
auto/Wrap/doxygenResample.i
+
1
−
1
View file @
489574b3
...
...
@@ -440,7 +440,7 @@ It is set by the preprocessor makeReLayout in ReSample.cpp.
C++ includes: ReLayout.h
"
;
%
feature
(
"
docstring
"
)
ReLayout
::
ReLayout
"
ReLayout::ReLayout(double surface_density, OwningVector< const CoheringSubparticles > &&
formfactor
s, const IInterference *iff, std::map< size_t, Admixtures > &&slice2admixtures)
%
feature
(
"
docstring
"
)
ReLayout
::
ReLayout
"
ReLayout::ReLayout(double surface_density, OwningVector< const CoheringSubparticles > &&
particle
s, const IInterference *iff, std::map< size_t, Admixtures > &&slice2admixtures)
ReLayout::ReLayout
"
;
%
feature
(
"
docstring
"
)
ReLayout
::
ReLayout
"
ReLayout::ReLayout(ReLayout &&other)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment