Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
ControlSystemAdapter-DoocsAdapter
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
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ChimeraTK Mirror
ControlSystemAdapter-DoocsAdapter
Commits
66b7fc24
Commit
66b7fc24
authored
7 years ago
by
Martin Killenberg
Browse files
Options
Downloads
Patches
Plain Diff
static x-axis scaling work for D_spectra
parent
d9e38a98
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/VariableMapper.cc
+9
-0
9 additions, 0 deletions
src/VariableMapper.cc
tests/include/serverBasedTestTools.h
+0
-4
0 additions, 4 deletions
tests/include/serverBasedTestTools.h
with
9 additions
and
4 deletions
src/VariableMapper.cc
+
9
−
0
View file @
66b7fc24
...
...
@@ -148,6 +148,15 @@ namespace ChimeraTK{
processHistoryAndWritableAttributes
(
spectrumDescription
,
spectrumXml
,
locationName
);
auto
startNodes
=
spectrumXml
->
get_children
(
"start"
);
if
(
!
startNodes
.
empty
()){
spectrumDescription
->
start
=
std
::
stof
(
getContentString
(
startNodes
.
front
()));
}
auto
incrementNodes
=
spectrumXml
->
get_children
(
"increment"
);
if
(
!
incrementNodes
.
empty
()){
spectrumDescription
->
increment
=
std
::
stof
(
getContentString
(
incrementNodes
.
front
()));
}
addDescription
(
spectrumDescription
,
absoluteSource
);
}
...
...
This diff is collapsed.
Click to expand it.
tests/include/serverBasedTestTools.h
+
0
−
4
View file @
66b7fc24
...
...
@@ -66,10 +66,6 @@ void checkSpectrum(std::string const & propertyAddress, bool expected_has_histor
D_spectrum
*
spectrum
=
dynamic_cast
<
D_spectrum
*>
(
eqFct
->
find_property
(
propertyName
));
BOOST_REQUIRE_MESSAGE
(
spectrum
,
"Could not find property "
+
propertyName
+
" (address "
<<
propertyAddress
<<
"), or property has unexpected type."
);
std
::
cout
<<
"The magic 4 "
<<
spectrum
->
spec_time
()
<<
", "
<<
spectrum
->
spec_start
()
<<
", "
<<
spectrum
->
spec_inc
()
<<
", "
<<
spectrum
->
spec_status
()
<<
std
::
endl
;
BOOST_CHECK
(
std
::
fabs
(
spectrum
->
spec_start
()
-
expected_start
)
<
0.001
);
BOOST_CHECK
(
std
::
fabs
(
spectrum
->
spec_inc
()
-
expected_increment
)
<
0.001
);
}
...
...
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