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
2fc78bd5
Commit
2fc78bd5
authored
2 years ago
by
Dominik Smith
Committed by
Volker Friese
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Bugfix for STS unpacker in algo namespace: Fixed channel mapping and adc calibration.
parent
f19c0e50
No related branches found
No related tags found
1 merge request
!1042
Bugfix: Fixed channel mapping and adc calibration for STS Unpacker in Algo namespace.
Pipeline
#20646
passed
2 years ago
Stage: documentation
Stage: deploy
Changes
3
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
algo/detectors/sts/StsReadoutConfig.cxx
+9
-8
9 additions, 8 deletions
algo/detectors/sts/StsReadoutConfig.cxx
algo/detectors/sts/UnpackSts.cxx
+2
-1
2 additions, 1 deletion
algo/detectors/sts/UnpackSts.cxx
reco/tasks/CbmTaskUnpack.cxx
+2
-2
2 additions, 2 deletions
reco/tasks/CbmTaskUnpack.cxx
with
13 additions
and
11 deletions
algo/detectors/sts/StsReadoutConfig.cxx
+
9
−
8
View file @
2fc78bd5
...
...
@@ -115,7 +115,7 @@ namespace cbm::algo
// Type 0 had the connector at the right side, type 1 at the left side.
// For type 0, the mapping of FEB to module side as above applies,
// for type 1, it has to be inverted.
bool
modType
[
numModules
]
=
{
0
,
0
,
1
,
1
,
1
,
0
,
0
,
0
,
1
,
1
,
1
,
1
};
bool
modType
[
numModules
]
=
{
0
,
0
,
1
,
1
,
1
,
0
,
0
,
0
,
1
,
1
,
1
,
1
,
1
};
// Module addresses (CbmStsAddress)
int32_t
modAddress
[
numModules
];
...
...
@@ -127,11 +127,11 @@ namespace cbm::algo
modAddress
[
5
]
=
0x10008412
;
modAddress
[
6
]
=
0x10018412
;
modAddress
[
7
]
=
0x101FFC02
;
modAddress
[
8
]
=
0x10008
0
12
;
modAddress
[
9
]
=
0x10018
0
12
;
modAddress
[
10
]
=
0x100
0
8812
;
modAddress
[
11
]
=
0x100
188
12
;
modAddress
[
12
]
=
0x100
288
12
;
modAddress
[
8
]
=
0x10008
8
12
;
modAddress
[
9
]
=
0x10018
8
12
;
modAddress
[
10
]
=
0x100
2
8812
;
modAddress
[
11
]
=
0x100
080
12
;
modAddress
[
12
]
=
0x100
180
12
;
// Constructing the map (equipmentId, eLink) -> (module, ASIC within module)
...
...
@@ -149,6 +149,8 @@ namespace cbm::algo
int16_t
feb
=
elink2Feb
[
elinkId
];
// FEB within CROB
if
(
feb
!=
-
1
)
{
int16_t
module
=
feb2module
[
comp
][
crob
][
feb
];
// Module index
moduleAddress
=
modAddress
[
module
];
if
(
module
!=
-
1
)
{
assert
(
module
<
numModules
);
bool
moduleType
=
modType
[
module
];
// 0 or 1
...
...
@@ -157,8 +159,7 @@ namespace cbm::algo
uint32_t
asicIndex
=
(
febType
==
0
?
elink2AsicFebA
[
elinkId
]
:
elink2AsicFebB
[
elinkId
]);
uint32_t
asicInFeb
=
asicIndex
%
numAsicsPerFeb
;
// ASIC number within FEB
moduleAddress
=
modAddress
[
module
];
asicInModule
=
(
moduleSide
==
0
?
asicInFeb
:
asicInFeb
+
numAsicsPerFeb
);
asicInModule
=
(
moduleSide
==
1
?
asicInFeb
:
asicInFeb
+
numAsicsPerFeb
);
}
}
fReadoutMap
[
equipment
][
elink
]
=
std
::
make_pair
(
moduleAddress
,
asicInModule
);
...
...
This diff is collapsed.
Click to expand it.
algo/detectors/sts/UnpackSts.cxx
+
2
−
1
View file @
2fc78bd5
...
...
@@ -113,7 +113,8 @@ namespace cbm::algo
channel
=
message
.
GetHitChannel
()
+
fParams
.
fNumChansPerAsic
*
asicNr
;
}
else
{
// back side (p side)
channel
=
numChansPerModule
-
message
.
GetHitChannel
()
+
1
;
channel
=
numChansPerModule
-
message
.
GetHitChannel
()
-
fParams
.
fNumChansPerAsic
*
(
asicNr
-
fParams
.
fNumAsicsPerModule
/
2
)
-
1
;
}
// --- Expand time stamp to time within timeslice (in clock cycle)
...
...
This diff is collapsed.
Click to expand it.
reco/tasks/CbmTaskUnpack.cxx
+
2
−
2
View file @
2fc78bd5
...
...
@@ -255,8 +255,8 @@ InitStatus CbmTaskUnpack::Init()
elinkPar
.
fAddress
=
mapEntry
.
first
;
// Module address for this elink
elinkPar
.
fAsicNr
=
mapEntry
.
second
;
// ASIC number within module
elinkPar
.
fTimeOffset
=
0.
;
elinkPar
.
fAdcOffset
=
0
.
;
elinkPar
.
fAdcGain
=
0
.
;
elinkPar
.
fAdcOffset
=
1
.
;
elinkPar
.
fAdcGain
=
1
.
;
// TODO: Add parameters for time and ADC calibration
par
->
fElinkParams
.
push_back
(
elinkPar
);
}
...
...
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