Skip to content

GPU: Add missing headeres and some protections #13878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidrohr merged 1 commit into from
Jan 20, 2025
Merged

GPU: Add missing headeres and some protections #13878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions GPU/GPUTracking/Debug/GPUTPCClusterFilter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
/// \author David Rohr

#include "GPUTPCClusterFilter.h"
#ifdef GPUCA_HAVE_O2HEADERS
#include "DataFormatsTPC/ClusterNative.h"

using namespace o2::gpu;
Expand All @@ -29,3 +30,4 @@ bool GPUTPCClusterFilter::filter(uint32_t sector, uint32_t row, o2::tpc::Cluster
// Note that this function might be called multiple times for the same cluster, in which case the final modified cl reference goes into the output clusters.
return true;
}
#endif
2 changes: 2 additions & 0 deletions GPU/GPUTracking/Global/GPUChainTrackingDebugAndProfiling.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ void GPUChainTracking::SanityCheck()

void GPUChainTracking::RunTPCClusterFilter(o2::tpc::ClusterNativeAccess* clusters, std::function<o2::tpc::ClusterNative*(size_t)> allocator, bool applyClusterCuts)
{
#ifdef GPUCA_HAVE_O2HEADERS
GPUTPCClusterFilter clusterFilter(*clusters);
o2::tpc::ClusterNative* outputBuffer = nullptr;
for (int32_t iPhase = 0; iPhase < 2; iPhase++) {
Expand Down Expand Up @@ -337,4 +338,5 @@ void GPUChainTracking::RunTPCClusterFilter(o2::tpc::ClusterNativeAccess* cluster
outputBuffer = allocator(countTotal);
}
}
#endif
}
2 changes: 1 addition & 1 deletion GPU/GPUTracking/SliceTracker/GPUTPCTrackerComponent.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ int32_t GPUTPCTrackerComponent::ConfigureSlices()
GPUSettingsProcessing devProc;

grp.solenoidBzNominalGPU = fSolenoidBz;
grp.continuousMaxTimeBin = 0; // triggered events
grp.grpContinuousMaxTimeBin = 0; // triggered events
if (mNeighboursSearchArea > 0) {
rec.tpc.neighboursSearchArea = mNeighboursSearchArea;
}
Expand Down
1 change: 1 addition & 0 deletions GPU/TPCFastTransformation/NDPiecewisePolynomials.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

#if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE)
#include <vector>
#include <functional>
#endif

class TFile;
Expand Down
Loading