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
6fda867c
Commit
6fda867c
authored
7 years ago
by
Martin Killenberg
Browse files
Options
Downloads
Patches
Plain Diff
improved debug printout of VariableMapper
parent
f57f61fc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/PropertyDescription.h
+14
-0
14 additions, 0 deletions
include/PropertyDescription.h
src/VariableMapper.cc
+3
-6
3 additions, 6 deletions
src/VariableMapper.cc
src/eq_create.cc
+1
-1
1 addition, 1 deletion
src/eq_create.cc
with
18 additions
and
7 deletions
include/PropertyDescription.h
+
14
−
0
View file @
6fda867c
...
...
@@ -38,6 +38,10 @@ namespace ChimeraTK{
virtual
const
std
::
type_info
&
type
()
const
{
return
typeid
(
PropertyDescription
);
}
virtual
void
print
(
std
::
ostream
&
os
=
std
::
cout
)
const
{
os
<<
location
<<
" / "
<<
name
<<
std
::
endl
;
}
};
// Combines property attributes and the base description
...
...
@@ -58,6 +62,10 @@ namespace ChimeraTK{
virtual
const
std
::
type_info
&
type
()
const
override
{
return
typeid
(
AutoPropertyDescription
);
}
virtual
void
print
(
std
::
ostream
&
os
=
std
::
cout
)
const
{
os
<<
source
<<
" -> "
<<
location
<<
" / "
<<
name
<<
std
::
endl
;
}
};
struct
ArrayDescription
:
public
AutoPropertyDescription
{
...
...
@@ -106,6 +114,12 @@ namespace ChimeraTK{
virtual
const
std
::
type_info
&
type
()
const
{
return
typeid
(
SpectrumDescription
);
}
virtual
void
print
(
std
::
ostream
&
os
=
std
::
cout
)
const
{
os
<<
source
<<
" -> "
<<
location
<<
" / "
<<
name
<<
" (startSource = "
<<
startSource
<<
", incrementSource = "
<<
incrementSource
<<
")"
<<
std
::
endl
;
}
};
// struct SpectrumDescription:
...
...
This diff is collapsed.
Click to expand it.
src/VariableMapper.cc
+
3
−
6
View file @
6fda867c
...
...
@@ -342,14 +342,11 @@ namespace ChimeraTK{
/// printing the map is useful for debugging
void
VariableMapper
::
print
(
std
::
ostream
&
os
)
const
{
os
<<
"====== VariableMapper ====="
<<
std
::
endl
;
for
(
auto
&
description
:
_descriptions
){
// FIXME: commenting out the history already shows that there is something wrong
// each description needs << overloaded.
os
<<
description
->
location
<<
" / "
<<
description
->
name
// << " hasHistory:" << propertyDescription.hasHistory
// << " isWriteable:" << propertyDescription.isWriteable
<<
std
::
endl
;
description
->
print
(
os
);
}
os
<<
"======= Mapping End ======="
<<
std
::
endl
;
}
bool
VariableMapper
::
evaluateBool
(
std
::
string
txt
){
...
...
This diff is collapsed.
Click to expand it.
src/eq_create.cc
+
1
−
1
View file @
6fda867c
...
...
@@ -32,7 +32,7 @@ void eq_init_prolog() {
std
::
cerr
<<
"WARNIUNG: No XML file for the Doocs variable config found. Trying direct import."
<<
std
::
endl
;
ChimeraTK
::
VariableMapper
::
getInstance
().
directImport
(
pvNames
);
}
std
::
cout
<<
"here is the mapping:"
<<
std
::
endl
;
// print the mapping for debug purposes
ChimeraTK
::
VariableMapper
::
getInstance
().
print
();
// activate the advanced archiver to have histories
...
...
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