Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions DataFormats/Reconstruction/src/Vertex.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ namespace o2
namespace dataformats
{

#ifndef GPUCA_NO_FMT
std::string VertexBase::asString() const
{
return fmt::format("Vtx {{{:+.4e},{:+.4e},{:+.4e}}} Cov.:{{{{{:.3e}..}},{{{:.3e},{:.3e}..}},{{{:.3e},{:.3e},{:.3e}}}}}",
Expand All @@ -37,6 +38,7 @@ void VertexBase::print() const
{
std::cout << *this << std::endl;
}
#endif

bool VertexBase::operator==(const VertexBase& other) const
{
Expand Down
2 changes: 1 addition & 1 deletion GPU/GPUTracking/Base/GPUReconstructionDeviceBase.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ int32_t GPUReconstructionDeviceBase::InitDevice()
return (1);
}
if ((size_t)GetProcessingSettings().nStreams > constants::GPU_MAX_STREAMS) {
GPUError("Too many straems requested %d > %d\n", GetProcessingSettings().nStreams, constants::GPU_MAX_STREAMS);
GPUError("Too many straems requested %d > %zu\n", GetProcessingSettings().nStreams, constants::GPU_MAX_STREAMS);
return (1);
}

Expand Down
4 changes: 2 additions & 2 deletions GPU/GPUTracking/Base/GPUReconstructionIO.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ inline uint32_t GPUReconstruction::DumpData(FILE* fp, const T* const* entries, c
}
}
if (GetProcessingSettings().debugLevel >= 2) {
GPUInfo("Dumped %zu %s", numTotal, IOTYPENAMES[type]);
GPUInfo("Dumped %u %s", numTotal, IOTYPENAMES[type]);
}
return numTotal;
}
Expand Down Expand Up @@ -247,7 +247,7 @@ inline aligned_unique_buffer_ptr<T> GPUReconstruction::ReadDynamicStructFromFile
r = fread(newObj.getraw() + sizeof(T), 1, dynsize - sizeof(T), fp);
fclose(fp);
if (r != dynsize - sizeof(T)) {
GPUError("ERROR in %s: File Read error in %s: %zu (%zu expected)", file, r, dynsize);
GPUError("ERROR in %s: File Read error: %zu (%zu expected)", file, r, dynsize - sizeof(T));
throw std::runtime_error("invalid size");
}
if (GetProcessingSettings().debugLevel >= 2) {
Expand Down
4 changes: 2 additions & 2 deletions GPU/GPUTracking/DataTypes/CalibdEdxTrackTopologyPol.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -181,15 +181,15 @@ void CalibdEdxTrackTopologyPol::setFromContainer(const CalibdEdxTrackTopologyPol
construct();
}

#ifndef GPUCA_STANDALONE

std::string CalibdEdxTrackTopologyPol::getPolyName(const int32_t region, const ChargeType charge)
{
const std::string typeName[2] = {"qMax", "qTot"};
const std::string polname = fmt::format("polynomial_{}_region{}", typeName[charge], region).data();
return polname;
}

#ifndef GPUCA_STANDALONE

void CalibdEdxTrackTopologyPol::writeToFile(TFile& outf, const char* name) const
{
CalibdEdxTrackTopologyPolContainer cont;
Expand Down
2 changes: 1 addition & 1 deletion GPU/GPUTracking/Global/GPUChainTrackingClusterizer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ void GPUChainTracking::TPCClusterizerCheckExtraADCZeros(GPUTPCClusterFinder& clu
if (nNonZeroADCs > 0) {
GPUInfo("Non Zero ADCs: %zu", nNonZeroADCs);
} else {
GPUInfo("Cleared all extra ADC values!", nNonZeroADCs);
GPUInfo("Cleared all extra ADC values!");
}
}

Expand Down
Loading