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
5b57e25d
Commit
5b57e25d
authored
5 years ago
by
Zenker, Dr. Klaus (FWKE) - 126506
Browse files
Options
Downloads
Patches
Plain Diff
Add support for direct connection of a device to MicroDAQ module.
parent
2277f33c
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/MicroDAQ.h
+4
-0
4 additions, 0 deletions
Modules/include/MicroDAQ.h
Modules/src/MicroDAQ.cc
+8
-0
8 additions, 0 deletions
Modules/src/MicroDAQ.cc
include/DeviceModule.h
+2
-0
2 additions, 0 deletions
include/DeviceModule.h
with
14 additions
and
0 deletions
Modules/include/MicroDAQ.h
+
4
−
0
View file @
5b57e25d
...
...
@@ -66,6 +66,10 @@ namespace ChimeraTK {
/** Add a Module as a source to this DAQ. */
void
addSource
(
const
Module
&
source
,
const
RegisterPath
&
namePrefix
=
""
);
/**
* Overload that calls virtualiseFromCatalog.
*/
void
addSource
(
const
DeviceModule
&
source
,
const
RegisterPath
&
namePrefix
=
""
);
protected
:
void
mainLoop
()
override
;
...
...
This diff is collapsed.
Click to expand it.
Modules/src/MicroDAQ.cc
+
8
−
0
View file @
5b57e25d
...
...
@@ -78,6 +78,14 @@ namespace ChimeraTK {
/*********************************************************************************************************************/
template
<
typename
TRIGGERTYPE
>
void
MicroDAQ
<
TRIGGERTYPE
>::
addSource
(
const
DeviceModule
&
source
,
const
RegisterPath
&
namePrefix
)
{
auto
mod
=
source
.
virtualiseFromCatalog
();
addSource
(
mod
,
namePrefix
);
}
/*********************************************************************************************************************/
template
<
typename
TRIGGERTYPE
>
template
<
typename
UserType
>
VariableNetworkNode
MicroDAQ
<
TRIGGERTYPE
>::
getAccessor
(
const
std
::
string
&
variableName
)
{
...
...
This diff is collapsed.
Click to expand it.
include/DeviceModule.h
+
2
−
0
View file @
5b57e25d
...
...
@@ -268,6 +268,8 @@ namespace ChimeraTK {
friend
class
Application
;
friend
struct
history
::
ServerHistory
;
template
<
typename
TRIGGERTYPE
>
friend
class
MicroDAQ
;
friend
class
detail
::
DeviceModuleProxy
;
template
<
typename
T
>
...
...
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