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
1f0e7453
Commit
1f0e7453
authored
1 year ago
by
Dominik Smith
Committed by
Volker Friese
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
CbmTaskBuildEvents: Replaced CbmModuleList::GetModuleNameCaps() with ToString.
parent
96aeb56f
No related branches found
No related tags found
1 merge request
!1178
Added TRD2D support in cbm::algo::EventBuilder and dependent classes.
Pipeline
#22743
passed
1 year ago
Stage: build
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
reco/tasks/CbmTaskBuildEvents.cxx
+7
-10
7 additions, 10 deletions
reco/tasks/CbmTaskBuildEvents.cxx
reco/tasks/CbmTaskBuildEvents.h
+1
-1
1 addition, 1 deletion
reco/tasks/CbmTaskBuildEvents.h
with
8 additions
and
11 deletions
reco/tasks/CbmTaskBuildEvents.cxx
+
7
−
10
View file @
1f0e7453
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
#include
"CbmDigiBranchBase.h"
#include
"CbmDigiBranchBase.h"
#include
"CbmDigiManager.h"
#include
"CbmDigiManager.h"
#include
"CbmDigiTimeslice.h"
#include
"CbmDigiTimeslice.h"
#include
"CbmModuleList.h"
#include
<FairRootManager.h>
#include
<FairRootManager.h>
#include
<Logger.h>
#include
<Logger.h>
...
@@ -171,7 +170,7 @@ void CbmTaskBuildEvents::Exec(Option_t*)
...
@@ -171,7 +170,7 @@ void CbmTaskBuildEvents::Exec(Option_t*)
for
(
const
auto
&
entry
:
fEventWindows
)
{
for
(
const
auto
&
entry
:
fEventWindows
)
{
auto
system
=
entry
.
first
;
auto
system
=
entry
.
first
;
logOut
<<
", frac "
<<
CbmModuleList
::
GetModuleNameCaps
(
system
)
<<
" digis "
logOut
<<
", frac "
<<
ToString
(
system
)
<<
" digis "
<<
100.
*
double
(
numDigisEv
[
system
])
/
double
(
numDigisTs
[
system
])
<<
" %"
;
<<
100.
*
double
(
numDigisEv
[
system
])
/
double
(
numDigisTs
[
system
])
<<
" %"
;
}
}
...
@@ -201,11 +200,9 @@ void CbmTaskBuildEvents::Finish()
...
@@ -201,11 +200,9 @@ void CbmTaskBuildEvents::Finish()
LOG
(
info
)
<<
"Events : "
<<
fNumEvents
;
LOG
(
info
)
<<
"Events : "
<<
fNumEvents
;
for
(
const
auto
&
entry
:
fEventWindows
)
{
for
(
const
auto
&
entry
:
fEventWindows
)
{
auto
system
=
entry
.
first
;
auto
system
=
entry
.
first
;
LOG
(
info
)
<<
setw
(
4
)
<<
left
<<
CbmModuleList
::
GetModuleNameCaps
(
system
)
LOG
(
info
)
<<
setw
(
4
)
<<
left
<<
ToString
(
system
)
<<
" digis in TS : "
<<
fNumDigisTs
[
system
];
<<
" digis in TS : "
<<
fNumDigisTs
[
system
];
LOG
(
info
)
<<
setw
(
4
)
<<
left
<<
ToString
(
system
)
<<
" digis in events : "
<<
fNumDigisEv
[
system
]
<<
" = "
<<
fixed
LOG
(
info
)
<<
setw
(
4
)
<<
left
<<
CbmModuleList
::
GetModuleNameCaps
(
system
)
<<
setprecision
(
2
)
<<
100.
*
double
(
fNumDigisEv
[
system
])
/
double
(
fNumDigisTs
[
system
])
<<
" %"
;
<<
" digis in events : "
<<
fNumDigisEv
[
system
]
<<
" = "
<<
fixed
<<
setprecision
(
2
)
<<
100.
*
double
(
fNumDigisEv
[
system
])
/
double
(
fNumDigisTs
[
system
])
<<
" %"
;
}
}
LOG
(
info
)
<<
"Time / TS : "
<<
fixed
<<
setprecision
(
2
)
<<
1000.
*
fTimeTot
/
double
(
fNumTs
)
<<
" ms"
;
LOG
(
info
)
<<
"Time / TS : "
<<
fixed
<<
setprecision
(
2
)
<<
1000.
*
fTimeTot
/
double
(
fNumTs
)
<<
" ms"
;
LOG
(
info
)
<<
"Time fill TS : "
<<
fixed
<<
setprecision
(
2
)
<<
1000.
*
fTimeFillTs
/
double
(
fNumTs
)
LOG
(
info
)
<<
"Time fill TS : "
<<
fixed
<<
setprecision
(
2
)
<<
1000.
*
fTimeFillTs
/
double
(
fNumTs
)
...
@@ -260,10 +257,10 @@ InitStatus CbmTaskBuildEvents::Init()
...
@@ -260,10 +257,10 @@ InitStatus CbmTaskBuildEvents::Init()
for
(
const
auto
&
entry
:
fEventWindows
)
{
for
(
const
auto
&
entry
:
fEventWindows
)
{
auto
system
=
entry
.
first
;
auto
system
=
entry
.
first
;
if
(
!
fDigiMan
->
IsPresent
(
system
))
{
if
(
!
fDigiMan
->
IsPresent
(
system
))
{
LOG
(
fatal
)
<<
GetName
()
<<
": No digi branch for "
<<
CbmModuleList
::
GetModuleNameCaps
(
system
);
LOG
(
fatal
)
<<
GetName
()
<<
": No digi branch for "
<<
ToString
(
system
);
return
kFATAL
;
return
kFATAL
;
}
}
LOG
(
info
)
<<
"--- Found digi branch for "
<<
CbmModuleList
::
GetModuleNameCaps
(
system
);
LOG
(
info
)
<<
"--- Found digi branch for "
<<
ToString
(
system
);
}
}
}
}
...
@@ -302,7 +299,7 @@ InitStatus CbmTaskBuildEvents::Init()
...
@@ -302,7 +299,7 @@ InitStatus CbmTaskBuildEvents::Init()
const
double
tMax
=
entry
.
second
.
second
;
const
double
tMax
=
entry
.
second
.
second
;
fAlgo
.
SetEventWindow
(
system
,
tMin
,
tMax
);
fAlgo
.
SetEventWindow
(
system
,
tMin
,
tMax
);
LOG
(
info
)
<<
"--- Use algo EventBuilder with event window ["
<<
tMin
<<
", "
<<
tMax
<<
"] ns for "
LOG
(
info
)
<<
"--- Use algo EventBuilder with event window ["
<<
tMin
<<
", "
<<
tMax
<<
"] ns for "
<<
CbmModuleList
::
GetModuleNameCaps
(
system
);
<<
ToString
(
system
);
}
}
LOG
(
info
)
<<
"=================================================="
;
LOG
(
info
)
<<
"=================================================="
;
...
...
This diff is collapsed.
Click to expand it.
reco/tasks/CbmTaskBuildEvents.h
+
1
−
1
View file @
1f0e7453
...
@@ -120,7 +120,7 @@ private: // members
...
@@ -120,7 +120,7 @@ private: // members
double
fTimeSelectorEvt
=
0.
;
double
fTimeSelectorEvt
=
0.
;
double
fTimeTot
=
0.
;
double
fTimeTot
=
0.
;
ClassDef
(
CbmTaskBuildEvents
,
2
);
ClassDef
(
CbmTaskBuildEvents
,
1
);
};
};
#endif
/* CBMTASKBUILDEVENTS_H */
#endif
/* CBMTASKBUILDEVENTS_H */
This diff is collapsed.
Click to expand it.
Florian Uhlig
@f.uhlig
mentioned in merge request
!1186 (merged)
·
1 year ago
mentioned in merge request
!1186 (merged)
mentioned in merge request !1186
Toggle commit list
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