Skip to content

Commit 996b7b1

Browse files
committed
Do not use random 1000 value for auto-setting of 83cm for trackReferenceX as default, just disable as default
1 parent d890d41 commit 996b7b1

File tree

11 files changed

+5
-12
lines changed

11 files changed

+5
-12
lines changed

Detectors/GlobalTracking/src/MatchCosmics.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ void MatchCosmics::refitWinners(const o2::globaltracking::RecoContainer& data)
9696
mTPCCorrMapsHelper, mBz,
9797
tpcClusRefs.data(), 0, tpcClusShMap.data(),
9898
tpcClusOccMap.data(), tpcClusOccMap.size(), nullptr, o2::base::Propagator::Instance());
99-
tpcRefitter->setTrackReferenceX(900); // disable propagation after refit by setting reference to value > 500
10099
}
101100

102101
const auto& itsClusters = prepareITSClusters(data);

Detectors/GlobalTracking/src/MatchTPCITS.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,6 @@ bool MatchTPCITS::prepareTPCData()
505505
}
506506

507507
mTPCRefitter = std::make_unique<o2::gpu::GPUO2InterfaceRefit>(mTPCClusterIdxStruct, mTPCCorrMapsHelper, mBz, mTPCTrackClusIdx.data(), 0, mTPCRefitterShMap.data(), mTPCRefitterOccMap.data(), mTPCRefitterOccMap.size(), nullptr, o2::base::Propagator::Instance());
508-
mTPCRefitter->setTrackReferenceX(900); // disable propagation after refit by setting reference to value > 500
509508
mNTPCOccBinLength = mTPCRefitter->getParam()->rec.tpc.occupancyMapTimeBins;
510509
mTBinClOcc.clear();
511510
if (mNTPCOccBinLength > 1 && mTPCRefitterOccMap.size()) {

Detectors/GlobalTrackingWorkflow/study/src/TPCTrackStudy.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ void TPCTrackStudySpec::process(o2::globaltracking::RecoContainer& recoData)
188188
if (mTPCTracksArray.size()) {
189189
LOGP(info, "Found {} TPC tracks", mTPCTracksArray.size());
190190
mTPCRefitter = std::make_unique<o2::gpu::GPUO2InterfaceRefit>(mTPCClusterIdxStruct, &mTPCCorrMapsLoader, prop->getNominalBz(), mTPCTrackClusIdx.data(), 0, mTPCRefitterShMap.data(), mTPCRefitterOccMap.data(), mTPCRefitterOccMap.size(), nullptr, o2::base::Propagator::Instance());
191-
mTPCRefitter->setTrackReferenceX(900); // disable propagation after refit by setting reference to value > 500
192191
}
193192
float vdriftTB = mTPCVDriftHelper.getVDriftObject().getVDrift() * o2::tpc::ParameterElectronics::Instance().ZbinWidth; // VDrift expressed in cm/TimeBin
194193
float tpcTBBias = mTPCVDriftHelper.getVDriftObject().getTimeOffset() / (8 * o2::constants::lhc::LHCBunchSpacingMUS);

Detectors/GlobalTrackingWorkflow/study/src/TrackingStudy.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ void TrackingStudySpec::run(ProcessingContext& pc)
163163
mTPCRefitter = std::make_unique<o2::gpu::GPUO2InterfaceRefit>(&recoData.inputsTPCclusters->clusterIndex, &mTPCCorrMapsLoader, o2::base::Propagator::Instance()->getNominalBz(),
164164
recoData.getTPCTracksClusterRefs().data(), 0, recoData.clusterShMapTPC.data(), recoData.occupancyMapTPC.data(),
165165
recoData.occupancyMapTPC.size(), nullptr, o2::base::Propagator::Instance());
166-
mTPCRefitter->setTrackReferenceX(900); // disable propagation after refit by setting reference to value > 500
167166
mNTPCOccBinLength = mTPCRefitter->getParam()->rec.tpc.occupancyMapTimeBins;
168167
mTBinClOccBef.clear();
169168
mTBinClOccAft.clear();

Detectors/TPC/reconstruction/test/testGPUCATracking.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE(CATracking_test1)
5151
GPUO2Interface tracker;
5252

5353
float solenoidBz = -5.00668; // B-field
54-
float refX = 1000.; // transport tracks to this x after tracking, >500 for disabling
54+
float refX = 83.; // transport tracks to this x after tracking, >500 for disabling
5555
bool continuous = false; // time frame data v.s. triggered events
5656

5757
GPUO2InterfaceConfiguration config;

Detectors/TPC/workflow/src/TPCRefitter.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@ void TPCRefitterSpec::process(o2::globaltracking::RecoContainer& recoData)
336336
}
337337

338338
mTPCRefitter = std::make_unique<o2::gpu::GPUO2InterfaceRefit>(mTPCClusterIdxStruct, &mTPCCorrMapsLoader, prop->getNominalBz(), mTPCTrackClusIdx.data(), 0, mTPCRefitterShMap.data(), mTPCRefitterOccMap.data(), mTPCRefitterOccMap.size(), nullptr, prop);
339-
mTPCRefitter->setTrackReferenceX(900); // disable propagation after refit by setting reference to value > 500
340339

