Skip to content

Commit de197ab

Browse files
cbmswdavidrohr
authored andcommitted
TPCFastTransform: adjust the test macro to the new code
1 parent d1658ad commit de197ab

1 file changed

Lines changed: 8 additions & 13 deletions

File tree

GPU/TPCFastTransformation/macro/TPCFastTransformInit.C

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ void TPCFastTransformInit(const char* fileName = "debugVoxRes.root", const char*
180180

181181
const char* fileName = outFileName;
182182

183-
// fileName = "~/test/master/TPCFastTransform_VoxRes.root";
183+
//fileName = "~/alidock/test/master/TPCFastTransform_VoxRes.root";
184184

185185
std::cout << "load corrections from file " << fileName << std::endl;
186186

@@ -306,18 +306,13 @@ void TPCFastTransformInit(const char* fileName = "debugVoxRes.root", const char*
306306

307307
auto getInvCorrections = [&](int iSector, int iRow, float realY, float realZ, float& ix, float& iy, float& iz) {
308308
// get the inverse corrections ix, iy, iz at x,y,z
309-
ix = corr.getCorrectionXatRealYZ(iSector, iRow, realY, realZ);
310-
const auto c = corr.getCorrectionYZatRealYZ(iSector, iRow, realY, realZ);
311-
iy = c[0];
312-
iz = c[1];
309+
ix = corr.getCorrectionXatRealYZ(iSector, iRow, realY, realZ);
310+
corr.getCorrectionYZatRealYZ(iSector, iRow, realY, realZ, iy, iz);
313311
};
314312

315313
auto getAllCorrections = [&](int iSector, int iRow, float y, float z, float& cx, float& cy, float& cz, float& ix, float& iy, float& iz) {
316314
// get the corrections cx,cy,cz at x,y,z
317-
const auto c = corr.getCorrectionLocal(iSector, iRow, y, z);
318-
cx = c[0];
319-
cy = c[1];
320-
cz = c[2];
315+
corr.getCorrectionLocal(iSector, iRow, y, z, cx, cy, cz);
321316
getInvCorrections(iSector, iRow, y + cy, z + cz, ix, iy, iz);
322317
};
323318

@@ -582,15 +577,15 @@ void TPCFastTransformInit(const char* fileName = "debugVoxRes.root", const char*
582577
float correctionY = point.mDy;
583578
float correctionZ = point.mDz;
584579
if (direction == 0) {
585-
auto [cx, cy, cz] =
586-
corr.getCorrectionLocal(iSector, iRow, y, z);
580+
float cx, cy, cz;
581+
corr.getCorrectionLocal(iSector, iRow, y, z, cx, cy, cz);
587582
ntFitPoints->Fill(iSector, iRow, x, y, z, correctionX, correctionY,
588583
correctionZ, cx, cy, cz);
589584
} else {
590585
float cx =
591586
corr.getCorrectionXatRealYZ(iSector, iRow, y, z);
592-
auto [cy, cz] =
593-
corr.getCorrectionYZatRealYZ(iSector, iRow, y, z);
587+
float cy, cz;
588+
corr.getCorrectionYZatRealYZ(iSector, iRow, y, z, cy, cz);
594589
ntInvFitPoints->Fill(iSector, iRow, x, y, z, correctionX, correctionY,
595590
correctionZ, cx, cy, cz);
596591
}

0 commit comments

Comments
 (0)