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
58eb1a68
Commit
58eb1a68
authored
3 years ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
rename -> m_rotMatrix
parent
0e51378d
No related branches found
Branches containing commit
No related tags found
1 merge request
!530
Rename Transform3D -> RotMatrix
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Sample/Scattering/FormFactorDecoratorRotation.cpp
+7
-7
7 additions, 7 deletions
Sample/Scattering/FormFactorDecoratorRotation.cpp
Sample/Scattering/FormFactorDecoratorRotation.h
+1
-1
1 addition, 1 deletion
Sample/Scattering/FormFactorDecoratorRotation.h
with
8 additions
and
8 deletions
Sample/Scattering/FormFactorDecoratorRotation.cpp
+
7
−
7
View file @
58eb1a68
...
...
@@ -21,40 +21,40 @@ FormFactorDecoratorRotation::FormFactorDecoratorRotation(const IFormFactor& ff,
const
IRotation
&
rotation
)
:
IFormFactorDecorator
(
ff
)
{
m_
transform
=
rotation
.
getTransform3D
();
m_
rotMatrix
=
rotation
.
getTransform3D
();
}
FormFactorDecoratorRotation
*
FormFactorDecoratorRotation
::
clone
()
const
{
return
new
FormFactorDecoratorRotation
(
*
m_ff
,
m_
transform
);
return
new
FormFactorDecoratorRotation
(
*
m_ff
,
m_
rotMatrix
);
}
double
FormFactorDecoratorRotation
::
bottomZ
(
const
IRotation
*
rotation
)
const
{
Transform3D
transform
=
rotation
?
rotation
->
getTransform3D
()
:
Transform3D
();
std
::
unique_ptr
<
IRotation
>
total_rotation
(
IRotation
::
createRotation
(
transform
*
m_
transform
));
std
::
unique_ptr
<
IRotation
>
total_rotation
(
IRotation
::
createRotation
(
transform
*
m_
rotMatrix
));
return
m_ff
->
bottomZ
(
total_rotation
.
get
());
}
double
FormFactorDecoratorRotation
::
topZ
(
const
IRotation
*
rotation
)
const
{
Transform3D
transform
=
rotation
?
rotation
->
getTransform3D
()
:
Transform3D
();
std
::
unique_ptr
<
IRotation
>
total_rotation
(
IRotation
::
createRotation
(
transform
*
m_
transform
));
std
::
unique_ptr
<
IRotation
>
total_rotation
(
IRotation
::
createRotation
(
transform
*
m_
rotMatrix
));
return
m_ff
->
topZ
(
total_rotation
.
get
());
}
complex_t
FormFactorDecoratorRotation
::
theFF
(
const
WavevectorInfo
&
wavevectors
)
const
{
return
m_ff
->
theFF
(
wavevectors
.
transformed
(
m_
transform
.
getInverse
()));
return
m_ff
->
theFF
(
wavevectors
.
transformed
(
m_
rotMatrix
.
getInverse
()));
}
Eigen
::
Matrix2cd
FormFactorDecoratorRotation
::
thePolFF
(
const
WavevectorInfo
&
wavevectors
)
const
{
return
m_ff
->
thePolFF
(
wavevectors
.
transformed
(
m_
transform
.
getInverse
()));
return
m_ff
->
thePolFF
(
wavevectors
.
transformed
(
m_
rotMatrix
.
getInverse
()));
}
FormFactorDecoratorRotation
::
FormFactorDecoratorRotation
(
const
IFormFactor
&
ff
,
const
Transform3D
&
transform
)
:
IFormFactorDecorator
(
ff
),
m_
transform
(
transform
)
:
IFormFactorDecorator
(
ff
),
m_
rotMatrix
(
transform
)
{
}
This diff is collapsed.
Click to expand it.
Sample/Scattering/FormFactorDecoratorRotation.h
+
1
−
1
View file @
58eb1a68
...
...
@@ -47,7 +47,7 @@ public:
#endif
private
:
Transform3D
m_
transform
;
Transform3D
m_
rotMatrix
;
//! Private constructor for cloning.
FormFactorDecoratorRotation
(
const
IFormFactor
&
ff
,
const
Transform3D
&
transform
);
};
...
...
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