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
cc158d61
Commit
cc158d61
authored
1 year ago
by
Felix Weiglhofer
Committed by
Volker Friese
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
algo::Unpack: Add flag to toggle walk correction.
parent
0d974bcd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1201
cbmreco: Integrate algo::Unpack
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
algo/unpack/Unpack.cxx
+3
-2
3 additions, 2 deletions
algo/unpack/Unpack.cxx
algo/unpack/Unpack.h
+9
-2
9 additions, 2 deletions
algo/unpack/Unpack.h
algo/unpack/UnpackChain.cxx
+2
-0
2 additions, 0 deletions
algo/unpack/UnpackChain.cxx
with
14 additions
and
4 deletions
algo/unpack/Unpack.cxx
+
3
−
2
View file @
cc158d61
...
...
@@ -153,7 +153,7 @@ namespace cbm::algo
elinkPar
.
fTimeOffset
=
fSystemTimeOffset
[
fles
::
SubsystemIdentifier
::
STS
];
elinkPar
.
fAdcOffset
=
1.
;
elinkPar
.
fAdcGain
=
1.
;
elinkPar
.
fWalk
=
fStsConfig
.
WalkMap
(
elinkPar
.
fAddress
,
elinkPar
.
fAsicNr
);
if
(
fApplyWalkCorrection
)
elinkPar
.
fWalk
=
fStsConfig
.
WalkMap
(
elinkPar
.
fAddress
,
elinkPar
.
fAsicNr
);
// TODO: Add parameters for time and ADC calibration
par
->
fElinkParams
.
push_back
(
elinkPar
);
}
...
...
@@ -274,7 +274,8 @@ namespace cbm::algo
L_
(
debug
)
<<
"--- Configured equipment "
<<
equip
<<
" with "
<<
numAsics
<<
" asics"
;
}
L_
(
info
)
<<
"--- Configured "
<<
fAlgoSts
.
size
()
<<
" unpacker algorithms for STS."
;
L_
(
info
)
<<
"--- Configured "
<<
fAlgoSts
.
size
()
<<
" unpacker algorithms for STS. (Walk correction = "
<<
fApplyWalkCorrection
<<
")"
;
L_
(
debug
)
<<
"Readout map:"
<<
fStsConfig
.
PrintReadoutMap
();
L_
(
info
)
<<
"--- Configured "
<<
fAlgoMuch
.
size
()
<<
" unpacker algorithms for MUCH."
;
L_
(
info
)
<<
"--- Configured "
<<
fAlgoRich
.
size
()
<<
" unpacker algorithms for RICH."
;
...
...
This diff is collapsed.
Click to expand it.
algo/unpack/Unpack.h
+
9
−
2
View file @
cc158d61
...
...
@@ -101,6 +101,12 @@ namespace cbm::algo
/** @brief Parameters for RICH unpackers **/
RichReadoutConfig
fRichConfig
{};
/**
* @brief Set whether to apply walk correction. Must be set before Init(). (default: true)
**/
void
SetApplyWalkCorrection
(
bool
applyWalkCorrection
)
{
fApplyWalkCorrection
=
applyWalkCorrection
;
}
/** @brief Initialize unpackers and fill parameters from config objects
* @param subIds: vector of subsystem identifiers to unpack, default: all
* @see Init()
...
...
@@ -128,8 +134,9 @@ namespace cbm::algo
std
::
vector
<
MonitorData
>*
monitorMs
,
uint8_t
sys_ver
);
private
:
// members
std
::
vector
<
fles
::
SubsystemIdentifier
>
fSubIds
=
{};
///< Detector identifiers to unpack
private
:
// members
bool
fApplyWalkCorrection
=
true
;
///< Apply walk correction
std
::
vector
<
fles
::
SubsystemIdentifier
>
fSubIds
=
{};
///< Detector identifiers to unpack
/** @brief STS unpackers **/
std
::
map
<
uint16_t
,
UnpackSts
>
fAlgoSts
=
{};
...
...
This diff is collapsed.
Click to expand it.
algo/unpack/UnpackChain.cxx
+
2
−
0
View file @
cc158d61
...
...
@@ -7,6 +7,8 @@ using namespace cbm::algo;
void
UnpackChain
::
Init
()
{
// Disable walk correction for now. 2022 data crashes unpacker with hardcoded 2021 params.
fUnpack
.
SetApplyWalkCorrection
(
false
);
fUnpack
.
Init
(
std
::
vector
<
fles
::
SubsystemIdentifier
>
{
fles
::
SubsystemIdentifier
::
STS
,
// fles::SubsystemIdentifier::MUCH,
...
...
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