Skip to content

Commit 800b3b6

Browse files
committed
fixup
1 parent adf6dfb commit 800b3b6

File tree

2 files changed

+92
-91
lines changed

2 files changed

+92
-91
lines changed

GPU/TPCFastTransformation/TPCFastTransformPOD.cxx

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,22 @@
1414
///
1515
/// \author ruben.shahoayn@cern.ch
1616

17-
#include "TPCFastTransformPOD.h"
1817
/// \brief Implementation of POD correction map
1918
///
2019
/// \author ruben.shahoayn@cern.ch
2120

22-
#include "TPCFastTransformPOD.h"
23-
#include "GPUDebugStreamer.h"
24-
#if !defined(GPUCA_GPUCODE)
21+
#if !defined(GPUCA_NO_ROOT) && !defined(GPUCA_NO_FMT) && !defined(GPUCA_STANDALONE)
2522
#include <TRandom.h>
2623
#endif
24+
#include "TPCFastTransformPOD.h"
25+
#include "GPUDebugStreamer.h"
2726

2827
namespace o2
2928
{
3029
namespace gpu
3130
{
3231

33-
#if !defined(GPUCA_GPUCODE)
32+
#if !defined(GPUCA_NO_ROOT) && !defined(GPUCA_NO_FMT) && !defined(GPUCA_STANDALONE)
3433

3534
size_t TPCFastTransformPOD::estimateSize(const TPCFastSpaceChargeCorrection& origCorr)
3635
{
@@ -184,12 +183,16 @@ bool TPCFastTransformPOD::test(const TPCFastSpaceChargeCorrection& origCorr, int
184183
long origStart[3], origEnd[3], thisStart[3], thisEnd[3];
185184
origStart[0] = std::chrono::time_point_cast<std::chrono::microseconds>(std::chrono::system_clock::now()).time_since_epoch().count();
186185
for (int i = 0; i < npoints; i++) {
187-
corr0.push_back(origCorr.getCorrectionLocal(sector[i], row[i], y[i], z[i]));
186+
std::array<float, 3> val;
187+
origCorr.getCorrectionLocal(sector[i], row[i], y[i], z[i], val[0], val[1], val[2]);
188+
corr0.push_back(val);
188189
}
189190

190191
origEnd[0] = origStart[1] = std::chrono::time_point_cast<std::chrono::microseconds>(std::chrono::system_clock::now()).time_since_epoch().count();
191192
for (int i = 0; i < npoints; i++) {
192-
corrInv0.push_back(origCorr.getCorrectionYZatRealYZ(sector[i], row[i], y[i], z[i]));
193+
std::array<float, 2> val;
194+
origCorr.getCorrectionYZatRealYZ(sector[i], row[i], y[i], z[i], val[0], val[1]);
195+
corrInv0.push_back(val);
193196
}
194197

195198
origEnd[1] = origStart[2] = std::chrono::time_point_cast<std::chrono::microseconds>(std::chrono::system_clock::now()).time_since_epoch().count();
@@ -199,11 +202,15 @@ bool TPCFastTransformPOD::test(const TPCFastSpaceChargeCorrection& origCorr, int
199202
//
200203
origEnd[2] = thisStart[0] = std::chrono::time_point_cast<std::chrono::microseconds>(std::chrono::system_clock::now()).time_since_epoch().count();
201204
for (int i = 0; i < npoints; i++) {
202-
corr1.push_back(this->getCorrectionLocal(sector[i], row[i], y[i], z[i]));
205+
std::array<float, 3> val;
206+
this->getCorrectionLocal(sector[i], row[i], y[i], z[i], val[0], val[1], val[2]);
207+
corr1.push_back(val);
203208
}
204209
thisEnd[0] = thisStart[1] = std::chrono::time_point_cast<std::chrono::microseconds>(std::chrono::system_clock::now()).time_since_epoch().count();
205210
for (int i = 0; i < npoints; i++) {
206-
corrInv1.push_back(this->getCorrectionYZatRealYZ(sector[i], row[i], y[i], z[i]));
211+
std::array<float, 2> val;
212+
this->getCorrectionYZatRealYZ(sector[i], row[i], y[i], z[i], val[0], val[1]);
213+
corrInv1.push_back(val);
207214
}
208215

209216
thisEnd[1] = thisStart[2] = std::chrono::time_point_cast<std::chrono::microseconds>(std::chrono::system_clock::now()).time_since_epoch().count();

0 commit comments

Comments
 (0)