From 15053ab26ba6b8a0c27cb2e7418fa86c2c50e6e5 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Thu, 11 Apr 2019 18:21:18 +0200 Subject: [PATCH] Fix the CUDA product availability logic in rechit --- .../SiPixelRecHits/plugins/SiPixelRecHitHeterogeneous.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitHeterogeneous.cc b/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitHeterogeneous.cc index e26ec84ddf5b5..2139aec0dbc42 100644 --- a/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitHeterogeneous.cc +++ b/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitHeterogeneous.cc @@ -187,10 +187,10 @@ void SiPixelRecHitHeterogeneous::acquireGPUCuda(const edm::HeterogeneousEvent& i // synchronize explicitly (implementation is from // CUDAScopedContext). In practice these should not be needed // (because of synchronizations upstream), but let's play generic. - if(not hclusters->isAvailable() && hclusters->event()->has_occurred()) { + if(not hclusters->isAvailable() and not hclusters->event()->has_occurred()) { cudaCheck(cudaStreamWaitEvent(cudaStream.id(), hclusters->event()->id(), 0)); } - if(not hdigis->isAvailable() && hdigis->event()->has_occurred()) { + if(not hdigis->isAvailable() and not hdigis->event()->has_occurred()) { cudaCheck(cudaStreamWaitEvent(cudaStream.id(), hclusters->event()->id(), 0)); }