Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cbmroot
Manage
Activity
Members
Labels
Plan
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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
Computing
cbmroot
Commits
1280cc9b
Commit
1280cc9b
authored
2 years ago
by
Pierre-Alain Loizeau
Browse files
Options
Downloads
Patches
Plain Diff
Fix mismatch in old MQ samplers with current flesnet IPC, removing warnings
parent
dc43ab02
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!893
Fix warnings introduced by mCBM MRs + some similar ones
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
MQ/source/CbmMQTsaMultiSamplerTof.cxx
+4
-4
4 additions, 4 deletions
MQ/source/CbmMQTsaMultiSamplerTof.cxx
MQ/source/CbmMQTsaSampler.cxx
+1
-1
1 addition, 1 deletion
MQ/source/CbmMQTsaSampler.cxx
MQ/source/CbmMQTsaSamplerTof.cxx
+4
-4
4 additions, 4 deletions
MQ/source/CbmMQTsaSamplerTof.cxx
with
9 additions
and
9 deletions
MQ/source/CbmMQTsaMultiSamplerTof.cxx
+
4
−
4
View file @
1280cc9b
...
...
@@ -290,7 +290,7 @@ bool CbmMQTsaMultiSamplerTof::ConditionalRun()
if
(
fComponentsToSend
[
idx
]
>
0
)
{
LOG
(
debug
)
<<
"Append timeslice component of link "
<<
nrComp
<<
" to idx "
<<
idx
;
fles
::
StorableTimeslice
component
{
static_cast
<
uint32_t
>
(
ts
.
num_microslices
(
nrComp
),
ts
.
index
()
)
};
fles
::
StorableTimeslice
component
{
static_cast
<
uint32_t
>
(
ts
.
num_
core_
microslices
(
)
),
ts
.
index
()};
component
.
append_component
(
ts
.
num_microslices
(
0
));
for
(
size_t
m
=
0
;
m
<
ts
.
num_microslices
(
nrComp
);
++
m
)
{
...
...
@@ -365,7 +365,7 @@ bool CbmMQTsaMultiSamplerTof::CreateAndCombineComponents(const fles::Timeslice&
if (fComponentsToSend[idx]>0) {
LOG(debug) << "Append timeslice component of link " << nrComp<< " to idx "<<idx;
fles::StorableTimeslice component{static_cast<uint32_t>(ts.num_microslices(
nrComp
), ts.index()
)
};
fles::StorableTimeslice component{static_cast<uint32_t>(ts.num_
core_
microslices(
)
), ts.index()};
component.append_component(ts.num_microslices(0));
for (size_t m = 0; m < ts.num_microslices(nrComp); ++m) {
...
...
@@ -406,7 +406,7 @@ bool CbmMQTsaMultiSamplerTof::AppendData(const fles::StorableTimeslice& /*compon
bool
CbmMQTsaMultiSamplerTof
::
SendTs
()
{
/*
for (int idx=0; idx<parts.size(); idx++)
for (int idx=0; idx<parts.size(); idx++)
if(bparts[idx]){
LOG(debug) << "Send data to channel " << fChannelsToSend[idx][0];
if (Send(parts[idx], fChannelsToSend[idx][0]) < 0) {
...
...
@@ -525,7 +525,7 @@ bool CbmMQTsaMultiSamplerTof::CheckTimeslice(const fles::Timeslice& ts)
LOG
(
debug
)
<<
"Component "
<<
c
<<
" has the system id 0x"
<<
std
::
hex
<<
static_cast
<
int
>
(
ts
.
descriptor
(
c
,
0
).
sys_id
)
<<
std
::
dec
;
/*
if(ts.descriptor(c,0).sys_id == 0x90 ) { // found a t0 - timeslice
if(ts.descriptor(c,0).sys_id == 0x90 ) { // found a t0 - timeslice
ts.descriptor(c,0).sys_id = 0x60; // rename t0 to tof , not allowed
}
*/
...
...
This diff is collapsed.
Click to expand it.
MQ/source/CbmMQTsaSampler.cxx
+
1
−
1
View file @
1280cc9b
...
...
@@ -305,7 +305,7 @@ bool CbmMQTsaSampler::CreateAndSendComponent(const fles::Timeslice& ts, int nrCo
if
(
fComponentsToSend
[
idx
]
>
0
)
{
LOG
(
info
)
<<
"Create timeslice component for link "
<<
nrComp
;
fles
::
StorableTimeslice
component
{
static_cast
<
uint32_t
>
(
ts
.
num_microslices
(
nrComp
)),
ts
.
index
()};
fles
::
StorableTimeslice
component
{
static_cast
<
uint32_t
>
(
ts
.
num_
core_
microslices
()),
ts
.
index
()};
component
.
append_component
(
ts
.
num_microslices
(
0
));
for
(
size_t
m
=
0
;
m
<
ts
.
num_microslices
(
nrComp
);
++
m
)
{
...
...
This diff is collapsed.
Click to expand it.
MQ/source/CbmMQTsaSamplerTof.cxx
+
4
−
4
View file @
1280cc9b
...
...
@@ -306,7 +306,7 @@ bool CbmMQTsaSamplerTof::ConditionalRun()
if
(
fComponentsToSend
[
idx
]
>
0
)
{
LOG
(
debug
)
<<
"Append timeslice component of link "
<<
nrComp
<<
" to idx "
<<
idx
;
fles
::
StorableTimeslice
component
{
static_cast
<
uint32_t
>
(
ts
.
num_microslices
(
nrComp
)),
ts
.
index
()};
fles
::
StorableTimeslice
component
{
static_cast
<
uint32_t
>
(
ts
.
num_
core_
microslices
()),
ts
.
index
()};
component
.
append_component
(
ts
.
num_microslices
(
0
));
for
(
size_t
m
=
0
;
m
<
ts
.
num_microslices
(
nrComp
);
++
m
)
{
...
...
@@ -390,7 +390,7 @@ bool CbmMQTsaSamplerTof::CreateAndCombineComponents(const fles::Timeslice& /*ts*
if (fComponentsToSend[idx]>0) {
LOG(debug) << "Append timeslice component of link " << nrComp<< " to idx "<<idx;
fles::StorableTimeslice component{static_cast<uint32_t>(ts.num_microslices(
nrComp
), ts.index()
)
};
fles::StorableTimeslice component{static_cast<uint32_t>(ts.num_
core_
microslices(
)
), ts.index()};
component.append_component(ts.num_microslices(0));
for (size_t m = 0; m < ts.num_microslices(nrComp); ++m) {
...
...
@@ -431,7 +431,7 @@ bool CbmMQTsaSamplerTof::AppendData(const fles::StorableTimeslice& /*component*/
bool
CbmMQTsaSamplerTof
::
SendTs
()
{
/*
for (int idx=0; idx<parts.size(); idx++)
for (int idx=0; idx<parts.size(); idx++)
if(bparts[idx]){
LOG(debug) << "Send data to channel " << fChannelsToSend[idx][0];
if (Send(parts[idx], fChannelsToSend[idx][0]) < 0) {
...
...
@@ -462,7 +462,7 @@ bool CbmMQTsaSamplerTof::CreateAndSendComponent(const fles::Timeslice& ts, int n
if
(
fComponentsToSend
[
idx
]
>
0
)
{
LOG
(
debug
)
<<
"Create timeslice component for link "
<<
nrComp
;
fles
::
StorableTimeslice
component
{
static_cast
<
uint32_t
>
(
ts
.
num_microslices
(
nrComp
)),
ts
.
index
()};
fles
::
StorableTimeslice
component
{
static_cast
<
uint32_t
>
(
ts
.
num_
core_
microslices
()),
ts
.
index
()};
component
.
append_component
(
ts
.
num_microslices
(
0
));
for
(
size_t
m
=
0
;
m
<
ts
.
num_microslices
(
nrComp
);
++
m
)
{
...
...
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