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
70f419a3
Commit
70f419a3
authored
2 years ago
by
Alexandru Bercuci
Browse files
Options
Downloads
Patches
Plain Diff
modify histo naming, explicit variable naming
parent
983048ac
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/detectors/trd/CbmTrdParFasp.h
+1
-1
1 addition, 1 deletion
core/detectors/trd/CbmTrdParFasp.h
reco/detectors/trd/unpack/CbmTrdUnpackFaspMonitor.cxx
+6
-5
6 additions, 5 deletions
reco/detectors/trd/unpack/CbmTrdUnpackFaspMonitor.cxx
with
7 additions
and
6 deletions
core/detectors/trd/CbmTrdParFasp.h
+
1
−
1
View file @
70f419a3
...
...
@@ -93,7 +93,7 @@ public:
}
virtual
uint32_t
GetChannelMask
()
const
;
virtual
bool
IsChannelMasked
(
int
ch
)
const
;
Int_
t
GetPadAddress
(
Int_t
ich
)
const
{
return
0.5
*
GetChannelAddress
(
ich
);
}
in
t
GetPadAddress
(
Int_t
ich
)
const
{
return
int
(
0.5
*
GetChannelAddress
(
ich
)
)
;
}
Double_t
GetSizeX
()
const
{
return
fgSizeX
;
}
Double_t
GetSizeY
()
const
{
return
fgSizeY
;
}
Double_t
GetSizeZ
()
const
{
return
fgSizeZ
;
}
...
...
This diff is collapsed.
Click to expand it.
reco/detectors/trd/unpack/CbmTrdUnpackFaspMonitor.cxx
+
6
−
5
View file @
70f419a3
...
...
@@ -136,7 +136,7 @@ void CbmTrdUnpackFaspMonitor::MapMaskedChannels(const CbmTrdParSetAsic* par)
}
for
(
int
ich
(
0
);
ich
<
NFASPCH
;
ich
++
)
{
const
CbmTrdParFaspChannel
*
faspCh
=
fasp
->
GetChannel
(
ich
);
int
pad
=
fasp
->
Get
Channel
Address
(
ich
)
/
2
,
row
=
pad
/
ncol
,
col
=
pad
%
ncol
;
int
pad
=
fasp
->
Get
Pad
Address
(
ich
),
row
=
pad
/
ncol
,
col
=
pad
%
ncol
;
if
(
faspCh
->
IsMasked
())
histo
->
Fill
(
col
+
(
faspCh
->
HasPairingR
()
?
1
:
-
1
)
*
0.25
,
row
);
}
}
...
...
@@ -151,7 +151,7 @@ void CbmTrdUnpackFaspMonitor::addParam(uint32_t madd, const CbmTrdParSetAsic* as
return
;
}
std
::
vector
<
int32_t
>
pad
ToFaspMapping
(
NFASPMOD
*
NFASPCH
,
-
1
);
std
::
vector
<
int32_t
>
ch
ToFaspMapping
(
NFASPMOD
*
NFASPCH
,
-
1
);
std
::
vector
<
Int_t
>
add
;
asics
->
GetAsicAddresses
(
&
add
);
for
(
auto
afasp
:
add
)
{
...
...
@@ -159,11 +159,11 @@ void CbmTrdUnpackFaspMonitor::addParam(uint32_t madd, const CbmTrdParSetAsic* as
int
faspid
(
afasp
%
1000
),
ich
(
faspid
*
100
);
for
(
auto
ach
:
fasp
->
GetChannelAddresses
())
{
pad
ToFaspMapping
[
ach
]
=
ich
;
ch
ToFaspMapping
[
ach
]
=
ich
;
ich
++
;
}
}
std
::
get
<
0
>
((
*
moduleDef
).
second
)
=
pad
ToFaspMapping
;
std
::
get
<
0
>
((
*
moduleDef
).
second
)
=
ch
ToFaspMapping
;
}
//_________________________________________________________________________
...
...
@@ -192,7 +192,7 @@ void CbmTrdUnpackFaspMonitor::createHisto(eDigiHistos kHisto)
auto
nrows
=
std
::
get
<
2
>
(
moduleDef
.
second
);
auto
nchs
=
nrows
*
ncols
;
histoname
=
"Fasp_"
+
getTypeName
(
kHisto
)
+
"_"
+
getHistoName
(
kHisto
);
histoname
=
getTypeName
(
kHisto
)
+
getHistoName
(
kHisto
)
+
"Fasp"
;
switch
(
kHisto
)
{
case
eDigiHistos
::
kMap
:
newhisto
=
std
::
make_shared
<
TH2I
>
(
histoname
.
data
(),
Form
(
"%s %d"
,
histoname
.
data
(),
modId
),
2
*
ncols
,
-
0.5
,
...
...
@@ -203,6 +203,7 @@ void CbmTrdUnpackFaspMonitor::createHisto(eDigiHistos kHisto)
break
;
case
eDigiHistos
::
kMap_St
:
histoname
=
getTypeName
(
kHisto
)
+
"MaskFasp"
;
newhisto
=
std
::
make_shared
<
TH2I
>
(
histoname
.
data
(),
Form
(
"%s %d"
,
histoname
.
data
(),
modId
),
2
*
ncols
,
-
0.5
,
(
ncols
-
0.5
),
nrows
,
-
0.5
,
(
nrows
-
0.5
));
newhisto
->
SetXTitle
(
"COL (pad)"
);
...
...
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