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
b11e8637
Commit
b11e8637
authored
2 years ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
merge fcts
parent
d921479f
No related branches found
No related tags found
1 merge request
!1303
simplifications of resolution handling; resolve warnings
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Sim/Export/SimulationToPython.cpp
+2
-2
2 additions, 2 deletions
Sim/Export/SimulationToPython.cpp
Sim/Scan/ScanResolution.h
+0
-6
0 additions, 6 deletions
Sim/Scan/ScanResolution.h
with
2 additions
and
8 deletions
Sim/Export/SimulationToPython.cpp
+
2
−
2
View file @
b11e8637
...
...
@@ -97,12 +97,12 @@ std::string defineAlphaScan(const AlphaScan& scan)
if
(
const
auto
*
r
=
scan
.
angleResolution
();
r
&&
r
->
rdistribution
())
{
result
<<
Py
::
Fmt2
::
printRangedDistribution
(
*
r
->
rdistribution
())
<<
"
\n
"
;
result
<<
indent
()
<<
"scan.setAbsoluteAngularResolution(distribution, "
<<
Py
::
Fmt
::
printDouble
(
r
->
delta
())
<<
")
\n
"
;
<<
Py
::
Fmt
::
printDouble
(
r
->
stdDev
())
<<
")
\n
"
;
}
if
(
const
auto
*
r
=
scan
.
wavelengthResolution
();
r
&&
r
->
rdistribution
())
{
result
<<
Py
::
Fmt2
::
printRangedDistribution
(
*
r
->
rdistribution
())
<<
"
\n
"
;
result
<<
indent
()
<<
"scan.setWavelengthResolution(distribution, "
<<
Py
::
Fmt
::
printDouble
(
r
->
delta
())
<<
")
\n
"
;
<<
Py
::
Fmt
::
printDouble
(
r
->
stdDev
())
<<
")
\n
"
;
}
return
result
.
str
();
}
...
...
This diff is collapsed.
Click to expand it.
Sim/Scan/ScanResolution.h
+
0
−
6
View file @
b11e8637
...
...
@@ -43,12 +43,6 @@ public:
return
m_stddev
;
}
//... For export:
double
delta
()
const
{
return
m_stddev
;
}
protected
:
std
::
unique_ptr
<
IRangedDistribution
>
m_distr
;
//!< basic distribution function
double
m_stddev
;
//!< deltas for computing resolutions
...
...
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