Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
X
Xspress3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
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
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Tango devices
Acquisition
1D
Xspress3
Commits
0af0ebbb
Commit
0af0ebbb
authored
9 months ago
by
Arafat NOUREDDINE
Browse files
Options
Downloads
Patches
Plain Diff
Add some YAT_VERBOSE logs
parent
a95ad4df
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
pom.xml
+1
-1
1 addition, 1 deletion
pom.xml
src/StreamNexus.cpp
+6
-1
6 additions, 1 deletion
src/StreamNexus.cpp
src/Xspress3Handler.cpp
+4
-0
4 additions, 0 deletions
src/Xspress3Handler.cpp
with
11 additions
and
2 deletions
pom.xml
+
1
−
1
View file @
0af0ebbb
...
...
@@ -17,7 +17,7 @@
<groupId>
fr.soleil.device
</groupId>
<artifactId>
Xspress3-amd64-Linux-gcc-shared-${mode}
</artifactId>
<version>
1.3.4
-SNAPSHOT
</version>
<version>
1.3.4
</version>
<packaging>
nar
</packaging>
<name>
Xspress3
</name>
<description>
Xspress3 device
</description>
...
...
This diff is collapsed.
Click to expand it.
src/StreamNexus.cpp
+
6
−
1
View file @
0af0ebbb
...
...
@@ -275,6 +275,7 @@ void StreamNexus::set_dataset_prefix(const std::string& dataset_prefix)
m_dataset_prefix
=
dataset_prefix
;
}
//----------------------------------------------------------------------------------------------------------------------
void
StreamNexus
::
store_statistics
(
int
channel
,
double
realtime
,
double
deadtime
,
double
icr
,
double
ocr
,
unsigned
long
events_in_run
)
{
yat
::
MutexLock
scoped_lock
(
m_data_lock
);
...
...
@@ -312,6 +313,7 @@ void StreamNexus::store_statistics(int channel, double realtime, double deadtime
}
}
//----------------------------------------------------------------------------------------------------------------------
void
StreamNexus
::
store_spectrum_data
(
int
channel
,
uint32_t
*
data
,
size_t
length
)
{
yat
::
MutexLock
scoped_lock
(
m_data_lock
);
...
...
@@ -328,6 +330,8 @@ void StreamNexus::store_spectrum_data(int channel, uint32_t* data, size_t length
void
StreamNexus
::
update_data
(
int
current_frame
,
int
ichannel
,
yat
::
SharedPtr
<
DataStore
>
data_store
)
{
yat
::
MutexLock
scoped_lock
(
m_data_lock
);
YAT_VERBOSE
<<
"StreamNexus::update_data()"
<<
current_frame
<<
endl
;
YAT_VERBOSE
<<
"
\t
- current_frame = "
<<
current_frame
<<
endl
;
store_statistics
(
ichannel
,
data_store
->
get_realtime
(
current_frame
,
ichannel
),
...
...
@@ -342,11 +346,12 @@ void StreamNexus::update_data(int current_frame, int ichannel, yat::SharedPtr<Da
data_store
->
get_frame_spectrum_data
(
current_frame
,
ichannel
).
size
());
}
//----------------------------------------------------------------------------------------------------------------------
void
StreamNexus
::
reset_index
()
{
YAT_INFO
<<
"StreamNexus::reset_index()"
<<
endl
;
yat
::
MutexLock
scoped_lock
(
m_data_lock
);
nxcpp
::
DataStreamer
::
ResetBufferIndex
();
}
//----------------------------------------------------------------------------------------------------------------------
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/Xspress3Handler.cpp
+
4
−
0
View file @
0af0ebbb
...
...
@@ -358,6 +358,7 @@ void Xspress3Handler::start_acquisition()
struct
timespec
delay
,
remain
;
delay
.
tv_sec
=
0
;
delay
.
tv_nsec
=
(
int
)(
m_expert_acquistion_polling_period
*
1000000
);
YAT_VERBOSE
<<
" m_nb_acq_frames "
<<
m_nb_acq_frames
<<
std
::
endl
;
int
temp_curr_frame
=
m_nb_acq_frames
;
std
::
chrono
::
high_resolution_clock
::
time_point
check_progress_start
=
std
::
chrono
::
high_resolution_clock
::
now
();
...
...
@@ -388,6 +389,9 @@ void Xspress3Handler::start_acquisition()
while
(
temp_curr_frame
<
completed_frame
);
m_nb_acq_frames
=
(
completed_frame
>
m_nb_frames
)
?
m_nb_frames
:
completed_frame
;
YAT_VERBOSE
<<
" completed_frame "
<<
completed_frame
<<
std
::
endl
;
YAT_VERBOSE
<<
" m_nb_frames "
<<
m_nb_frames
<<
std
::
endl
;
YAT_VERBOSE
<<
" m_nb_acq_frames "
<<
m_nb_acq_frames
<<
std
::
endl
;
std
::
chrono
::
high_resolution_clock
::
time_point
acquisition_end
=
std
::
chrono
::
high_resolution_clock
::
now
();
std
::
chrono
::
duration
<
double
,
std
::
milli
>
acquisition_duration
=
acquisition_end
-
acquisition_start
;
...
...
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