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

Hcal Phase I #2265

Merged
merged 25 commits into from
Feb 4, 2014
Merged

Hcal Phase I #2265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
dd97dc8
Relabelling with new Rec numbering Record
Jan 24, 2014
e43100b
Topology and geometry built from RecNumbering Record
Jan 24, 2014
c3c9ec9
Delete an obsolete file
Jan 24, 2014
b8d9fec
Update the geometry cff files to initiate a producer
Jan 26, 2014
7a9fa31
Update the geometry cff files to initiate a producer
Jan 26, 2014
dfeeabc
Update the geometry cff files to initiate a producer
Jan 26, 2014
e2e6426
Merged Phase2HE_9 from repository bsunanda
Jan 27, 2014
055219f
Merged Phase2HE_10 from repository bsunanda
Jan 27, 2014
e9c161a
Merged Phase2-HE12 from repository bsunanda
Jan 27, 2014
f53fc28
Remove verbosity
Jan 27, 2014
e068622
Merged Phase2HE_11 from repository bsunanda
Jan 27, 2014
9bc9716
Further changes to use new HcalTopology
Jan 27, 2014
b438331
Merged Phase2HE_14 from repository bsunanda
ianna Jan 28, 2014
f1b0363
Update HcalTopology record which now depends on HcalRecNumbering.
ianna Jan 28, 2014
157964a
Update HcalTopology record which now depends on HcalRecNumbering.
ianna Jan 28, 2014
f6f0285
Remove Hcal Topology constants from configuration file fragments. The…
ianna Jan 29, 2014
8762ac4
Replace IdealGeometryRecord with HcalRecNumberingRecord.
ianna Jan 29, 2014
db91d14
Add dependent numbering record to HcalTopology configuration.
ianna Jan 29, 2014
ec27110
Correcting record dependency.
ianna Jan 29, 2014
ef4687f
Merged hcal-topology-and-numbering-records from repository ianna
ianna Feb 2, 2014
cd396e0
Fixes for Hcal PhaseI - all steps pass.
ianna Feb 2, 2014
dd643cd
Remove unneeded customizations for Hcal geometry.
ianna Feb 3, 2014
6ce3834
Hcal topology is a rec numbering record now.
ianna Feb 3, 2014
097a60c
Add back digi relabelling.
ianna Feb 3, 2014
594b472
The relabelling constants come from a record.
ianna Feb 3, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CalibCalorimetry/CaloMiscalibTools/plugins/HcalRecHitRecalib.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "DataFormats/Common/interface/Handle.h"
#include "FWCore/ParameterSet/interface/FileInPath.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "Geometry/Records/interface/HcalRecNumberingRecord.h"

