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
e939afdf
Commit
e939afdf
authored
Jul 21, 2021
by
Pascal Raisig
Committed by
Pierre-Alain Loizeau
Jul 22, 2021
Browse files
Silence llu to lu conversion warnings on macos
parent
b801618b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
7 deletions
+15
-7
fles/mcbm2018/unpacker/CbmCriGet4RawPrint.cxx
fles/mcbm2018/unpacker/CbmCriGet4RawPrint.cxx
+3
-1
reco/detectors/psd/unpack/CbmPsdUnpackAlgo.cxx
reco/detectors/psd/unpack/CbmPsdUnpackAlgo.cxx
+2
-1
reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx
reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx
+8
-4
reco/detectors/trd/unpack/CbmTrdUnpackAlgoFasp2D.cxx
reco/detectors/trd/unpack/CbmTrdUnpackAlgoFasp2D.cxx
+2
-1
No files found.
fles/mcbm2018/unpacker/CbmCriGet4RawPrint.cxx
View file @
e939afdf
...
...
@@ -181,9 +181,11 @@ Bool_t CbmCriGet4RawPrint::DoUnpack(const fles::Timeslice& ts, size_t /*componen
procEpochUntilError
++
;
if
(
lastGlobalEpoch
!=
0xFFFFFF
)
{
if
((
lastGlobalEpoch
+
1
)
!=
epoch
)
{
// Cast required to silence a warning on macos (there a uint64_t is a llu)
snprintf
(
buf
,
sizeof
(
buf
),
"Error global epoch, last epoch, current epoch, diff 0x%06x 0x%06x %d 0x%016lx %d"
,
lastGlobalEpoch
,
epoch
,
lastGlobalEpoch
-
epoch
,
ulData
,
procEpochUntilError
);
lastGlobalEpoch
,
epoch
,
lastGlobalEpoch
-
epoch
,
static_cast
<
size_t
>
(
ulData
),
procEpochUntilError
);
std
::
cout
<<
buf
<<
std
::
endl
;
procEpochUntilError
=
0
;
...
...
reco/detectors/psd/unpack/CbmPsdUnpackAlgo.cxx
View file @
e939afdf
...
...
@@ -195,7 +195,8 @@ bool CbmPsdUnpackAlgo::unpack(const fles::Timeslice* ts, std::uint16_t icomp, UI
while
(
PsdReader
.
GetTotalGbtWordsRead
()
<
uNbMessages
)
{
int
ReadResult
=
PsdReader
.
ReadMs
();
if
(
fair
::
Logger
::
Logging
(
fair
::
Severity
::
debug
))
{
printf
(
"
\n
Microslice idx: %lu
\n
"
,
mstime
);
// Cast requires to silence a warning on macos, there a uint64_t is a long long unsigned
printf
(
"
\n
Microslice idx: %lu
\n
"
,
static_cast
<
size_t
>
(
mstime
));
PsdReader
.
PrintOut
();
/*PsdReader.PrintSaveBuff();*/
}
if
(
ReadResult
==
0
)
{
...
...
reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx
View file @
e939afdf
...
...
@@ -299,11 +299,12 @@ void CbmTofUnpackAlgo::ProcessEpoch(const critof001::Message& mess, uint32_t uMe
}
if
(
ulEpochNr
!=
ulMsStartInEpoch
)
{
// size_t required to silence a warning on macos (there a uint64_t is a llu)
LOG
(
error
)
<<
fName
<<
"::ProcessEpoch => Error first global epoch, "
<<
Form
(
"from MS index 0x%06lx, current 0x%06llx, diff %lld, raw 0x%016lx, NoErr %d, current 0x%06lx %f"
,
ulMsStartInEpoch
,
ulEpochNr
,
ulEpochNr
-
ulMsStartInEpoch
,
mess
.
getData
(),
fuProcEpochUntilError
,
static_cast
<
uint64
_t
>
(
fulCurrentMsIdx
/
critof001
::
kuEpochInNs
),
static_cast
<
size
_t
>
(
fulCurrentMsIdx
/
critof001
::
kuEpochInNs
),
fulCurrentMsIdx
/
critof001
::
kuEpochInNs
);
LOG
(
error
)
<<
fName
<<
"::ProcessEpoch => Ignoring data until next valid epoch"
;
...
...
@@ -317,9 +318,10 @@ void CbmTofUnpackAlgo::ProcessEpoch(const critof001::Message& mess, uint32_t uMe
}
// else of if( ulEpochNr != ulMsStartInEpoch )
}
// if( 0 < uMesgIdx )
else
if
(((
fulCurrentEpoch
+
1
)
%
critof001
::
kulEpochCycleEp
)
!=
ulEpochNr
)
{
// Cast required to silence a warning on macos (there a uint64_t is a llu)
LOG
(
error
)
<<
fName
<<
"::ProcessEpoch => Error global epoch, "
<<
Form
(
"last 0x%06llx, current 0x%06llx, diff %lld, raw 0x%016lx, NoErr %d"
,
fulCurrentEpoch
,
ulEpochNr
,
ulEpochNr
-
fulCurrentEpoch
,
mess
.
getData
(),
fuProcEpochUntilError
);
ulEpochNr
-
fulCurrentEpoch
,
static_cast
<
size_t
>
(
mess
.
getData
()
)
,
fuProcEpochUntilError
);
LOG
(
error
)
<<
fName
<<
"::ProcessEpoch => Ignoring data until next valid epoch"
;
ulEpochNr
=
(
fulCurrentEpoch
+
1
)
%
critof001
::
kulEpochCycleEp
;
...
...
@@ -337,10 +339,12 @@ void CbmTofUnpackAlgo::ProcessEpoch(const critof001::Message& mess, uint32_t uMe
fulEpochIndexInTs
=
ulEpochNr
+
critof001
::
kulEpochCycleEp
-
fulTsStartInEpoch
;
}
if
(
10e9
<
critof001
::
kuEpochInNs
*
fulEpochIndexInTs
)
// Cast required to silence a warning on macos (there a uint64_t is a llu)
LOG
(
debug
)
<<
fName
<<
"::ProcessEpoch => "
<<
Form
(
"Raw Epoch: 0x%06llx, Epoch offset 0x%06lx, Epoch in Ts: 0x%07lx, time %f ns (%f * %lu)"
,
ulEpochNr
,
fulTsStartInEpoch
,
fulEpochIndexInTs
,
critof001
::
kuEpochInNs
*
fulEpochIndexInTs
,
critof001
::
kuEpochInNs
,
fulEpochIndexInTs
);
ulEpochNr
,
fulTsStartInEpoch
,
static_cast
<
size_t
>
(
fulEpochIndexInTs
),
critof001
::
kuEpochInNs
*
fulEpochIndexInTs
,
critof001
::
kuEpochInNs
,
static_cast
<
size_t
>
(
fulEpochIndexInTs
));
}
void
CbmTofUnpackAlgo
::
ProcessHit
(
const
critof001
::
Message
&
mess
)
...
...
reco/detectors/trd/unpack/CbmTrdUnpackAlgoFasp2D.cxx
View file @
e939afdf
...
...
@@ -146,7 +146,8 @@ bool CbmTrdUnpackAlgoFasp2D::unpack(const fles::Timeslice* ts, std::uint16_t ico
//Double_t fdMsSizeInNs = 1.28e6;
auto
msdesc
=
ts
->
descriptor
(
icomp
,
imslice
);
if
(
VERBOSE
)
printf
(
"time start %lu
\n
"
,
msdesc
.
idx
);
// Cast required to silence a warning on macos (there a uint64_t is a llu)
if
(
VERBOSE
)
printf
(
"time start %lu
\n
"
,
static_cast
<
size_t
>
(
msdesc
.
idx
));
// define time wrt start of time slice in TRD/FASP clks [80 MHz]
fTime
[
0
]
=
ULong64_t
((
msdesc
.
idx
-
fTsStartTime
)
/
12.5
);
...
...
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