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
feafd483
Commit
feafd483
authored
4 years ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
function name not capitalized
parent
c3b2d529
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Core/Computation/ProcessedLayout.cpp
+2
-2
2 additions, 2 deletions
Core/Computation/ProcessedLayout.cpp
Core/Computation/ProcessedLayout.h
+1
-1
1 addition, 1 deletion
Core/Computation/ProcessedLayout.h
with
3 additions
and
3 deletions
Core/Computation/ProcessedLayout.cpp
+
2
−
2
View file @
feafd483
...
@@ -81,7 +81,7 @@ void ProcessedLayout::collectFormFactors(const ILayout& layout, const std::vecto
...
@@ -81,7 +81,7 @@ void ProcessedLayout::collectFormFactors(const ILayout& layout, const std::vecto
{
{
double
layout_abundance
=
layout
.
getTotalAbundance
();
double
layout_abundance
=
layout
.
getTotalAbundance
();
for
(
auto
p_particle
:
layout
.
particles
())
{
for
(
auto
p_particle
:
layout
.
particles
())
{
auto
ff_coh
=
P
rocessParticle
(
*
p_particle
,
slices
,
z_ref
);
auto
ff_coh
=
p
rocessParticle
(
*
p_particle
,
slices
,
z_ref
);
ff_coh
.
scaleRelativeAbundance
(
layout_abundance
);
ff_coh
.
scaleRelativeAbundance
(
layout_abundance
);
m_formfactors
.
push_back
(
std
::
move
(
ff_coh
));
m_formfactors
.
push_back
(
std
::
move
(
ff_coh
));
}
}
...
@@ -91,7 +91,7 @@ void ProcessedLayout::collectFormFactors(const ILayout& layout, const std::vecto
...
@@ -91,7 +91,7 @@ void ProcessedLayout::collectFormFactors(const ILayout& layout, const std::vecto
ScaleRegionMap
(
m_region_map
,
scale_factor
);
ScaleRegionMap
(
m_region_map
,
scale_factor
);
}
}
FormFactorCoherentSum
ProcessedLayout
::
P
rocessParticle
(
const
IParticle
&
particle
,
FormFactorCoherentSum
ProcessedLayout
::
p
rocessParticle
(
const
IParticle
&
particle
,
const
std
::
vector
<
Slice
>&
slices
,
const
std
::
vector
<
Slice
>&
slices
,
double
z_ref
)
double
z_ref
)
{
{
...
...
This diff is collapsed.
Click to expand it.
Core/Computation/ProcessedLayout.h
+
1
−
1
View file @
feafd483
...
@@ -50,7 +50,7 @@ public:
...
@@ -50,7 +50,7 @@ public:
private:
private:
void
collectFormFactors
(
const
ILayout
&
layout
,
const
std
::
vector
<
Slice
>&
slices
,
double
z_ref
);
void
collectFormFactors
(
const
ILayout
&
layout
,
const
std
::
vector
<
Slice
>&
slices
,
double
z_ref
);
FormFactorCoherentSum
P
rocessParticle
(
const
IParticle
&
particle
,
FormFactorCoherentSum
p
rocessParticle
(
const
IParticle
&
particle
,
const
std
::
vector
<
Slice
>&
slices
,
double
z_ref
);
const
std
::
vector
<
Slice
>&
slices
,
double
z_ref
);
void
mergeRegionMap
(
const
std
::
map
<
size_t
,
std
::
vector
<
HomogeneousRegion
>>&
region_map
);
void
mergeRegionMap
(
const
std
::
map
<
size_t
,
std
::
vector
<
HomogeneousRegion
>>&
region_map
);
const
IFresnelMap
*
m_fresnel_map
;
const
IFresnelMap
*
m_fresnel_map
;
...
...
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