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
c688961d
Commit
c688961d
authored
2 years ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
correct name -> relayouts
parent
03b9a59c
No related branches found
No related tags found
1 merge request
!1275
streamline computation of scattering contributions
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Resample/Processed/ReSample.cpp
+4
-4
4 additions, 4 deletions
Resample/Processed/ReSample.cpp
Resample/Processed/ReSample.h
+2
-2
2 additions, 2 deletions
Resample/Processed/ReSample.h
with
6 additions
and
6 deletions
Resample/Processed/ReSample.cpp
+
4
−
4
View file @
c688961d
...
@@ -346,12 +346,12 @@ ReSample ReSample::make(const MultiLayer& sample)
...
@@ -346,12 +346,12 @@ ReSample ReSample::make(const MultiLayer& sample)
//...
//...
ReSample
::
ReSample
(
const
MultiLayer
&
sample
,
bool
polarized
,
std
::
vector
<
ReLayout
>&&
layouts
,
ReSample
::
ReSample
(
const
MultiLayer
&
sample
,
bool
polarized
,
std
::
vector
<
ReLayout
>&&
re
layouts
,
const
SliceStack
&
refined_stack
,
const
SliceStack
&
refined_stack
,
OwningVector
<
const
ParticleLayoutContribution
>&&
re2layouts
)
OwningVector
<
const
ParticleLayoutContribution
>&&
re2layouts
)
:
m_sample
(
sample
)
:
m_sample
(
sample
)
,
m_polarized
(
polarized
)
,
m_polarized
(
polarized
)
,
m_layouts
(
std
::
move
(
layouts
))
,
m_
re
layouts
(
std
::
move
(
re
layouts
))
,
m_stack
(
refined_stack
)
,
m_stack
(
refined_stack
)
,
m_re2layouts
(
std
::
move
(
re2layouts
))
,
m_re2layouts
(
std
::
move
(
re2layouts
))
{
{
...
@@ -374,9 +374,9 @@ const Slice& ReSample::avgeSlice(size_t i) const
...
@@ -374,9 +374,9 @@ const Slice& ReSample::avgeSlice(size_t i) const
return
m_stack
.
at
(
i
);
return
m_stack
.
at
(
i
);
}
}
const
std
::
vector
<
ReLayout
>&
ReSample
::
layouts
()
const
const
std
::
vector
<
ReLayout
>&
ReSample
::
re
layouts
()
const
{
{
return
m_layouts
;
return
m_
re
layouts
;
}
}
double
ReSample
::
sliceTopZ
(
size_t
i
)
const
double
ReSample
::
sliceTopZ
(
size_t
i
)
const
...
...
This diff is collapsed.
Click to expand it.
Resample/Processed/ReSample.h
+
2
−
2
View file @
c688961d
...
@@ -47,7 +47,7 @@ public:
...
@@ -47,7 +47,7 @@ public:
size_t
numberOfSlices
()
const
;
size_t
numberOfSlices
()
const
;
const
SliceStack
&
averageSlices
()
const
;
const
SliceStack
&
averageSlices
()
const
;
const
Slice
&
avgeSlice
(
size_t
i
)
const
;
const
Slice
&
avgeSlice
(
size_t
i
)
const
;
const
std
::
vector
<
ReLayout
>&
layouts
()
const
;
const
std
::
vector
<
ReLayout
>&
re
layouts
()
const
;
double
sliceTopZ
(
size_t
i
)
const
;
double
sliceTopZ
(
size_t
i
)
const
;
double
sliceBottomZ
(
size_t
i
)
const
;
double
sliceBottomZ
(
size_t
i
)
const
;
bool
containsMagneticMaterial
()
const
;
bool
containsMagneticMaterial
()
const
;
...
@@ -72,7 +72,7 @@ private:
...
@@ -72,7 +72,7 @@ private:
OwningVector
<
const
ParticleLayoutContribution
>&&
re2layouts
);
OwningVector
<
const
ParticleLayoutContribution
>&&
re2layouts
);
const
MultiLayer
&
m_sample
;
const
MultiLayer
&
m_sample
;
const
bool
m_polarized
;
const
bool
m_polarized
;
std
::
vector
<
ReLayout
>
m_layouts
;
// const forbidden by move c'tor < needed by tests
std
::
vector
<
ReLayout
>
m_
re
layouts
;
// const forbidden by move c'tor < needed by tests
const
SliceStack
m_stack
;
const
SliceStack
m_stack
;
OwningVector
<
const
ParticleLayoutContribution
>
m_re2layouts
;
OwningVector
<
const
ParticleLayoutContribution
>
m_re2layouts
;
};
};
...
...
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