Skip to content

Commit 4215a64

Browse files
committed
Fix couple of invalid debug print arguments
1 parent fc0f636 commit 4215a64

5 files changed

Lines changed: 8 additions & 6 deletions

File tree

‎DataFormats/Reconstruction/src/Vertex.cxx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ namespace o2
2020
namespace dataformats
2121
{
2222

23+
#ifndef GPUCA_NO_FMT
2324
std::string VertexBase::asString() const
2425
{
2526
return fmt::format("Vtx {{{:+.4e},{:+.4e},{:+.4e}}} Cov.:{{{{{:.3e}..}},{{{:.3e},{:.3e}..}},{{{:.3e},{:.3e},{:.3e}}}}}",
@@ -37,6 +38,7 @@ void VertexBase::print() const
3738
{
3839
std::cout << *this << std::endl;
3940
}
41+
#endif
4042

4143
bool VertexBase::operator==(const VertexBase& other) const
4244
{

‎GPU/GPUTracking/Base/GPUReconstructionDeviceBase.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ int32_t GPUReconstructionDeviceBase::InitDevice()
9999
return (1);
100100
}
101101
if ((size_t)GetProcessingSettings().nStreams > constants::GPU_MAX_STREAMS) {
102-
GPUError("Too many straems requested %d > %d\n", GetProcessingSettings().nStreams, constants::GPU_MAX_STREAMS);
102+
GPUError("Too many straems requested %d > %zu\n", GetProcessingSettings().nStreams, constants::GPU_MAX_STREAMS);
103103
return (1);
104104
}
105105

‎GPU/GPUTracking/Base/GPUReconstructionIO.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ inline uint32_t GPUReconstruction::DumpData(FILE* fp, const T* const* entries, c
6969
}
7070
}
7171
if (GetProcessingSettings().debugLevel >= 2) {
72-
GPUInfo("Dumped %zu %s", numTotal, IOTYPENAMES[type]);
72+
GPUInfo("Dumped %u %s", numTotal, IOTYPENAMES[type]);
7373
}
7474
return numTotal;
7575
}
@@ -247,7 +247,7 @@ inline aligned_unique_buffer_ptr<T> GPUReconstruction::ReadDynamicStructFromFile
247247
r = fread(newObj.getraw() + sizeof(T), 1, dynsize - sizeof(T), fp);
248248
fclose(fp);
249249
if (r != dynsize - sizeof(T)) {
250-
GPUError("ERROR in %s: File Read error in %s: %zu (%zu expected)", file, r, dynsize);
250+
GPUError("ERROR in %s: File Read error: %zu (%zu expected)", file, r, dynsize - sizeof(T));
251251
throw std::runtime_error("invalid size");
252252
}
253253
if (GetProcessingSettings().debugLevel >= 2) {

‎GPU/GPUTracking/DataTypes/CalibdEdxTrackTopologyPol.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,15 +181,15 @@ void CalibdEdxTrackTopologyPol::setFromContainer(const CalibdEdxTrackTopologyPol
181181
construct();
182182
}
183183

184+
#ifndef GPUCA_STANDALONE
185+
184186
std::string CalibdEdxTrackTopologyPol::getPolyName(const int32_t region, const ChargeType charge)
185187
{
186188
const std::string typeName[2] = {"qMax", "qTot"};
187189
const std::string polname = fmt::format("polynomial_{}_region{}", typeName[charge], region).data();
188190
return polname;
189191
}
190192

191-
#ifndef GPUCA_STANDALONE
192-
193193
void CalibdEdxTrackTopologyPol::writeToFile(TFile& outf, const char* name) const
194194
{
195195
CalibdEdxTrackTopologyPolContainer cont;

‎GPU/GPUTracking/Global/GPUChainTrackingClusterizer.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ void GPUChainTracking::TPCClusterizerCheckExtraADCZeros(GPUTPCClusterFinder& clu
249249
if (nNonZeroADCs > 0) {
250250
GPUInfo("Non Zero ADCs: %zu", nNonZeroADCs);
251251
} else {
252-
GPUInfo("Cleared all extra ADC values!", nNonZeroADCs);
252+
GPUInfo("Cleared all extra ADC values!");
253253
}
254254
}
255255

0 commit comments

Comments
 (0)