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
1c1a92a2
Commit
1c1a92a2
authored
4 years ago
by
vargheseg
Browse files
Options
Downloads
Patches
Plain Diff
Support new D_fct::write signature
parent
a91fe2be
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/DoocsSpectrum.h
+1
-1
1 addition, 1 deletion
include/DoocsSpectrum.h
src/DoocsSpectrum.cc
+2
-2
2 additions, 2 deletions
src/DoocsSpectrum.cc
with
3 additions
and
3 deletions
include/DoocsSpectrum.h
+
1
−
1
View file @
1c1a92a2
...
...
@@ -73,7 +73,7 @@ namespace ChimeraTK {
void
setMacroPulseNumberSource
(
boost
::
shared_ptr
<
ChimeraTK
::
NDRegisterAccessor
<
int64_t
>>
macroPulseNumberSource
);
void
write
(
std
::
f
stream
&
fptr
)
override
;
void
write
(
std
::
o
stream
&
s
)
override
;
boost
::
shared_ptr
<
ChimeraTK
::
NDRegisterAccessor
<
float
>>
_processArray
;
boost
::
shared_ptr
<
ChimeraTK
::
NDRegisterAccessor
<
float
>>
_startAccessor
;
...
...
This diff is collapsed.
Click to expand it.
src/DoocsSpectrum.cc
+
2
−
2
View file @
1c1a92a2
...
...
@@ -80,7 +80,7 @@ namespace ChimeraTK {
}
}
void
DoocsSpectrum
::
write
(
std
::
f
stream
&
fptr
)
{
void
DoocsSpectrum
::
write
(
std
::
o
stream
&
s
)
{
// DOOCS is normally keeping the location lock until everything is written for that location: all D_spectrum and all
// other properties. This can take too long (like seconds), which leads to noticable freezes of the UI. As a
// work-around we release the lock here, wait some time and acquire the lock again. Since this happens in a separate
...
...
@@ -89,7 +89,7 @@ namespace ChimeraTK {
usleep
(
1000
);
efp_
->
lock
();
if
(
!
modified
)
return
;
D_spectrum
::
write
(
fptr
);
D_spectrum
::
write
(
s
);
}
void
DoocsSpectrum
::
updateDoocsBuffer
(
TransferElementID
transferElementId
)
{
...
...
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