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
82615e09
Commit
82615e09
authored
5 years ago
by
Martin Killenberg
Browse files
Options
Downloads
Patches
Plain Diff
fixed typo in variable name
parent
25efa04d
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
include/VariableMapper.h
+2
-2
2 additions, 2 deletions
include/VariableMapper.h
src/VariableMapper.cc
+2
-2
2 additions, 2 deletions
src/VariableMapper.cc
with
4 additions
and
4 deletions
include/VariableMapper.h
+
2
−
2
View file @
82615e09
...
...
@@ -29,7 +29,7 @@ namespace ChimeraTK {
std
::
list
<
std
::
shared_ptr
<
PropertyDescription
>>
getPropertiesInLocation
(
std
::
string
location
)
const
;
std
::
list
<
std
::
shared_ptr
<
PropertyDescription
>>
const
&
getAllProperties
()
const
;
std
::
unordered_set
<
std
::
string
>
getAllLocations
()
const
;
std
::
map
<
std
::
string
,
int
>
getLocationAndCode
()
const
{
return
_inputLocationA
a
ndCode
;
}
std
::
map
<
std
::
string
,
int
>
getLocationAndCode
()
const
{
return
_inputLocationAndCode
;
}
VariableMapper
(
VariableMapper
&
)
=
delete
;
void
operator
=
(
VariableMapper
const
&
)
=
delete
;
...
...
@@ -54,7 +54,7 @@ namespace ChimeraTK {
protected
:
VariableMapper
()
=
default
;
std
::
map
<
std
::
string
,
int
>
_inputLocationA
a
ndCode
;
// map of location and fct_code,
std
::
map
<
std
::
string
,
int
>
_inputLocationAndCode
;
// map of location and fct_code,
// from location tag of the mapping xml file
std
::
set
<
std
::
string
>
_inputVariables
;
std
::
set
<
std
::
string
>
_usedInputVariables
;
// For tracing which variables are
...
...
This diff is collapsed.
Click to expand it.
src/VariableMapper.cc
+
2
−
2
View file @
82615e09
...
...
@@ -391,7 +391,7 @@ namespace ChimeraTK {
void
VariableMapper
::
processCode
(
xmlpp
::
Element
const
*
location
,
std
::
string
locationName
)
{
// If the the code is set in the location tag of the mapping xml file,
// this function adds the location and fct_code to a map _inputLocationA
a
ndCode.
// this function adds the location and fct_code to a map _inputLocationAndCode.
// It throws an exeption if the code is not an integer. The code must be greater than 1,
// because 1 is reserved for the server. And the code must be consistent.
auto
locationCodeAttribute
=
location
->
get_attribute
(
"code"
);
...
...
@@ -409,7 +409,7 @@ namespace ChimeraTK {
locationCodeAttribute
->
get_value
()
+
"' must be > 1, in doocs 1 is reserved for server"
);
}
auto
result
=
_inputLocationA
a
ndCode
.
insert
(
std
::
pair
<
std
::
string
,
int
>
(
locationName
,
locationCode
));
auto
result
=
_inputLocationAndCode
.
insert
(
std
::
pair
<
std
::
string
,
int
>
(
locationName
,
locationCode
));
if
(
result
.
second
==
false
)
{
//test if pair is already in map
if
(
result
.
first
->
second
!=
locationCode
)
{
//and test if code is the same like before
// maybe an exection is too much and a warning is enough?
...
...
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