Skip to content

Commit 6fa1c30

Browse files
davidrohrdavidrohr
committed
GPU: Rename configEvent to configGRP since it affects the full run not a single event
1 parent d8776a4 commit 6fa1c30

File tree

20 files changed

+88
-88
lines changed

20 files changed

+88
-88
lines changed

‎Detectors/TPC/qc/src/Tracking.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ void Tracking::initialize(outputModes outputMode, bool postprocessOnly)
4848
mQAConfig = std::make_unique<GPUO2InterfaceConfiguration>();
4949
const auto grp = o2::parameters::GRPObject::loadFrom(o2::base::NameConf::getGRPFileName());
5050
if (grp) {
51-
mQAConfig->configEvent.solenoidBz = 5.00668f * grp->getL3Current() / 30000.;
52-
mQAConfig->configEvent.continuousMaxTimeBin = grp->isDetContinuousReadOut(o2::detectors::DetID::TPC) ? -1 : 0;
51+
mQAConfig->configGRP.solenoidBz = 5.00668f * grp->getL3Current() / 30000.;
52+
mQAConfig->configGRP.continuousMaxTimeBin = grp->isDetContinuousReadOut(o2::detectors::DetID::TPC) ? -1 : 0;
5353
} else {
5454
throw std::runtime_error("Failed to initialize run parameters from GRP");
5555
}

