Skip to content
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

Jump to bottom

ECAL - Sort digis collections coming from GPU unpacking - 123x #38322

Merged
merged 3 commits into from Jun 14, 2022
Merged

ECAL - Sort digis collections coming from GPU unpacking - 123x #38322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ece8b14
Sort ECAL digis collections converted from GPU digis.
thomreis Jun 10, 2022
99e32f4
Refactoring of HLTEcalPhiSymFilter.
thomreis Jun 10, 2022
ef03458
Check if detector ID was found before adding the digi to the collection.
thomreis Jun 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions EventFilter/EcalRawToDigi/plugins/EcalCPUDigisProducer.cc
View file
Open in desktop
Expand Up @@ -181,6 +181,9 @@ void EcalCPUDigisProducer::produce(edm::Event& event, edm::EventSetup const& set
std::memcpy(idsEB, idsebtmp.data(), idsebtmp.size() * sizeof(uint32_t));
std::memcpy(idsEE, idseetmp.data(), idseetmp.size() * sizeof(uint32_t));

digisEB->sort();
digisEE->sort();

event.put(digisOutEBToken_, std::move(digisEB));
event.put(digisOutEEToken_, std::move(digisEE));

Expand Down
21 changes: 17 additions & 4 deletions HLTrigger/special/plugins/HLTEcalPhiSymFilter.cc
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/Utilities/interface/Exception.h"
#include "Calibration/Tools/interface/EcalRingCalibrationTools.h"
#include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h"
#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
Expand Down Expand Up @@ -114,7 +115,7 @@ bool HLTEcalPhiSymFilter::filter(edm::StreamID, edm::Event& event, const edm::Ev
EBDetId hitDetId = hit.id();
uint16_t statusCode = 0;
if (useRecoFlag_)
statusCode = (*EBRechits->find(hit.id())).recoFlag();
statusCode = EBRechits->find(hitDetId)->recoFlag();
else
statusCode = channelStatus[itunb->id().rawId()].getStatusCode();
int iRing = CalibRing.getRingIndex(hitDetId);
Expand All @@ -125,7 +126,13 @@ bool HLTEcalPhiSymFilter::filter(edm::StreamID, edm::Event& event, const edm::Ev
ampCut = ampCut_barlP_[iRing - N_RING_BARREL / 2];
float amplitude = hit.amplitude();
if (statusCode <= statusThreshold_ && amplitude > ampCut) {
phiSymEBDigiCollection->push_back((*EBDigis->find(hit.id())).id(), (*EBDigis->find(hit.id())).begin());
const auto digiIt = EBDigis->find(hitDetId);
if (digiIt != EBDigis->end()) {
phiSymEBDigiCollection->push_back(digiIt->id(), digiIt->begin());
} else {
throw cms::Exception("DetIdNotFound") << "The detector ID " << hitDetId.rawId()
<< " is not in the EB digis collection or the collection is not sorted.";
}
}
}

Expand All @@ -136,7 +143,7 @@ bool HLTEcalPhiSymFilter::filter(edm::StreamID, edm::Event& event, const edm::Ev
EEDetId hitDetId = hit.id();
uint16_t statusCode = 0;
if (useRecoFlag_)
statusCode = (*EERechits->find(hit.id())).recoFlag();
statusCode = EERechits->find(hitDetId)->recoFlag();
else
statusCode = channelStatus[itune->id().rawId()].getStatusCode();
int iRing = CalibRing.getRingIndex(hitDetId);
Expand All @@ -147,7 +154,13 @@ bool HLTEcalPhiSymFilter::filter(edm::StreamID, edm::Event& event, const edm::Ev
ampCut = ampCut_endcP_[iRing - N_RING_BARREL - N_RING_ENDCAP / 2];
float amplitude = hit.amplitude();
if (statusCode <= statusThreshold_ && amplitude > ampCut) {
phiSymEEDigiCollection->push_back((*EEDigis->find(hit.id())).id(), (*EEDigis->find(hit.id())).begin());
const auto digiIt = EEDigis->find(hitDetId);
if (digiIt != EEDigis->end()) {
phiSymEEDigiCollection->push_back(digiIt->id(), digiIt->begin());
} else {
throw cms::Exception("DetIdNotFound") << "The detector ID " << hitDetId.rawId()
<< " is not in the EE digis collection or the collection is not sorted.";
}
}
}

Expand Down