Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ApplicationCore
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
ApplicationCore
Commits
f27d8e8c
Commit
f27d8e8c
authored
3 years ago
by
Martin Christoph Hierholzer
Browse files
Options
Downloads
Patches
Plain Diff
several fixes for Void data type
parent
ab345855
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
Modules/include/ConfigReader.h
+4
-4
4 additions, 4 deletions
Modules/include/ConfigReader.h
Modules/include/ServerHistory.h
+2
-2
2 additions, 2 deletions
Modules/include/ServerHistory.h
include/TestFacility.h
+2
-2
2 additions, 2 deletions
include/TestFacility.h
with
8 additions
and
8 deletions
Modules/include/ConfigReader.h
+
4
−
4
View file @
f27d8e8c
...
...
@@ -186,7 +186,7 @@ namespace ChimeraTK {
using
MapOfVar
=
std
::
unordered_map
<
std
::
string
,
Var
<
T
>>
;
/** Type-depending map of vectors of variables */
ChimeraTK
::
TemplateUserTypeMap
<
MapOfVar
>
variableMap
;
ChimeraTK
::
TemplateUserTypeMap
NoVoid
<
MapOfVar
>
variableMap
;
/** Define type for map of std::string to Array, so we can put it into the
* TemplateUserTypeMap */
...
...
@@ -194,11 +194,11 @@ namespace ChimeraTK {
using
MapOfArray
=
std
::
unordered_map
<
std
::
string
,
Array
<
T
>>
;
/** Type-depending map of vectors of arrays */
ChimeraTK
::
TemplateUserTypeMap
<
MapOfArray
>
arrayMap
;
ChimeraTK
::
TemplateUserTypeMap
NoVoid
<
MapOfArray
>
arrayMap
;
/** Map assigning string type identifyers to C++ types */
ChimeraTK
::
SingleTypeUserTypeMap
<
const
char
*>
typeMap
{
"int8"
,
"uint8"
,
"int16"
,
"uint16"
,
"int32"
,
"uint32"
,
"int64"
,
"uint64"
,
"float"
,
"double"
,
"string"
,
"boolean"
,
"void"
};
ChimeraTK
::
SingleTypeUserTypeMap
NoVoid
<
const
char
*>
typeMap
{
"int8"
,
"uint8"
,
"int16"
,
"uint16"
,
"int32"
,
"uint32"
,
"int64"
,
"uint64"
,
"float"
,
"double"
,
"string"
,
"boolean"
};
/** Implementation of get() which can be overloaded for scalars and vectors.
* The second argument is a dummy only to distinguish the two overloaded
...
...
This diff is collapsed.
Click to expand it.
Modules/include/ServerHistory.h
+
2
−
2
View file @
f27d8e8c
...
...
@@ -165,7 +165,7 @@ namespace ChimeraTK { namespace history {
* created by the AccessorAttacher. */
template
<
typename
UserType
>
using
AccessorList
=
std
::
list
<
std
::
pair
<
ArrayPushInput
<
UserType
>
,
HistoryEntry
<
UserType
>>>
;
TemplateUserTypeMap
<
AccessorList
>
_accessorListMap
;
TemplateUserTypeMap
NoVoid
<
AccessorList
>
_accessorListMap
;
/** boost::fusion::map of UserTypes to std::lists containing the names of the
* accessors. Technically there would be no need to use TemplateUserTypeMap
...
...
@@ -174,7 +174,7 @@ namespace ChimeraTK { namespace history {
* is used here. */
template
<
typename
UserType
>
using
NameList
=
std
::
list
<
std
::
string
>
;
TemplateUserTypeMap
<
NameList
>
_nameListMap
;
TemplateUserTypeMap
NoVoid
<
NameList
>
_nameListMap
;
/** Overall variable name list, used to detect name collisions */
std
::
list
<
std
::
string
>
_overallVariableList
;
...
...
This diff is collapsed.
Click to expand it.
include/TestFacility.h
+
2
−
2
View file @
f27d8e8c
...
...
@@ -40,7 +40,7 @@ namespace ChimeraTK {
Application
::
getInstance
().
testFacilityRunApplicationCalled
=
true
;
// send default values for all control system variables
for
(
auto
&
pv
:
pvManager
->
getAllProcessVariables
())
{
callForType
(
pv
->
getValueType
(),
[
&
pv
,
this
](
auto
arg
)
{
callForType
NoVoid
(
pv
->
getValueType
(),
[
&
pv
,
this
](
auto
arg
)
{
// Applies only to writeable variables. @todo FIXME It should also NOT apply for application-to-controlsystem
// variables with a return channel, despite being writeable here!
if
(
!
pv
->
isWriteable
())
return
;
...
...
@@ -92,7 +92,7 @@ namespace ChimeraTK {
if
(
Application
::
getInstance
().
isTestableModeEnabled
())
{
for
(
auto
&
pv
:
pvManager
->
getAllProcessVariables
())
{
if
(
!
pv
->
isReadable
())
continue
;
callForType
(
pv
->
getValueType
(),
[
&
](
auto
t
)
{
callForType
NoVoid
(
pv
->
getValueType
(),
[
&
](
auto
t
)
{
typedef
decltype
(
t
)
UserType
;
this
->
getArray
<
UserType
>
(
pv
->
getName
()).
readNonBlocking
();
});
...
...
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