Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mehulkumar Shiroya
cbmroot
Commits
bd531a5c
Commit
bd531a5c
authored
Jul 16, 2021
by
Pascal Raisig
Committed by
Pierre-Alain Loizeau
Jul 22, 2021
Browse files
Fix warning message of sts
parent
ff3ccc64
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
8 deletions
+9
-8
reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx
reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx
+4
-3
reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx
reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx
+4
-4
reco/detectors/trd/unpack/CbmTrdUnpackMonitor.cxx
reco/detectors/trd/unpack/CbmTrdUnpackMonitor.cxx
+0
-1
reco/detectors/trd/unpack/CbmTrdUnpackMonitor.h
reco/detectors/trd/unpack/CbmTrdUnpackMonitor.h
+1
-0
No files found.
reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx
View file @
bd531a5c
...
...
@@ -11,6 +11,7 @@
#include <RtypesCore.h>
#include <cstdint>
#include <iomanip>
// FIXME
// #include "StsXyterFinalHit.h"
...
...
@@ -27,7 +28,7 @@ uint32_t CbmStsUnpackAlgo::getAsicIndex(uint32_t dpbidx, uint32_t crobidx, uint1
uint32_t
asicidx
=
0
;
const
int32_t
uFebIdx
=
fElinkIdxToFebIdxVec
.
at
(
elinkidx
);
uint32_t
febtype
=
fviFebType
[
fuCurrD
pb
I
dx
][
crobidx
][
uFebIdx
];
uint32_t
febtype
=
fviFebType
[
d
pb
i
dx
][
crobidx
][
uFebIdx
];
// Feb type a
if
(
febtype
==
0
)
asicidx
=
fElinkIdxToAsicIdxVec
.
at
(
elinkidx
).
first
;
// Feb type b
...
...
@@ -35,7 +36,7 @@ uint32_t CbmStsUnpackAlgo::getAsicIndex(uint32_t dpbidx, uint32_t crobidx, uint1
// else would be inactive feb, this was not handled in the previous implementation, this I expect it should not happen
uint32_t
uAsicIdx
=
(
fuCurrD
pb
I
dx
*
fNrCrobPerDpb
+
crobidx
)
*
fNrAsicsPerCrob
+
asicidx
;
uint32_t
uAsicIdx
=
(
d
pb
i
dx
*
fNrCrobPerDpb
+
crobidx
)
*
fNrAsicsPerCrob
+
asicidx
;
return
uAsicIdx
;
}
...
...
@@ -693,7 +694,7 @@ bool CbmStsUnpackAlgo::unpack(const fles::Timeslice* ts, std::uint16_t icomp, UI
LOG
(
info
)
<<
"---------------------------------------------------------------"
;
// Had to remove this line otherwise we would get circle dependencies in the current stage of cbmroot, since we still have Unpackers in the fles folders, which require the reco folders
// LOG(info) << FormatMsHeaderPrintout(msDescriptor);
LOG
(
warning
)
<<
fName
<<
"unpack(...)::Could not find the sDPB index for AFCK id 0x"
<<
std
::
hex
<<
uCurrDpbId
LOG
(
warning
)
<<
fName
<<
"
::
unpack(...)::Could not find the sDPB index for AFCK id 0x"
<<
std
::
hex
<<
uCurrDpbId
<<
std
::
dec
<<
" in timeslice "
<<
fNrProcessedTs
<<
" in microslice "
<<
imslice
<<
" component "
<<
icomp
<<
"
\n
"
<<
"If valid this index has to be added in the STS "
...
...
reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx
View file @
bd531a5c
...
...
@@ -290,13 +290,13 @@ void CbmStsUnpackMonitor::DrawCanvases()
Bool_t
CbmStsUnpackMonitor
::
CreateMsComponentSizeHistos
(
UInt_t
component
)
{
if
(
nullptr
==
fvhMsSize
[
component
])
{
TString
sMsSizeName
=
Form
(
"MsSize_link_%02
l
u"
,
component
);
TString
sMsSizeTitle
=
Form
(
"Size of MS for nDPB of link %02
l
u; Ms Size [bytes]"
,
component
);
TString
sMsSizeName
=
Form
(
"MsSize_link_%02u"
,
component
);
TString
sMsSizeTitle
=
Form
(
"Size of MS for nDPB of link %02u; Ms Size [bytes]"
,
component
);
fvhMsSize
[
component
]
=
new
TH1F
(
sMsSizeName
.
Data
(),
sMsSizeTitle
.
Data
(),
30000
,
0.
,
30000.
);
fvhMsSize
[
component
]
->
SetCanExtend
(
TH2
::
kAllAxes
);
sMsSizeName
=
Form
(
"MsSizeTime_link_%02
l
u"
,
component
);
sMsSizeTitle
=
Form
(
"Size of MS vs time for gDPB of link %02
l
u; Time[s] ; Ms Size [bytes]"
,
component
);
sMsSizeName
=
Form
(
"MsSizeTime_link_%02u"
,
component
);
sMsSizeTitle
=
Form
(
"Size of MS vs time for gDPB of link %02u; Time[s] ; Ms Size [bytes]"
,
component
);
fvhMsSizeTime
[
component
]
=
new
TProfile
(
sMsSizeName
.
Data
(),
sMsSizeTitle
.
Data
(),
15000
,
0.
,
300.
);
fvhMsSizeTime
[
component
]
->
SetCanExtend
(
TH2
::
kAllAxes
);
...
...
reco/detectors/trd/unpack/CbmTrdUnpackMonitor.cxx
View file @
bd531a5c
...
...
@@ -89,7 +89,6 @@ void CbmTrdUnpackMonitor::Finish()
TDirectory
*
oldDir
=
gDirectory
;
/// (Re-)Create ROOT file to store the histos
// std::unique_ptr<TFile> histofile(new TFile(fOutfilename.data(), "RECREATE"));
TFile
histofile
(
fOutfilename
.
data
(),
"RECREATE"
);
nhistos
+=
writeHistosToFile
(
&
fDigiHistoMap
,
&
histofile
);
...
...
reco/detectors/trd/unpack/CbmTrdUnpackMonitor.h
View file @
bd531a5c
...
...
@@ -35,6 +35,7 @@
#include <Rtypes.h> // for types
#include <RtypesCore.h>
#include <TFile.h>
#include <TH1.h>
#include <THttpServer.h> // for histogram server
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment