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
11e5befb
Commit
11e5befb
authored
3 years ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
Polyhedron: simplify
parent
64d40113
No related branches found
No related tags found
1 merge request
!594
Depend on libformfactor; rename pyramid classes; add formfactors of Platonic 4 and 8-hedra
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Sample/ff/Polyhedron.cpp
+2
-4
2 additions, 4 deletions
Sample/ff/Polyhedron.cpp
with
2 additions
and
4 deletions
Sample/ff/Polyhedron.cpp
+
2
−
4
View file @
11e5befb
...
@@ -113,17 +113,15 @@ std::vector<R3> ff::Polyhedron::vertices() const
...
@@ -113,17 +113,15 @@ std::vector<R3> ff::Polyhedron::vertices() const
//! Returns the form factor F(q) of this polyhedron, respecting the offset z_bottom.
//! Returns the form factor F(q) of this polyhedron, respecting the offset z_bottom.
complex_t
ff
::
Polyhedron
::
formfactor_at_bottom
(
const
C3
&
_
q
)
const
complex_t
ff
::
Polyhedron
::
formfactor_at_bottom
(
const
C3
&
q
)
const
{
{
C3
q
{
_q
};
return
exp_I
(
-
m_z_bottom
*
q
.
z
())
*
formfactor_at_center
(
q
);
return
exp_I
(
-
m_z_bottom
*
q
.
z
())
*
formfactor_at_center
(
q
);
}
}
//! Returns the form factor F(q) of this polyhedron, with origin at z=0.
//! Returns the form factor F(q) of this polyhedron, with origin at z=0.
complex_t
ff
::
Polyhedron
::
formfactor_at_center
(
const
C3
&
_
q
)
const
complex_t
ff
::
Polyhedron
::
formfactor_at_center
(
const
C3
&
q
)
const
{
{
C3
q
{
_q
};
double
q_red
=
m_radius
*
q
.
mag
();
double
q_red
=
m_radius
*
q
.
mag
();
#ifdef ALGORITHM_DIAGNOSTIC
#ifdef ALGORITHM_DIAGNOSTIC
polyhedralDiagnosis
.
reset
();
polyhedralDiagnosis
.
reset
();
...
...
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