341340
mVdriftTB = mTPCVDriftHelper.getVDriftObject().getVDrift() * o2::tpc::ParameterElectronics::Instance().ZbinWidth; // VDrift expressed in cm/TimeBin
342341
mTPCTBBias = mTPCVDriftHelper.getVDriftObject().getTimeOffset() / (8 * o2::constants::lhc::LHCBunchSpacingMUS);

Detectors/TRD/workflow/src/TRDGlobalTrackingSpec.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@ void TRDGlobalTracking::run(ProcessingContext& pc)
294294

295295
mTPCClusterIdxStruct = &inputTracks.inputsTPCclusters->clusterIndex;
296296
mTPCRefitter = std::make_unique<o2::gpu::GPUO2InterfaceRefit>(mTPCClusterIdxStruct, &mTPCCorrMapsLoader, o2::base::Propagator::Instance()->getNominalBz(), inputTracks.getTPCTracksClusterRefs().data(), 0, inputTracks.clusterShMapTPC.data(), inputTracks.occupancyMapTPC.data(), inputTracks.occupancyMapTPC.size(), nullptr, o2::base::Propagator::Instance());
297-
mTPCRefitter->setTrackReferenceX(900); // disable propagation after refit by setting reference to value > 500
298297
auto tmpInputContainer = getRecoInputContainer(pc, &mChainTracking->mIOPtrs, &inputTracks, mUseMC);
299298
auto tmpContainer = GPUWorkflowHelper::fillIOPtr(mChainTracking->mIOPtrs, inputTracks, mUseMC, nullptr, GTrackID::getSourcesMask("TRD"), mTrkMask, GTrackID::mask_t{GTrackID::MASK_NONE});
300299
mTrackletsRaw = inputTracks.getTRDTracklets();

Detectors/Vertexing/src/SVertexer.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,6 @@ void SVertexer::buildT2V(const o2::globaltracking::RecoContainer& recoData) // a
459459
mTPCRefitterShMap = recoData.clusterShMapTPC;
460460
mTPCRefitterOccMap = mRecoCont->occupancyMapTPC;
461461
mTPCRefitter = std::make_unique<o2::gpu::GPUO2InterfaceRefit>(mTPCClusterIdxStruct, mTPCCorrMapsHelper, o2::base::Propagator::Instance()->getNominalBz(), mTPCTrackClusIdx.data(), 0, mTPCRefitterShMap.data(), mTPCRefitterOccMap.data(), mTPCRefitterOccMap.size(), nullptr, o2::base::Propagator::Instance());
462-
mTPCRefitter->setTrackReferenceX(900); // disable propagation after refit by setting reference to value > 500
463462
}
464463

465464
std::unordered_map<GIndex, std::pair<int, int>> tmap;

GPU/GPUTracking/DataTypes/GPUO2ConfigurableParam.cxx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,6 @@ GPUSettingsO2 GPUO2InterfaceConfiguration::ReadConfigurableParam(GPUO2InterfaceC
119119
if (global.gpuDisplayfilterMacro != "") {
120120
obj.configDisplay.filterMacros.emplace_back(global.gpuDisplayfilterMacro);
121121
}
122-
if (obj.configReconstruction.tpc.trackReferenceX == 1000.f) {
123-
obj.configReconstruction.tpc.trackReferenceX = 83.f;
124-
}
125122
obj.configDeviceBackend.deviceType = gpudatatypes::GetDeviceType(global.deviceType.c_str());
126123
obj.configDeviceBackend.forceDeviceType = global.forceDeviceType;
127124
return global;

GPU/GPUTracking/Definitions/GPUSettingsList.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ AddOptionRTC(sysClusErrorC12Box, float, 1.1e-05f, "", 0, "Systematic cluster for
6666
AddOptionRTC(minNClustersTrackSeed, int32_t, -1, "", 0, "required min number of clusters on the track after track following (before merging)")
6767
AddOptionRTC(minNClustersFinalTrack, int32_t, -1, "", 0, "required min number of clusters on the final track")
6868
AddOptionRTC(searchWindowDZDR, float, 2.5f, "", 0, "Use DZDR window for seeding instead of neighboursSearchArea")
69-
AddOptionRTC(trackReferenceX, float, 1000.f, "", 0, "Transport all tracks to this X after tracking (disabled if > 500, auto = 1000)")
69+
AddOptionRTC(trackReferenceX, float, 1000.f, "", 0, "Transport all tracks to this X after tracking (disabled if > 500)")
7070
AddOptionRTC(zsThreshold, float, 2.0f, "", 0, "Zero-Suppression threshold")
7171
AddOptionRTC(tubeProtectSigma2, float, 4.f * 4.f, "", 0, "Max sigma2 to mark adjacent cluster for protection")
7272
AddOptionRTC(tubeProtectMaxSize2, float, 2.f * 2.f, "", 0, "Square of max tube size (if smaller than tubeProtectChi2)")

0 commit comments

Comments
 (0)