Skip to content

Commit

Permalink
Revert some changes that fail assertion
Browse files Browse the repository at this point in the history
  • Loading branch information
iarspider committed Aug 21, 2024
1 parent 1370641 commit a8d271a
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 8 deletions.
3 changes: 2 additions & 1 deletion CalibCalorimetry/CaloTPG/plugins/CaloTPGTranscoderULUTs.cc
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ CaloTPGTranscoderULUTs::ReturnType CaloTPGTranscoderULUTs::produce(const CaloTPG

const auto& lutMetadata = iRecord.get(lutMetadataToken);
const auto& theTrigTowerGeometry = iRecord.get(theTrigTowerGeometryToken);
const auto& topo = iRecord.get(topoToken);
const auto& topoRecord = iRecord.getRecord<HcalLutMetadataRcd>();
const auto& topo = topoRecord.get(topoToken);

HcalLutMetadata fullLut{lutMetadata};
fullLut.setTopo(&topo);
Expand Down
3 changes: 2 additions & 1 deletion CalibCalorimetry/HcalTPGEventSetup/src/HcalTPGCoderULUT.cc
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@ HcalTPGCoderULUT::ReturnType HcalTPGCoderULUT::produce(const HcalTPGRecord& iRec
auto host = holder_.makeOrGet([]() { return new HostType; });

const auto& topo = iRecord.get(topoToken_);
const auto& delay = iRecord.get(delayToken_);
const auto& delayRcd = iRecord.getRecord<HcalDbRecord>();
const auto& delay = delayRcd.get(delayToken_);
if (read_Ascii_ || read_XML_) {
buildCoder(&topo, &delay, host.get());
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ namespace fakeOTLA {

std::unique_ptr<SiPhase2OuterTrackerLorentzAngle> SiPhase2OuterTrackerFakeLorentzAngleESSource::produceOTLA(
const SiPhase2OuterTrackerLorentzAngleRcd& rcd) {
const auto& geomDet = rcd.get(m_geomDetToken);
const auto& geomDet = rcd.getRecord<TrackerTopologyRcd>().get(m_geomDetToken);
return fakeOTLA::produceRecord<SiPhase2OuterTrackerLorentzAngle>(LAvalue_, geomDet);
}

std::unique_ptr<SiPhase2OuterTrackerLorentzAngle> SiPhase2OuterTrackerFakeLorentzAngleESSource::produceOTSimLA(
const SiPhase2OuterTrackerLorentzAngleSimRcd& rcd) {
const auto& geomDet = rcd.get(m_geomDetToken);
const auto& geomDet = rcd.getRecord<TrackerTopologyRcd>().get(m_geomDetToken);
return fakeOTLA::produceRecord<SiPhase2OuterTrackerLorentzAngle>(LAvalue_, geomDet);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ SiStripBackPlaneCorrectionFakeESSource::ReturnType SiStripBackPlaneCorrectionFak
const SiStripBackPlaneCorrectionRcd& iRecord) {
using namespace edm::es;

const auto& geomDet = iRecord.get(m_geomDetToken);
const auto& geomDetRcd = iRecord.getRecord<TrackerTopologyRcd>();
const auto& geomDet = geomDetRcd.get(m_geomDetToken);
const auto& tTopo = iRecord.get(m_tTopoToken);

auto backPlaneCorrection = std::make_unique<SiStripBackPlaneCorrection>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ std::unique_ptr<SiStripHashedDetId> SiStripHashedDetIdFakeESSource::produce(cons
edm::LogVerbatim("HashedDetId") << "[SiStripHashedDetIdFakeESSource::" << __func__ << "]"
<< " Building \"fake\" hashed DetId map from IdealGeometry";

const auto& geomDet = record.get(geomDetToken_);
const auto& geomDetRcd = record.getRecord<TrackerDigiGeometryRecord>();
const auto& geomDet = geomDetRcd.get(geomDetToken_);

const std::vector<uint32_t> dets = TrackerGeometryUtils::getSiStripDetIds(geomDet);
edm::LogVerbatim("HashedDetId") << "[SiStripHashedDetIdFakeESSource::" << __func__ << "]"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ SiStripLorentzAngleFakeESSource::ReturnType SiStripLorentzAngleFakeESSource::pro
const SiStripLorentzAngleRcd& iRecord) {
using namespace edm::es;

const auto& geomDet = iRecord.get(m_geomDetToken);
const auto& geomDetRcd = iRecord.getRecord<TrackerTopologyRcd>();
const auto& geomDet = geomDetRcd.get(m_geomDetToken);
const auto& tTopo = iRecord.get(m_tTopoToken);

auto lorentzAngle = std::make_unique<SiStripLorentzAngle>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class HcalChannelPropertiesEP : public edm::ESProducer {
const HcalDbService& cond = dbRecord.get(condToken_);
const HcalRecoParams& params = rcd.get(myParamsToken_);
const HcalSeverityLevelComputer& severity = rcd.get(sevToken_);
const HcalChannelQuality& qual = rcd.get(qualToken_);
const HcalChannelQuality& qual = dbRecord.get(qualToken_);
const CaloGeometry& geom = rcd.get(geomToken_);

// HcalTopology is taken from "params" created by the "produce1" method
Expand Down

0 comments on commit a8d271a

Please sign in to comment.