Skip to content

Commit 7208318

Browse files
committed
Using cluster error NN in reco
1 parent 4944e5f commit 7208318

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

GPU/GPUTracking/Base/GPUParam.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ void GPUParam::SetDefaults(const GPUSettingsGRP* g, const GPUSettingsRec* r, con
157157
rec = *r;
158158
}
159159
UpdateSettings(g, p, w);
160+
initClusterErrorModel(p->nn);
160161
}
161162

162163
void GPUParam::UpdateRun3ClusterErrors(const float* yErrorParam, const float* zErrorParam)

GPU/GPUTracking/Base/GPUParam.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ struct GPUParam : public internal::GPUParam_t<GPUSettingsRec, GPUSettingsParam>
9393
void UpdateRun3ClusterErrors(const float* yErrorParam, const float* zErrorParam);
9494
#endif
9595

96-
void initClusterErrorModel(const GPUSettingsProcessing* p) {
97-
useClusterErrorNetwork = p->nn.nnUseClusterErrorNetwork;
98-
mOrtOptions["model_path"] = p->nn.nnClusterErrorModelPath;
96+
void initClusterErrorModel(const GPUSettingsProcessingNNclusterizer& p) {
97+
useClusterErrorNetwork = p.nnUseClusterErrorNetwork;
98+
mOrtOptions["model_path"] = p.nnClusterErrorModelPath;
9999
mModelClusterErrors.initOptions(mOrtOptions);
100100
mModelClusterErrors.setIntraOpNumThreads(1);
101101
mModelClusterErrors.initEnvironment();

GPU/GPUTracking/Base/GPUReconstruction.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,6 +1278,7 @@ void GPUReconstruction::SetSettings(const GPUSettingsGRP* grp, const GPUSettings
12781278
mRecoSteps.outputs = workflow->outputs;
12791279
}
12801280
param().SetDefaults(mGRPSettings.get(), rec, proc, workflow);
1281+
// param().initClusterErrorModel(proc->nn);
12811282
}
12821283

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

0 commit comments

Comments
 (0)