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
d3af3ab8
Commit
d3af3ab8
authored
7 years ago
by
Martin Killenberg
Browse files
Options
Downloads
Patches
Plain Diff
made the adapter work with the upcoming release of DOOCS
parent
f703b7e4
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/CSAdapterEqFct.h
+1
-1
1 addition, 1 deletion
include/CSAdapterEqFct.h
src/CSAdapterEqFct.cc
+7
-4
7 additions, 4 deletions
src/CSAdapterEqFct.cc
with
8 additions
and
5 deletions
include/CSAdapterEqFct.h
+
1
−
1
View file @
d3af3ab8
...
@@ -16,7 +16,7 @@ class CSAdapterEqFct : public EqFct , boost::noncopyable {
...
@@ -16,7 +16,7 @@ class CSAdapterEqFct : public EqFct , boost::noncopyable {
boost
::
shared_ptr
<
ControlSystemPVManager
>
controlSystemPVManager_
;
boost
::
shared_ptr
<
ControlSystemPVManager
>
controlSystemPVManager_
;
int
fctCode_
;
int
fctCode_
;
std
::
vector
<
boost
::
shared_ptr
<
D_fct
>
>
doocsProperties_
;
std
::
vector
<
boost
::
shared_ptr
<
D_fct
>
>
doocsProperties_
;
void
registerProcessVariablesInDoocs
(
std
::
string
const
&
fctName
);
void
registerProcessVariablesInDoocs
();
std
::
vector
<
ChimeraTK
::
ProcessVariable
::
SharedPtr
>
getProcessVariablesInThisLocation
();
std
::
vector
<
ChimeraTK
::
ProcessVariable
::
SharedPtr
>
getProcessVariablesInThisLocation
();
static
bool
emptyLocationVariablesHandled
;
static
bool
emptyLocationVariablesHandled
;
...
...
This diff is collapsed.
Click to expand it.
src/CSAdapterEqFct.cc
+
7
−
4
View file @
d3af3ab8
...
@@ -19,8 +19,11 @@ namespace ChimeraTK{
...
@@ -19,8 +19,11 @@ namespace ChimeraTK{
controlSystemPVManager_
(
controlSystemPVManager
),
controlSystemPVManager_
(
controlSystemPVManager
),
fctCode_
(
fctCode
),
updater_
(
updater
){
fctCode_
(
fctCode
),
updater_
(
updater
){
std
::
cout
<<
"CSAdapterEqFct::CSAdapterEqFct name is "
<<
name
()
<<
std
::
endl
;
// When testing the EqFct stand alone, the name is not set properly. Do this with the additional parameter of this constructor.
registerProcessVariablesInDoocs
(
fctName
);
if
(
name
().
empty
()){
name_
.
assign
(
fctName
);
}
registerProcessVariablesInDoocs
();
}
}
CSAdapterEqFct
::~
CSAdapterEqFct
(){
CSAdapterEqFct
::~
CSAdapterEqFct
(){
...
@@ -36,11 +39,11 @@ namespace ChimeraTK{
...
@@ -36,11 +39,11 @@ namespace ChimeraTK{
return
fctCode_
;
return
fctCode_
;
}
}
void
CSAdapterEqFct
::
registerProcessVariablesInDoocs
(
std
::
string
const
&
fctName
){
void
CSAdapterEqFct
::
registerProcessVariablesInDoocs
(){
// We only need the factory inside this function
// We only need the factory inside this function
DoocsPVFactory
factory
(
this
,
*
updater_
,
controlSystemPVManager_
);
DoocsPVFactory
factory
(
this
,
*
updater_
,
controlSystemPVManager_
);
auto
mappingForThisLocation
=
VariableMapper
::
getInstance
().
getPropertiesInLocation
(
fctN
ame
);
auto
mappingForThisLocation
=
VariableMapper
::
getInstance
().
getPropertiesInLocation
(
n
ame
()
);
doocsProperties_
.
reserve
(
mappingForThisLocation
.
size
()
);
doocsProperties_
.
reserve
(
mappingForThisLocation
.
size
()
);
for
(
auto
&
propertyDescrition
:
mappingForThisLocation
){
for
(
auto
&
propertyDescrition
:
mappingForThisLocation
){
...
...
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