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
e64c7d08
Commit
e64c7d08
authored
3 years ago
by
Martin Christoph Hierholzer
Browse files
Options
Downloads
Patches
Plain Diff
[#7951] pass unsed variables to Application for optimisation
No test yet, hence ticket added on github #63
parent
be57fda9
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/DoocsUpdater.h
+2
-0
2 additions, 0 deletions
include/DoocsUpdater.h
include/VariableMapper.h
+2
-0
2 additions, 0 deletions
include/VariableMapper.h
src/eq_create.cc
+9
-0
9 additions, 0 deletions
src/eq_create.cc
with
13 additions
and
0 deletions
include/DoocsUpdater.h
+
2
−
0
View file @
e64c7d08
...
...
@@ -37,6 +37,8 @@ namespace ChimeraTK {
void
addVariable
(
ChimeraTK
::
TransferElementAbstractor
variable
,
EqFct
*
eq_fct
,
std
::
function
<
void
()
>
updaterFunction
);
const
std
::
list
<
ChimeraTK
::
TransferElementAbstractor
>&
getElementsToRead
()
{
return
_elementsToRead
;
}
protected
:
std
::
list
<
ChimeraTK
::
TransferElementAbstractor
>
_elementsToRead
;
boost
::
thread
_syncThread
;
// we have to use boost thread to use interruption points
...
...
This diff is collapsed.
Click to expand it.
include/VariableMapper.h
+
2
−
0
View file @
e64c7d08
...
...
@@ -54,6 +54,8 @@ namespace ChimeraTK {
/// Functiont o convert a string into a DataConsistencyGroup::MatchingMode enum value
static
DataConsistencyGroup
::
MatchingMode
evaluateDataMatching
(
std
::
string
txt
);
const
std
::
set
<
std
::
string
>&
getUsedVariables
()
const
{
return
_usedInputVariables
;
}
protected
:
VariableMapper
()
=
default
;
...
...
This diff is collapsed.
Click to expand it.
src/eq_create.cc
+
9
−
0
View file @
e64c7d08
...
...
@@ -41,6 +41,15 @@ void eq_init_prolog() {
ChimeraTK
::
VariableMapper
::
getInstance
().
directImport
(
pvNames
);
}
// prepare list of unmapped read variables and pass it to the Application for optimisation
for
(
auto
&
p
:
ChimeraTK
::
VariableMapper
::
getInstance
().
getUsedVariables
())
{
auto
it
=
pvNames
.
find
(
p
);
if
(
it
!=
pvNames
.
end
())
{
pvNames
.
erase
(
it
);
}
}
ChimeraTK
::
ApplicationBase
::
getInstance
().
optimiseUnmappedVariables
(
pvNames
);
// activate the advanced archiver to have histories
set_arch_mode
(
1
);
}
...
...
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