From 0b28d10f3d10d8ec2e42c9ddb8c4842f9138a9c9 Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Fri, 14 Oct 2022 19:59:41 +0200 Subject: [PATCH 1/2] Mark as bad channels with an invalid SOI --- RecoLocalCalo/HcalRecProducers/src/MahiGPU.cu | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/RecoLocalCalo/HcalRecProducers/src/MahiGPU.cu b/RecoLocalCalo/HcalRecProducers/src/MahiGPU.cu index 71718a0e2deb2..759dee43e72ba 100644 --- a/RecoLocalCalo/HcalRecProducers/src/MahiGPU.cu +++ b/RecoLocalCalo/HcalRecProducers/src/MahiGPU.cu @@ -142,6 +142,7 @@ namespace hcal { method0Time[gch] = 0; outputEnergy[gch] = 0; outputChi2[gch] = 0; + soiSamples[gch] = -1; } #ifdef HCAL_MAHI_GPUDEBUG @@ -265,6 +266,16 @@ namespace hcal { int32_t const soi = gch < nchannelsf01HE ? soiSamples[gch] : (gch < nchannelsf015 ? npresamplesf5HB[gch - nchannelsf01HE] : soiSamples[gch]); + + bool badSOI = (soi < 0 or soi >= nsamplesForCompute); + if (badSOI and sampleWithinWindow == 0) { +#ifdef GPU_DEBUG + printf("Found HBHE channel %d with invalid SOI %d\n", gch, soi); +#endif + // mark the channel as bad + outputChi2[gch] = -9999.f; + } + //int32_t const soi = gch >= nchannelsf01HE // ? npresamplesf5HB[gch - nchannelsf01HE] // : soiSamples[gch]; @@ -365,6 +376,7 @@ namespace hcal { __syncthreads(); // NOTE: must take soi, as values for that thread are used... + // NOTE: does not run if soi is bad, because it does not match any sampleWithinWindow if (sampleWithinWindow == soi) { auto const method0_energy = shrMethod0EnergyAccum[lch]; auto const val = shrMethod0EnergySamplePair[lch]; From 868f16375cc42c9d5169c50c99d2c17ddd6846b3 Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Fri, 14 Oct 2022 19:59:58 +0200 Subject: [PATCH 2/2] Skip bad channels in the conversion to legacy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the conversion from SoA to legacy format, skip bad channels, identified by a negative chi². --- .../HcalRecProducers/src/HcalCPURecHitsProducer.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/RecoLocalCalo/HcalRecProducers/src/HcalCPURecHitsProducer.cc b/RecoLocalCalo/HcalRecProducers/src/HcalCPURecHitsProducer.cc index 108bdc76d8f28..ceb8f4b08f849 100644 --- a/RecoLocalCalo/HcalRecProducers/src/HcalCPURecHitsProducer.cc +++ b/RecoLocalCalo/HcalRecProducers/src/HcalCPURecHitsProducer.cc @@ -103,14 +103,18 @@ void HcalCPURecHitsProducer::produce(edm::Event& event, edm::EventSetup const& s // did not set size with ctor as there is no setter for did recHitsLegacy->reserve(tmpRecHits_.did.size()); for (uint32_t i = 0; i < tmpRecHits_.did.size(); i++) { + // skip bad channels + if (tmpRecHits_.chi2[i] < 0) + continue; + + // build a legacy rechit with the computed detid and MAHI energy recHitsLegacy->emplace_back(HcalDetId{tmpRecHits_.did[i]}, tmpRecHits_.energy[i], 0 // timeRising ); - - // update newly pushed guy - (*recHitsLegacy)[i].setChiSquared(tmpRecHits_.chi2[i]); - (*recHitsLegacy)[i].setRawEnergy(tmpRecHits_.energyM0[i]); + // update the legacy rechit with the Chi2 and M0 values + recHitsLegacy->back().setChiSquared(tmpRecHits_.chi2[i]); + recHitsLegacy->back().setRawEnergy(tmpRecHits_.energyM0[i]); } // put the legacy collection