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
7cac2013
Commit
7cac2013
authored
2 years ago
by
Vikas Singhal
Committed by
Pierre-Alain Loizeau
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix mMUCH unpack Algo and Config classes for compat. w/ 2 GEM + RPC readout
parent
82ef80d4
No related branches found
No related tags found
1 merge request
!885
Changes from mCBM 2022 prod to MUCH unpacking
Pipeline
#17946
passed
2 years ago
Stage: build
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
reco/detectors/much/unpack/CbmMuchUnpackAlgo.cxx
+5
-2
5 additions, 2 deletions
reco/detectors/much/unpack/CbmMuchUnpackAlgo.cxx
reco/detectors/much/unpack/CbmMuchUnpackConfig.h
+1
-1
1 addition, 1 deletion
reco/detectors/much/unpack/CbmMuchUnpackConfig.h
with
6 additions
and
3 deletions
reco/detectors/much/unpack/CbmMuchUnpackAlgo.cxx
+
5
−
2
View file @
7cac2013
...
@@ -528,8 +528,11 @@ void CbmMuchUnpackAlgo::processHitInfo(const stsxyter::Message& mess)
...
@@ -528,8 +528,11 @@ void CbmMuchUnpackAlgo::processHitInfo(const stsxyter::Message& mess)
//}
//}
if
(
fMonitor
)
fMonitor
->
CountDigi
(
uAsicIdx
,
uChanInFeb
);
if
(
fMonitor
)
fMonitor
->
CountDigi
(
uAsicIdx
,
uChanInFeb
);
//Checking for Raw channel value
if
(
usChan
>
127
||
usChan
<
0
)
LOG
(
debug
)
<<
"ERROR !!! Channel in hit message is out of range "
<<
usChan
;
// uFebIdx is FEB position in the GEM and RPC
// uFebIdx is FEB position in the GEM and RPC
const
uint32_t
address
=
CreateMuchAddress
(
fuCurrDpbIdx
,
uFebIdx
,
uChanInFeb
);
const
uint32_t
address
=
CreateMuchAddress
(
fuCurrDpbIdx
,
uFebIdx
,
usChan
);
//const uint32_t address = CreateMuchAddress(fuCurrDpbIdx, uFebIdx, uChanInFeb);
LOG
(
debug
)
<<
"Created Much Address = "
<<
address
<<
" from fuCurrDpbIdx "
<<
fuCurrDpbIdx
<<
" Feb Id "
LOG
(
debug
)
<<
"Created Much Address = "
<<
address
<<
" from fuCurrDpbIdx "
<<
fuCurrDpbIdx
<<
" Feb Id "
<<
uFebIdx
<<
" Channnel Id "
<<
uChanInFeb
;
<<
uFebIdx
<<
" Channnel Id "
<<
uChanInFeb
;
if
(
address
)
{
if
(
address
)
{
...
@@ -605,7 +608,7 @@ uint32_t CbmMuchUnpackAlgo::CreateMuchAddress(uint32_t dpbidx, int32_t iFebId, u
...
@@ -605,7 +608,7 @@ uint32_t CbmMuchUnpackAlgo::CreateMuchAddress(uint32_t dpbidx, int32_t iFebId, u
station
=
0
;
// for mCBM setup
station
=
0
;
// for mCBM setup
layer
=
0
;
// Station 0 for GEM-A and station 1 for Module GEM-B
layer
=
0
;
// Station 0 for GEM-A and station 1 for Module GEM-B
}
}
else
if
(
dpbidx
==
4
||
dpbidx
==
5
)
//Last
2
DPBs are for GEM-2
else
if
(
dpbidx
==
4
||
dpbidx
==
5
||
dpbidx
==
6
)
//Last
3
DPBs are for GEM-2
after 10/04/2022
{
{
station
=
1
;
// for mCBM setup station
station
=
1
;
// for mCBM setup station
layer
=
0
;
// 0 for Module GEM-A and 1 for Module GEM-B
layer
=
0
;
// 0 for Module GEM-A and 1 for Module GEM-B
...
...
This diff is collapsed.
Click to expand it.
reco/detectors/much/unpack/CbmMuchUnpackConfig.h
+
1
−
1
View file @
7cac2013
...
@@ -144,7 +144,7 @@ protected:
...
@@ -144,7 +144,7 @@ protected:
std
::
vector
<
FebChanMaskReco
>
fvChanMasks
=
{};
std
::
vector
<
FebChanMaskReco
>
fvChanMasks
=
{};
/// Parameter file name
/// Parameter file name
std
::
string
fsParFileName
=
"m
TofCri
Par.par"
;
std
::
string
fsParFileName
=
"m
Much
Par.par"
;
private
:
private
:
ClassDef
(
CbmMuchUnpackConfig
,
2
)
ClassDef
(
CbmMuchUnpackConfig
,
2
)
...
...
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