From fbe2b5996b95b91df4e0b141ce261f6a984707db Mon Sep 17 00:00:00 2001
From: Dan Riley <Daniel.Riley@cornell.edu>
Date: Thu, 29 Jul 2021 06:30:06 -0400
Subject: [PATCH] resolve test failures and compiler warnings

---
 .../plugins/SiStripRawToClusterGPUKernel.h                | 2 +-
 .../python/SiStripClusterizerOnDemand_cfi.py              | 6 ++++--
 .../python/customizeStripClustersFromRaw.py               | 8 +++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/RecoLocalTracker/SiStripClusterizer/plugins/SiStripRawToClusterGPUKernel.h b/RecoLocalTracker/SiStripClusterizer/plugins/SiStripRawToClusterGPUKernel.h
index ca5615e369de5..7746501aff626 100644
--- a/RecoLocalTracker/SiStripClusterizer/plugins/SiStripRawToClusterGPUKernel.h
+++ b/RecoLocalTracker/SiStripClusterizer/plugins/SiStripRawToClusterGPUKernel.h
@@ -23,7 +23,7 @@ namespace edm {
   class ParameterSet;
 }
 
-class sst_data_t;
+struct sst_data_t;
 class clust_data_t;
 
 namespace stripgpu {
diff --git a/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterizerOnDemand_cfi.py b/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterizerOnDemand_cfi.py
index 1a612b149b536..a5744643c3f8c 100644
--- a/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterizerOnDemand_cfi.py
+++ b/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterizerOnDemand_cfi.py
@@ -32,12 +32,14 @@
     cuda = siStripClustersFromSOA,
 )
 
-siStripClustersTaskCUDA = cms.Task(
+siStripClustersTaskCUDA = cms.Task()
+
+gpu.toReplaceWith(siStripClustersTaskCUDA, cms.Task(
     # conditions used *only* by the modules running on GPU
     SiStripClusterizerConditionsGPUESProducer,
     # reconstruct the strip clusters on the gpu
     siStripClusterizerFromRawGPU,
-)
+))
 
 gpu.toReplaceWith(siStripClustersTask, cms.Task(
     # CUDA specific
diff --git a/RecoLocalTracker/SiStripClusterizer/python/customizeStripClustersFromRaw.py b/RecoLocalTracker/SiStripClusterizer/python/customizeStripClustersFromRaw.py
index 5948f6931bd19..01b16ee7598fb 100644
--- a/RecoLocalTracker/SiStripClusterizer/python/customizeStripClustersFromRaw.py
+++ b/RecoLocalTracker/SiStripClusterizer/python/customizeStripClustersFromRaw.py
@@ -1,5 +1,4 @@
 import FWCore.ParameterSet.Config as cms
-import RecoLocalTracker.SiStripClusterizer.SiStripClusterizerOnDemand_cfi as SiStripClusterizerOnDemand_cfi
 
 def customizeStripClustersFromRaw(process):
     if hasattr(process, 'striptrackerlocalrecoTask'):
@@ -13,10 +12,13 @@ def customizeStripClustersFromRaw(process):
 
 def customizeHLTStripClustersFromRaw(process):
     if hasattr(process, 'hltSiStripRawToClustersFacility'):
-        process.load("RecoLocalTracker.SiStripClusterizer.SiStripClusterizerConditionsGPUESProducer_cfi")
+        import RecoLocalTracker.SiStripClusterizer.SiStripClusterizerOnDemand_cfi as SiStripClusterizerOnDemand_cfi
+
         process.load("RecoLocalTracker.SiStripClusterizer.SiStripClusterizerOnDemand_cfi")
         process.hltSiStripRawToClustersFacility = SiStripClusterizerOnDemand_cfi.siStripClusters.clone()
         process.HLTDoLocalStripSequence.replace(process.hltSiStripRawToClustersFacility,
-                                   cms.Sequence(process.hltSiStripRawToClustersFacility, process.siStripClustersTask))
+                                   cms.Sequence(process.hltSiStripRawToClustersFacility, process.siStripClustersTaskCUDA))
+        process.HLTDoLocalStripSequenceRegForBTag.replace(process.hltSiStripRawToClustersFacility,
+                                             cms.Sequence(process.hltSiStripRawToClustersFacility, process.siStripClustersTaskCUDA))
 
     return process