‎Detectors/TPC/reconstruction/src/GPUCATracking.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ int GPUCATracking::runTracking(GPUO2InterfaceIOPtrs* data, GPUInterfaceOutputs*
6868
ptrs.tpcZS = data->tpcZS;
6969
if (data->o2Digits) {
7070
const float zsThreshold = mTrackingCAO2Interface->getConfig().configReconstruction.tpcZSthreshold;
71-
const int maxContTimeBin = mTrackingCAO2Interface->getConfig().configEvent.continuousMaxTimeBin;
71+
const int maxContTimeBin = mTrackingCAO2Interface->getConfig().configGRP.continuousMaxTimeBin;
7272
for (int i = 0; i < Sector::MAXSECTOR; i++) {
7373
const auto& d = (*(data->o2Digits))[i];
7474
if (zsThreshold > 0 && data->tpcZS == nullptr) {

‎Detectors/TPC/reconstruction/test/testGPUCATracking.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ BOOST_AUTO_TEST_CASE(CATracking_test1)
6060
config.configProcessing.eventDisplay = nullptr; //Ptr to event display backend, for running standalone OpenGL event display
6161
//config.configProcessing.eventDisplay = new GPUDisplayBackendGlfw;
6262

63-
config.configEvent.solenoidBz = solenoidBz;
64-
config.configEvent.continuousMaxTimeBin = continuous ? GPUSettings::TPC_MAX_TF_TIME_BIN : 0; //Number of timebins in timeframe if continuous, 0 otherwise
63+
config.configGRP.solenoidBz = solenoidBz;
64+
config.configGRP.continuousMaxTimeBin = continuous ? GPUSettings::TPC_MAX_TF_TIME_BIN : 0; //Number of timebins in timeframe if continuous, 0 otherwise
6565

6666
config.configReconstruction.NWays = 3; //Should always be 3!
6767
config.configReconstruction.NWaysOuter = true; //Will create outer param for TRD

‎Detectors/TPC/workflow/src/CATrackerSpec.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ DataProcessorSpec getCATrackerSpec(CompletionPolicyData* policyData, ca::Config
134134
o2::base::GeometryManager::loadGeometry();
135135
o2::base::Propagator::initFieldFromGRP(o2::base::NameConf::getGRPFileName());
136136
if (grp) {
137-
config.configEvent.solenoidBz = 5.00668f * grp->getL3Current() / 30000.;
138-
config.configEvent.continuousMaxTimeBin = grp->isDetContinuousReadOut(o2::detectors::DetID::TPC) ? -1 : 0; // Number of timebins in timeframe if continuous, 0 otherwise
139-
LOG(INFO) << "Initializing run paramerers from GRP bz=" << config.configEvent.solenoidBz << " cont=" << grp->isDetContinuousReadOut(o2::detectors::DetID::TPC);
137+
config.configGRP.solenoidBz = 5.00668f * grp->getL3Current() / 30000.;
138+
config.configGRP.continuousMaxTimeBin = grp->isDetContinuousReadOut(o2::detectors::DetID::TPC) ? -1 : 0; // Number of timebins in timeframe if continuous, 0 otherwise
139+
LOG(INFO) << "Initializing run paramerers from GRP bz=" << config.configGRP.solenoidBz << " cont=" << grp->isDetContinuousReadOut(o2::detectors::DetID::TPC);
140140
} else {
141141
throw std::runtime_error("Failed to initialize run parameters from GRP");
142142
}
@@ -156,8 +156,8 @@ DataProcessorSpec getCATrackerSpec(CompletionPolicyData* policyData, ca::Config
156156
#endif
157157
}
158158

159-
if (config.configEvent.continuousMaxTimeBin == -1) {
160-
config.configEvent.continuousMaxTimeBin = (o2::raw::HBFUtils::Instance().getNOrbitsPerTF() * o2::constants::lhc::LHCMaxBunches + 2 * constants::LHCBCPERTIMEBIN - 2) / constants::LHCBCPERTIMEBIN;
159+
if (config.configGRP.continuousMaxTimeBin == -1) {
160+
config.configGRP.continuousMaxTimeBin = (o2::raw::HBFUtils::Instance().getNOrbitsPerTF() * o2::constants::lhc::LHCMaxBunches + 2 * constants::LHCBCPERTIMEBIN - 2) / constants::LHCBCPERTIMEBIN;
161161
}
162162
if (config.configProcessing.deviceNum == -2) {
163163
int myId = ic.services().get<const o2::framework::DeviceSpec>().inputTimesliceId;

‎Detectors/TPC/workflow/src/ZSSpec.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ DataProcessorSpec getZSEncoderSpec(std::vector<int> const& inputIds, bool zs10bi
9595

9696
GPUParam _GPUParam;
9797
GPUO2InterfaceConfiguration config;
98-
config.configEvent.solenoidBz = 5.00668;
98+
config.configGRP.solenoidBz = 5.00668;
9999
config.ReadConfigurableParam();
100-
_GPUParam.SetDefaults(&config.configEvent, &config.configReconstruction, &config.configProcessing, nullptr);
100+
_GPUParam.SetDefaults(&config.configGRP, &config.configReconstruction, &config.configProcessing, nullptr);
101101

102102
const auto& inputs = getWorkflowTPCInput(pc, 0, false, false, 0xFFFFFFFFF, true);
103103
sizes.resize(NSectors * NEndpoints);

‎GPU/GPUTracking/Base/GPUParam.cxx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@ void GPUParam::SetDefaults(float solenoidBz)
119119
GPUTPCGMPolynomialFieldManager::GetPolynomialField(par.BzkG, polynomialField);
120120
}
121121

122-
void GPUParam::UpdateEventSettings(const GPUSettingsEvent* e, const GPUSettingsProcessing* p)
122+
void GPUParam::UpdateGRPSettings(const GPUSettingsGRP* g, const GPUSettingsProcessing* p)
123123
{
124-
if (e) {
125-
par.AssumeConstantBz = e->constBz;
126-
par.ToyMCEventsFlag = e->homemadeEvents;
127-
par.ContinuousTracking = e->continuousMaxTimeBin != 0;
128-
par.continuousMaxTimeBin = e->continuousMaxTimeBin == -1 ? GPUSettings::TPC_MAX_TF_TIME_BIN : e->continuousMaxTimeBin;
124+
if (g) {
125+
par.AssumeConstantBz = g->constBz;
126+
par.ToyMCEventsFlag = g->homemadeEvents;
127+
par.ContinuousTracking = g->continuousMaxTimeBin != 0;
128+
par.continuousMaxTimeBin = g->continuousMaxTimeBin == -1 ? GPUSettings::TPC_MAX_TF_TIME_BIN : g->continuousMaxTimeBin;
129129
polynomialField.Reset();
130130
if (par.AssumeConstantBz) {
131131
GPUTPCGMPolynomialFieldManager::GetPolynomialField(GPUTPCGMPolynomialFieldManager::kUniform, par.BzkG, polynomialField);
@@ -140,9 +140,9 @@ void GPUParam::UpdateEventSettings(const GPUSettingsEvent* e, const GPUSettingsP
140140
par.earlyTpcTransform = rec.ForceEarlyTPCTransform == -1 ? (!par.ContinuousTracking) : rec.ForceEarlyTPCTransform;
141141
}
142142

143-
void GPUParam::SetDefaults(const GPUSettingsEvent* e, const GPUSettingsRec* r, const GPUSettingsProcessing* p, const GPURecoStepConfiguration* w)
143+
void GPUParam::SetDefaults(const GPUSettingsGRP* g, const GPUSettingsRec* r, const GPUSettingsProcessing* p, const GPURecoStepConfiguration* w)
144144
{
145-
SetDefaults(e->solenoidBz);
145+
SetDefaults(g->solenoidBz);
146146
if (w) {
147147
par.dodEdx = w->steps.isSet(GPUDataTypes::RecoStep::TPCdEdx);
148148
}
@@ -152,7 +152,7 @@ void GPUParam::SetDefaults(const GPUSettingsEvent* e, const GPUSettingsRec* r, c
152152
rec.fitPropagateBzOnly = rec.NWays - 1;
153153
}
154154
}
155-
UpdateEventSettings(e, p);
155+
UpdateGRPSettings(g, p);
156156
}
157157

158158
#ifndef GPUCA_ALIROOT_LIB

‎GPU/GPUTracking/Base/GPUParam.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace GPUCA_NAMESPACE
3535
namespace gpu
3636
{
3737
struct GPUSettingsRec;
38-
struct GPUSettingsEvent;
38+
struct GPUSettingsGTP;
3939
struct GPURecoStepConfiguration;
4040

4141
struct GPUParamSlice {
@@ -69,8 +69,8 @@ struct GPUParam : public internal::GPUParam_t<GPUSettingsRec, GPUSettingsParam>
6969

7070
#ifndef GPUCA_GPUCODE
7171
void SetDefaults(float solenoidBz);
72-
void SetDefaults(const GPUSettingsEvent* e, const GPUSettingsRec* r = nullptr, const GPUSettingsProcessing* p = nullptr, const GPURecoStepConfiguration* w = nullptr);
73-
void UpdateEventSettings(const GPUSettingsEvent* e, const GPUSettingsProcessing* p = nullptr);
72+
void SetDefaults(const GPUSettingsGRP* g, const GPUSettingsRec* r = nullptr, const GPUSettingsProcessing* p = nullptr, const GPURecoStepConfiguration* w = nullptr);
73+
void UpdateGRPSettings(const GPUSettingsGRP* g, const GPUSettingsProcessing* p = nullptr);
7474
void LoadClusterErrors(bool Print = 0);
7575
o2::base::Propagator* GetDefaultO2Propagator(bool useGPUField = false) const;
7676
#endif

‎GPU/GPUTracking/Base/GPUReconstruction.cxx‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ GPUReconstruction::GPUReconstruction(const GPUSettingsDeviceBackend& cfg) : mHos
9595
cfg.master->mSlaves.emplace_back(this);
9696
}
9797
new (&mProcessingSettings) GPUSettingsProcessing;
98-
new (&mEventSettings) GPUSettingsEvent;
99-
param().SetDefaults(&mEventSettings);
98+
new (&mGRPSettings) GPUSettingsGRP;
99+
param().SetDefaults(&mGRPSettings);
100100
mMemoryScalers.reset(new GPUMemorySizeScalers);
101101
for (unsigned int i = 0; i < NSLICES; i++) {
102102
processors()->tpcTrackers[i].SetSlice(i); // TODO: Move to a better place
@@ -980,15 +980,15 @@ void GPUReconstruction::DumpSettings(const char* dir)
980980
std::string f;
981981
f = dir;
982982
f += "settings.dump";
983-
DumpStructToFile(&mEventSettings, f.c_str());
983+
DumpStructToFile(&mGRPSettings, f.c_str());
984984
for (unsigned int i = 0; i < mChains.size(); i++) {
985985
mChains[i]->DumpSettings(dir);
986986
}
987987
}
988988

989-
void GPUReconstruction::UpdateEventSettings(const GPUSettingsEvent* e, const GPUSettingsProcessing* p)
989+
void GPUReconstruction::UpdateGRPSettings(const GPUSettingsGRP* g, const GPUSettingsProcessing* p)
990990
{
991-
param().UpdateEventSettings(e, p);
991+
param().UpdateGRPSettings(g, p);
992992
if (mInitialized) {
993993
WriteConstantParams();
994994
}
@@ -999,11 +999,11 @@ int GPUReconstruction::ReadSettings(const char* dir)
999999
std::string f;
10001000
f = dir;
10011001
f += "settings.dump";
1002-
new (&mEventSettings) GPUSettingsEvent;
1003-
if (ReadStructFromFile(f.c_str(), &mEventSettings)) {
1002+
new (&mGRPSettings) GPUSettingsGRP;
1003+
if (ReadStructFromFile(f.c_str(), &mGRPSettings)) {
10041004
return 1;
10051005
}
1006-
param().UpdateEventSettings(&mEventSettings);
1006+
param().UpdateGRPSettings(&mGRPSettings);
10071007
for (unsigned int i = 0; i < mChains.size(); i++) {
10081008
mChains[i]->ReadSettings(dir);
10091009
}
@@ -1015,24 +1015,24 @@ void GPUReconstruction::SetSettings(float solenoidBz, const GPURecoStepConfigura
10151015
#ifdef GPUCA_O2_LIB
10161016
GPUO2InterfaceConfiguration config;
10171017
config.ReadConfigurableParam_internal();
1018-
if (config.configEvent.solenoidBz <= -1e6f) {
1019-
config.configEvent.solenoidBz = solenoidBz;
1018+
if (config.configGRP.solenoidBz <= -1e6f) {
1019+
config.configGRP.solenoidBz = solenoidBz;
10201020
}
1021-
SetSettings(&config.configEvent, &config.configReconstruction, &config.configProcessing, workflow);
1021+
SetSettings(&config.configGRP, &config.configReconstruction, &config.configProcessing, workflow);
10221022
#else
1023-
GPUSettingsEvent ev;
1024-
ev.solenoidBz = solenoidBz;
1025-
SetSettings(&ev, nullptr, nullptr, workflow);
1023+
GPUSettingsGRP grp;
1024+
grp.solenoidBz = solenoidBz;
1025+
SetSettings(&grp, nullptr, nullptr, workflow);
10261026
#endif
10271027
}
10281028

1029-
void GPUReconstruction::SetSettings(const GPUSettingsEvent* settings, const GPUSettingsRec* rec, const GPUSettingsProcessing* proc, const GPURecoStepConfiguration* workflow)
1029+
void GPUReconstruction::SetSettings(const GPUSettingsGRP* grp, const GPUSettingsRec* rec, const GPUSettingsProcessing* proc, const GPURecoStepConfiguration* workflow)
10301030
{
10311031
if (mInitialized) {
10321032
GPUError("Cannot update settings while initialized");
10331033
throw std::runtime_error("Settings updated while initialized");
10341034
}
1035-
mEventSettings = *settings;
1035+
mGRPSettings = *grp;
10361036
if (proc) {
10371037
mProcessingSettings = *proc;
10381038
}
@@ -1042,7 +1042,7 @@ void GPUReconstruction::SetSettings(const GPUSettingsEvent* settings, const GPUS
10421042
mRecoStepsInputs = workflow->inputs;
10431043
mRecoStepsOutputs = workflow->outputs;
10441044
}
1045-
param().SetDefaults(&mEventSettings, rec, proc, workflow);
1045+
param().SetDefaults(&mGRPSettings, rec, proc, workflow);
10461046
}
10471047

10481048
void GPUReconstruction::SetOutputControl(void* ptr, size_t size)

‎GPU/GPUTracking/Base/GPUReconstruction.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,15 +224,15 @@ class GPUReconstruction
224224
bool IsGPU() const { return GetDeviceType() != DeviceType::INVALID_DEVICE && GetDeviceType() != DeviceType::CPU; }
225225
const GPUParam& GetParam() const { return mHostConstantMem->param; }
226226
const GPUConstantMem& GetConstantMem() const { return *mHostConstantMem; }
227-
const GPUSettingsEvent& GetEventSettings() const { return mEventSettings; }
227+
const GPUSettingsGRP& GetGRPSettings() const { return mGRPSettings; }
228228
const GPUSettingsDeviceBackend& GetDeviceBackendSettings() { return mDeviceBackendSettings; }
229229
const GPUSettingsProcessing& GetProcessingSettings() const { return mProcessingSettings; }
230230
bool IsInitialized() const { return mInitialized; }
231231
void SetSettings(float solenoidBz, const GPURecoStepConfiguration* workflow = nullptr);
232-
void SetSettings(const GPUSettingsEvent* settings, const GPUSettingsRec* rec = nullptr, const GPUSettingsProcessing* proc = nullptr, const GPURecoStepConfiguration* workflow = nullptr);
232+
void SetSettings(const GPUSettingsGRP* grp, const GPUSettingsRec* rec = nullptr, const GPUSettingsProcessing* proc = nullptr, const GPURecoStepConfiguration* workflow = nullptr);
233233
void SetResetTimers(bool reset) { mProcessingSettings.resetTimers = reset; } // May update also after Init()
234234
void SetDebugLevelTmp(int level) { mProcessingSettings.debugLevel = level; } // Temporarily, before calling SetSettings()
235-
void UpdateEventSettings(const GPUSettingsEvent* e, const GPUSettingsProcessing* p = nullptr);
235+
void UpdateGRPSettings(const GPUSettingsGRP* g, const GPUSettingsProcessing* p = nullptr);
236236
void SetOutputControl(const GPUOutputControl& v) { mOutputControl = v; }
237237
void SetOutputControl(void* ptr, size_t size);
238238
void SetInputControl(void* ptr, size_t size);
@@ -323,7 +323,7 @@ class GPUReconstruction
323323
GPUConstantMem* mDeviceConstantMem = nullptr;
324324

325325
// Settings
326-
GPUSettingsEvent mEventSettings; // Event Parameters
326+
GPUSettingsGRP mGRPSettings; // Global Run Parameters
327327
GPUSettingsDeviceBackend mDeviceBackendSettings; // Processing Parameters (at constructor level)
328328
GPUSettingsProcessing mProcessingSettings; // Processing Parameters (at init level)
329329
GPUOutputControl mOutputControl; // Controls the output of the individual components

‎GPU/GPUTracking/Benchmark/standalone.cxx‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ int SetupReconstruction()
279279
printf("Error reading event config file\n");
280280
return 1;
281281
}
282-
printf("Read event settings from dir %s (solenoidBz: %f, home-made events %d, constBz %d, maxTimeBin %d)\n", filename, rec->GetEventSettings().solenoidBz, (int)rec->GetEventSettings().homemadeEvents, (int)rec->GetEventSettings().constBz, rec->GetEventSettings().continuousMaxTimeBin);
282+
printf("Read event settings from dir %s (solenoidBz: %f, home-made events %d, constBz %d, maxTimeBin %d)\n", filename, rec->GetGRPSettings().solenoidBz, (int)rec->GetGRPSettings().homemadeEvents, (int)rec->GetGRPSettings().constBz, rec->GetGRPSettings().continuousMaxTimeBin);
283283
if (configStandalone.testSyncAsync) {
284284
recAsync->ReadSettings(filename);
285285
}
@@ -291,24 +291,24 @@ int SetupReconstruction()
291291
chainTracking->mConfigQA = &configStandalone.QA;
292292
chainTracking->mConfigDisplay = &configStandalone.GL;
293293

294-
GPUSettingsEvent ev = rec->GetEventSettings();
294+
GPUSettingsGRP grp = rec->GetGRPSettings();
295295
GPUSettingsRec recSet;
296296
GPUSettingsProcessing devProc;
297297
memcpy((void*)&recSet, (void*)&configStandalone.rec, sizeof(GPUSettingsRec));
298298
memcpy((void*)&devProc, (void*)&configStandalone.proc, sizeof(GPUSettingsProcessing));
299299
GPURecoStepConfiguration steps;
300300

301301
if (configStandalone.eventGenerator) {
302-
ev.homemadeEvents = true;
302+
grp.homemadeEvents = true;
303303
}
304304
if (configStandalone.solenoidBz != -1e6f) {
305-
ev.solenoidBz = configStandalone.solenoidBz;
305+
grp.solenoidBz = configStandalone.solenoidBz;
306306
}
307307
if (configStandalone.constBz) {
308-
ev.constBz = true;
308+
grp.constBz = true;
309309
}
310310
if (configStandalone.TF.nMerge || configStandalone.TF.bunchSim) {
311-
if (ev.continuousMaxTimeBin) {
311+
if (grp.continuousMaxTimeBin) {
312312
printf("ERROR: requested to overlay continuous data - not supported\n");
313313
return 1;
314314
}
@@ -317,11 +317,11 @@ int SetupReconstruction()
317317
configStandalone.cont = true;
318318
}
319319
if (chainTracking->GetTPCTransform()) {
320-
ev.continuousMaxTimeBin = configStandalone.TF.timeFrameLen * ((double)GPUReconstructionTimeframe::TPCZ / (double)GPUReconstructionTimeframe::DRIFT_TIME) / chainTracking->GetTPCTransform()->getVDrift();
320+
grp.continuousMaxTimeBin = configStandalone.TF.timeFrameLen * ((double)GPUReconstructionTimeframe::TPCZ / (double)GPUReconstructionTimeframe::DRIFT_TIME) / chainTracking->GetTPCTransform()->getVDrift();
321321
}
322322
}
323-
if (configStandalone.cont && ev.continuousMaxTimeBin == 0) {
324-
ev.continuousMaxTimeBin = -1;
323+
if (configStandalone.cont && grp.continuousMaxTimeBin == 0) {
324+
grp.continuousMaxTimeBin = -1;
325325
}
326326
if (rec->GetDeviceType() == GPUReconstruction::DeviceType::CPU) {
327327
printf("Standalone Test Framework for CA Tracker - Using CPU\n");
@@ -389,7 +389,7 @@ int SetupReconstruction()
389389
steps.steps.setBits(GPUDataTypes::RecoStep::TRDTracking, false);
390390
}
391391
steps.inputs.set(GPUDataTypes::InOutType::TPCClusters, GPUDataTypes::InOutType::TRDTracklets);
392-
if (ev.needsClusterer) {
392+
if (grp.needsClusterer) {
393393
steps.inputs.setBits(GPUDataTypes::InOutType::TPCRaw, true);
394394
steps.inputs.setBits(GPUDataTypes::InOutType::TPCClusters, false);
395395
} else {
@@ -421,9 +421,9 @@ int SetupReconstruction()
421421
}
422422
}
423423

424-
rec->SetSettings(&ev, &recSet, &devProc, &steps);
424+
rec->SetSettings(&grp, &recSet, &devProc, &steps);
425425
if (configStandalone.proc.doublePipeline) {
426-
recPipeline->SetSettings(&ev, &recSet, &devProc, &steps);
426+
recPipeline->SetSettings(&grp, &recSet, &devProc, &steps);
427427
}
428428
if (configStandalone.testSyncAsync) {
429429
// Set settings for asynchronous
@@ -443,7 +443,7 @@ int SetupReconstruction()
443443
recSet.loopInterpolationInExtraPass = 0;
444444
recSet.MaxTrackQPt = CAMath::Min(recSet.MaxTrackQPt, recSet.tpcRejectQPt);
445445
recSet.useMatLUT = true;
446-
recAsync->SetSettings(&ev, &recSet, &devProc, &steps);
446+
recAsync->SetSettings(&grp, &recSet, &devProc, &steps);
447447
}
448448

449449
if (configStandalone.outputcontrolmem) {
@@ -845,18 +845,18 @@ int main(int argc, char** argv)
845845
}
846846

847847
if (configStandalone.overrideMaxTimebin && (chainTracking->mIOPtrs.clustersNative || chainTracking->mIOPtrs.tpcPackedDigits || chainTracking->mIOPtrs.tpcZS)) {
848-
GPUSettingsEvent ev = rec->GetEventSettings();
849-
if (ev.continuousMaxTimeBin == 0) {
848+
GPUSettingsGRP grp = rec->GetGRPSettings();
849+
if (grp.continuousMaxTimeBin == 0) {
850850
printf("Cannot override max time bin for non-continuous data!\n");
851851
} else {
852-
ev.continuousMaxTimeBin = chainTracking->mIOPtrs.tpcZS ? GPUReconstructionConvert::GetMaxTimeBin(*chainTracking->mIOPtrs.tpcZS) : chainTracking->mIOPtrs.tpcPackedDigits ? GPUReconstructionConvert::GetMaxTimeBin(*chainTracking->mIOPtrs.tpcPackedDigits) : GPUReconstructionConvert::GetMaxTimeBin(*chainTracking->mIOPtrs.clustersNative);
853-
printf("Max time bin set to %d\n", (int)ev.continuousMaxTimeBin);
854-
rec->UpdateEventSettings(&ev);
852+
grp.continuousMaxTimeBin = chainTracking->mIOPtrs.tpcZS ? GPUReconstructionConvert::GetMaxTimeBin(*chainTracking->mIOPtrs.tpcZS) : chainTracking->mIOPtrs.tpcPackedDigits ? GPUReconstructionConvert::GetMaxTimeBin(*chainTracking->mIOPtrs.tpcPackedDigits) : GPUReconstructionConvert::GetMaxTimeBin(*chainTracking->mIOPtrs.clustersNative);
853+
printf("Max time bin set to %d\n", (int)grp.continuousMaxTimeBin);
854+
rec->UpdateGRPSettings(&grp);
855855
if (recAsync) {
856-
recAsync->UpdateEventSettings(&ev);
856+
recAsync->UpdateGRPSettings(&grp);
857857
}
858858
if (recPipeline) {
859-
recPipeline->UpdateEventSettings(&ev);
859+
recPipeline->UpdateGRPSettings(&grp);
860860
}
861861
}
862862
}

0 commit comments

Comments
 (0)