#include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
Expand Down Expand Up @@ -54,7 +55,7 @@ void
HcalRecHitRecalib::beginRun(const edm::Run&, const edm::EventSetup& iSetup)
{
edm::ESHandle<HcalTopology> topology;
iSetup.get<IdealGeometryRecord>().get( topology );
iSetup.get<HcalRecNumberingRecord>().get( topology );

mapHcal_.prefillMap(*topology);

Expand Down
4 changes: 2 additions & 2 deletions CalibCalorimetry/HcalAlgos/src/HcalPulseShapes.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "Geometry/CaloTopology/interface/HcalTopology.h"
#include "Geometry/Records/interface/IdealGeometryRecord.h"
#include "Geometry/Records/interface/HcalRecNumberingRecord.h"

// #include "CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h"
#include <cmath>
Expand Down Expand Up @@ -115,7 +115,7 @@ void HcalPulseShapes::beginRun(edm::EventSetup const & es)
theMCParams = new HcalMCParams(*p.product());

edm::ESHandle<HcalTopology> htopo;
es.get<IdealGeometryRecord>().get(htopo);
es.get<HcalRecNumberingRecord>().get(htopo);
theTopology=new HcalTopology(*htopo);
theMCParams->setTopo(theTopology);

Expand Down
2 changes: 0 additions & 2 deletions CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,3 @@

es_prefer_hcalHardcode = cms.ESPrefer("HcalHardcodeCalibrations", "es_hardcode")

import Geometry.HcalEventSetup.hcalTopologyConstants_cfi as hcalTopologyConstants_cfi
es_hardcode.hcalTopologyConstants = cms.PSet(hcalTopologyConstants_cfi.hcalTopologyConstants)
28 changes: 14 additions & 14 deletions CalibCalorimetry/HcalPlugins/src/HcalDbProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"


#include "CondFormats/HcalObjects/interface/AllObjects.h"
#include "Geometry/Records/interface/HcalRecNumberingRecord.h"

#include "HcalDbProducer.h"

Expand Down Expand Up @@ -99,7 +99,7 @@ void HcalDbProducer::pedestalsCallback (const HcalPedestalsRcd& fRecord) {

if (item->topo()==0) {
edm::ESHandle<HcalTopology> htopo;
fRecord.getRecord<IdealGeometryRecord>().get(htopo);
fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);
item->setTopo(topo);
}
Expand All @@ -117,7 +117,7 @@ void HcalDbProducer::pedestalWidthsCallback (const HcalPedestalWidthsRcd& fRecor

if (item->topo()==0) {
edm::ESHandle<HcalTopology> htopo;
fRecord.getRecord<IdealGeometryRecord>().get(htopo);
fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);
item->setTopo(topo);
}
Expand All @@ -136,7 +136,7 @@ void HcalDbProducer::gainsCallback (const HcalGainsRcd& fRecord) {

if (item->topo()==0) {
edm::ESHandle<HcalTopology> htopo;
fRecord.getRecord<IdealGeometryRecord>().get(htopo);
fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);
item->setTopo(topo);
}
Expand All @@ -155,7 +155,7 @@ void HcalDbProducer::gainWidthsCallback (const HcalGainWidthsRcd& fRecord) {

if (item->topo()==0) {
edm::ESHandle<HcalTopology> htopo;
fRecord.getRecord<IdealGeometryRecord>().get(htopo);
fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);
item->setTopo(topo);
}
Expand All @@ -173,7 +173,7 @@ void HcalDbProducer::QIEDataCallback (const HcalQIEDataRcd& fRecord) {

if (item->topo()==0) {
edm::ESHandle<HcalTopology> htopo;
fRecord.getRecord<IdealGeometryRecord>().get(htopo);
fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);
item->setTopo(topo);
}
Expand All @@ -191,7 +191,7 @@ void HcalDbProducer::channelQualityCallback (const HcalChannelQualityRcd& fRecor

if (item->topo()==0) {
edm::ESHandle<HcalTopology> htopo;
fRecord.getRecord<IdealGeometryRecord>().get(htopo);
fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);
item->setTopo(topo);
}
Expand All @@ -209,7 +209,7 @@ void HcalDbProducer::respCorrsCallback (const HcalRespCorrsRcd& fRecord) {

if (item->topo()==0) {
edm::ESHandle<HcalTopology> htopo;
fRecord.getRecord<IdealGeometryRecord>().get(htopo);
fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);
item->setTopo(topo);
}
Expand All @@ -227,7 +227,7 @@ void HcalDbProducer::LUTCorrsCallback (const HcalLUTCorrsRcd& fRecord) {

if (item->topo()==0) {
edm::ESHandle<HcalTopology> htopo;
fRecord.getRecord<IdealGeometryRecord>().get(htopo);
fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);
item->setTopo(topo);
}
Expand All @@ -245,7 +245,7 @@ void HcalDbProducer::PFCorrsCallback (const HcalPFCorrsRcd& fRecord) {

if (item->topo()==0) {
edm::ESHandle<HcalTopology> htopo;
fRecord.getRecord<IdealGeometryRecord>().get(htopo);
fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);
item->setTopo(topo);
}
Expand All @@ -263,7 +263,7 @@ void HcalDbProducer::timeCorrsCallback (const HcalTimeCorrsRcd& fRecord) {

if (item->topo()==0) {
edm::ESHandle<HcalTopology> htopo;
fRecord.getRecord<IdealGeometryRecord>().get(htopo);
fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);
item->setTopo(topo);
}
Expand All @@ -281,7 +281,7 @@ void HcalDbProducer::zsThresholdsCallback (const HcalZSThresholdsRcd& fRecord) {

if (item->topo()==0) {
edm::ESHandle<HcalTopology> htopo;
fRecord.getRecord<IdealGeometryRecord>().get(htopo);
fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);
item->setTopo(topo);
}
Expand All @@ -299,7 +299,7 @@ void HcalDbProducer::L1triggerObjectsCallback (const HcalL1TriggerObjectsRcd& fR

if (item->topo()==0) {
edm::ESHandle<HcalTopology> htopo;
fRecord.getRecord<IdealGeometryRecord>().get(htopo);
fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);
item->setTopo(topo);
}
Expand Down Expand Up @@ -327,7 +327,7 @@ void HcalDbProducer::lutMetadataCallback (const HcalLutMetadataRcd& fRecord) {

if (item->topo()==0) {
edm::ESHandle<HcalTopology> htopo;
fRecord.getRecord<IdealGeometryRecord>().get(htopo);
fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);
item->setTopo(topo);
}
Expand Down
44 changes: 22 additions & 22 deletions CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "CalibCalorimetry/HcalAlgos/interface/HcalDbHardcode.h"

#include "CondFormats/DataRecord/interface/HcalAllRcds.h"
#include "Geometry/Records/interface/IdealGeometryRecord.h"
#include "Geometry/Records/interface/HcalRecNumberingRecord.h"

#include "Geometry/ForwardGeometry/interface/ZdcTopology.h"
#include "Geometry/CaloTopology/interface/HcalTopology.h"
Expand Down Expand Up @@ -287,7 +287,7 @@ HcalHardcodeCalibrations::setIntervalFor( const edm::eventsetup::EventSetupRecor
std::auto_ptr<HcalPedestals> HcalHardcodeCalibrations::producePedestals (const HcalPedestalsRcd& rec) {
edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::producePedestals-> ...";
edm::ESHandle<HcalTopology> htopo;
rec.getRecord<IdealGeometryRecord>().get(htopo);
rec.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::auto_ptr<HcalPedestals> result (new HcalPedestals (topo,false));
Expand All @@ -302,7 +302,7 @@ std::auto_ptr<HcalPedestals> HcalHardcodeCalibrations::producePedestals (const H
std::auto_ptr<HcalPedestalWidths> HcalHardcodeCalibrations::producePedestalWidths (const HcalPedestalWidthsRcd& rec) {
edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::producePedestalWidths-> ...";
edm::ESHandle<HcalTopology> htopo;
rec.getRecord<IdealGeometryRecord>().get(htopo);
rec.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::auto_ptr<HcalPedestalWidths> result (new HcalPedestalWidths (topo,false));
Expand All @@ -317,7 +317,7 @@ std::auto_ptr<HcalPedestalWidths> HcalHardcodeCalibrations::producePedestalWidth
std::auto_ptr<HcalGains> HcalHardcodeCalibrations::produceGains (const HcalGainsRcd& rec) {
edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::produceGains-> ...";
edm::ESHandle<HcalTopology> htopo;
rec.getRecord<IdealGeometryRecord>().get(htopo);
rec.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::auto_ptr<HcalGains> result (new HcalGains (topo));
Expand All @@ -332,7 +332,7 @@ std::auto_ptr<HcalGains> HcalHardcodeCalibrations::produceGains (const HcalGains
std::auto_ptr<HcalGainWidths> HcalHardcodeCalibrations::produceGainWidths (const HcalGainWidthsRcd& rec) {
edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::produceGainWidths-> ...";
edm::ESHandle<HcalTopology> htopo;
rec.getRecord<IdealGeometryRecord>().get(htopo);
rec.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::auto_ptr<HcalGainWidths> result (new HcalGainWidths (topo));
Expand Down Expand Up @@ -360,7 +360,7 @@ std::auto_ptr<HcalQIEData> HcalHardcodeCalibrations::produceQIEData (const HcalQ
*/

edm::ESHandle<HcalTopology> htopo;
rcd.getRecord<IdealGeometryRecord>().get(htopo);
rcd.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::auto_ptr<HcalQIEData> result (new HcalQIEData (topo));
Expand All @@ -375,7 +375,7 @@ std::auto_ptr<HcalQIEData> HcalHardcodeCalibrations::produceQIEData (const HcalQ
std::auto_ptr<HcalChannelQuality> HcalHardcodeCalibrations::produceChannelQuality (const HcalChannelQualityRcd& rcd) {
edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::produceChannelQuality-> ...";
edm::ESHandle<HcalTopology> htopo;
rcd.getRecord<IdealGeometryRecord>().get(htopo);
rcd.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::auto_ptr<HcalChannelQuality> result (new HcalChannelQuality (topo));
Expand All @@ -391,7 +391,7 @@ std::auto_ptr<HcalChannelQuality> HcalHardcodeCalibrations::produceChannelQualit
std::auto_ptr<HcalRespCorrs> HcalHardcodeCalibrations::produceRespCorrs (const HcalRespCorrsRcd& rcd) {
edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::produceRespCorrs-> ...";
edm::ESHandle<HcalTopology> htopo;
rcd.getRecord<IdealGeometryRecord>().get(htopo);
rcd.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::auto_ptr<HcalRespCorrs> result (new HcalRespCorrs (topo));
Expand Down Expand Up @@ -435,7 +435,7 @@ std::auto_ptr<HcalRespCorrs> HcalHardcodeCalibrations::produceRespCorrs (const H
std::auto_ptr<HcalLUTCorrs> HcalHardcodeCalibrations::produceLUTCorrs (const HcalLUTCorrsRcd& rcd) {
edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::produceLUTCorrs-> ...";
edm::ESHandle<HcalTopology> htopo;
rcd.getRecord<IdealGeometryRecord>().get(htopo);
rcd.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::auto_ptr<HcalLUTCorrs> result (new HcalLUTCorrs (topo));
Expand All @@ -450,7 +450,7 @@ std::auto_ptr<HcalLUTCorrs> HcalHardcodeCalibrations::produceLUTCorrs (const Hca
std::auto_ptr<HcalPFCorrs> HcalHardcodeCalibrations::producePFCorrs (const HcalPFCorrsRcd& rcd) {
edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::producePFCorrs-> ...";
edm::ESHandle<HcalTopology> htopo;
rcd.getRecord<IdealGeometryRecord>().get(htopo);
rcd.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::auto_ptr<HcalPFCorrs> result (new HcalPFCorrs (topo));
Expand All @@ -465,7 +465,7 @@ std::auto_ptr<HcalPFCorrs> HcalHardcodeCalibrations::producePFCorrs (const HcalP
std::auto_ptr<HcalTimeCorrs> HcalHardcodeCalibrations::produceTimeCorrs (const HcalTimeCorrsRcd& rcd) {
edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::produceTimeCorrs-> ...";
edm::ESHandle<HcalTopology> htopo;
rcd.getRecord<IdealGeometryRecord>().get(htopo);
rcd.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::auto_ptr<HcalTimeCorrs> result (new HcalTimeCorrs (topo));
Expand All @@ -480,7 +480,7 @@ std::auto_ptr<HcalTimeCorrs> HcalHardcodeCalibrations::produceTimeCorrs (const H
std::auto_ptr<HcalZSThresholds> HcalHardcodeCalibrations::produceZSThresholds (const HcalZSThresholdsRcd& rcd) {
edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::produceZSThresholds-> ...";
edm::ESHandle<HcalTopology> htopo;
rcd.getRecord<IdealGeometryRecord>().get(htopo);
rcd.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::auto_ptr<HcalZSThresholds> result (new HcalZSThresholds (topo));
Expand All @@ -496,7 +496,7 @@ std::auto_ptr<HcalZSThresholds> HcalHardcodeCalibrations::produceZSThresholds (c
std::auto_ptr<HcalL1TriggerObjects> HcalHardcodeCalibrations::produceL1TriggerObjects (const HcalL1TriggerObjectsRcd& rcd) {
edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::produceL1TriggerObjects-> ...";
edm::ESHandle<HcalTopology> htopo;
rcd.getRecord<IdealGeometryRecord>().get(htopo);
rcd.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::auto_ptr<HcalL1TriggerObjects> result (new HcalL1TriggerObjects (topo));
Expand Down Expand Up @@ -525,7 +525,7 @@ std::auto_ptr<HcalElectronicsMap> HcalHardcodeCalibrations::produceElectronicsMa
std::auto_ptr<HcalValidationCorrs> HcalHardcodeCalibrations::produceValidationCorrs (const HcalValidationCorrsRcd& rcd) {
edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::produceValidationCorrs-> ...";
edm::ESHandle<HcalTopology> htopo;
rcd.getRecord<IdealGeometryRecord>().get(htopo);
rcd.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::auto_ptr<HcalValidationCorrs> result (new HcalValidationCorrs (topo));
Expand All @@ -540,7 +540,7 @@ std::auto_ptr<HcalValidationCorrs> HcalHardcodeCalibrations::produceValidationCo
std::auto_ptr<HcalLutMetadata> HcalHardcodeCalibrations::produceLutMetadata (const HcalLutMetadataRcd& rcd) {
edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::produceLutMetadata-> ...";
edm::ESHandle<HcalTopology> htopo;
rcd.getRecord<IdealGeometryRecord>().get(htopo);
rcd.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::auto_ptr<HcalLutMetadata> result (new HcalLutMetadata (topo));
Expand Down Expand Up @@ -586,7 +586,7 @@ std::auto_ptr<HcalDcsMap> HcalHardcodeCalibrations::produceDcsMap (const HcalDcs
std::auto_ptr<HcalRecoParams> HcalHardcodeCalibrations::produceRecoParams (const HcalRecoParamsRcd& rec) {
edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::produceRecoParams-> ...";
edm::ESHandle<HcalTopology> htopo;
rec.getRecord<IdealGeometryRecord>().get(htopo);
rec.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::auto_ptr<HcalRecoParams> result (new HcalRecoParams (topo));
Expand All @@ -600,7 +600,7 @@ std::auto_ptr<HcalRecoParams> HcalHardcodeCalibrations::produceRecoParams (const
std::auto_ptr<HcalTimingParams> HcalHardcodeCalibrations::produceTimingParams (const HcalTimingParamsRcd& rec) {
edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::produceTimingParams-> ...";
edm::ESHandle<HcalTopology> htopo;
rec.getRecord<IdealGeometryRecord>().get(htopo);
rec.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::auto_ptr<HcalTimingParams> result (new HcalTimingParams (topo));
Expand All @@ -614,7 +614,7 @@ std::auto_ptr<HcalTimingParams> HcalHardcodeCalibrations::produceTimingParams (c
std::auto_ptr<HcalLongRecoParams> HcalHardcodeCalibrations::produceLongRecoParams (const HcalLongRecoParamsRcd& rec) {
edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::produceLongRecoParams-> ...";
edm::ESHandle<HcalTopology> htopo;
rec.getRecord<IdealGeometryRecord>().get(htopo);
rec.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::auto_ptr<HcalLongRecoParams> result (new HcalLongRecoParams (topo));
Expand Down Expand Up @@ -644,7 +644,7 @@ std::auto_ptr<HcalMCParams> HcalHardcodeCalibrations::produceMCParams (const Hca

edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::produceMCParams-> ...";
edm::ESHandle<HcalTopology> htopo;
rec.getRecord<IdealGeometryRecord>().get(htopo);
rec.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);
std::auto_ptr<HcalMCParams> result (new HcalMCParams (topo));
std::vector <HcalGenericDetId> cells = allCells(*topo);
Expand All @@ -661,7 +661,7 @@ std::auto_ptr<HcalMCParams> HcalHardcodeCalibrations::produceMCParams (const Hca
std::auto_ptr<HcalFlagHFDigiTimeParams> HcalHardcodeCalibrations::produceFlagHFDigiTimeParams (const HcalFlagHFDigiTimeParamsRcd& rec) {
edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::produceFlagHFDigiTimeParams-> ...";
edm::ESHandle<HcalTopology> htopo;
rec.getRecord<IdealGeometryRecord>().get(htopo);
rec.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::auto_ptr<HcalFlagHFDigiTimeParams> result (new HcalFlagHFDigiTimeParams (topo));
Expand Down Expand Up @@ -689,7 +689,7 @@ std::auto_ptr<HcalFlagHFDigiTimeParams> HcalHardcodeCalibrations::produceFlagHFD
std::auto_ptr<HcalCholeskyMatrices> HcalHardcodeCalibrations::produceCholeskyMatrices (const HcalCholeskyMatricesRcd& rec) {

edm::ESHandle<HcalTopology> htopo;
rec.getRecord<IdealGeometryRecord>().get(htopo);
rec.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);
std::auto_ptr<HcalCholeskyMatrices> result (new HcalCholeskyMatrices (topo));

Expand All @@ -712,7 +712,7 @@ std::auto_ptr<HcalCholeskyMatrices> HcalHardcodeCalibrations::produceCholeskyMat
std::auto_ptr<HcalCovarianceMatrices> HcalHardcodeCalibrations::produceCovarianceMatrices (const HcalCovarianceMatricesRcd& rec) {

edm::ESHandle<HcalTopology> htopo;
rec.getRecord<IdealGeometryRecord>().get(htopo);
rec.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);
std::auto_ptr<HcalCovarianceMatrices> result (new HcalCovarianceMatrices (topo));
std::vector <HcalGenericDetId> cells = allCells(*topo);
Expand Down
Loading