From e18a25670f1f20623180018fe3c3aa4efedacf7e Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Thu, 26 Feb 2015 18:30:43 +0100 Subject: [PATCH 01/21] Use Tracker Parameters from DB --- .../interface/TrackerDigiGeometryRecord.h | 6 +- .../Records/interface/TrackerTopologyRcd.h | 13 + Geometry/Records/src/TrackerTopologyRcd.cc | 4 + .../TrackerGeomBuilderFromGeometricDet.h | 3 +- .../plugins/TrackerDigiGeometryESModule.cc | 51 +-- .../plugins/TrackerDigiGeometryESModule.h | 1 - .../idealForDigiTrackerGeometryDB_cff.py | 31 -- .../python/trackerGeometryConstants_cfi.py | 10 - .../trackerSLHCGeometryConstants_cfi.py | 10 - .../src/TrackerGeomBuilderFromGeometricDet.cc | 14 +- .../plugins/TrackerTopologyEP.cc | 381 ++++-------------- .../plugins/TrackerTopologyEP.h | 31 +- 12 files changed, 123 insertions(+), 432 deletions(-) create mode 100644 Geometry/Records/interface/TrackerTopologyRcd.h create mode 100644 Geometry/Records/src/TrackerTopologyRcd.cc delete mode 100644 Geometry/TrackerGeometryBuilder/python/trackerGeometryConstants_cfi.py delete mode 100644 Geometry/TrackerGeometryBuilder/python/trackerSLHCGeometryConstants_cfi.py diff --git a/Geometry/Records/interface/TrackerDigiGeometryRecord.h b/Geometry/Records/interface/TrackerDigiGeometryRecord.h index 82bd4007cc60e..c8f9c59fcd3f6 100644 --- a/Geometry/Records/interface/TrackerDigiGeometryRecord.h +++ b/Geometry/Records/interface/TrackerDigiGeometryRecord.h @@ -26,6 +26,8 @@ #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h" #include "CondFormats/AlignmentRecord/interface/TrackerSurfaceDeformationRcd.h" #include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h" +#include "Geometry/Records/interface/PTrackerParametersRcd.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "boost/mpl/vector.hpp" @@ -36,7 +38,9 @@ class TrackerDigiGeometryRecord : TrackerAlignmentErrorRcd, TrackerAlignmentErrorExtendedRcd, TrackerSurfaceDeformationRcd, - GlobalPositionRcd> > {}; + GlobalPositionRcd, + PTrackerParametersRcd, + TrackerTopologyRcd> > {}; #endif /* RECORDS_TRACKERDIGIGEOMETRYRECORD_H */ diff --git a/Geometry/Records/interface/TrackerTopologyRcd.h b/Geometry/Records/interface/TrackerTopologyRcd.h new file mode 100644 index 0000000000000..e2ce8c7e2c9c8 --- /dev/null +++ b/Geometry/Records/interface/TrackerTopologyRcd.h @@ -0,0 +1,13 @@ +#ifndef Geometry_Records_TrackerTopologyRcd +#define Geometry_Records_TrackerTopologyRcd + +#include "FWCore/Framework/interface/EventSetupRecordImplementation.h" +#include "FWCore/Framework/interface/DependentRecordImplementation.h" +#include "Geometry/Records/interface/PTrackerParametersRcd.h" +#include "boost/mpl/vector.hpp" + +class TrackerTopologyRcd : +public edm::eventsetup::DependentRecordImplementation > {}; + +#endif diff --git a/Geometry/Records/src/TrackerTopologyRcd.cc b/Geometry/Records/src/TrackerTopologyRcd.cc new file mode 100644 index 0000000000000..3dfb4105a14bc --- /dev/null +++ b/Geometry/Records/src/TrackerTopologyRcd.cc @@ -0,0 +1,4 @@ +#include "Geometry/Records/interface/TrackerTopologyRcd.h" +#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h" + +EVENTSETUP_RECORD_REG(TrackerTopologyRcd); diff --git a/Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h b/Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h index f8305af438266..175ddbb8e8d14 100644 --- a/Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h +++ b/Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h @@ -11,11 +11,12 @@ class TrackerGeometry; class PixelGeomDetType; class StripGeomDetType; +class PTrackerParameters; class TrackerGeomBuilderFromGeometricDet { public: - TrackerGeometry* build(const GeometricDet* gd, const edm::ParameterSet& pSet ); + TrackerGeometry* build(const GeometricDet* gd, const PTrackerParameters* ptp ); private: diff --git a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc index 795d5960c0ded..d872d63a6eeb2 100644 --- a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc +++ b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc @@ -3,6 +3,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" #include "DetectorDescription/Core/interface/DDCompactView.h" // Alignments @@ -32,7 +33,6 @@ TrackerDigiGeometryESModule::TrackerDigiGeometryESModule(const edm::ParameterSet m_pSet( p ) { applyAlignment_ = p.getParameter("applyAlignment"); - fromDDD_ = p.getParameter("fromDDD"); setWhatProduced(this); @@ -48,53 +48,11 @@ TrackerDigiGeometryESModule::~TrackerDigiGeometryESModule() {} void TrackerDigiGeometryESModule::fillDescriptions(edm::ConfigurationDescriptions & descriptions) { - edm::ParameterSetDescription descTrackerGeometryConstants; - descTrackerGeometryConstants.add( "ROWS_PER_ROC", 80 ); - descTrackerGeometryConstants.add( "COLS_PER_ROC", 52 ); - descTrackerGeometryConstants.add( "BIG_PIX_PER_ROC_X", 1 ); - descTrackerGeometryConstants.add( "BIG_PIX_PER_ROC_Y", 2 ); - descTrackerGeometryConstants.add( "ROCS_X", 0 ); - descTrackerGeometryConstants.add( "ROCS_Y", 0 ); - - edm::ParameterSetDescription descTrackerSLHCGeometryConstants; - descTrackerSLHCGeometryConstants.add( "ROWS_PER_ROC", 80 ); - descTrackerSLHCGeometryConstants.add( "COLS_PER_ROC", 52 ); - descTrackerSLHCGeometryConstants.add( "BIG_PIX_PER_ROC_X", 0 ); - descTrackerSLHCGeometryConstants.add( "BIG_PIX_PER_ROC_Y", 0 ); - descTrackerSLHCGeometryConstants.add( "ROCS_X", 2 ); - descTrackerSLHCGeometryConstants.add( "ROCS_Y", 8 ); - - edm::ParameterSetDescription descDB; - descDB.add( "appendToDataLabel", "" ); - descDB.add( "fromDDD", false ); - descDB.add( "applyAlignment", true ); - descDB.add( "alignmentsLabel", "" ); - descDB.addOptional( "trackerGeometryConstants", descTrackerGeometryConstants ); - descriptions.add( "trackerGeometryDB", descDB ); - edm::ParameterSetDescription desc; desc.add( "appendToDataLabel", "" ); - desc.add( "fromDDD", true ); desc.add( "applyAlignment", true ); desc.add( "alignmentsLabel", "" ); - desc.addOptional( "trackerGeometryConstants", descTrackerGeometryConstants ); - descriptions.add( "trackerGeometry", desc ); - - edm::ParameterSetDescription descSLHCDB; - descSLHCDB.add( "appendToDataLabel", "" ); - descSLHCDB.add( "fromDDD", false ); - descSLHCDB.add( "applyAlignment", true ); - descSLHCDB.add( "alignmentsLabel", "" ); - descSLHCDB.addOptional( "trackerGeometryConstants", descTrackerSLHCGeometryConstants ); - descriptions.add( "trackerSLHCGeometryDB", descSLHCDB ); - - edm::ParameterSetDescription descSLHC; - descSLHC.add( "appendToDataLabel", "" ); - descSLHC.add( "fromDDD", true ); - descSLHC.add( "applyAlignment", true ); - descSLHC.add( "alignmentsLabel", "" ); - descSLHC.addOptional( "trackerGeometryConstants", descTrackerSLHCGeometryConstants ); - descriptions.add( "trackerSLHCGeometry", descSLHC ); + descriptions.add( "trackerGeometryDB", desc ); } //__________________________________________________________________ @@ -107,8 +65,11 @@ TrackerDigiGeometryESModule::produce(const TrackerDigiGeometryRecord & iRecord) edm::ESHandle gD; iRecord.getRecord().get( gD ); + edm::ESHandle ptp; + iRecord.getRecord().get( ptp ); + TrackerGeomBuilderFromGeometricDet builder; - _tracker = boost::shared_ptr(builder.build(&(*gD), m_pSet )); + _tracker = boost::shared_ptr(builder.build(&(*gD), &(*ptp) )); if (applyAlignment_) { // Since fake is fully working when checking for 'empty', we should get rid of applyAlignment_! diff --git a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.h b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.h index aca9e015d28f1..c809a65c6f45f 100644 --- a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.h +++ b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.h @@ -28,7 +28,6 @@ class TrackerDigiGeometryESModule: public edm::ESProducer{ const std::string myLabel_; const edm::ParameterSet m_pSet; bool applyAlignment_; // Switch to apply alignment corrections - bool fromDDD_; }; diff --git a/Geometry/TrackerGeometryBuilder/python/idealForDigiTrackerGeometryDB_cff.py b/Geometry/TrackerGeometryBuilder/python/idealForDigiTrackerGeometryDB_cff.py index d75db9982c8f7..8494126c826ec 100644 --- a/Geometry/TrackerGeometryBuilder/python/idealForDigiTrackerGeometryDB_cff.py +++ b/Geometry/TrackerGeometryBuilder/python/idealForDigiTrackerGeometryDB_cff.py @@ -14,34 +14,3 @@ idealForDigiTrackerGeometry.appendToDataLabel = 'idealForDigi' # Alignments are looked for with this label: idealForDigiTrackerGeometry.alignmentsLabel = 'fakeForIdeal' - -import Geometry.TrackerGeometryBuilder.trackerGeometryConstants_cfi as trackerGeometryConstants_cfi -idealForDigiTrackerGeometry.trackerGeometryConstants = cms.PSet(trackerGeometryConstants_cfi.trackerGeometryConstants) - -#fakeTrackerAlignmentSource = cms.ESSource("EmptyESSource", -# recordName = cms.string("TrackerAlignmentRcd"), -# firstValid = cms.vuint32(1), -# iovIsRunNotTime = cms.bool(True) -# ) -#The follwoing to be converted as the above... -#es_source fakeTrackerAlignmentErrorSource = EmptyESSource { -# string recordName = "TrackerAlignmentErrorExtendedRcd" -# vuint32 firstValid = {1} -# bool iovIsRunNotTime = true -#} -## care: This might lead to a duplication with DT and CSC equivalents of this file: -#es_source fakeGlobalPositionSource = EmptyESSource { -# string recordName = "GlobalPositionRcd" -# vuint32 firstValid = {1} -# bool iovIsRunNotTime = true -#} - -# Comments by GF: -# - In anticipation of the removal of the applyAlignment flag, I'd like to keep it true. -# - Then we would need to get IOVs for the fake alignments, -# * either using FakeAlignmentSource instead of FakeAlignmentProducer in fakeForIdealAlignmentProducer.cfi -# * or by using the commented IOV settings above. -# - But this causes problems in co-existence with e.g. GlobalTag: -# Both Globaltag as well as FakeAlignmentSource provide IOV - it is not distinguished to provide IOV for -# a given label only (e.g. 'fakeForIdeal' compared to ''). -# - I'll try to contact framework people for CMSSW_2_2_0 and above. diff --git a/Geometry/TrackerGeometryBuilder/python/trackerGeometryConstants_cfi.py b/Geometry/TrackerGeometryBuilder/python/trackerGeometryConstants_cfi.py deleted file mode 100644 index 3c31c5da97ec4..0000000000000 --- a/Geometry/TrackerGeometryBuilder/python/trackerGeometryConstants_cfi.py +++ /dev/null @@ -1,10 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -trackerGeometryConstants = cms.PSet( - ROWS_PER_ROC = cms.int32(80), - COLS_PER_ROC = cms.int32(52), - BIG_PIX_PER_ROC_X = cms.int32(1), - BIG_PIX_PER_ROC_Y = cms.int32(2), - ROCS_X = cms.int32(0), - ROCS_Y = cms.int32(0) -) diff --git a/Geometry/TrackerGeometryBuilder/python/trackerSLHCGeometryConstants_cfi.py b/Geometry/TrackerGeometryBuilder/python/trackerSLHCGeometryConstants_cfi.py deleted file mode 100644 index 143ffcc4439ca..0000000000000 --- a/Geometry/TrackerGeometryBuilder/python/trackerSLHCGeometryConstants_cfi.py +++ /dev/null @@ -1,10 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -trackerGeometryConstants = cms.PSet( - ROWS_PER_ROC = cms.int32(80), - COLS_PER_ROC = cms.int32(52), - BIG_PIX_PER_ROC_X = cms.int32(0), - BIG_PIX_PER_ROC_Y = cms.int32(0), - ROCS_X = cms.int32(2), - ROCS_Y = cms.int32(8) -) diff --git a/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc b/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc index a4a2300fb6068..91b2788bef1c8 100644 --- a/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc +++ b/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc @@ -12,6 +12,7 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/GeometrySurface/interface/MediumProperties.h" +#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Utilities/interface/Exception.h" @@ -37,18 +38,11 @@ namespace { } TrackerGeometry* -TrackerGeomBuilderFromGeometricDet::build( const GeometricDet* gd, const edm::ParameterSet& pSet ) +TrackerGeomBuilderFromGeometricDet::build( const GeometricDet* gd, const PTrackerParameters* ptp ) { - int BIG_PIX_PER_ROC_X = 1; - int BIG_PIX_PER_ROC_Y = 2; + int BIG_PIX_PER_ROC_X = ptp->vpars[2]; + int BIG_PIX_PER_ROC_Y = ptp->vpars[3]; - if( pSet.exists( "trackerGeometryConstants" )) - { - const edm::ParameterSet tkGeomConsts( pSet.getParameter( "trackerGeometryConstants" )); - BIG_PIX_PER_ROC_X = tkGeomConsts.getParameter( "BIG_PIX_PER_ROC_X" ); - BIG_PIX_PER_ROC_Y = tkGeomConsts.getParameter( "BIG_PIX_PER_ROC_Y" ); - } - thePixelDetTypeMap.clear(); theStripDetTypeMap.clear(); diff --git a/Geometry/TrackerNumberingBuilder/plugins/TrackerTopologyEP.cc b/Geometry/TrackerNumberingBuilder/plugins/TrackerTopologyEP.cc index 07f9c4e15849f..b3e8dc89535d6 100644 --- a/Geometry/TrackerNumberingBuilder/plugins/TrackerTopologyEP.cc +++ b/Geometry/TrackerNumberingBuilder/plugins/TrackerTopologyEP.cc @@ -9,87 +9,15 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" +#include "FWCore/Framework/interface/ModuleFactory.h" +#include "FWCore/Framework/interface/ESHandle.h" +#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" +#include "Geometry/Records/interface/PTrackerParametersRcd.h" -// -// constants, enums and typedefs -// - -// -// static data member definitions -// - -// -// constructors and destructor -// TrackerTopologyEP::TrackerTopologyEP(const edm::ParameterSet& conf) { edm::LogInfo("TRACKER") << "TrackerTopologyIdealEP::TrackerTopologyIdealEP"; - pxbVals_.layerStartBit_=conf.getParameter("pxb_layerStartBit"); - pxbVals_.ladderStartBit_=conf.getParameter("pxb_ladderStartBit"); - pxbVals_.moduleStartBit_=conf.getParameter("pxb_moduleStartBit"); - pxbVals_.layerMask_=conf.getParameter("pxb_layerMask"); - pxbVals_.ladderMask_=conf.getParameter("pxb_ladderMask"); - pxbVals_.moduleMask_=conf.getParameter("pxb_moduleMask"); - pxfVals_.sideStartBit_=conf.getParameter("pxf_sideStartBit"); - pxfVals_.diskStartBit_=conf.getParameter("pxf_diskStartBit"); - pxfVals_.bladeStartBit_=conf.getParameter("pxf_bladeStartBit"); - pxfVals_.panelStartBit_=conf.getParameter("pxf_panelStartBit"); - pxfVals_.moduleStartBit_=conf.getParameter("pxf_moduleStartBit"); - pxfVals_.sideMask_=conf.getParameter("pxf_sideMask"); - pxfVals_.diskMask_=conf.getParameter("pxf_diskMask"); - pxfVals_.bladeMask_=conf.getParameter("pxf_bladeMask"); - pxfVals_.panelMask_=conf.getParameter("pxf_panelMask"); - pxfVals_.moduleMask_=conf.getParameter("pxf_moduleMask"); - tecVals_.sideStartBit_=conf.getParameter("tec_sideStartBit"); - tecVals_.wheelStartBit_=conf.getParameter("tec_wheelStartBit"); - tecVals_.petal_fw_bwStartBit_=conf.getParameter("tec_petal_fw_bwStartBit"); - tecVals_.petalStartBit_=conf.getParameter("tec_petalStartBit"); - tecVals_.ringStartBit_=conf.getParameter("tec_ringStartBit"); - tecVals_.moduleStartBit_=conf.getParameter("tec_moduleStartBit"); - tecVals_.sterStartBit_=conf.getParameter("tec_sterStartBit"); - tecVals_.sideMask_=conf.getParameter("tec_sideMask"); - tecVals_.wheelMask_=conf.getParameter("tec_wheelMask"); - tecVals_.petal_fw_bwMask_=conf.getParameter("tec_petal_fw_bwMask"); - tecVals_.petalMask_=conf.getParameter("tec_petalMask"); - tecVals_.ringMask_=conf.getParameter("tec_ringMask"); - tecVals_.moduleMask_=conf.getParameter("tec_moduleMask"); - tecVals_.sterMask_=conf.getParameter("tec_sterMask"); - tibVals_.layerStartBit_=conf.getParameter("tib_layerStartBit"); - tibVals_.str_fw_bwStartBit_=conf.getParameter("tib_str_fw_bwStartBit"); - tibVals_.str_int_extStartBit_=conf.getParameter("tib_str_int_extStartBit"); - tibVals_.strStartBit_=conf.getParameter("tib_strStartBit"); - tibVals_.moduleStartBit_=conf.getParameter("tib_moduleStartBit"); - tibVals_.sterStartBit_=conf.getParameter("tib_sterStartBit"); - tibVals_.layerMask_=conf.getParameter("tib_layerMask"); - tibVals_.str_fw_bwMask_=conf.getParameter("tib_str_fw_bwMask"); - tibVals_.str_int_extMask_=conf.getParameter("tib_str_int_extMask"); - tibVals_.strMask_=conf.getParameter("tib_strMask"); - tibVals_.moduleMask_=conf.getParameter("tib_moduleMask"); - tibVals_.sterMask_=conf.getParameter("tib_sterMask"); - tidVals_.sideStartBit_=conf.getParameter("tid_sideStartBit"); - tidVals_.wheelStartBit_=conf.getParameter("tid_wheelStartBit"); - tidVals_.ringStartBit_=conf.getParameter("tid_ringStartBit"); - tidVals_.module_fw_bwStartBit_=conf.getParameter("tid_module_fw_bwStartBit"); - tidVals_.moduleStartBit_=conf.getParameter("tid_moduleStartBit"); - tidVals_.sterStartBit_=conf.getParameter("tid_sterStartBit"); - tidVals_.sideMask_=conf.getParameter("tid_sideMask"); - tidVals_.wheelMask_=conf.getParameter("tid_wheelMask"); - tidVals_.ringMask_=conf.getParameter("tid_ringMask"); - tidVals_.module_fw_bwMask_=conf.getParameter("tid_module_fw_bwMask"); - tidVals_.moduleMask_=conf.getParameter("tid_moduleMask"); - tidVals_.sterMask_=conf.getParameter("tid_sterMask"); - tobVals_.layerStartBit_=conf.getParameter("tob_layerStartBit"); - tobVals_.rod_fw_bwStartBit_=conf.getParameter("tob_rod_fw_bwStartBit"); - tobVals_.rodStartBit_=conf.getParameter("tob_rodStartBit"); - tobVals_.moduleStartBit_=conf.getParameter("tob_moduleStartBit"); - tobVals_.sterStartBit_=conf.getParameter("tob_sterStartBit"); - tobVals_.layerMask_=conf.getParameter("tob_layerMask"); - tobVals_.rod_fw_bwMask_=conf.getParameter("tob_rod_fw_bwMask"); - tobVals_.rodMask_=conf.getParameter("tob_rodMask"); - tobVals_.moduleMask_=conf.getParameter("tob_moduleMask"); - tobVals_.sterMask_=conf.getParameter("tob_sterMask"); - setWhatProduced(this); } @@ -102,235 +30,90 @@ void TrackerTopologyEP::fillDescriptions( edm::ConfigurationDescriptions & descriptions ) { edm::ParameterSetDescription ttc; - ttc.add("pxb_layerStartBit",16); - ttc.add("pxb_ladderStartBit",8); - ttc.add("pxb_moduleStartBit",2); - ttc.add("pxb_layerMask",0xF); - ttc.add("pxb_ladderMask",0xFF); - ttc.add("pxb_moduleMask",0x3F); - - ttc.add("pxf_sideStartBit",23); - ttc.add("pxf_diskStartBit",16); - ttc.add("pxf_bladeStartBit",10); - ttc.add("pxf_panelStartBit",8); - ttc.add("pxf_moduleStartBit",2); - ttc.add("pxf_sideMask",0x3); - ttc.add("pxf_diskMask",0xF); - ttc.add("pxf_bladeMask",0x3F); - ttc.add("pxf_panelMask",0x3); - ttc.add("pxf_moduleMask",0x3F); - - ttc.add("tec_sideStartBit",18); - ttc.add("tec_wheelStartBit",14); - ttc.add("tec_petal_fw_bwStartBit",12); - ttc.add("tec_petalStartBit",8); - ttc.add("tec_ringStartBit",5); - ttc.add("tec_moduleStartBit",2); - ttc.add("tec_sterStartBit",0); - ttc.add("tec_sideMask",0x3); - ttc.add("tec_wheelMask",0xF); - ttc.add("tec_petal_fw_bwMask",0x3); - ttc.add("tec_petalMask",0xF); - ttc.add("tec_ringMask",0x7); - ttc.add("tec_moduleMask",0x7); - ttc.add("tec_sterMask",0x3); - - ttc.add("tib_layerStartBit",14); - ttc.add("tib_str_fw_bwStartBit",12); - ttc.add("tib_str_int_extStartBit",10); - ttc.add("tib_strStartBit",4); - ttc.add("tib_moduleStartBit",2); - ttc.add("tib_sterStartBit",0); - ttc.add("tib_layerMask",0x7); - ttc.add("tib_str_fw_bwMask",0x3); - ttc.add("tib_str_int_extMask",0x3); - ttc.add("tib_strMask",0x3F); - ttc.add("tib_moduleMask",0x3); - ttc.add("tib_sterMask",0x3); - - ttc.add("tid_sideStartBit",13); - ttc.add("tid_wheelStartBit",11); - ttc.add("tid_ringStartBit",9); - ttc.add("tid_module_fw_bwStartBit",7); - ttc.add("tid_moduleStartBit",2); - ttc.add("tid_sterStartBit",0); - ttc.add("tid_sideMask",0x3); - ttc.add("tid_wheelMask",0x3); - ttc.add("tid_ringMask",0x3); - ttc.add("tid_module_fw_bwMask",0x3); - ttc.add("tid_moduleMask",0x1F); - ttc.add("tid_sterMask",0x3); - - ttc.add("tob_layerStartBit",14); - ttc.add("tob_rod_fw_bwStartBit",12); - ttc.add("tob_rodStartBit",5); - ttc.add("tob_moduleStartBit",2); - ttc.add("tob_sterStartBit",0); - ttc.add("tob_layerMask",0x7); - ttc.add("tob_rod_fw_bwMask",0x3); - ttc.add("tob_rodMask",0x7F); - ttc.add("tob_moduleMask",0x7); - ttc.add("tob_sterMask",0x3); - descriptions.add( "trackerTopologyConstants", ttc ); - - edm::ParameterSetDescription ttcphase1; - ttcphase1.add("pxb_layerStartBit",20); - ttcphase1.add("pxb_ladderStartBit",12); - ttcphase1.add("pxb_moduleStartBit",2); - ttcphase1.add("pxb_layerMask",0xF); - ttcphase1.add("pxb_ladderMask",0xFF); - ttcphase1.add("pxb_moduleMask",0x3FF); - - ttcphase1.add("pxf_sideStartBit",23); - ttcphase1.add("pxf_diskStartBit",18); - ttcphase1.add("pxf_bladeStartBit",12); - ttcphase1.add("pxf_panelStartBit",10); - ttcphase1.add("pxf_moduleStartBit",2); - ttcphase1.add("pxf_sideMask",0x3); - ttcphase1.add("pxf_diskMask",0xF); - ttcphase1.add("pxf_bladeMask",0x3F); - ttcphase1.add("pxf_panelMask",0x3); - ttcphase1.add("pxf_moduleMask",0xFF); - - ttcphase1.add("tec_sideStartBit",18); - ttcphase1.add("tec_wheelStartBit",14); - ttcphase1.add("tec_petal_fw_bwStartBit",12); - ttcphase1.add("tec_petalStartBit",8); - ttcphase1.add("tec_ringStartBit",5); - ttcphase1.add("tec_moduleStartBit",2); - ttcphase1.add("tec_sterStartBit",0); - ttcphase1.add("tec_sideMask",0x3); - ttcphase1.add("tec_wheelMask",0xF); - ttcphase1.add("tec_petal_fw_bwMask",0x3); - ttcphase1.add("tec_petalMask",0xF); - ttcphase1.add("tec_ringMask",0x7); - ttcphase1.add("tec_moduleMask",0x7); - ttcphase1.add("tec_sterMask",0x3); - - ttcphase1.add("tib_layerStartBit",14); - ttcphase1.add("tib_str_fw_bwStartBit",12); - ttcphase1.add("tib_str_int_extStartBit",10); - ttcphase1.add("tib_strStartBit",4); - ttcphase1.add("tib_moduleStartBit",2); - ttcphase1.add("tib_sterStartBit",0); - ttcphase1.add("tib_layerMask",0x7); - ttcphase1.add("tib_str_fw_bwMask",0x3); - ttcphase1.add("tib_str_int_extMask",0x3); - ttcphase1.add("tib_strMask",0x3F); - ttcphase1.add("tib_moduleMask",0x3); - ttcphase1.add("tib_sterMask",0x3); - - ttcphase1.add("tid_sideStartBit",13); - ttcphase1.add("tid_wheelStartBit",11); - ttcphase1.add("tid_ringStartBit",9); - ttcphase1.add("tid_module_fw_bwStartBit",7); - ttcphase1.add("tid_moduleStartBit",2); - ttcphase1.add("tid_sterStartBit",0); - ttcphase1.add("tid_sideMask",0x3); - ttcphase1.add("tid_wheelMask",0x3); - ttcphase1.add("tid_ringMask",0x3); - ttcphase1.add("tid_module_fw_bwMask",0x3); - ttcphase1.add("tid_moduleMask",0x1F); - ttcphase1.add("tid_sterMask",0x3); - - ttcphase1.add("tob_layerStartBit",14); - ttcphase1.add("tob_rod_fw_bwStartBit",12); - ttcphase1.add("tob_rodStartBit",5); - ttcphase1.add("tob_moduleStartBit",2); - ttcphase1.add("tob_sterStartBit",0); - ttcphase1.add("tob_layerMask",0x7); - ttcphase1.add("tob_rod_fw_bwMask",0x3); - ttcphase1.add("tob_rodMask",0x7F); - ttcphase1.add("tob_moduleMask",0x7); - ttcphase1.add("tob_sterMask",0x3); - - descriptions.add( "trackerTopology2017Constants", ttcphase1 ); - - edm::ParameterSetDescription ttcphase2; - ttcphase2.add("pxb_layerStartBit",20); - ttcphase2.add("pxb_ladderStartBit",12); - ttcphase2.add("pxb_moduleStartBit",2); - ttcphase2.add("pxb_layerMask",0xF); - ttcphase2.add("pxb_ladderMask",0xFF); - ttcphase2.add("pxb_moduleMask",0x3FF); - - ttcphase2.add("pxf_sideStartBit",23); - ttcphase2.add("pxf_diskStartBit",18); - ttcphase2.add("pxf_bladeStartBit",12); - ttcphase2.add("pxf_panelStartBit",10); - ttcphase2.add("pxf_moduleStartBit",2); - ttcphase2.add("pxf_sideMask",0x3); - ttcphase2.add("pxf_diskMask",0xF); - ttcphase2.add("pxf_bladeMask",0x3F); - ttcphase2.add("pxf_panelMask",0x3); - ttcphase2.add("pxf_moduleMask",0xFF); - - ttcphase2.add("tec_sideStartBit",18); - ttcphase2.add("tec_wheelStartBit",14); - ttcphase2.add("tec_petal_fw_bwStartBit",12); - ttcphase2.add("tec_petalStartBit",8); - ttcphase2.add("tec_ringStartBit",5); - ttcphase2.add("tec_moduleStartBit",2); - ttcphase2.add("tec_sterStartBit",0); - ttcphase2.add("tec_sideMask",0x3); - ttcphase2.add("tec_wheelMask",0xF); - ttcphase2.add("tec_petal_fw_bwMask",0x3); - ttcphase2.add("tec_petalMask",0xF); - ttcphase2.add("tec_ringMask",0x7); - ttcphase2.add("tec_moduleMask",0x7); - ttcphase2.add("tec_sterMask",0x3); - - ttcphase2.add("tib_layerStartBit",14); - ttcphase2.add("tib_str_fw_bwStartBit",12); - ttcphase2.add("tib_str_int_extStartBit",10); - ttcphase2.add("tib_strStartBit",4); - ttcphase2.add("tib_moduleStartBit",2); - ttcphase2.add("tib_sterStartBit",0); - ttcphase2.add("tib_layerMask",0x7); - ttcphase2.add("tib_str_fw_bwMask",0x3); - ttcphase2.add("tib_str_int_extMask",0x3); - ttcphase2.add("tib_strMask",0x3F); - ttcphase2.add("tib_moduleMask",0x3); - ttcphase2.add("tib_sterMask",0x3); - - ttcphase2.add("tid_sideStartBit",23); - ttcphase2.add("tid_wheelStartBit",18); - ttcphase2.add("tid_ringStartBit",12); - ttcphase2.add("tid_module_fw_bwStartBit",10); - ttcphase2.add("tid_moduleStartBit",2); - ttcphase2.add("tid_sterStartBit",0); - ttcphase2.add("tid_sideMask",0x3); - ttcphase2.add("tid_wheelMask",0xF); - ttcphase2.add("tid_ringMask",0x3F); - ttcphase2.add("tid_module_fw_bwMask",0x3); - ttcphase2.add("tid_moduleMask",0xFF); - ttcphase2.add("tid_sterMask",0x3); - - ttcphase2.add("tob_layerStartBit",20); - ttcphase2.add("tob_rod_fw_bwStartBit",12); - ttcphase2.add("tob_rodStartBit",12); - ttcphase2.add("tob_moduleStartBit",2); - ttcphase2.add("tob_sterStartBit",0); - ttcphase2.add("tob_layerMask",0xF); - ttcphase2.add("tob_rod_fw_bwMask",0x0); - ttcphase2.add("tob_rodMask",0xFF); - ttcphase2.add("tob_moduleMask",0x3FF); - ttcphase2.add("tob_sterMask",0x3); - - descriptions.add( "trackerTopology2023Constants", ttcphase2 ); } -// -// member functions -// - -// ------------ method called to produce the data ------------ TrackerTopologyEP::ReturnType -TrackerTopologyEP::produce(const IdealGeometryRecord& iRecord) +TrackerTopologyEP::produce( const TrackerTopologyRcd& iRecord ) { edm::LogInfo("TrackerTopologyEP") << "TrackerTopologyIdealEP::produce(const IdealGeometryRecord& iRecord)"; - + edm::ESHandle ptp; + iRecord.getRecord().get( ptp ); + + pxbVals_.layerStartBit_ = ptp->vitems[0].vpars[0]; // 16 + pxbVals_.ladderStartBit_ = ptp->vitems[0].vpars[1]; // 8 + pxbVals_.moduleStartBit_ = ptp->vitems[0].vpars[2]; // 2 + pxbVals_.layerMask_ = ptp->vitems[0].vpars[3]; // 0xF + pxbVals_.ladderMask_ = ptp->vitems[0].vpars[4]; // 0xFF + pxbVals_.moduleMask_ = ptp->vitems[0].vpars[5]; // 0x3F + + pxfVals_.sideStartBit_ = ptp->vitems[1].vpars[0]; + pxfVals_.diskStartBit_ = ptp->vitems[1].vpars[1]; + pxfVals_.bladeStartBit_ = ptp->vitems[1].vpars[2]; + pxfVals_.panelStartBit_ = ptp->vitems[1].vpars[3]; + pxfVals_.moduleStartBit_ = ptp->vitems[1].vpars[4]; + pxfVals_.sideMask_ = ptp->vitems[1].vpars[5]; + pxfVals_.diskMask_ = ptp->vitems[1].vpars[6]; + pxfVals_.bladeMask_ = ptp->vitems[1].vpars[7]; + pxfVals_.panelMask_ = ptp->vitems[1].vpars[8]; + pxfVals_.moduleMask_ = ptp->vitems[1].vpars[9]; + + // TEC: 6 + tecVals_.sideStartBit_ = ptp->vitems[6].vpars[0]; + tecVals_.wheelStartBit_ = ptp->vitems[6].vpars[1]; + tecVals_.petal_fw_bwStartBit_ = ptp->vitems[6].vpars[2]; + tecVals_.petalStartBit_ = ptp->vitems[6].vpars[3]; + tecVals_.ringStartBit_ = ptp->vitems[6].vpars[4]; + tecVals_.moduleStartBit_ = ptp->vitems[6].vpars[5]; + tecVals_.sterStartBit_ = ptp->vitems[6].vpars[6]; + tecVals_.sideMask_ = ptp->vitems[6].vpars[7]; + tecVals_.wheelMask_ = ptp->vitems[6].vpars[8]; + tecVals_.petal_fw_bwMask_ = ptp->vitems[6].vpars[9]; + tecVals_.petalMask_ = ptp->vitems[6].vpars[10]; + tecVals_.ringMask_ = ptp->vitems[6].vpars[11]; + tecVals_.moduleMask_ = ptp->vitems[6].vpars[12]; + tecVals_.sterMask_ = ptp->vitems[6].vpars[13]; + + // TIB: 3 + tibVals_.layerStartBit_ = ptp->vitems[3].vpars[0]; + tibVals_.str_fw_bwStartBit_ = ptp->vitems[3].vpars[1]; + tibVals_.str_int_extStartBit_ = ptp->vitems[3].vpars[2]; + tibVals_.strStartBit_ = ptp->vitems[3].vpars[3]; + tibVals_.moduleStartBit_ = ptp->vitems[3].vpars[4]; + tibVals_.sterStartBit_ = ptp->vitems[3].vpars[5]; + tibVals_.layerMask_ = ptp->vitems[3].vpars[6]; + tibVals_.str_fw_bwMask_ = ptp->vitems[3].vpars[7]; + tibVals_.str_int_extMask_ = ptp->vitems[3].vpars[8]; + tibVals_.strMask_ = ptp->vitems[3].vpars[9]; + tibVals_.moduleMask_ = ptp->vitems[3].vpars[10]; + tibVals_.sterMask_ = ptp->vitems[3].vpars[11]; + + // TID: 4 + tidVals_.sideStartBit_= ptp->vitems[4].vpars[0]; + tidVals_.wheelStartBit_= ptp->vitems[4].vpars[1]; + tidVals_.ringStartBit_= ptp->vitems[4].vpars[2]; + tidVals_.module_fw_bwStartBit_= ptp->vitems[4].vpars[3]; + tidVals_.moduleStartBit_= ptp->vitems[4].vpars[4]; + tidVals_.sterStartBit_= ptp->vitems[4].vpars[5]; + tidVals_.sideMask_= ptp->vitems[4].vpars[6]; + tidVals_.wheelMask_= ptp->vitems[4].vpars[7]; + tidVals_.ringMask_= ptp->vitems[4].vpars[8]; + tidVals_.module_fw_bwMask_= ptp->vitems[4].vpars[9]; + tidVals_.moduleMask_= ptp->vitems[4].vpars[10]; + tidVals_.sterMask_= ptp->vitems[4].vpars[11]; + + // TOB: 5 + tobVals_.layerStartBit_ = ptp->vitems[4].vpars[0]; + tobVals_.rod_fw_bwStartBit_= ptp->vitems[4].vpars[1]; + tobVals_.rodStartBit_= ptp->vitems[4].vpars[2]; + tobVals_.moduleStartBit_= ptp->vitems[4].vpars[3]; + tobVals_.sterStartBit_= ptp->vitems[4].vpars[4]; + tobVals_.layerMask_= ptp->vitems[4].vpars[5]; + tobVals_.rod_fw_bwMask_= ptp->vitems[4].vpars[6]; + tobVals_.rodMask_= ptp->vitems[4].vpars[7]; + tobVals_.moduleMask_= ptp->vitems[4].vpars[8]; + tobVals_.sterMask_= ptp->vitems[4].vpars[9]; + ReturnType myTopo(new TrackerTopology(pxbVals_, pxfVals_, tecVals_, tibVals_, tidVals_, tobVals_)); return myTopo ; diff --git a/Geometry/TrackerNumberingBuilder/plugins/TrackerTopologyEP.h b/Geometry/TrackerNumberingBuilder/plugins/TrackerTopologyEP.h index 63288f6957fb1..8605a7606e4fc 100644 --- a/Geometry/TrackerNumberingBuilder/plugins/TrackerTopologyEP.h +++ b/Geometry/TrackerNumberingBuilder/plugins/TrackerTopologyEP.h @@ -1,51 +1,34 @@ #ifndef GEOMETRY_TRACKERNUMBERINGBUILDER_TRACKERTOPOLOGYEP_H #define GEOMETRY_TRACKERNUMBERINGBUILDER_TRACKERTOPOLOGYEP_H 1 - -// system include files -#include #include "boost/shared_ptr.hpp" - -// user include files -#include "FWCore/Framework/interface/ModuleFactory.h" #include "FWCore/Framework/interface/ESProducer.h" - -#include "FWCore/Framework/interface/ESHandle.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" - -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" namespace edm { class ConfigurationDescriptions; } -// -// class decleration -// - -class TrackerTopologyEP : public edm::ESProducer { - +class TrackerTopologyEP : public edm::ESProducer +{ public: - TrackerTopologyEP(const edm::ParameterSet&); - ~TrackerTopologyEP(); + TrackerTopologyEP( const edm::ParameterSet & ); + ~TrackerTopologyEP( void ); typedef boost::shared_ptr ReturnType; static void fillDescriptions( edm::ConfigurationDescriptions & descriptions ); - ReturnType produce(const IdealGeometryRecord&); + ReturnType produce( const TrackerTopologyRcd & ); private: - // ----------member data --------------------------- TrackerTopology::PixelBarrelValues pxbVals_; TrackerTopology::PixelEndcapValues pxfVals_; TrackerTopology::TECValues tecVals_; TrackerTopology::TIBValues tibVals_; TrackerTopology::TIDValues tidVals_; TrackerTopology::TOBValues tobVals_; - - - - }; + #endif From ae96d5336f6f88c4613bca7d86e2dd3fea10d473 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Fri, 27 Feb 2015 15:30:30 +0100 Subject: [PATCH 02/21] Transient tracker parameters producer. Cleanup tests. Use correct record dependencies. --- .../test/trackergeometrywriterRun2.py | 2 +- .../test/trackergeometrywriterRun3.py | 2 +- .../Geometry/python/GeometryRecoDB_cff.py | 2 +- .../Geometry/python/GeometryReco_cff.py | 3 +- .../Records/interface/PTrackerParametersRcd.h | 6 +- .../interface/TrackerDigiGeometryRecord.h | 27 +-- .../Records/interface/TrackerTopologyRcd.h | 3 +- .../TrackerGeomBuilderFromGeometricDet.h | 3 +- .../plugins/TrackerDigiGeometryESModule.cc | 51 +++++- .../plugins/TrackerDigiGeometryESModule.h | 1 + .../plugins/TrackerParametersESModule.cc | 46 +++++ .../plugins/TrackerParametersESModule.h | 28 +++ .../python/idealForDigiTrackerGeometry_cff.py | 31 ---- .../src/TrackerGeomBuilderFromGeometricDet.cc | 14 +- .../plugins/TrackerTopologyEP.cc | 166 +++++++++--------- .../plugins/TrackerTopologyEP.h | 3 + .../python/TrackerTopology_cfi.py | 8 - .../test/ModuleNumbering.cc | 3 +- .../test/TrackerTopologyAnalyzer.cc | 6 +- .../test/trackerModuleNumbering_cfg.py | 17 +- .../test/trackerTopologyDB_cfg.py | 24 +++ .../test/trackerTopology_cfg.py | 34 +--- 22 files changed, 268 insertions(+), 212 deletions(-) create mode 100644 Geometry/TrackerGeometryBuilder/plugins/TrackerParametersESModule.cc create mode 100644 Geometry/TrackerGeometryBuilder/plugins/TrackerParametersESModule.h delete mode 100644 Geometry/TrackerNumberingBuilder/python/TrackerTopology_cfi.py create mode 100644 Geometry/TrackerNumberingBuilder/test/trackerTopologyDB_cfg.py diff --git a/CondTools/Geometry/test/trackergeometrywriterRun2.py b/CondTools/Geometry/test/trackergeometrywriterRun2.py index 4710c01da9f26..027dd7966ba2b 100644 --- a/CondTools/Geometry/test/trackergeometrywriterRun2.py +++ b/CondTools/Geometry/test/trackergeometrywriterRun2.py @@ -26,7 +26,7 @@ process.CondDBCommon, toPut = cms.VPSet(cms.PSet(record = cms.string('IdealGeometryRecord'),tag = cms.string('TKRECO_Geometry_Run2_Test02')), cms.PSet(record = cms.string('PGeometricDetExtraRcd'),tag = cms.string('TKExtra_Geometry_Run2_Test02')), - cms.PSet(record = cms.string('PTrackerParametersRcd'),tag = cms.string('TK_Parameters_Run2_Test02')) + cms.PSet(record = cms.string('PTrackerParametersRcd'),tag = cms.string('TKParameters_Geometry_Run2_Test02')) ) ) diff --git a/CondTools/Geometry/test/trackergeometrywriterRun3.py b/CondTools/Geometry/test/trackergeometrywriterRun3.py index 1a7997e983013..8aeee86277fcd 100644 --- a/CondTools/Geometry/test/trackergeometrywriterRun3.py +++ b/CondTools/Geometry/test/trackergeometrywriterRun3.py @@ -26,7 +26,7 @@ process.CondDBCommon, toPut = cms.VPSet(cms.PSet(record = cms.string('IdealGeometryRecord'),tag = cms.string('TKRECO_Geometry_Run3_Test02')), cms.PSet(record = cms.string('PGeometricDetExtraRcd'),tag = cms.string('TKExtra_Geometry_Run3_Test02')), - cms.PSet(record = cms.string('PTrackerParametersRcd'),tag = cms.string('TK_Parameters_Run3_Test02')) + cms.PSet(record = cms.string('PTrackerParametersRcd'),tag = cms.string('TKParameters_Geometry_Run3_Test02')) ) ) diff --git a/Configuration/Geometry/python/GeometryRecoDB_cff.py b/Configuration/Geometry/python/GeometryRecoDB_cff.py index 6263968fd2542..5aadfd5f8f43a 100644 --- a/Configuration/Geometry/python/GeometryRecoDB_cff.py +++ b/Configuration/Geometry/python/GeometryRecoDB_cff.py @@ -5,7 +5,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopologyConstants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryReco_cff.py b/Configuration/Geometry/python/GeometryReco_cff.py index ad5643dcc47e3..a5d2992bc9548 100644 --- a/Configuration/Geometry/python/GeometryReco_cff.py +++ b/Configuration/Geometry/python/GeometryReco_cff.py @@ -6,7 +6,8 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopologyConstants_cfi import * +from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * diff --git a/Geometry/Records/interface/PTrackerParametersRcd.h b/Geometry/Records/interface/PTrackerParametersRcd.h index 77349b69a1818..9796de498d394 100644 --- a/Geometry/Records/interface/PTrackerParametersRcd.h +++ b/Geometry/Records/interface/PTrackerParametersRcd.h @@ -2,7 +2,11 @@ #define PTrackerParametersRcd_H #include "FWCore/Framework/interface/EventSetupRecordImplementation.h" +#include "FWCore/Framework/interface/DependentRecordImplementation.h" +#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "boost/mpl/vector.hpp" -class PTrackerParametersRcd : public edm::eventsetup::EventSetupRecordImplementation {}; +class PTrackerParametersRcd : public edm::eventsetup::DependentRecordImplementation > {}; #endif // PTrackerParameters_H diff --git a/Geometry/Records/interface/TrackerDigiGeometryRecord.h b/Geometry/Records/interface/TrackerDigiGeometryRecord.h index c8f9c59fcd3f6..fea337405f7f9 100644 --- a/Geometry/Records/interface/TrackerDigiGeometryRecord.h +++ b/Geometry/Records/interface/TrackerDigiGeometryRecord.h @@ -1,36 +1,16 @@ #ifndef RECORDS_TRACKERDIGIGEOMETRYRECORD_H #define RECORDS_TRACKERDIGIGEOMETRYRECORD_H -// -*- C++ -*- -// -// Package: Records -// Class : IdealGeometryRecord -// -/**\class IdealGeometryRecord IdealGeometryRecord.h Geometry/Records/interface/IdealGeometryRecord.h - - Description: - - Usage: - - -*/ -// -// Author: -// Created: Mon Jul 25 11:05:09 EDT 2005 -// #include "FWCore/Framework/interface/EventSetupRecordImplementation.h" #include "FWCore/Framework/interface/DependentRecordImplementation.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h" #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorRcd.h" #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h" #include "CondFormats/AlignmentRecord/interface/TrackerSurfaceDeformationRcd.h" #include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h" -#include "Geometry/Records/interface/PTrackerParametersRcd.h" -#include "Geometry/Records/interface/TrackerTopologyRcd.h" +#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "boost/mpl/vector.hpp" - class TrackerDigiGeometryRecord : public edm::eventsetup::DependentRecordImplementation > {}; + GlobalPositionRcd> > {}; #endif /* RECORDS_TRACKERDIGIGEOMETRYRECORD_H */ - diff --git a/Geometry/Records/interface/TrackerTopologyRcd.h b/Geometry/Records/interface/TrackerTopologyRcd.h index e2ce8c7e2c9c8..9e17801435cc6 100644 --- a/Geometry/Records/interface/TrackerTopologyRcd.h +++ b/Geometry/Records/interface/TrackerTopologyRcd.h @@ -3,11 +3,12 @@ #include "FWCore/Framework/interface/EventSetupRecordImplementation.h" #include "FWCore/Framework/interface/DependentRecordImplementation.h" +#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" #include "boost/mpl/vector.hpp" class TrackerTopologyRcd : public edm::eventsetup::DependentRecordImplementation > {}; + boost::mpl::vector > {}; #endif diff --git a/Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h b/Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h index 175ddbb8e8d14..f8305af438266 100644 --- a/Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h +++ b/Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h @@ -11,12 +11,11 @@ class TrackerGeometry; class PixelGeomDetType; class StripGeomDetType; -class PTrackerParameters; class TrackerGeomBuilderFromGeometricDet { public: - TrackerGeometry* build(const GeometricDet* gd, const PTrackerParameters* ptp ); + TrackerGeometry* build(const GeometricDet* gd, const edm::ParameterSet& pSet ); private: diff --git a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc index d872d63a6eeb2..795d5960c0ded 100644 --- a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc +++ b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc @@ -3,7 +3,6 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" -#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" #include "DetectorDescription/Core/interface/DDCompactView.h" // Alignments @@ -33,6 +32,7 @@ TrackerDigiGeometryESModule::TrackerDigiGeometryESModule(const edm::ParameterSet m_pSet( p ) { applyAlignment_ = p.getParameter("applyAlignment"); + fromDDD_ = p.getParameter("fromDDD"); setWhatProduced(this); @@ -48,11 +48,53 @@ TrackerDigiGeometryESModule::~TrackerDigiGeometryESModule() {} void TrackerDigiGeometryESModule::fillDescriptions(edm::ConfigurationDescriptions & descriptions) { + edm::ParameterSetDescription descTrackerGeometryConstants; + descTrackerGeometryConstants.add( "ROWS_PER_ROC", 80 ); + descTrackerGeometryConstants.add( "COLS_PER_ROC", 52 ); + descTrackerGeometryConstants.add( "BIG_PIX_PER_ROC_X", 1 ); + descTrackerGeometryConstants.add( "BIG_PIX_PER_ROC_Y", 2 ); + descTrackerGeometryConstants.add( "ROCS_X", 0 ); + descTrackerGeometryConstants.add( "ROCS_Y", 0 ); + + edm::ParameterSetDescription descTrackerSLHCGeometryConstants; + descTrackerSLHCGeometryConstants.add( "ROWS_PER_ROC", 80 ); + descTrackerSLHCGeometryConstants.add( "COLS_PER_ROC", 52 ); + descTrackerSLHCGeometryConstants.add( "BIG_PIX_PER_ROC_X", 0 ); + descTrackerSLHCGeometryConstants.add( "BIG_PIX_PER_ROC_Y", 0 ); + descTrackerSLHCGeometryConstants.add( "ROCS_X", 2 ); + descTrackerSLHCGeometryConstants.add( "ROCS_Y", 8 ); + + edm::ParameterSetDescription descDB; + descDB.add( "appendToDataLabel", "" ); + descDB.add( "fromDDD", false ); + descDB.add( "applyAlignment", true ); + descDB.add( "alignmentsLabel", "" ); + descDB.addOptional( "trackerGeometryConstants", descTrackerGeometryConstants ); + descriptions.add( "trackerGeometryDB", descDB ); + edm::ParameterSetDescription desc; desc.add( "appendToDataLabel", "" ); + desc.add( "fromDDD", true ); desc.add( "applyAlignment", true ); desc.add( "alignmentsLabel", "" ); - descriptions.add( "trackerGeometryDB", desc ); + desc.addOptional( "trackerGeometryConstants", descTrackerGeometryConstants ); + descriptions.add( "trackerGeometry", desc ); + + edm::ParameterSetDescription descSLHCDB; + descSLHCDB.add( "appendToDataLabel", "" ); + descSLHCDB.add( "fromDDD", false ); + descSLHCDB.add( "applyAlignment", true ); + descSLHCDB.add( "alignmentsLabel", "" ); + descSLHCDB.addOptional( "trackerGeometryConstants", descTrackerSLHCGeometryConstants ); + descriptions.add( "trackerSLHCGeometryDB", descSLHCDB ); + + edm::ParameterSetDescription descSLHC; + descSLHC.add( "appendToDataLabel", "" ); + descSLHC.add( "fromDDD", true ); + descSLHC.add( "applyAlignment", true ); + descSLHC.add( "alignmentsLabel", "" ); + descSLHC.addOptional( "trackerGeometryConstants", descTrackerSLHCGeometryConstants ); + descriptions.add( "trackerSLHCGeometry", descSLHC ); } //__________________________________________________________________ @@ -65,11 +107,8 @@ TrackerDigiGeometryESModule::produce(const TrackerDigiGeometryRecord & iRecord) edm::ESHandle gD; iRecord.getRecord().get( gD ); - edm::ESHandle ptp; - iRecord.getRecord().get( ptp ); - TrackerGeomBuilderFromGeometricDet builder; - _tracker = boost::shared_ptr(builder.build(&(*gD), &(*ptp) )); + _tracker = boost::shared_ptr(builder.build(&(*gD), m_pSet )); if (applyAlignment_) { // Since fake is fully working when checking for 'empty', we should get rid of applyAlignment_! diff --git a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.h b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.h index c809a65c6f45f..aca9e015d28f1 100644 --- a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.h +++ b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.h @@ -28,6 +28,7 @@ class TrackerDigiGeometryESModule: public edm::ESProducer{ const std::string myLabel_; const edm::ParameterSet m_pSet; bool applyAlignment_; // Switch to apply alignment corrections + bool fromDDD_; }; diff --git a/Geometry/TrackerGeometryBuilder/plugins/TrackerParametersESModule.cc b/Geometry/TrackerGeometryBuilder/plugins/TrackerParametersESModule.cc new file mode 100644 index 0000000000000..836b86c92c387 --- /dev/null +++ b/Geometry/TrackerGeometryBuilder/plugins/TrackerParametersESModule.cc @@ -0,0 +1,46 @@ +#include "TrackerParametersESModule.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" +#include "FWCore/Framework/interface/ModuleFactory.h" +#include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/Framework/interface/ESTransientHandle.h" +#include "DetectorDescription/Core/interface/DDCompactView.h" +#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/PTrackerParametersRcd.h" +#include "Geometry/TrackerGeometryBuilder/interface/TrackerParametersFromDD.h" +#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" + +TrackerParametersESModule::TrackerParametersESModule( const edm::ParameterSet& ) +{ + edm::LogInfo("TRACKER") << "TrackerParametersESModule::TrackerParametersESModule"; + + setWhatProduced(this); +} + +TrackerParametersESModule::~TrackerParametersESModule() +{ +} + +void +TrackerParametersESModule::fillDescriptions( edm::ConfigurationDescriptions & descriptions ) +{ + edm::ParameterSetDescription desc; + descriptions.add( "trackerParameters", desc ); +} + +TrackerParametersESModule::ReturnType +TrackerParametersESModule::produce( const PTrackerParametersRcd& iRecord ) +{ + //edm::LogInfo("TrackerParametersESModule") + std::cout << "TrackerParametersESModule::produce(const PTrackerParametersRcd& iRecord)" << std::endl; + edm::ESTransientHandle cpv; + iRecord.getRecord().get( cpv ); + + PTrackerParameters* ptp = new PTrackerParameters(); + TrackerParametersFromDD builder; + builder.build( &(*cpv), *ptp ); + + return ReturnType( ptp ) ; +} + +DEFINE_FWK_EVENTSETUP_MODULE( TrackerParametersESModule); diff --git a/Geometry/TrackerGeometryBuilder/plugins/TrackerParametersESModule.h b/Geometry/TrackerGeometryBuilder/plugins/TrackerParametersESModule.h new file mode 100644 index 0000000000000..40d9988457681 --- /dev/null +++ b/Geometry/TrackerGeometryBuilder/plugins/TrackerParametersESModule.h @@ -0,0 +1,28 @@ +#ifndef Geometry_TrackerGeometryBuilder_TrackerParametersESModule_H +#define Geometry_TrackerGeometryBuilder_TrackerParametersESModule_H + +#include "FWCore/Framework/interface/ESProducer.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include + +namespace edm { + class ConfigurationDescriptions; +} +class PTrackerParameters; +class PTrackerParametersRcd; + +class TrackerParametersESModule: public edm::ESProducer +{ + public: + TrackerParametersESModule( const edm::ParameterSet & ); + ~TrackerParametersESModule( void ); + + typedef boost::shared_ptr ReturnType; + + static void fillDescriptions( edm::ConfigurationDescriptions & ); + + ReturnType produce( const PTrackerParametersRcd & ); +}; + +#endif diff --git a/Geometry/TrackerGeometryBuilder/python/idealForDigiTrackerGeometry_cff.py b/Geometry/TrackerGeometryBuilder/python/idealForDigiTrackerGeometry_cff.py index f3bb6bcb7c6d4..8ac25f975e58e 100644 --- a/Geometry/TrackerGeometryBuilder/python/idealForDigiTrackerGeometry_cff.py +++ b/Geometry/TrackerGeometryBuilder/python/idealForDigiTrackerGeometry_cff.py @@ -14,34 +14,3 @@ idealForDigiTrackerGeometry.appendToDataLabel = 'idealForDigi' # Alignments are looked for with this label: idealForDigiTrackerGeometry.alignmentsLabel = 'fakeForIdeal' - -import Geometry.TrackerGeometryBuilder.trackerGeometryConstants_cfi as trackerGeometryConstants_cfi -idealForDigiTrackerGeometry.trackerGeometryConstants = cms.PSet(trackerGeometryConstants_cfi.trackerGeometryConstants) - -#fakeTrackerAlignmentSource = cms.ESSource("EmptyESSource", -# recordName = cms.string("TrackerAlignmentRcd"), -# firstValid = cms.vuint32(1), -# iovIsRunNotTime = cms.bool(True) -# ) -#The follwoing to be converted as the above... -#es_source fakeTrackerAlignmentErrorSource = EmptyESSource { -# string recordName = "TrackerAlignmentErrorExtendedRcd" -# vuint32 firstValid = {1} -# bool iovIsRunNotTime = true -#} -## care: This might lead to a duplication with DT and CSC equivalents of this file: -#es_source fakeGlobalPositionSource = EmptyESSource { -# string recordName = "GlobalPositionRcd" -# vuint32 firstValid = {1} -# bool iovIsRunNotTime = true -#} - -# Comments by GF: -# - In anticipation of the removal of the applyAlignment flag, I'd like to keep it true. -# - Then we would need to get IOVs for the fake alignments, -# * either using FakeAlignmentSource instead of FakeAlignmentProducer in fakeForIdealAlignmentProducer.cfi -# * or by using the commented IOV settings above. -# - But this causes problems in co-existence with e.g. GlobalTag: -# Both Globaltag as well as FakeAlignmentSource provide IOV - it is not distinguished to provide IOV for -# a given label only (e.g. 'fakeForIdeal' compared to ''). -# - I'll try to contact framework people for CMSSW_2_2_0 and above. diff --git a/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc b/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc index 91b2788bef1c8..a4a2300fb6068 100644 --- a/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc +++ b/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc @@ -12,7 +12,6 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/GeometrySurface/interface/MediumProperties.h" -#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Utilities/interface/Exception.h" @@ -38,11 +37,18 @@ namespace { } TrackerGeometry* -TrackerGeomBuilderFromGeometricDet::build( const GeometricDet* gd, const PTrackerParameters* ptp ) +TrackerGeomBuilderFromGeometricDet::build( const GeometricDet* gd, const edm::ParameterSet& pSet ) { - int BIG_PIX_PER_ROC_X = ptp->vpars[2]; - int BIG_PIX_PER_ROC_Y = ptp->vpars[3]; + int BIG_PIX_PER_ROC_X = 1; + int BIG_PIX_PER_ROC_Y = 2; + if( pSet.exists( "trackerGeometryConstants" )) + { + const edm::ParameterSet tkGeomConsts( pSet.getParameter( "trackerGeometryConstants" )); + BIG_PIX_PER_ROC_X = tkGeomConsts.getParameter( "BIG_PIX_PER_ROC_X" ); + BIG_PIX_PER_ROC_Y = tkGeomConsts.getParameter( "BIG_PIX_PER_ROC_Y" ); + } + thePixelDetTypeMap.clear(); theStripDetTypeMap.clear(); diff --git a/Geometry/TrackerNumberingBuilder/plugins/TrackerTopologyEP.cc b/Geometry/TrackerNumberingBuilder/plugins/TrackerTopologyEP.cc index b3e8dc89535d6..668d5905dc7dd 100644 --- a/Geometry/TrackerNumberingBuilder/plugins/TrackerTopologyEP.cc +++ b/Geometry/TrackerNumberingBuilder/plugins/TrackerTopologyEP.cc @@ -1,9 +1,3 @@ -// -*- C++ -*- -// -// Package: TrackerTopologyEP -// Class: TrackerTopologyEP -// - #include "TrackerTopologyEP.h" #include "FWCore/Utilities/interface/Exception.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" @@ -11,17 +5,15 @@ #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "FWCore/Framework/interface/ModuleFactory.h" #include "FWCore/Framework/interface/ESHandle.h" -#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" -TrackerTopologyEP::TrackerTopologyEP(const edm::ParameterSet& conf) +TrackerTopologyEP::TrackerTopologyEP( const edm::ParameterSet& conf ) { - edm::LogInfo("TRACKER") << "TrackerTopologyIdealEP::TrackerTopologyIdealEP"; + edm::LogInfo("TRACKER") << "TrackerTopologyEP::TrackerTopologyEP"; setWhatProduced(this); } - TrackerTopologyEP::~TrackerTopologyEP() { } @@ -30,95 +22,99 @@ void TrackerTopologyEP::fillDescriptions( edm::ConfigurationDescriptions & descriptions ) { edm::ParameterSetDescription ttc; - descriptions.add( "trackerTopologyConstants", ttc ); + descriptions.add( "trackerTopology", ttc ); } TrackerTopologyEP::ReturnType TrackerTopologyEP::produce( const TrackerTopologyRcd& iRecord ) { - edm::LogInfo("TrackerTopologyEP") << "TrackerTopologyIdealEP::produce(const IdealGeometryRecord& iRecord)"; + edm::LogInfo("TrackerTopologyEP") << "TrackerTopologyEP::produce(const TrackerTopologyRcd& iRecord)"; edm::ESHandle ptp; iRecord.getRecord().get( ptp ); + fillParameters( *ptp ); + + ReturnType myTopo( new TrackerTopology( pxbVals_, pxfVals_, tecVals_, tibVals_, tidVals_, tobVals_ )); - pxbVals_.layerStartBit_ = ptp->vitems[0].vpars[0]; // 16 - pxbVals_.ladderStartBit_ = ptp->vitems[0].vpars[1]; // 8 - pxbVals_.moduleStartBit_ = ptp->vitems[0].vpars[2]; // 2 - pxbVals_.layerMask_ = ptp->vitems[0].vpars[3]; // 0xF - pxbVals_.ladderMask_ = ptp->vitems[0].vpars[4]; // 0xFF - pxbVals_.moduleMask_ = ptp->vitems[0].vpars[5]; // 0x3F - - pxfVals_.sideStartBit_ = ptp->vitems[1].vpars[0]; - pxfVals_.diskStartBit_ = ptp->vitems[1].vpars[1]; - pxfVals_.bladeStartBit_ = ptp->vitems[1].vpars[2]; - pxfVals_.panelStartBit_ = ptp->vitems[1].vpars[3]; - pxfVals_.moduleStartBit_ = ptp->vitems[1].vpars[4]; - pxfVals_.sideMask_ = ptp->vitems[1].vpars[5]; - pxfVals_.diskMask_ = ptp->vitems[1].vpars[6]; - pxfVals_.bladeMask_ = ptp->vitems[1].vpars[7]; - pxfVals_.panelMask_ = ptp->vitems[1].vpars[8]; - pxfVals_.moduleMask_ = ptp->vitems[1].vpars[9]; + return myTopo ; +} +void +TrackerTopologyEP::fillParameters( const PTrackerParameters& ptp ) +{ + pxbVals_.layerStartBit_ = ptp.vitems[0].vpars[0]; // 16 + pxbVals_.ladderStartBit_ = ptp.vitems[0].vpars[1]; // 8 + pxbVals_.moduleStartBit_ = ptp.vitems[0].vpars[2]; // 2 + pxbVals_.layerMask_ = ptp.vitems[0].vpars[3]; // 0xF + pxbVals_.ladderMask_ = ptp.vitems[0].vpars[4]; // 0xFF + pxbVals_.moduleMask_ = ptp.vitems[0].vpars[5]; // 0x3F + + pxfVals_.sideStartBit_ = ptp.vitems[1].vpars[0]; + pxfVals_.diskStartBit_ = ptp.vitems[1].vpars[1]; + pxfVals_.bladeStartBit_ = ptp.vitems[1].vpars[2]; + pxfVals_.panelStartBit_ = ptp.vitems[1].vpars[3]; + pxfVals_.moduleStartBit_ = ptp.vitems[1].vpars[4]; + pxfVals_.sideMask_ = ptp.vitems[1].vpars[5]; + pxfVals_.diskMask_ = ptp.vitems[1].vpars[6]; + pxfVals_.bladeMask_ = ptp.vitems[1].vpars[7]; + pxfVals_.panelMask_ = ptp.vitems[1].vpars[8]; + pxfVals_.moduleMask_ = ptp.vitems[1].vpars[9]; + // TEC: 6 - tecVals_.sideStartBit_ = ptp->vitems[6].vpars[0]; - tecVals_.wheelStartBit_ = ptp->vitems[6].vpars[1]; - tecVals_.petal_fw_bwStartBit_ = ptp->vitems[6].vpars[2]; - tecVals_.petalStartBit_ = ptp->vitems[6].vpars[3]; - tecVals_.ringStartBit_ = ptp->vitems[6].vpars[4]; - tecVals_.moduleStartBit_ = ptp->vitems[6].vpars[5]; - tecVals_.sterStartBit_ = ptp->vitems[6].vpars[6]; - tecVals_.sideMask_ = ptp->vitems[6].vpars[7]; - tecVals_.wheelMask_ = ptp->vitems[6].vpars[8]; - tecVals_.petal_fw_bwMask_ = ptp->vitems[6].vpars[9]; - tecVals_.petalMask_ = ptp->vitems[6].vpars[10]; - tecVals_.ringMask_ = ptp->vitems[6].vpars[11]; - tecVals_.moduleMask_ = ptp->vitems[6].vpars[12]; - tecVals_.sterMask_ = ptp->vitems[6].vpars[13]; - + tecVals_.sideStartBit_ = ptp.vitems[5].vpars[0]; + tecVals_.wheelStartBit_ = ptp.vitems[5].vpars[1]; + tecVals_.petal_fw_bwStartBit_ = ptp.vitems[5].vpars[2]; + tecVals_.petalStartBit_ = ptp.vitems[5].vpars[3]; + tecVals_.ringStartBit_ = ptp.vitems[5].vpars[4]; + tecVals_.moduleStartBit_ = ptp.vitems[5].vpars[5]; + tecVals_.sterStartBit_ = ptp.vitems[5].vpars[6]; + tecVals_.sideMask_ = ptp.vitems[5].vpars[7]; + tecVals_.wheelMask_ = ptp.vitems[5].vpars[8]; + tecVals_.petal_fw_bwMask_ = ptp.vitems[5].vpars[9]; + tecVals_.petalMask_ = ptp.vitems[5].vpars[10]; + tecVals_.ringMask_ = ptp.vitems[5].vpars[11]; + tecVals_.moduleMask_ = ptp.vitems[5].vpars[12]; + tecVals_.sterMask_ = ptp.vitems[5].vpars[13]; + // TIB: 3 - tibVals_.layerStartBit_ = ptp->vitems[3].vpars[0]; - tibVals_.str_fw_bwStartBit_ = ptp->vitems[3].vpars[1]; - tibVals_.str_int_extStartBit_ = ptp->vitems[3].vpars[2]; - tibVals_.strStartBit_ = ptp->vitems[3].vpars[3]; - tibVals_.moduleStartBit_ = ptp->vitems[3].vpars[4]; - tibVals_.sterStartBit_ = ptp->vitems[3].vpars[5]; - tibVals_.layerMask_ = ptp->vitems[3].vpars[6]; - tibVals_.str_fw_bwMask_ = ptp->vitems[3].vpars[7]; - tibVals_.str_int_extMask_ = ptp->vitems[3].vpars[8]; - tibVals_.strMask_ = ptp->vitems[3].vpars[9]; - tibVals_.moduleMask_ = ptp->vitems[3].vpars[10]; - tibVals_.sterMask_ = ptp->vitems[3].vpars[11]; - + tibVals_.layerStartBit_ = ptp.vitems[2].vpars[0]; + tibVals_.str_fw_bwStartBit_ = ptp.vitems[2].vpars[1]; + tibVals_.str_int_extStartBit_ = ptp.vitems[2].vpars[2]; + tibVals_.strStartBit_ = ptp.vitems[2].vpars[3]; + tibVals_.moduleStartBit_ = ptp.vitems[2].vpars[4]; + tibVals_.sterStartBit_ = ptp.vitems[2].vpars[5]; + tibVals_.layerMask_ = ptp.vitems[2].vpars[6]; + tibVals_.str_fw_bwMask_ = ptp.vitems[2].vpars[7]; + tibVals_.str_int_extMask_ = ptp.vitems[2].vpars[8]; + tibVals_.strMask_ = ptp.vitems[2].vpars[9]; + tibVals_.moduleMask_ = ptp.vitems[2].vpars[10]; + tibVals_.sterMask_ = ptp.vitems[2].vpars[11]; + // TID: 4 - tidVals_.sideStartBit_= ptp->vitems[4].vpars[0]; - tidVals_.wheelStartBit_= ptp->vitems[4].vpars[1]; - tidVals_.ringStartBit_= ptp->vitems[4].vpars[2]; - tidVals_.module_fw_bwStartBit_= ptp->vitems[4].vpars[3]; - tidVals_.moduleStartBit_= ptp->vitems[4].vpars[4]; - tidVals_.sterStartBit_= ptp->vitems[4].vpars[5]; - tidVals_.sideMask_= ptp->vitems[4].vpars[6]; - tidVals_.wheelMask_= ptp->vitems[4].vpars[7]; - tidVals_.ringMask_= ptp->vitems[4].vpars[8]; - tidVals_.module_fw_bwMask_= ptp->vitems[4].vpars[9]; - tidVals_.moduleMask_= ptp->vitems[4].vpars[10]; - tidVals_.sterMask_= ptp->vitems[4].vpars[11]; - - // TOB: 5 - tobVals_.layerStartBit_ = ptp->vitems[4].vpars[0]; - tobVals_.rod_fw_bwStartBit_= ptp->vitems[4].vpars[1]; - tobVals_.rodStartBit_= ptp->vitems[4].vpars[2]; - tobVals_.moduleStartBit_= ptp->vitems[4].vpars[3]; - tobVals_.sterStartBit_= ptp->vitems[4].vpars[4]; - tobVals_.layerMask_= ptp->vitems[4].vpars[5]; - tobVals_.rod_fw_bwMask_= ptp->vitems[4].vpars[6]; - tobVals_.rodMask_= ptp->vitems[4].vpars[7]; - tobVals_.moduleMask_= ptp->vitems[4].vpars[8]; - tobVals_.sterMask_= ptp->vitems[4].vpars[9]; + tidVals_.sideStartBit_= ptp.vitems[3].vpars[0]; + tidVals_.wheelStartBit_= ptp.vitems[3].vpars[1]; + tidVals_.ringStartBit_= ptp.vitems[3].vpars[2]; + tidVals_.module_fw_bwStartBit_= ptp.vitems[3].vpars[3]; + tidVals_.moduleStartBit_= ptp.vitems[3].vpars[4]; + tidVals_.sterStartBit_= ptp.vitems[3].vpars[5]; + tidVals_.sideMask_= ptp.vitems[3].vpars[6]; + tidVals_.wheelMask_= ptp.vitems[3].vpars[7]; + tidVals_.ringMask_= ptp.vitems[3].vpars[8]; + tidVals_.module_fw_bwMask_= ptp.vitems[3].vpars[9]; + tidVals_.moduleMask_= ptp.vitems[3].vpars[10]; + tidVals_.sterMask_= ptp.vitems[3].vpars[11]; - ReturnType myTopo(new TrackerTopology(pxbVals_, pxfVals_, tecVals_, tibVals_, tidVals_, tobVals_)); - - return myTopo ; + // TOB: 5 + tobVals_.layerStartBit_ = ptp.vitems[4].vpars[0]; + tobVals_.rod_fw_bwStartBit_= ptp.vitems[4].vpars[1]; + tobVals_.rodStartBit_= ptp.vitems[4].vpars[2]; + tobVals_.moduleStartBit_= ptp.vitems[4].vpars[3]; + tobVals_.sterStartBit_= ptp.vitems[4].vpars[4]; + tobVals_.layerMask_= ptp.vitems[4].vpars[5]; + tobVals_.rod_fw_bwMask_= ptp.vitems[4].vpars[6]; + tobVals_.rodMask_= ptp.vitems[4].vpars[7]; + tobVals_.moduleMask_= ptp.vitems[4].vpars[8]; + tobVals_.sterMask_= ptp.vitems[4].vpars[9]; } - DEFINE_FWK_EVENTSETUP_MODULE( TrackerTopologyEP); diff --git a/Geometry/TrackerNumberingBuilder/plugins/TrackerTopologyEP.h b/Geometry/TrackerNumberingBuilder/plugins/TrackerTopologyEP.h index 8605a7606e4fc..2ac4b44b7268d 100644 --- a/Geometry/TrackerNumberingBuilder/plugins/TrackerTopologyEP.h +++ b/Geometry/TrackerNumberingBuilder/plugins/TrackerTopologyEP.h @@ -5,6 +5,7 @@ #include "FWCore/Framework/interface/ESProducer.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" +#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" namespace edm { class ConfigurationDescriptions; @@ -23,6 +24,8 @@ class TrackerTopologyEP : public edm::ESProducer ReturnType produce( const TrackerTopologyRcd & ); private: + void fillParameters( const PTrackerParameters& ); + TrackerTopology::PixelBarrelValues pxbVals_; TrackerTopology::PixelEndcapValues pxfVals_; TrackerTopology::TECValues tecVals_; diff --git a/Geometry/TrackerNumberingBuilder/python/TrackerTopology_cfi.py b/Geometry/TrackerNumberingBuilder/python/TrackerTopology_cfi.py deleted file mode 100644 index 56054509b5c1b..0000000000000 --- a/Geometry/TrackerNumberingBuilder/python/TrackerTopology_cfi.py +++ /dev/null @@ -1,8 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -import Geometry.HcalEventSetup.hcalTopologyIdeal_cfi - -hcalTopologyIdeal = Geometry.HcalEventSetup.hcalTopologyIdeal_cfi.hcalTopologyIdeal.clone() - -import Geometry.HcalEventSetup.hcalTopologyConstants_cfi as hcalTopologyConstants_cfi -hcalTopologyIdeal.hcalTopologyConstants = cms.PSet(hcalTopologyConstants_cfi.hcalTopologyConstants) diff --git a/Geometry/TrackerNumberingBuilder/test/ModuleNumbering.cc b/Geometry/TrackerNumberingBuilder/test/ModuleNumbering.cc index 11ce963184d12..9559c2e9bcdba 100644 --- a/Geometry/TrackerNumberingBuilder/test/ModuleNumbering.cc +++ b/Geometry/TrackerNumberingBuilder/test/ModuleNumbering.cc @@ -42,6 +42,7 @@ #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/TrackerNumberingBuilder/interface/CmsTrackerStringToEnum.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "DetectorDescription/Core/interface/DDRoot.h" @@ -167,7 +168,7 @@ ModuleNumbering::analyze( const edm::Event& iEvent, const edm::EventSetup& iSetu { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); diff --git a/Geometry/TrackerNumberingBuilder/test/TrackerTopologyAnalyzer.cc b/Geometry/TrackerNumberingBuilder/test/TrackerTopologyAnalyzer.cc index 6192a723c9255..322d080da9baf 100644 --- a/Geometry/TrackerNumberingBuilder/test/TrackerTopologyAnalyzer.cc +++ b/Geometry/TrackerNumberingBuilder/test/TrackerTopologyAnalyzer.cc @@ -4,14 +4,12 @@ #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include #include @@ -29,7 +27,7 @@ class TrackerTopologyAnalyzer : public edm::EDAnalyzer { void TrackerTopologyAnalyzer::analyze( const edm::Event &iEvent, const edm::EventSetup& iSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); typedef std::vector DetIdContainer; diff --git a/Geometry/TrackerNumberingBuilder/test/trackerModuleNumbering_cfg.py b/Geometry/TrackerNumberingBuilder/test/trackerModuleNumbering_cfg.py index fe338c5ed9a68..0d0d0c408047b 100644 --- a/Geometry/TrackerNumberingBuilder/test/trackerModuleNumbering_cfg.py +++ b/Geometry/TrackerNumberingBuilder/test/trackerModuleNumbering_cfg.py @@ -1,26 +1,25 @@ import FWCore.ParameterSet.Config as cms process = cms.Process("NumberingTest") -# empty input service, fire 10 events -process.load("FWCore.MessageLogger.MessageLogger_cfi") - -# Choose Tracker Geometry -process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi") -process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi") +process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi") +process.load("Configuration.Geometry.GeometryReco_cff") +process.load("Geometry.CMSCommonData.cmsExtendedGeometryXML_cfi") +process.load("Alignment.CommonAlignmentProducer.FakeAlignmentSource_cfi") +#this is always needed if users want access to the vector +process.TrackerGeometricDetExtraESModule = cms.ESProducer( "TrackerGeometricDetExtraESModule", + fromDDD = cms.bool( True ) + ) process.source = cms.Source("EmptySource") process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1) ) -process.print = cms.OutputModule("AsciiOutputModule") process.prod = cms.EDAnalyzer("ModuleNumbering") process.p1 = cms.Path(process.prod) -process.ep = cms.EndPath(process.print) diff --git a/Geometry/TrackerNumberingBuilder/test/trackerTopologyDB_cfg.py b/Geometry/TrackerNumberingBuilder/test/trackerTopologyDB_cfg.py new file mode 100644 index 0000000000000..d7040dadd2e33 --- /dev/null +++ b/Geometry/TrackerNumberingBuilder/test/trackerTopologyDB_cfg.py @@ -0,0 +1,24 @@ +import FWCore.ParameterSet.Config as cms + +process = cms.Process("NumberingTest") + +process.load('Configuration.StandardSequences.GeometryRecoDB_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:startup', '') + +process.GlobalTag.toGet = cms.VPSet(cms.PSet(record = cms.string('PTrackerParametersRcd'), + tag = cms.string('TKParameters_Geometry_Test01'), + connect = cms.untracked.string("sqlite_file:./myfile.db") + ) + ) + +process.source = cms.Source("EmptySource") + +process.maxEvents = cms.untracked.PSet( + input = cms.untracked.int32(1) +) + +process.prod = cms.EDAnalyzer("TrackerTopologyAnalyzer"); + +process.p1 = cms.Path(process.prod) diff --git a/Geometry/TrackerNumberingBuilder/test/trackerTopology_cfg.py b/Geometry/TrackerNumberingBuilder/test/trackerTopology_cfg.py index f015d4d0e7a74..6dfa5e19f433f 100644 --- a/Geometry/TrackerNumberingBuilder/test/trackerTopology_cfg.py +++ b/Geometry/TrackerNumberingBuilder/test/trackerTopology_cfg.py @@ -1,35 +1,10 @@ import FWCore.ParameterSet.Config as cms process = cms.Process("NumberingTest") -# empty input service, fire 10 events -process.load("FWCore.MessageLogger.MessageLogger_cfi") - - -process.load('Configuration.StandardSequences.Services_cff') -process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') -process.load('FWCore.MessageService.MessageLogger_cfi') -process.load('Configuration.EventContent.EventContent_cff') -process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.StandardSequences.GeometryRecoDB_cff') -process.load('Configuration.StandardSequences.MagneticField_38T_cff') -process.load('Configuration.StandardSequences.RawToDigi_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:startup', '') - - - -# Choose Tracker Geometry -#process.load("Configuration.Geometry.GeometryReco_cff") - -#process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi") -#process.load("Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff") -#process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi") - -#process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi") - -process.load("Geometry.TrackerNumberingBuilder.trackerTopologyConstants_cfi") +process.load("Configuration.Geometry.GeometryReco_cff") +process.load("Geometry.CMSCommonData.cmsExtendedGeometryXML_cfi") +process.trackerGeometry.applyAlignment = cms.bool(False) process.source = cms.Source("EmptySource") @@ -39,7 +14,4 @@ process.prod = cms.EDAnalyzer("TrackerTopologyAnalyzer"); - process.p1 = cms.Path(process.prod) - - From 77f36af33669d36dd969604db48aec97e3bda680 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Fri, 27 Feb 2015 15:31:06 +0100 Subject: [PATCH 03/21] Remove duplicate file. --- .../python/trackerModuleNumbering_cfg.py | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 Geometry/TrackerNumberingBuilder/python/trackerModuleNumbering_cfg.py diff --git a/Geometry/TrackerNumberingBuilder/python/trackerModuleNumbering_cfg.py b/Geometry/TrackerNumberingBuilder/python/trackerModuleNumbering_cfg.py deleted file mode 100644 index d39f2d893133e..0000000000000 --- a/Geometry/TrackerNumberingBuilder/python/trackerModuleNumbering_cfg.py +++ /dev/null @@ -1,31 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -process = cms.Process("NumberingTest") -process.load("FWCore.MessageLogger.MessageLogger_cfi") - -process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi") - -process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi") - -process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi") -process.load("Alignment.CommonAlignmentProducer.FakeAlignmentSource_cfi") - -#this is always needed if users want access to the vector -process.TrackerGeometricDetExtraESModule = cms.ESProducer( "TrackerGeometricDetExtraESModule", - fromDDD = cms.bool( True ) - ) - -process.source = cms.Source("EmptySource") - -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) -) -#process.print = cms.OutputModule("AsciiOutputModule") - -process.prod = cms.EDAnalyzer("ModuleNumbering") - -process.p1 = cms.Path(process.prod) -#process.ep = cms.EndPath(process.print) - - - From a4ed470201f3410268e9b8289bd419467d921e49 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Wed, 4 Mar 2015 14:18:10 +0100 Subject: [PATCH 04/21] * Use Tracker parameters in Tracker geometry builder * Use Tracker topology record * Introduce correct record dependencies * Update test configurations --- .../plugins/AlignmentMonitorAsAnalyzer.cc | 13 +++--- .../plugins/AlignmentStats.cc | 4 +- .../plugins/BuildFile.xml | 1 + .../plugins/AlignmentProducer.cc | 9 +++- .../plugins/BuildFile.xml | 1 + .../src/AlignmentTrackSelector.cc | 4 +- .../src/HIPAlignmentAlgorithm.cc | 4 +- .../plugins/KalmanAlignmentAlgorithm.cc | 3 +- .../src/KalmanAlignmentSetup.cc | 3 -- .../LaserAlignment/plugins/BuildFile.xml | 1 + .../LaserAlignment/plugins/LaserAlignment.cc | 15 ++++--- .../LaserAlignment/plugins/LaserAlignment.h | 2 - .../test/RecoAnalyzerRecHits.cc | 4 +- .../LaserDQM/plugins/LaserDQMStatistics.cc | 4 +- .../OfflineValidation/plugins/BuildFile.xml | 1 + .../plugins/ResidualRefitting.cc | 4 +- .../plugins/TrackerGeometryCompare.cc | 15 ++++--- .../plugins/TrackerGeometryCompare.h | 1 - .../plugins/TrackerGeometryIntoNtuples.cc | 13 +++--- .../plugins/TrackerOfflineValidation.cc | 5 ++- .../TrackerOfflineValidationSummary.cc | 4 +- .../SurveyAnalysis/plugins/BuildFile.xml | 1 + .../plugins/CreateSurveyRcds.cc | 10 +++-- .../SurveyAnalysis/plugins/CreateSurveyRcds.h | 1 - .../plugins/SurveyDataConverter.cc | 4 +- .../plugins/SurveyInputTrackerFromDB.cc | 12 +++-- .../plugins/SurveyInputTrackerFromDB.h | 2 - .../plugins/SurveyMisalignmentInput.cc | 13 ++++-- .../plugins/SurveyMisalignmentInput.h | 2 - .../SurveyAnalysis/test/SurveyInputDummy.cc | 3 +- .../TrackerAlignment/plugins/BuildFile.xml | 1 + .../plugins/MisalignedTrackerESProducer.cc | 9 ++-- .../plugins/TkAlCaOverlapTagger.cc | 4 +- .../plugins/TrackerSystematicMisalignments.cc | 12 +++-- .../plugins/TrackerSystematicMisalignments.h | 2 - .../src/TrackerAlignableId.cc | 1 - .../TrackerAlignment/src/TrackerAlignment.cc | 3 +- .../test/test-misalign_cfg.py | 2 + .../python/cmsIdealGeometryXML_cfi.py | 1 + .../interface/TrackerDigiGeometryRecord.h | 6 ++- .../TrackerGeomBuilderFromGeometricDet.h | 3 +- .../plugins/TrackerDigiGeometryESModule.cc | 44 +++---------------- .../plugins/TrackerDigiGeometryESModule.h | 1 - .../src/TrackerGeomBuilderFromGeometricDet.cc | 14 ++---- .../test/trackerHierarchy_cfg.py | 5 ++- .../test/trackerMap_cfg.py | 11 +---- .../test/trackerModuleInfoDDD_cfg.py | 1 + .../test/trackerParametersFromDDD_cfg.py | 8 ---- .../test/tracker_cfg.py | 1 + 49 files changed, 138 insertions(+), 150 deletions(-) diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc index f9845eddde5c1..4bb9f28fc2da6 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc +++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc @@ -41,10 +41,13 @@ #include "Geometry/DTGeometry/interface/DTGeometry.h" #include "Geometry/CSCGeometry/interface/CSCGeometry.h" #include "Geometry/Records/interface/MuonNumberingRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/MuonNumbering/interface/MuonDDDConstants.h" #include "Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDDD.h" #include "Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.h" #include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h" +#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" +#include "Geometry/Records/interface/PTrackerParametersRcd.h" #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h" #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h" #include "CondFormats/AlignmentRecord/interface/DTAlignmentRcd.h" @@ -73,7 +76,6 @@ class AlignmentMonitorAsAnalyzer : public edm::EDAnalyzer { // ----------member data --------------------------- edm::InputTag m_tjTag; edm::ParameterSet m_aliParamStoreCfg; - const edm::ParameterSet m_pSet; AlignableTracker *m_alignableTracker; AlignableMuon *m_alignableMuon; @@ -98,8 +100,7 @@ class AlignmentMonitorAsAnalyzer : public edm::EDAnalyzer { // AlignmentMonitorAsAnalyzer::AlignmentMonitorAsAnalyzer(const edm::ParameterSet& iConfig) : m_tjTag(iConfig.getParameter("tjTkAssociationMapTag")) - , m_aliParamStoreCfg(iConfig.getParameter("ParameterStore")), - m_pSet(iConfig) + , m_aliParamStoreCfg(iConfig.getParameter("ParameterStore")) , m_alignableTracker(NULL) , m_alignableMuon(NULL) , m_alignmentParameterStore(NULL) @@ -134,7 +135,7 @@ AlignmentMonitorAsAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSe { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); if (m_firstEvent) { @@ -145,8 +146,10 @@ AlignmentMonitorAsAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSe edm::ESHandle theGeometricDet; iSetup.get().get( theGeometricDet ); + edm::ESHandle ptp; + iSetup.get().get( ptp ); TrackerGeomBuilderFromGeometricDet trackerBuilder; - boost::shared_ptr theTracker(trackerBuilder.build(&(*theGeometricDet), m_pSet )); + boost::shared_ptr theTracker(trackerBuilder.build(&(*theGeometricDet), *ptp )); edm::ESHandle mdc; iSetup.get().get(mdc); diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.cc index b308e29ff8fb7..1df60ecd02c47 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.cc +++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.cc @@ -3,7 +3,7 @@ #include "DataFormats/Common/interface/View.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Alignment/TrackerAlignment/interface/AlignableTracker.h" #include "Alignment/CommonAlignment/interface/Alignable.h" #include "Alignment/CommonAlignment/interface/Utilities.h" @@ -311,7 +311,7 @@ void AlignmentStats::endJob(){ //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - lastSetup_->get().get(tTopoHandle); + lastSetup_->get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); AlignableTracker* theAliTracker=new AlignableTracker(&(*trackerGeometry_), tTopo); diff --git a/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml b/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml index 3e67a8cda6d97..57873f748d191 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml +++ b/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml @@ -69,6 +69,7 @@ + diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentProducer.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentProducer.cc index 6a64cfaddc4b4..beca73476f06b 100644 --- a/Alignment/CommonAlignmentProducer/plugins/AlignmentProducer.cc +++ b/Alignment/CommonAlignmentProducer/plugins/AlignmentProducer.cc @@ -36,9 +36,12 @@ #include "Geometry/DTGeometry/interface/DTGeometry.h" #include "Geometry/CSCGeometry/interface/CSCGeometry.h" #include "Geometry/Records/interface/MuonNumberingRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDDD.h" #include "Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.h" #include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h" +#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" +#include "Geometry/Records/interface/PTrackerParametersRcd.h" #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h" #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h" #include "CondFormats/AlignmentRecord/interface/TrackerSurfaceDeformationRcd.h" @@ -199,7 +202,7 @@ void AlignmentProducer::beginOfJob( const edm::EventSetup& iSetup ) //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // Create the geometries from the ideal geometries (first time only) @@ -646,8 +649,10 @@ void AlignmentProducer::createGeometries_( const edm::EventSetup& iSetup ) if (doTracker_) { edm::ESHandle geometricDet; iSetup.get().get( geometricDet ); + edm::ESHandle ptp; + iSetup.get().get( ptp ); TrackerGeomBuilderFromGeometricDet trackerBuilder; - theTracker = boost::shared_ptr( trackerBuilder.build(&(*geometricDet), theParameterSet )); + theTracker = boost::shared_ptr( trackerBuilder.build(&(*geometricDet), *ptp )); } if (doMuon_) { diff --git a/Alignment/CommonAlignmentProducer/plugins/BuildFile.xml b/Alignment/CommonAlignmentProducer/plugins/BuildFile.xml index fcc0e72705051..df2e871fe3c0c 100644 --- a/Alignment/CommonAlignmentProducer/plugins/BuildFile.xml +++ b/Alignment/CommonAlignmentProducer/plugins/BuildFile.xml @@ -15,6 +15,7 @@ + diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc index 5f963001df469..9435e2850d8d3 100644 --- a/Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc +++ b/Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc @@ -23,7 +23,7 @@ #include "DataFormats/SiStripDetId/interface/SiStripDetId.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include @@ -331,7 +331,7 @@ bool AlignmentTrackSelector::detailedHitsCheck(const reco::Track *trackp, const //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - eSetup.get().get(tTopoHandle); + eSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // checking hit requirements beyond simple number of valid hits diff --git a/Alignment/HIPAlignmentAlgorithm/src/HIPAlignmentAlgorithm.cc b/Alignment/HIPAlignmentAlgorithm/src/HIPAlignmentAlgorithm.cc index 307e66554cce1..c4919078ae79b 100644 --- a/Alignment/HIPAlignmentAlgorithm/src/HIPAlignmentAlgorithm.cc +++ b/Alignment/HIPAlignmentAlgorithm/src/HIPAlignmentAlgorithm.cc @@ -26,7 +26,7 @@ #include "Alignment/CommonAlignment/interface/AlignableExtras.h" #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h" #include "FWCore/Framework/interface/ValidityInterval.h" @@ -1137,7 +1137,7 @@ void HIPAlignmentAlgorithm::fillRoot(const edm::EventSetup& iSetup) //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); for (std::vector::const_iterator it=theAlignables.begin(); diff --git a/Alignment/KalmanAlignmentAlgorithm/plugins/KalmanAlignmentAlgorithm.cc b/Alignment/KalmanAlignmentAlgorithm/plugins/KalmanAlignmentAlgorithm.cc index 7ad892eebc7d6..a21e4a281d443 100644 --- a/Alignment/KalmanAlignmentAlgorithm/plugins/KalmanAlignmentAlgorithm.cc +++ b/Alignment/KalmanAlignmentAlgorithm/plugins/KalmanAlignmentAlgorithm.cc @@ -31,6 +31,7 @@ #include "TrackingTools/Records/interface/TrackingComponentsRecord.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h" #include "DataFormats/BeamSpot/interface/BeamSpot.h" @@ -213,7 +214,7 @@ void KalmanAlignmentAlgorithm::initializeAlignmentParameters( const edm::EventSe { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - setup.get().get(tTopoHandle); + setup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // Just to be sure, set all APEs to zero ... diff --git a/Alignment/KalmanAlignmentAlgorithm/src/KalmanAlignmentSetup.cc b/Alignment/KalmanAlignmentAlgorithm/src/KalmanAlignmentSetup.cc index d8eda23f83e4c..62159364d54cf 100644 --- a/Alignment/KalmanAlignmentAlgorithm/src/KalmanAlignmentSetup.cc +++ b/Alignment/KalmanAlignmentAlgorithm/src/KalmanAlignmentSetup.cc @@ -1,9 +1,6 @@ #include "Alignment/KalmanAlignmentAlgorithm/interface/KalmanAlignmentSetup.h" -//#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -//#include "Geometry/Records/interface/IdealGeometryRecord.h" - #include #include diff --git a/Alignment/LaserAlignment/plugins/BuildFile.xml b/Alignment/LaserAlignment/plugins/BuildFile.xml index dbfdfdda2f003..c15ad44da118a 100644 --- a/Alignment/LaserAlignment/plugins/BuildFile.xml +++ b/Alignment/LaserAlignment/plugins/BuildFile.xml @@ -12,6 +12,7 @@ + diff --git a/Alignment/LaserAlignment/plugins/LaserAlignment.cc b/Alignment/LaserAlignment/plugins/LaserAlignment.cc index fe02f03e0233e..4537c0514a9dc 100644 --- a/Alignment/LaserAlignment/plugins/LaserAlignment.cc +++ b/Alignment/LaserAlignment/plugins/LaserAlignment.cc @@ -9,9 +9,9 @@ #include "Alignment/LaserAlignment/plugins/LaserAlignment.h" #include "FWCore/Framework/interface/Run.h" - - - +#include "Geometry/Records/interface/TrackerTopologyRcd.h" +#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" +#include "Geometry/Records/interface/PTrackerParametersRcd.h" /// /// @@ -39,8 +39,7 @@ LaserAlignment::LaserAlignment( edm::ParameterSet const& theConf ) : theAlignableTracker(), theAlignRecordName( "TrackerAlignmentRcd" ), theErrorRecordName( "TrackerAlignmentErrorExtendedRcd" ), - firstEvent_(true), - theParameterSet( theConf ) + firstEvent_(true) { @@ -267,7 +266,7 @@ void LaserAlignment::produce(edm::Event& theEvent, edm::EventSetup const& theSet //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - theSetup.get().get(tTopoHandle); + theSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // access the tracker @@ -290,8 +289,10 @@ void LaserAlignment::produce(edm::Event& theEvent, edm::EventSetup const& theSet // the AlignableTracker object is initialized with the ideal geometry edm::ESHandle theGeometricDet; theSetup.get().get(theGeometricDet); + edm::ESHandle ptp; + theSetup.get().get( ptp ); TrackerGeomBuilderFromGeometricDet trackerBuilder; - TrackerGeometry* theRefTracker = trackerBuilder.build(&*theGeometricDet, theParameterSet); + TrackerGeometry* theRefTracker = trackerBuilder.build(&*theGeometricDet, *ptp ); theAlignableTracker = new AlignableTracker(&(*theRefTracker), tTopo); } diff --git a/Alignment/LaserAlignment/plugins/LaserAlignment.h b/Alignment/LaserAlignment/plugins/LaserAlignment.h index fdb4598c1460f..5fdb695bff123 100644 --- a/Alignment/LaserAlignment/plugins/LaserAlignment.h +++ b/Alignment/LaserAlignment/plugins/LaserAlignment.h @@ -244,7 +244,5 @@ class LaserAlignment : public edm::one::EDProducer, public std::string theAlignRecordName, theErrorRecordName; bool firstEvent_; - - const edm::ParameterSet theParameterSet; }; #endif diff --git a/Alignment/LaserAlignment/test/RecoAnalyzerRecHits.cc b/Alignment/LaserAlignment/test/RecoAnalyzerRecHits.cc index b2661ef425dc2..7587c0aa65308 100644 --- a/Alignment/LaserAlignment/test/RecoAnalyzerRecHits.cc +++ b/Alignment/LaserAlignment/test/RecoAnalyzerRecHits.cc @@ -16,14 +16,14 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h" void RecoAnalyzer::trackerRecHits(edm::Event const& theEvent, edm::EventSetup const& theSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - theSetup.get().get(tTopoHandle); + theSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); diff --git a/Alignment/LaserDQM/plugins/LaserDQMStatistics.cc b/Alignment/LaserDQM/plugins/LaserDQMStatistics.cc index a40f89666b83d..5f00e4ff15627 100644 --- a/Alignment/LaserDQM/plugins/LaserDQMStatistics.cc +++ b/Alignment/LaserDQM/plugins/LaserDQMStatistics.cc @@ -21,13 +21,13 @@ #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" void LaserDQM::trackerStatistics(edm::Event const& theEvent,edm::EventSetup const& theSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - theSetup.get().get(tTopoHandle); + theSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); diff --git a/Alignment/OfflineValidation/plugins/BuildFile.xml b/Alignment/OfflineValidation/plugins/BuildFile.xml index 9e2c28aa15c31..68c034edce127 100644 --- a/Alignment/OfflineValidation/plugins/BuildFile.xml +++ b/Alignment/OfflineValidation/plugins/BuildFile.xml @@ -48,5 +48,6 @@ + diff --git a/Alignment/OfflineValidation/plugins/ResidualRefitting.cc b/Alignment/OfflineValidation/plugins/ResidualRefitting.cc index 648e45ad169a6..5977215cac55c 100755 --- a/Alignment/OfflineValidation/plugins/ResidualRefitting.cc +++ b/Alignment/OfflineValidation/plugins/ResidualRefitting.cc @@ -8,7 +8,7 @@ #include "DataFormats/MuonDetId/interface/CSCDetId.h" #include "DataFormats/MuonDetId/interface/RPCDetId.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" @@ -278,7 +278,7 @@ void ResidualRefitting::CollectTrackHits(edm::Handle trac //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - eventSetup.get().get(tTopoHandle); + eventSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); int iMuonHit = 0; diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc index 7f331e7ef55aa..c4f2e330d8c8c 100644 --- a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc +++ b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc @@ -15,6 +15,8 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "Alignment/CommonAlignment/interface/AlignableObjectId.h" +#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" +#include "Geometry/Records/interface/PTrackerParametersRcd.h" #include "Geometry/CommonTopologies/interface/SurfaceDeformationFactory.h" #include "Geometry/CommonTopologies/interface/SurfaceDeformation.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" @@ -45,14 +47,13 @@ //#include "Geometry/Records/interface/PGeometricDetRcd.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include #include #include TrackerGeometryCompare::TrackerGeometryCompare(const edm::ParameterSet& cfg) : - m_params( cfg ), referenceTracker(0), dummyTracker(0), currentTracker(0), @@ -230,7 +231,7 @@ void TrackerGeometryCompare::analyze(const edm::Event&, const edm::EventSetup& i //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); //upload the ROOT geometries @@ -276,7 +277,7 @@ void TrackerGeometryCompare::createROOTGeometry(const edm::EventSetup& iSetup){ //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); //declare alignments @@ -355,13 +356,15 @@ void TrackerGeometryCompare::createROOTGeometry(const edm::EventSetup& iSetup){ iSetup.get().get(cpv); edm::ESHandle theGeometricDet; iSetup.get().get(theGeometricDet); + edm::ESHandle ptp; + iSetup.get().get( ptp ); TrackerGeomBuilderFromGeometricDet trackerBuilder; edm::ESHandle globalPositionRcd; iSetup.get().getRecord().get(globalPositionRcd); //reference tracker - TrackerGeometry* theRefTracker = trackerBuilder.build(&*theGeometricDet, m_params); + TrackerGeometry* theRefTracker = trackerBuilder.build(&*theGeometricDet, *ptp ); if (_inputFilename1 != "IDEAL"){ GeometryAligner aligner1; aligner1.applyAlignments( &(*theRefTracker), &(*alignments1), &(*alignmentErrors1), @@ -402,7 +405,7 @@ void TrackerGeometryCompare::createROOTGeometry(const edm::EventSetup& iSetup){ } //currernt tracker - TrackerGeometry* theCurTracker = trackerBuilder.build(&*theGeometricDet,m_params); + TrackerGeometry* theCurTracker = trackerBuilder.build(&*theGeometricDet, *ptp ); if (_inputFilename2 != "IDEAL"){ GeometryAligner aligner2; aligner2.applyAlignments( &(*theCurTracker), &(*alignments2), &(*alignmentErrors2), diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h index e90826de0dab7..112f0b082607e 100644 --- a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h +++ b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h @@ -72,7 +72,6 @@ class TrackerGeometryCompare: public edm::EDAnalyzer { //parameters - edm::ParameterSet m_params; std::vector m_theLevels; //std::vector theSubDets; diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc b/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc index 5444b80560fe5..9940540ec1ba3 100644 --- a/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc +++ b/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc @@ -46,11 +46,14 @@ #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h" #include "CondFormats/AlignmentRecord/interface/TrackerSurfaceDeformationRcd.h" +#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" +#include "Geometry/Records/interface/PTrackerParametersRcd.h" + #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h" @@ -81,7 +84,6 @@ class TrackerGeometryIntoNtuples : public edm::EDAnalyzer { void addBranches(); // ----------member data --------------------------- - const edm::ParameterSet theParameterSet; //std::vector m_align; AlignableTracker* theCurrentTracker ; @@ -121,7 +123,6 @@ class TrackerGeometryIntoNtuples : public edm::EDAnalyzer { // constructors and destructor // TrackerGeometryIntoNtuples::TrackerGeometryIntoNtuples(const edm::ParameterSet& iConfig) : - theParameterSet( iConfig ), theCurrentTracker(0), m_rawid(0), m_x(0.), m_y(0.), m_z(0.), @@ -161,7 +162,7 @@ void TrackerGeometryIntoNtuples::analyze(const edm::Event& iEvent, const edm::Ev { // retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); @@ -170,9 +171,11 @@ void TrackerGeometryIntoNtuples::analyze(const edm::Event& iEvent, const edm::Ev //accessing the initial geometry edm::ESHandle theGeometricDet; iSetup.get().get(theGeometricDet); + edm::ESHandle ptp; + iSetup.get().get( ptp ); TrackerGeomBuilderFromGeometricDet trackerBuilder; //currernt tracker - TrackerGeometry* theCurTracker = trackerBuilder.build(&*theGeometricDet,theParameterSet); + TrackerGeometry* theCurTracker = trackerBuilder.build(&*theGeometricDet, *ptp ); //build the tracker edm::ESHandle alignments; diff --git a/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc b/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc index af17c9dd50655..91c4af330b3b9 100644 --- a/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc +++ b/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc @@ -55,6 +55,7 @@ #include "CommonTools/Utils/interface/TFileDirectory.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" @@ -390,7 +391,7 @@ TrackerOfflineValidation::checkBookHists(const edm::EventSetup& es) //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // construct alignable tracker to get access to alignable hierarchy @@ -1208,7 +1209,7 @@ TrackerOfflineValidation::endJob() //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - lastSetup_->get().get(tTopoHandle); + lastSetup_->get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); AlignableTracker aliTracker(&(*tkGeom_), tTopo); diff --git a/Alignment/OfflineValidation/plugins/TrackerOfflineValidationSummary.cc b/Alignment/OfflineValidation/plugins/TrackerOfflineValidationSummary.cc index 302207a33bfc2..af3e739f9328f 100644 --- a/Alignment/OfflineValidation/plugins/TrackerOfflineValidationSummary.cc +++ b/Alignment/OfflineValidation/plugins/TrackerOfflineValidationSummary.cc @@ -45,7 +45,7 @@ #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/GeometrySurface/interface/Surface.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/Math/interface/deltaPhi.h" @@ -213,7 +213,7 @@ TrackerOfflineValidationSummary::endJob() { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - lastSetup_->get().get(tTopoHandle); + lastSetup_->get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); AlignableTracker aliTracker(&(*tkGeom_), tTopo); diff --git a/Alignment/SurveyAnalysis/plugins/BuildFile.xml b/Alignment/SurveyAnalysis/plugins/BuildFile.xml index d0fb92a6afe2f..401d5436fcdb6 100644 --- a/Alignment/SurveyAnalysis/plugins/BuildFile.xml +++ b/Alignment/SurveyAnalysis/plugins/BuildFile.xml @@ -8,6 +8,7 @@ + diff --git a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc index 647228ed4bb60..7f558d8726709 100644 --- a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc +++ b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc @@ -1,7 +1,10 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" +#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" +#include "Geometry/Records/interface/PTrackerParametersRcd.h" #include "Alignment/CommonAlignment/interface/SurveyDet.h" #include "Alignment/TrackerAlignment/interface/AlignableTracker.h" @@ -26,7 +29,6 @@ #include "FWCore/ServiceRegistry/interface/Service.h" CreateSurveyRcds::CreateSurveyRcds(const edm::ParameterSet& cfg) - : theParameterSet( cfg ) { m_inputGeom = cfg.getUntrackedParameter< std::string > ("inputGeom"); m_inputSimpleMis = cfg.getUntrackedParameter< double > ("simpleMis"); @@ -38,12 +40,14 @@ void CreateSurveyRcds::analyze(const edm::Event& event, const edm::EventSetup& s //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - setup.get().get(tTopoHandle); + setup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); edm::ESHandle geom; setup.get().get(geom); - TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(&*geom, theParameterSet); + edm::ESHandle ptp; + setup.get().get( ptp ); + TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(&*geom, *ptp ); //take geometry from DB or randomly generate geometry if (m_inputGeom == "sqlite"){ diff --git a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.h b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.h index d0366a83d048b..cb8f23513aea7 100644 --- a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.h +++ b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.h @@ -58,7 +58,6 @@ class CreateSurveyRcds: std::string textFileName; edm::ESHandle alignments; - const edm::ParameterSet theParameterSet; }; #endif diff --git a/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.cc b/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.cc index 1b69a924d26b8..bbf1713501bce 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.cc +++ b/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.cc @@ -12,7 +12,7 @@ #include "Alignment/SurveyAnalysis/plugins/SurveyDataConverter.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" //__________________________________________________________________________________________________ SurveyDataConverter::SurveyDataConverter(const edm::ParameterSet& iConfig) : @@ -25,7 +25,7 @@ void SurveyDataConverter::analyze( const edm::Event& iEvent, const edm::EventSet { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); edm::LogInfo("SurveyDataConverter") << "Analyzer called"; diff --git a/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc b/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc index cee30ba59e857..c8d3e4da8e846 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc +++ b/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc @@ -4,7 +4,10 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" +#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" +#include "Geometry/Records/interface/PTrackerParametersRcd.h" // Database #include "CondCore/DBOutputService/interface/PoolDBOutputService.h" @@ -18,8 +21,7 @@ #include "Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h" SurveyInputTrackerFromDB::SurveyInputTrackerFromDB(const edm::ParameterSet& cfg) - : textFileName( cfg.getParameter("textFileName") ), - theParameterSet( cfg ) + : textFileName( cfg.getParameter("textFileName") ) {} void SurveyInputTrackerFromDB::analyze(const edm::Event&, const edm::EventSetup& setup) @@ -31,7 +33,7 @@ void SurveyInputTrackerFromDB::analyze(const edm::Event&, const edm::EventSetup& //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - setup.get().get(tTopoHandle); + setup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); //Get map from textreader @@ -41,7 +43,9 @@ void SurveyInputTrackerFromDB::analyze(const edm::Event&, const edm::EventSetup& edm::ESHandle geom; setup.get().get(geom); - TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(&*geom, theParameterSet); + edm::ESHandle ptp; + setup.get().get( ptp ); + TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(&*geom, *ptp ); addComponent( new AlignableTracker( tracker, tTopo ) ); addSurveyInfo( detector() ); diff --git a/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h b/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h index 3cb78c65c5c6f..21e05a201fd52 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h +++ b/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h @@ -42,8 +42,6 @@ class SurveyInputTrackerFromDB: void addSurveyInfo( Alignable* ); - - const edm::ParameterSet theParameterSet; }; #endif diff --git a/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.cc b/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.cc index d7c438ada67b6..ff8c8ac98036e 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.cc +++ b/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.cc @@ -1,6 +1,9 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" +#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" +#include "Geometry/Records/interface/PTrackerParametersRcd.h" #include "Alignment/CommonAlignment/interface/SurveyDet.h" #include "Alignment/TrackerAlignment/interface/AlignableTracker.h" @@ -14,8 +17,7 @@ #include "Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h" SurveyMisalignmentInput::SurveyMisalignmentInput(const edm::ParameterSet& cfg): - textFileName( cfg.getParameter("textFileName") ), - theParameterSet( cfg ) + textFileName( cfg.getParameter("textFileName") ) {} void SurveyMisalignmentInput::analyze(const edm::Event&, const edm::EventSetup& setup) @@ -23,12 +25,15 @@ void SurveyMisalignmentInput::analyze(const edm::Event&, const edm::EventSetup& if (theFirstEvent) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - setup.get().get(tTopoHandle); + setup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); edm::ESHandle geom; setup.get().get(geom); - TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(&*geom, theParameterSet); + + edm::ESHandle ptp; + setup.get().get( ptp ); + TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(&*geom, *ptp ); addComponent(new AlignableTracker( tracker, tTopo )); diff --git a/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h b/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h index 4bcc45625316d..cbd7366bfcfd7 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h +++ b/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h @@ -46,8 +46,6 @@ class SurveyMisalignmentInput: /// Get alignable surface from misalignments.db AlignableSurface getAlignableSurface(align::ID); - - const edm::ParameterSet theParameterSet; }; #endif diff --git a/Alignment/SurveyAnalysis/test/SurveyInputDummy.cc b/Alignment/SurveyAnalysis/test/SurveyInputDummy.cc index 8509b3bb9561e..40071b2ff7a7b 100644 --- a/Alignment/SurveyAnalysis/test/SurveyInputDummy.cc +++ b/Alignment/SurveyAnalysis/test/SurveyInputDummy.cc @@ -2,6 +2,7 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Alignment/CommonAlignment/interface/AlignableObjectId.h" #include "Alignment/CommonAlignment/interface/SurveyDet.h" @@ -33,7 +34,7 @@ void SurveyInputDummy::analyze(const edm::Event&, const edm::EventSetup& setup) if (theFirstEvent) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - setup.get().get(tTopoHandle); + setup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); edm::ESHandle tracker; diff --git a/Alignment/TrackerAlignment/plugins/BuildFile.xml b/Alignment/TrackerAlignment/plugins/BuildFile.xml index 9d6a0ebb69c3f..c54c3ae221227 100644 --- a/Alignment/TrackerAlignment/plugins/BuildFile.xml +++ b/Alignment/TrackerAlignment/plugins/BuildFile.xml @@ -3,6 +3,7 @@ + diff --git a/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc b/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc index c9eb7b2556120..069741dad66b2 100644 --- a/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc +++ b/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc @@ -14,6 +14,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" #include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" // Alignment @@ -51,7 +52,6 @@ class MisalignedTrackerESProducer: public edm::ESProducer const bool theSaveToDB; /// whether or not writing to DB const bool theSaveFakeScenario; /// if theSaveToDB is true, save a fake scenario (empty alignments), irrespective of the misalignment scenario below const edm::ParameterSet theScenario; /// misalignment scenario - const edm::ParameterSet thePSet; const std::string theAlignRecordName, theErrorRecordName; boost::shared_ptr theTracker; @@ -68,7 +68,6 @@ MisalignedTrackerESProducer::MisalignedTrackerESProducer(const edm::ParameterSet theSaveToDB(p.getUntrackedParameter("saveToDbase")), theSaveFakeScenario(p.getUntrackedParameter("saveFakeScenario")), theScenario(p.getParameter("scenario")), - thePSet(p), theAlignRecordName("TrackerAlignmentRcd"), theErrorRecordName("TrackerAlignmentErrorExtendedRcd") { @@ -87,7 +86,7 @@ MisalignedTrackerESProducer::produce( const TrackerDigiGeometryRecord& iRecord ) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iRecord.getRecord().get(tTopoHandle); + iRecord.getRecord().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); edm::LogInfo("MisalignedTracker") << "Producer called"; @@ -95,8 +94,10 @@ MisalignedTrackerESProducer::produce( const TrackerDigiGeometryRecord& iRecord ) // Create the tracker geometry from ideal geometry edm::ESHandle gD; iRecord.getRecord().get( gD ); + edm::ESHandle ptp; + iRecord.getRecord().get( ptp ); TrackerGeomBuilderFromGeometricDet trackerBuilder; - theTracker = boost::shared_ptr( trackerBuilder.build(&(*gD), thePSet)); + theTracker = boost::shared_ptr( trackerBuilder.build(&(*gD), *ptp )); // Create the alignable hierarchy std::auto_ptr theAlignableTracker(new AlignableTracker( &(*theTracker), tTopo ) ); diff --git a/Alignment/TrackerAlignment/plugins/TkAlCaOverlapTagger.cc b/Alignment/TrackerAlignment/plugins/TkAlCaOverlapTagger.cc index b82ef6d03caba..dd0084c72b5da 100644 --- a/Alignment/TrackerAlignment/plugins/TkAlCaOverlapTagger.cc +++ b/Alignment/TrackerAlignment/plugins/TkAlCaOverlapTagger.cc @@ -10,7 +10,7 @@ #include "DataFormats/Common/interface/View.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "DataFormats/TrackReco/interface/Track.h" @@ -59,7 +59,7 @@ TkAlCaOverlapTagger::~TkAlCaOverlapTagger(){} void TkAlCaOverlapTagger::produce(edm::Event &iEvent, const edm::EventSetup &iSetup){ //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); edm::Handle assoMap; diff --git a/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc b/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc index 26635c5cdf6ba..388dbe9be921a 100644 --- a/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc +++ b/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc @@ -1,6 +1,9 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" +#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" +#include "Geometry/Records/interface/PTrackerParametersRcd.h" #include "Alignment/CommonAlignment/interface/SurveyDet.h" #include "Alignment/TrackerAlignment/interface/AlignableTracker.h" @@ -33,8 +36,7 @@ // made some variables constant, removed obviously dead code and comments TrackerSystematicMisalignments::TrackerSystematicMisalignments(const edm::ParameterSet& cfg) - : theAlignableTracker(0), - theParameterSet(cfg) + : theAlignableTracker(0) { // use existing geometry m_fromDBGeom = cfg.getUntrackedParameter< bool > ("fromDBGeom"); @@ -112,12 +114,14 @@ void TrackerSystematicMisalignments::analyze(const edm::Event& event, const edm: //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - setup.get().get(tTopoHandle); + setup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); edm::ESHandle geom; setup.get().get(geom); - TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(&*geom, theParameterSet); + edm::ESHandle ptp; + setup.get().get( ptp ); + TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(&*geom, *ptp ); //take geometry from DB or randomly generate geometry if (m_fromDBGeom){ diff --git a/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.h b/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.h index 8adcc7cb7da40..f6c12cdbc83f2 100644 --- a/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.h +++ b/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.h @@ -69,8 +69,6 @@ public edm::EDAnalyzer // flag for old z behaviour, version <= 1.5 bool oldMinusZconvention; - - const edm::ParameterSet theParameterSet; }; #endif diff --git a/Alignment/TrackerAlignment/src/TrackerAlignableId.cc b/Alignment/TrackerAlignment/src/TrackerAlignableId.cc index 87cee8dd55cfc..3fbcdbcefefaa 100644 --- a/Alignment/TrackerAlignment/src/TrackerAlignableId.cc +++ b/Alignment/TrackerAlignment/src/TrackerAlignableId.cc @@ -9,7 +9,6 @@ #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Alignment/TrackerAlignment/interface/TrackerAlignableId.h" diff --git a/Alignment/TrackerAlignment/src/TrackerAlignment.cc b/Alignment/TrackerAlignment/src/TrackerAlignment.cc index f17f24164af36..cdc483d60de80 100644 --- a/Alignment/TrackerAlignment/src/TrackerAlignment.cc +++ b/Alignment/TrackerAlignment/src/TrackerAlignment.cc @@ -7,6 +7,7 @@ // Geometry #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" // Alignment #include "CondFormats/Alignment/interface/Alignments.h" @@ -23,7 +24,7 @@ TrackerAlignment::TrackerAlignment( const edm::EventSetup& setup ): //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - setup.get().get(tTopoHandle); + setup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); edm::ESHandle trackerGeometry; diff --git a/Alignment/TrackerAlignment/test/test-misalign_cfg.py b/Alignment/TrackerAlignment/test/test-misalign_cfg.py index 6611292fee917..8cddfe95e5e28 100644 --- a/Alignment/TrackerAlignment/test/test-misalign_cfg.py +++ b/Alignment/TrackerAlignment/test/test-misalign_cfg.py @@ -24,6 +24,8 @@ process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi") process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi") +process.load("Geometry.TrackerNumberingBuilder.trackerTopology_cfi") +process.load("Geometry.TrackerGeometryBuilder.trackerParameters_cfi") # Misalignment example scenario producer process.load("Alignment.TrackerAlignment.MisalignedTracker_cfi") diff --git a/Geometry/CMSCommonData/python/cmsIdealGeometryXML_cfi.py b/Geometry/CMSCommonData/python/cmsIdealGeometryXML_cfi.py index 4061678503cf4..8a159f75fbe19 100644 --- a/Geometry/CMSCommonData/python/cmsIdealGeometryXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsIdealGeometryXML_cfi.py @@ -16,6 +16,7 @@ 'Geometry/CMSCommonData/data/cmsBeam.xml', 'Geometry/CMSCommonData/data/muonMB.xml', 'Geometry/CMSCommonData/data/muonMagnet.xml', + 'Geometry/TrackerCommonData/data/trackerParameters.xml', 'Geometry/TrackerCommonData/data/pixfwdMaterials.xml', 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', 'Geometry/TrackerCommonData/data/pixfwdPlaq.xml', diff --git a/Geometry/Records/interface/TrackerDigiGeometryRecord.h b/Geometry/Records/interface/TrackerDigiGeometryRecord.h index fea337405f7f9..3f2ba5ac6e58c 100644 --- a/Geometry/Records/interface/TrackerDigiGeometryRecord.h +++ b/Geometry/Records/interface/TrackerDigiGeometryRecord.h @@ -9,6 +9,8 @@ #include "CondFormats/AlignmentRecord/interface/TrackerSurfaceDeformationRcd.h" #include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" +#include "Geometry/Records/interface/PTrackerParametersRcd.h" #include "boost/mpl/vector.hpp" class TrackerDigiGeometryRecord : @@ -18,6 +20,8 @@ class TrackerDigiGeometryRecord : TrackerAlignmentErrorRcd, TrackerAlignmentErrorExtendedRcd, TrackerSurfaceDeformationRcd, - GlobalPositionRcd> > {}; + GlobalPositionRcd, + TrackerTopologyRcd, + PTrackerParametersRcd> > {}; #endif /* RECORDS_TRACKERDIGIGEOMETRYRECORD_H */ diff --git a/Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h b/Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h index f8305af438266..8d87ba983c48f 100644 --- a/Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h +++ b/Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h @@ -11,11 +11,12 @@ class TrackerGeometry; class PixelGeomDetType; class StripGeomDetType; +class PTrackerParameters; class TrackerGeomBuilderFromGeometricDet { public: - TrackerGeometry* build(const GeometricDet* gd, const edm::ParameterSet& pSet ); + TrackerGeometry* build(const GeometricDet* gd, const PTrackerParameters & ptp ); private: diff --git a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc index 795d5960c0ded..672cf79d50047 100644 --- a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc +++ b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc @@ -3,7 +3,9 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/PTrackerParametersRcd.h" #include "DetectorDescription/Core/interface/DDCompactView.h" +#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" // Alignments #include "CondFormats/Alignment/interface/Alignments.h" @@ -28,8 +30,7 @@ //__________________________________________________________________ TrackerDigiGeometryESModule::TrackerDigiGeometryESModule(const edm::ParameterSet & p) : alignmentsLabel_(p.getParameter("alignmentsLabel")), - myLabel_(p.getParameter("appendToDataLabel")), - m_pSet( p ) + myLabel_(p.getParameter("appendToDataLabel")) { applyAlignment_ = p.getParameter("applyAlignment"); fromDDD_ = p.getParameter("fromDDD"); @@ -48,28 +49,11 @@ TrackerDigiGeometryESModule::~TrackerDigiGeometryESModule() {} void TrackerDigiGeometryESModule::fillDescriptions(edm::ConfigurationDescriptions & descriptions) { - edm::ParameterSetDescription descTrackerGeometryConstants; - descTrackerGeometryConstants.add( "ROWS_PER_ROC", 80 ); - descTrackerGeometryConstants.add( "COLS_PER_ROC", 52 ); - descTrackerGeometryConstants.add( "BIG_PIX_PER_ROC_X", 1 ); - descTrackerGeometryConstants.add( "BIG_PIX_PER_ROC_Y", 2 ); - descTrackerGeometryConstants.add( "ROCS_X", 0 ); - descTrackerGeometryConstants.add( "ROCS_Y", 0 ); - - edm::ParameterSetDescription descTrackerSLHCGeometryConstants; - descTrackerSLHCGeometryConstants.add( "ROWS_PER_ROC", 80 ); - descTrackerSLHCGeometryConstants.add( "COLS_PER_ROC", 52 ); - descTrackerSLHCGeometryConstants.add( "BIG_PIX_PER_ROC_X", 0 ); - descTrackerSLHCGeometryConstants.add( "BIG_PIX_PER_ROC_Y", 0 ); - descTrackerSLHCGeometryConstants.add( "ROCS_X", 2 ); - descTrackerSLHCGeometryConstants.add( "ROCS_Y", 8 ); - edm::ParameterSetDescription descDB; descDB.add( "appendToDataLabel", "" ); descDB.add( "fromDDD", false ); descDB.add( "applyAlignment", true ); descDB.add( "alignmentsLabel", "" ); - descDB.addOptional( "trackerGeometryConstants", descTrackerGeometryConstants ); descriptions.add( "trackerGeometryDB", descDB ); edm::ParameterSetDescription desc; @@ -77,24 +61,7 @@ TrackerDigiGeometryESModule::fillDescriptions(edm::ConfigurationDescriptions & d desc.add( "fromDDD", true ); desc.add( "applyAlignment", true ); desc.add( "alignmentsLabel", "" ); - desc.addOptional( "trackerGeometryConstants", descTrackerGeometryConstants ); descriptions.add( "trackerGeometry", desc ); - - edm::ParameterSetDescription descSLHCDB; - descSLHCDB.add( "appendToDataLabel", "" ); - descSLHCDB.add( "fromDDD", false ); - descSLHCDB.add( "applyAlignment", true ); - descSLHCDB.add( "alignmentsLabel", "" ); - descSLHCDB.addOptional( "trackerGeometryConstants", descTrackerSLHCGeometryConstants ); - descriptions.add( "trackerSLHCGeometryDB", descSLHCDB ); - - edm::ParameterSetDescription descSLHC; - descSLHC.add( "appendToDataLabel", "" ); - descSLHC.add( "fromDDD", true ); - descSLHC.add( "applyAlignment", true ); - descSLHC.add( "alignmentsLabel", "" ); - descSLHC.addOptional( "trackerGeometryConstants", descTrackerSLHCGeometryConstants ); - descriptions.add( "trackerSLHCGeometry", descSLHC ); } //__________________________________________________________________ @@ -106,9 +73,12 @@ TrackerDigiGeometryESModule::produce(const TrackerDigiGeometryRecord & iRecord) // edm::ESHandle gD; iRecord.getRecord().get( gD ); + + edm::ESHandle ptp; + iRecord.getRecord().get( ptp ); TrackerGeomBuilderFromGeometricDet builder; - _tracker = boost::shared_ptr(builder.build(&(*gD), m_pSet )); + _tracker = boost::shared_ptr(builder.build(&(*gD), *ptp )); if (applyAlignment_) { // Since fake is fully working when checking for 'empty', we should get rid of applyAlignment_! diff --git a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.h b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.h index aca9e015d28f1..92ae5d354cc0b 100644 --- a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.h +++ b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.h @@ -26,7 +26,6 @@ class TrackerDigiGeometryESModule: public edm::ESProducer{ boost::shared_ptr _tracker; const std::string alignmentsLabel_; const std::string myLabel_; - const edm::ParameterSet m_pSet; bool applyAlignment_; // Switch to apply alignment corrections bool fromDDD_; }; diff --git a/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc b/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc index a4a2300fb6068..dbc16f3ee01e7 100644 --- a/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc +++ b/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc @@ -9,6 +9,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h" #include "Geometry/TrackerGeometryBuilder/interface/StripTopologyBuilder.h" +#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/GeometrySurface/interface/MediumProperties.h" @@ -37,17 +38,10 @@ namespace { } TrackerGeometry* -TrackerGeomBuilderFromGeometricDet::build( const GeometricDet* gd, const edm::ParameterSet& pSet ) +TrackerGeomBuilderFromGeometricDet::build( const GeometricDet* gd, const PTrackerParameters& ptp ) { - int BIG_PIX_PER_ROC_X = 1; - int BIG_PIX_PER_ROC_Y = 2; - - if( pSet.exists( "trackerGeometryConstants" )) - { - const edm::ParameterSet tkGeomConsts( pSet.getParameter( "trackerGeometryConstants" )); - BIG_PIX_PER_ROC_X = tkGeomConsts.getParameter( "BIG_PIX_PER_ROC_X" ); - BIG_PIX_PER_ROC_Y = tkGeomConsts.getParameter( "BIG_PIX_PER_ROC_Y" ); - } + int BIG_PIX_PER_ROC_X = ptp.vpars[2]; + int BIG_PIX_PER_ROC_Y = ptp.vpars[3]; thePixelDetTypeMap.clear(); theStripDetTypeMap.clear(); diff --git a/Geometry/TrackerGeometryBuilder/test/trackerHierarchy_cfg.py b/Geometry/TrackerGeometryBuilder/test/trackerHierarchy_cfg.py index 6710325b967d3..74b138222f831 100644 --- a/Geometry/TrackerGeometryBuilder/test/trackerHierarchy_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/trackerHierarchy_cfg.py @@ -1,7 +1,6 @@ import FWCore.ParameterSet.Config as cms process = cms.Process("GeometryTest") -# empty input service, fire 10 events process.load("FWCore.MessageLogger.MessageLogger_cfi") # Choose Tracker Geometry @@ -10,6 +9,9 @@ process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi") process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi") +process.load("Geometry.TrackerGeometryBuilder.trackerParameters_cfi") +process.load("Alignment.CommonAlignmentProducer.FakeAlignmentSource_cfi") +process.preferFakeAlign = cms.ESPrefer("FakeAlignmentSource") process.source = cms.Source("EmptySource") @@ -21,6 +23,5 @@ ) process.p1 = cms.Path(process.prod) -process.MessageLogger.cout.placeholder = 'INFO' diff --git a/Geometry/TrackerGeometryBuilder/test/trackerMap_cfg.py b/Geometry/TrackerGeometryBuilder/test/trackerMap_cfg.py index f52bf7eda74fc..536c9bfca6d63 100644 --- a/Geometry/TrackerGeometryBuilder/test/trackerMap_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/trackerMap_cfg.py @@ -1,20 +1,16 @@ import FWCore.ParameterSet.Config as cms process = cms.Process("GeometryTest") -# empty input service, fire 10 events -process.load("FWCore.MessageLogger.MessageLogger_cfi") -#process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cff") +process.load("FWCore.MessageLogger.MessageLogger_cfi") process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi") - process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi") +process.load("Geometry.TrackerGeometryBuilder.trackerParameters_cfi") process.load("Geometry.TrackerSimData.trackerSimGeometryXML_cfi") process.load("Alignment.CommonAlignmentProducer.FakeAlignmentSource_cfi") -#process.load("Alignment.CommonAlignmentProducer.GlobalPosition_Frontier_cff") - process.load("Alignment.OfflineValidation.TrackerGeometryCompare_cfi") process.load("CondCore.DBCommon.CondDBSetup_cfi") @@ -28,6 +24,3 @@ process.prod = cms.EDAnalyzer("TrackerMapTool") process.p1 = cms.Path(process.prod) - - - diff --git a/Geometry/TrackerGeometryBuilder/test/trackerModuleInfoDDD_cfg.py b/Geometry/TrackerGeometryBuilder/test/trackerModuleInfoDDD_cfg.py index ec299820f6497..7744954429fb2 100644 --- a/Geometry/TrackerGeometryBuilder/test/trackerModuleInfoDDD_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/trackerModuleInfoDDD_cfg.py @@ -7,6 +7,7 @@ # Choose Tracker Geometry process.load('Configuration.Geometry.GeometryExtended_cff') process.load('Geometry.CommonDetUnit.globalTrackingGeometry_cfi') +process.load("Geometry.TrackerGeometryBuilder.trackerParameters_cfi") process.TrackerGeometricDetExtraESModule = cms.ESProducer( "TrackerGeometricDetExtraESModule", fromDDD = cms.bool( True ) diff --git a/Geometry/TrackerGeometryBuilder/test/trackerParametersFromDDD_cfg.py b/Geometry/TrackerGeometryBuilder/test/trackerParametersFromDDD_cfg.py index aa575b31df0ca..84731d484b93a 100644 --- a/Geometry/TrackerGeometryBuilder/test/trackerParametersFromDDD_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/trackerParametersFromDDD_cfg.py @@ -5,14 +5,6 @@ process.load('Configuration.Geometry.GeometryExtended_cff') process.load('Configuration.Geometry.GeometryExtendedReco_cff') -process.load("CondCore.DBCommon.CondDBSetup_cfi") -process.PoolDBESSourceGeometry = cms.ESSource("PoolDBESSource", - process.CondDBSetup, - timetype = cms.string('runnumber'), - toGet = cms.VPSet(cms.PSet(record = cms.string('PTrackerParametersRcd'),tag = cms.string('TK_Parameters_Test02')) - ), - connect = cms.string('sqlite_file:./myfile.db')) - process.trackerGeometry.applyAlignment = cms.bool(False) process.source = cms.Source("EmptySource") diff --git a/Geometry/TrackerGeometryBuilder/test/tracker_cfg.py b/Geometry/TrackerGeometryBuilder/test/tracker_cfg.py index a68ffe4c5fe27..15f50a83827c9 100644 --- a/Geometry/TrackerGeometryBuilder/test/tracker_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/tracker_cfg.py @@ -10,6 +10,7 @@ process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi") process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi") +process.load("Geometry.TrackerGeometryBuilder.trackerParameters_cfi") process.trackerGeometry.applyAlignment = cms.bool(False) process.source = cms.Source("EmptySource") From 69dff6671e8fd59def2104f487e06ad6eebd26ce Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Thu, 5 Mar 2015 08:19:59 +0100 Subject: [PATCH 05/21] * Use Tracker topology record --- .../TrackInfoProducer/test/TrackInfoAnalyzer.cc | 4 ++-- .../src/SiPixelErrorEstimation.cc | 4 ++-- .../SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc | 4 ++-- .../plugins/SiStripGainCosmicCalculator.cc | 4 ++-- .../SiStripChannelGain/plugins/SiStripGainFromData.cc | 4 ++-- .../SiStripCommon/plugins/ShallowClustersProducer.cc | 4 ++-- CalibTracker/SiStripCommon/src/SiStripDCSStatus.cc | 4 ++-- .../plugins/SiStripHitEffFromCalibTree.cc | 10 ++-------- CalibTracker/SiStripHitEfficiency/src/HitEff.cc | 4 ++-- .../SiStripHitEfficiency/src/TrajectoryAtInvalidHit.cc | 1 - .../plugins/SiStripCalibLorentzAngle.cc | 4 ++-- .../plugins/SiStripLAProfileBooker.cc | 6 +++--- .../plugins/SiStripQualityHotStripIdentifier.cc | 3 ++- .../SiStripQuality/plugins/SiStripQualityStatistics.cc | 4 ++-- .../src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc | 1 - ...ipBadAPVandHotStripAlgorithmFromClusterOccupancy.cc | 1 - .../SiStripHotStripAlgorithmFromClusterOccupancy.cc | 1 - 17 files changed, 27 insertions(+), 36 deletions(-) diff --git a/AnalysisAlgos/TrackInfoProducer/test/TrackInfoAnalyzer.cc b/AnalysisAlgos/TrackInfoProducer/test/TrackInfoAnalyzer.cc index 281ccfc908801..d08aeb74e3758 100644 --- a/AnalysisAlgos/TrackInfoProducer/test/TrackInfoAnalyzer.cc +++ b/AnalysisAlgos/TrackInfoProducer/test/TrackInfoAnalyzer.cc @@ -12,7 +12,7 @@ #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" //#include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h" #include #include @@ -50,7 +50,7 @@ class TrackInfoAnalyzer : public edm::EDAnalyzer { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - setup.get().get(tTopoHandle); + setup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); //std::cout << "\nEvent ID = "<< event.id() << std::endl ; diff --git a/CalibTracker/SiPixelErrorEstimation/src/SiPixelErrorEstimation.cc b/CalibTracker/SiPixelErrorEstimation/src/SiPixelErrorEstimation.cc index 721765abd5716..d6113568ad46a 100644 --- a/CalibTracker/SiPixelErrorEstimation/src/SiPixelErrorEstimation.cc +++ b/CalibTracker/SiPixelErrorEstimation/src/SiPixelErrorEstimation.cc @@ -16,7 +16,7 @@ #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/TrackReco/interface/TrackFwd.h" @@ -372,7 +372,7 @@ SiPixelErrorEstimation::analyze(const edm::Event& e, const edm::EventSetup& es) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); using namespace edm; diff --git a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc index 2e9f86c2a02f5..3911c082805d0 100644 --- a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc +++ b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc @@ -21,7 +21,7 @@ #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2D.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "TrackingTools/Records/interface/TransientRecHitRecord.h" @@ -157,7 +157,7 @@ void SiPixelLorentzAngle::analyze(const edm::Event& e, const edm::EventSetup& es { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); event_counter_++; diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc index 9adf8d18e2476..ed845e7a7b4e4 100644 --- a/CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc +++ b/CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc @@ -29,7 +29,7 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "TrackingTools/PatternTools/interface/Trajectory.h" //#include "DQM/SiStripCommon/interface/SiStripGenerateKey.h" @@ -71,7 +71,7 @@ void SiStripGainCosmicCalculator::algoBeginJob(const edm::EventSetup& iSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); tTopo = tTopoHandle.product(); eventSetupCopy_ = &iSetup; diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc index 75a16b0e710b0..5b7b74e2bc5a7 100644 --- a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc +++ b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc @@ -40,7 +40,7 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/TrackReco/interface/DeDxHit.h" #include "DataFormats/TrackReco/interface/TrackDeDxHits.h" @@ -337,7 +337,7 @@ SiStripGainFromData::algoBeginJob(const edm::EventSetup& iSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); iSetup_ = &iSetup; diff --git a/CalibTracker/SiStripCommon/plugins/ShallowClustersProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowClustersProducer.cc index 98a3d17e56c9b..100a4a6852bce 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowClustersProducer.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowClustersProducer.cc @@ -7,7 +7,7 @@ #include "DataFormats/SiStripDigi/interface/SiStripProcessedRawDigi.h" #include "DataFormats/Common/interface/DetSetVectorNew.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "boost/foreach.hpp" ShallowClustersProducer::ShallowClustersProducer(const edm::ParameterSet& iConfig) @@ -58,7 +58,7 @@ void ShallowClustersProducer:: produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); std::auto_ptr > number ( new std::vector(7,0) ); diff --git a/CalibTracker/SiStripCommon/src/SiStripDCSStatus.cc b/CalibTracker/SiStripCommon/src/SiStripDCSStatus.cc index 0b39b3f4f5f6e..e25d54fd9b49b 100644 --- a/CalibTracker/SiStripCommon/src/SiStripDCSStatus.cc +++ b/CalibTracker/SiStripCommon/src/SiStripDCSStatus.cc @@ -14,7 +14,7 @@ #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include @@ -101,7 +101,7 @@ bool SiStripDCSStatus::getStatus(edm::Event const& e, edm::EventSetup const& eSe void SiStripDCSStatus::initialise(edm::Event const& e, edm::EventSetup const& eSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - eSetup.get().get(tTopoHandle); + eSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); edm::ESHandle< SiStripFedCabling > fedCabling_; diff --git a/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc b/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc index acbafd1b5edf0..3291b8756b641 100755 --- a/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc +++ b/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc @@ -19,19 +19,14 @@ #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "DataFormats/GeometryVector/interface/GlobalVector.h" #include "DataFormats/GeometryVector/interface/LocalVector.h" -#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/TrackReco/interface/TrackExtra.h" -#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "TrackingTools/Records/interface/TransientRecHitRecord.h" #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" #include "CalibTracker/SiStripHitEfficiency/interface/TrajectoryAtInvalidHit.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "RecoLocalTracker/ClusterParameterEstimator/interface/StripClusterParameterEstimator.h" #include "TrackingTools/GeomPropagators/interface/AnalyticalPropagator.h" #include "DataFormats/TrackReco/interface/DeDxData.h" @@ -47,7 +42,6 @@ #include "CalibFormats/SiStripObjects/interface/SiStripQuality.h" #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h" #include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h" -#include "Geometry/TrackerGeometryBuilder/interface/GluedGeomDet.h" #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/Common/interface/DetSetVectorNew.h" #include "DataFormats/SiStripCluster/interface/SiStripCluster.h" @@ -164,7 +158,7 @@ void SiStripHitEffFromCalibTree::algoEndJob() { void SiStripHitEffFromCalibTree::algoAnalyze(const edm::Event& e, const edm::EventSetup& c) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - c.get().get(tTopoHandle); + c.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); //Open the ROOT Calib Tree diff --git a/CalibTracker/SiStripHitEfficiency/src/HitEff.cc b/CalibTracker/SiStripHitEfficiency/src/HitEff.cc index 1573ee57243ea..4dc52f88d0de9 100644 --- a/CalibTracker/SiStripHitEfficiency/src/HitEff.cc +++ b/CalibTracker/SiStripHitEfficiency/src/HitEff.cc @@ -37,7 +37,7 @@ #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" #include "CalibTracker/SiStripHitEfficiency/interface/TrajectoryAtInvalidHit.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "RecoLocalTracker/ClusterParameterEstimator/interface/StripClusterParameterEstimator.h" #include "TrackingTools/GeomPropagators/interface/AnalyticalPropagator.h" #include "DataFormats/TrackReco/interface/DeDxData.h" @@ -133,7 +133,7 @@ void HitEff::beginJob(){ void HitEff::analyze(const edm::Event& e, const edm::EventSetup& es){ //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // bool DEBUG = false; diff --git a/CalibTracker/SiStripHitEfficiency/src/TrajectoryAtInvalidHit.cc b/CalibTracker/SiStripHitEfficiency/src/TrajectoryAtInvalidHit.cc index ebf318d4c4e48..25bffac17c143 100644 --- a/CalibTracker/SiStripHitEfficiency/src/TrajectoryAtInvalidHit.cc +++ b/CalibTracker/SiStripHitEfficiency/src/TrajectoryAtInvalidHit.cc @@ -9,7 +9,6 @@ #include "DataFormats/GeometryCommonDetAlgo/interface/MeasurementVector.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/GluedGeomDet.h" // #include "RecoTracker/MeasurementDet/interface/RecHitPropagator.h" #include "TrackingTools/TransientTrackingRecHit/interface/TrackingRecHitProjector.h" diff --git a/CalibTracker/SiStripLorentzAngle/plugins/SiStripCalibLorentzAngle.cc b/CalibTracker/SiStripLorentzAngle/plugins/SiStripCalibLorentzAngle.cc index 4cb5ee716976d..cc614a267cbce 100755 --- a/CalibTracker/SiStripLorentzAngle/plugins/SiStripCalibLorentzAngle.cc +++ b/CalibTracker/SiStripLorentzAngle/plugins/SiStripCalibLorentzAngle.cc @@ -17,14 +17,14 @@ #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "DQM/SiStripCommon/interface/ExtractTObject.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" SiStripCalibLorentzAngle::SiStripCalibLorentzAngle(edm::ParameterSet const& conf) : ConditionDBWriter(conf) , tTopo(nullptr), conf_(conf) {} void SiStripCalibLorentzAngle::algoBeginJob(const edm::EventSetup& c){ //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - c.get().get(tTopoHandle); + c.get().get(tTopoHandle); tTopo = tTopoHandle.product(); c.get().get(estracker); diff --git a/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc b/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc index 3d3c09f8455be..3ba686d87e94e 100644 --- a/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc +++ b/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc @@ -27,7 +27,7 @@ #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2D.h" #include "DataFormats/TrackerRecHit2D/interface/ProjectedSiStripRecHit2D.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" @@ -72,7 +72,7 @@ void SiStripLAProfileBooker::beginRun(const edm::EventSetup& c){ //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - c.get().get(tTopoHandle); + c.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); //get magnetic field and geometry from ES @@ -271,7 +271,7 @@ void SiStripLAProfileBooker::analyze(const edm::Event& e, const edm::EventSetup& { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); RunNumber = e.id().run(); diff --git a/CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.cc b/CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.cc index 331fac51d18ca..0f181bf20a6a3 100644 --- a/CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.cc +++ b/CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.cc @@ -8,6 +8,7 @@ #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include #include #include @@ -85,7 +86,7 @@ SiStripBadStrip* SiStripQualityHotStripIdentifier::getNewObject(){ void SiStripQualityHotStripIdentifier::algoBeginRun(const edm::Run& run, const edm::EventSetup& iSetup){ //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); tTopo = tTopoHandle.product(); resetHistos(); diff --git a/CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.cc b/CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.cc index faf1e82c9c0b7..627936badf4c8 100644 --- a/CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.cc +++ b/CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.cc @@ -20,7 +20,7 @@ #include "CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include #include @@ -63,7 +63,7 @@ void SiStripQualityStatistics::endJob(){ void SiStripQualityStatistics::analyze( const edm::Event& e, const edm::EventSetup& iSetup){ //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); unsigned long long cacheID = iSetup.get().cacheIdentifier(); diff --git a/CalibTracker/SiStripQuality/src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc b/CalibTracker/SiStripQuality/src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc index ad693321e8e9e..b800cf35d9d2b 100644 --- a/CalibTracker/SiStripQuality/src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc +++ b/CalibTracker/SiStripQuality/src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc @@ -4,7 +4,6 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "CalibFormats/SiStripObjects/interface/SiStripQuality.h" diff --git a/CalibTracker/SiStripQuality/src/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.cc b/CalibTracker/SiStripQuality/src/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.cc index 48048336bb0d9..d0f78afebc650 100644 --- a/CalibTracker/SiStripQuality/src/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.cc +++ b/CalibTracker/SiStripQuality/src/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.cc @@ -4,7 +4,6 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "CalibFormats/SiStripObjects/interface/SiStripQuality.h" diff --git a/CalibTracker/SiStripQuality/src/SiStripHotStripAlgorithmFromClusterOccupancy.cc b/CalibTracker/SiStripQuality/src/SiStripHotStripAlgorithmFromClusterOccupancy.cc index 05332f346d998..97f398c623460 100644 --- a/CalibTracker/SiStripQuality/src/SiStripHotStripAlgorithmFromClusterOccupancy.cc +++ b/CalibTracker/SiStripQuality/src/SiStripHotStripAlgorithmFromClusterOccupancy.cc @@ -1,6 +1,5 @@ #include "CalibTracker/SiStripQuality/interface/SiStripHotStripAlgorithmFromClusterOccupancy.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" From 0f33e3defdeb831624504972b196468738c066df Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Thu, 5 Mar 2015 17:59:11 +0100 Subject: [PATCH 06/21] * Cleanup configurations * Use Topology record --- .../test/SiPixel2DTemplateDBObjectUploader.cc | 4 ++-- .../SiPixel/test/SiPixelLorentzAngleDB.cc | 4 ++-- .../python/GeometryExtended2016Reco_cff.py | 8 ++++---- .../python/GeometryExtended2017Reco_cff.py | 8 ++++---- .../python/GeometryExtended2019Reco_cff.py | 8 ++++---- .../GeometryExtended2023CFCal4EtaReco_cff.py | 8 ++++---- .../GeometryExtended2023CFCalReco_cff.py | 8 ++++---- .../GeometryExtended2023FastTimingReco_cff.py | 8 ++++---- ...ometryExtended2023HGCalMuon4EtaReco_cff.py | 8 ++++---- .../GeometryExtended2023HGCalMuonReco_cff.py | 8 ++++---- .../GeometryExtended2023HGCalReco_cff.py | 8 ++++---- .../GeometryExtended2023Muon4EtaReco_cff.py | 8 ++++---- .../GeometryExtended2023MuonReco_cff.py | 8 ++++---- .../python/GeometryExtended2023Reco_cff.py | 4 ++-- .../GeometryExtended2023SHCal4EtaReco_cff.py | 8 ++++---- ...tryExtended2023SHCalNoTaper4EtaReco_cff.py | 8 ++++---- ...eometryExtended2023SHCalNoTaperReco_cff.py | 8 ++++---- .../GeometryExtended2023SHCalReco_cff.py | 8 ++++---- ...tryExtendedPhase2TkBE5DPixel10DReco_cff.py | 8 ++++---- .../GeometryExtendedPhaseIPixelReco_cff.py | 8 ++++---- .../Geometry/python/GeometrySLHCRecoDB_cff.py | 10 +++++----- .../Geometry/python/GeometrySLHCReco_cff.py | 13 +++++------- .../plugins/TrackerDpgAnalysis.cc | 4 ++-- .../python/globalTracking2017Geometry_cfi.py | 13 ------------ .../python/globalTracking2023Geometry_cfi.py | 13 ------------ .../idealForDigiTrackerSLHCGeometry_cff.py | 20 ------------------- .../Geometry/test/writeFile_phase1_cfg.py | 4 ++-- 27 files changed, 88 insertions(+), 137 deletions(-) delete mode 100644 Geometry/CommonDetUnit/python/globalTracking2017Geometry_cfi.py delete mode 100644 Geometry/CommonDetUnit/python/globalTracking2023Geometry_cfi.py delete mode 100644 Geometry/TrackerGeometryBuilder/python/idealForDigiTrackerSLHCGeometry_cff.py diff --git a/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader.cc b/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader.cc index 7ad459e9761bf..45cb668631bf1 100644 --- a/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader.cc +++ b/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader.cc @@ -6,7 +6,7 @@ #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" @@ -108,7 +108,7 @@ SiPixel2DTemplateDBObjectUploader::analyze(const edm::Event& iEvent, const edm:: //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); edm::ESHandle pDD; diff --git a/CondTools/SiPixel/test/SiPixelLorentzAngleDB.cc b/CondTools/SiPixel/test/SiPixelLorentzAngleDB.cc index 4b584e8f9d6d7..963cb634268c9 100755 --- a/CondTools/SiPixel/test/SiPixelLorentzAngleDB.cc +++ b/CondTools/SiPixel/test/SiPixelLorentzAngleDB.cc @@ -9,7 +9,7 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "FWCore/ServiceRegistry/interface/Service.h" @@ -58,7 +58,7 @@ void SiPixelLorentzAngleDB::analyze(const edm::Event& e, const edm::EventSetup& //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); diff --git a/Configuration/Geometry/python/GeometryExtended2016Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2016Reco_cff.py index ebbafd0e89427..e567c96a375fd 100644 --- a/Configuration/Geometry/python/GeometryExtended2016Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2016Reco_cff.py @@ -8,21 +8,21 @@ # Reconstruction geometry services # Tracking Geometry #bah - well, this is not a cfi! -from Geometry.CommonDetUnit.globalTracking2017Geometry_cfi import * +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology2017Constants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * -trackerSLHCGeometry.applyAlignment = cms.bool(False) +trackerGeometry.applyAlignment = cms.bool(False) # Calorimeters from Geometry.CaloEventSetup.CaloTopology_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2017Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2017Reco_cff.py index ea88914219370..63be240815f6a 100644 --- a/Configuration/Geometry/python/GeometryExtended2017Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017Reco_cff.py @@ -7,21 +7,21 @@ # Reconstruction geometry services # Tracking Geometry #bah - well, this is not a cfi! -from Geometry.CommonDetUnit.globalTracking2017Geometry_cfi import * +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology2017Constants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * -trackerSLHCGeometry.applyAlignment = cms.bool(False) +trackerGeometry.applyAlignment = cms.bool(False) # Calorimeters from Geometry.CaloEventSetup.CaloTopology_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2019Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2019Reco_cff.py index c643610d87b7f..f50542bc7be20 100644 --- a/Configuration/Geometry/python/GeometryExtended2019Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2019Reco_cff.py @@ -8,11 +8,11 @@ # Reconstruction geometry services # Tracking Geometry #bah - well, this is not a cfi! -from Geometry.CommonDetUnit.globalTracking2017Geometry_cfi import * +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology2017Constants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * @@ -20,10 +20,10 @@ from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * -trackerSLHCGeometry.applyAlignment = cms.bool(False) +trackerGeometry.applyAlignment = cms.bool(False) # Calorimeters from Geometry.CaloEventSetup.CaloTopology_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023CFCal4EtaReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023CFCal4EtaReco_cff.py index 06b9ba582ccf6..e9c7068675a00 100644 --- a/Configuration/Geometry/python/GeometryExtended2023CFCal4EtaReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023CFCal4EtaReco_cff.py @@ -6,11 +6,11 @@ # Reconstruction geometry services # Tracking Geometry #bah - well, this is not a cfi! -from Geometry.CommonDetUnit.globalTracking2023Geometry_cfi import * +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology2023Constants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * @@ -19,10 +19,10 @@ from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * -trackerSLHCGeometry.applyAlignment = cms.bool(False) +trackerGeometry.applyAlignment = cms.bool(False) # Calorimeters from Geometry.CaloEventSetup.CaloTopology_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023CFCalReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023CFCalReco_cff.py index 9cc6b2f84f9e7..504dfe60ab84e 100644 --- a/Configuration/Geometry/python/GeometryExtended2023CFCalReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023CFCalReco_cff.py @@ -6,11 +6,11 @@ # Reconstruction geometry services # Tracking Geometry #bah - well, this is not a cfi! -from Geometry.CommonDetUnit.globalTracking2023Geometry_cfi import * +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology2023Constants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * @@ -19,10 +19,10 @@ from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * -trackerSLHCGeometry.applyAlignment = cms.bool(False) +trackerGeometry.applyAlignment = cms.bool(False) # Calorimeters from Geometry.CaloEventSetup.CaloTopology_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023FastTimingReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023FastTimingReco_cff.py index 5b5bd803435be..1616d9cca54b2 100644 --- a/Configuration/Geometry/python/GeometryExtended2023FastTimingReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023FastTimingReco_cff.py @@ -6,11 +6,11 @@ # Reconstruction geometry services # Tracking Geometry #bah - well, this is not a cfi! -from Geometry.CommonDetUnit.globalTracking2023Geometry_cfi import * +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology2023Constants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * @@ -19,10 +19,10 @@ from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * -trackerSLHCGeometry.applyAlignment = cms.bool(False) +trackerGeometry.applyAlignment = cms.bool(False) # Calorimeters from Geometry.CaloEventSetup.CaloTopology_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023HGCalMuon4EtaReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023HGCalMuon4EtaReco_cff.py index ce11673217431..0d800befed2bc 100644 --- a/Configuration/Geometry/python/GeometryExtended2023HGCalMuon4EtaReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023HGCalMuon4EtaReco_cff.py @@ -6,11 +6,11 @@ # Reconstruction geometry services # Tracking Geometry #bah - well, this is not a cfi! -from Geometry.CommonDetUnit.globalTracking2023Geometry_cfi import * +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology2023Constants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * @@ -19,10 +19,10 @@ from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * -trackerSLHCGeometry.applyAlignment = cms.bool(False) +trackerGeometry.applyAlignment = cms.bool(False) # Calorimeters from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023HGCalMuonReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023HGCalMuonReco_cff.py index 15652bdba1884..d5b41b0dfa5d3 100644 --- a/Configuration/Geometry/python/GeometryExtended2023HGCalMuonReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023HGCalMuonReco_cff.py @@ -6,11 +6,11 @@ # Reconstruction geometry services # Tracking Geometry #bah - well, this is not a cfi! -from Geometry.CommonDetUnit.globalTracking2023Geometry_cfi import * +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology2023Constants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * @@ -19,10 +19,10 @@ from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * -trackerSLHCGeometry.applyAlignment = cms.bool(False) +trackerGeometry.applyAlignment = cms.bool(False) # Calorimeters from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023HGCalReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023HGCalReco_cff.py index 5dc8db8c96e26..823ad39b01e96 100644 --- a/Configuration/Geometry/python/GeometryExtended2023HGCalReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023HGCalReco_cff.py @@ -6,11 +6,11 @@ # Reconstruction geometry services # Tracking Geometry #bah - well, this is not a cfi! -from Geometry.CommonDetUnit.globalTracking2023Geometry_cfi import * +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology2023Constants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * @@ -18,10 +18,10 @@ from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * -trackerSLHCGeometry.applyAlignment = cms.bool(False) +trackerGeometry.applyAlignment = cms.bool(False) # Calorimeters from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023Muon4EtaReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023Muon4EtaReco_cff.py index bc8c78526168f..6327808c9e8cc 100644 --- a/Configuration/Geometry/python/GeometryExtended2023Muon4EtaReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023Muon4EtaReco_cff.py @@ -6,11 +6,11 @@ # Reconstruction geometry services # Tracking Geometry #bah - well, this is not a cfi! -from Geometry.CommonDetUnit.globalTracking2023Geometry_cfi import * +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology2023Constants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * @@ -19,10 +19,10 @@ from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * -trackerSLHCGeometry.applyAlignment = cms.bool(False) +trackerGeometry.applyAlignment = cms.bool(False) # Calorimeters from Geometry.CaloEventSetup.CaloTopology_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023MuonReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023MuonReco_cff.py index f3383b15c6040..1239304ae2ac1 100644 --- a/Configuration/Geometry/python/GeometryExtended2023MuonReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023MuonReco_cff.py @@ -6,11 +6,11 @@ # Reconstruction geometry services # Tracking Geometry #bah - well, this is not a cfi! -from Geometry.CommonDetUnit.globalTracking2023Geometry_cfi import * +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology2023Constants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * @@ -19,10 +19,10 @@ from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * -trackerSLHCGeometry.applyAlignment = cms.bool(False) +trackerGeometry.applyAlignment = cms.bool(False) # Calorimeters from Geometry.CaloEventSetup.CaloTopology_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023Reco_cff.py index 2a66d86aab062..05b3bde36927b 100644 --- a/Configuration/Geometry/python/GeometryExtended2023Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023Reco_cff.py @@ -10,7 +10,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology2023Constants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * @@ -18,7 +18,7 @@ from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * trackerGeometry.applyAlignment = cms.bool(False) diff --git a/Configuration/Geometry/python/GeometryExtended2023SHCal4EtaReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023SHCal4EtaReco_cff.py index 9b0b3abd8ce25..b45c5e6883816 100644 --- a/Configuration/Geometry/python/GeometryExtended2023SHCal4EtaReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023SHCal4EtaReco_cff.py @@ -6,11 +6,11 @@ # Reconstruction geometry services # Tracking Geometry #bah - well, this is not a cfi! -from Geometry.CommonDetUnit.globalTracking2023Geometry_cfi import * +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology2023Constants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * @@ -19,10 +19,10 @@ from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * -trackerSLHCGeometry.applyAlignment = cms.bool(False) +trackerGeometry.applyAlignment = cms.bool(False) # Calorimeters from Geometry.HGCalCommonData.shashlikNumberingInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023SHCalNoTaper4EtaReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023SHCalNoTaper4EtaReco_cff.py index d2a0d96ed3148..db5f55cfeb549 100644 --- a/Configuration/Geometry/python/GeometryExtended2023SHCalNoTaper4EtaReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023SHCalNoTaper4EtaReco_cff.py @@ -6,11 +6,11 @@ # Reconstruction geometry services # Tracking Geometry #bah - well, this is not a cfi! -from Geometry.CommonDetUnit.globalTracking2023Geometry_cfi import * +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology2023Constants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * @@ -19,10 +19,10 @@ from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * -trackerSLHCGeometry.applyAlignment = cms.bool(False) +trackerGeometry.applyAlignment = cms.bool(False) # Calorimeters from Geometry.HGCalCommonData.shashlikNumberingInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023SHCalNoTaperReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023SHCalNoTaperReco_cff.py index 99f3944531057..7da3c071527f7 100644 --- a/Configuration/Geometry/python/GeometryExtended2023SHCalNoTaperReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023SHCalNoTaperReco_cff.py @@ -6,11 +6,11 @@ # Reconstruction geometry services # Tracking Geometry #bah - well, this is not a cfi! -from Geometry.CommonDetUnit.globalTracking2023Geometry_cfi import * +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology2023Constants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * @@ -19,10 +19,10 @@ from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * -trackerSLHCGeometry.applyAlignment = cms.bool(False) +trackerGeometry.applyAlignment = cms.bool(False) # Calorimeters from Geometry.HGCalCommonData.shashlikNumberingInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023SHCalReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023SHCalReco_cff.py index 062a4247dede1..0fc7484f263af 100644 --- a/Configuration/Geometry/python/GeometryExtended2023SHCalReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023SHCalReco_cff.py @@ -6,11 +6,11 @@ # Reconstruction geometry services # Tracking Geometry #bah - well, this is not a cfi! -from Geometry.CommonDetUnit.globalTracking2023Geometry_cfi import * +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology2023Constants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * @@ -19,10 +19,10 @@ from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * -trackerSLHCGeometry.applyAlignment = cms.bool(False) +trackerGeometry.applyAlignment = cms.bool(False) # Calorimeters from Geometry.HGCalCommonData.shashlikNumberingInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtendedPhase2TkBE5DPixel10DReco_cff.py b/Configuration/Geometry/python/GeometryExtendedPhase2TkBE5DPixel10DReco_cff.py index 2c8602ce62dbe..c1086c08ac1b2 100644 --- a/Configuration/Geometry/python/GeometryExtendedPhase2TkBE5DPixel10DReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedPhase2TkBE5DPixel10DReco_cff.py @@ -8,21 +8,21 @@ # Reconstruction geometry services # Tracking Geometry #bah - well, this is not a cfi! -from Geometry.CommonDetUnit.globalTracking2023Geometry_cfi import * +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology2023Constants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * -trackerSLHCGeometry.applyAlignment = cms.bool(False) +trackerGeometry.applyAlignment = cms.bool(False) # Calorimeters from Geometry.CaloEventSetup.CaloTopology_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtendedPhaseIPixelReco_cff.py b/Configuration/Geometry/python/GeometryExtendedPhaseIPixelReco_cff.py index d491aa2fc7ea2..db42f88780c75 100644 --- a/Configuration/Geometry/python/GeometryExtendedPhaseIPixelReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedPhaseIPixelReco_cff.py @@ -7,21 +7,21 @@ # Reconstruction geometry services # Tracking Geometry #bah - well, this is not a cfi! -from Geometry.CommonDetUnit.globalTracking2017Geometry_cfi import * +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology2017Constants_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * -trackerSLHCGeometry.applyAlignment = cms.bool(False) +trackerGeometry.applyAlignment = cms.bool(False) # Calorimeters from Geometry.CaloEventSetup.CaloTopology_cfi import * diff --git a/Configuration/Geometry/python/GeometrySLHCRecoDB_cff.py b/Configuration/Geometry/python/GeometrySLHCRecoDB_cff.py index e5a932e3b4b46..dd193ecbb9ca4 100644 --- a/Configuration/Geometry/python/GeometrySLHCRecoDB_cff.py +++ b/Configuration/Geometry/python/GeometrySLHCRecoDB_cff.py @@ -1,15 +1,15 @@ import FWCore.ParameterSet.Config as cms # Tracking Geometry -from Geometry.CommonDetUnit.globalTracking2023GeometryDB_cfi import * +from Geometry.CommonDetUnit.globalTrackingGeometryDB_cfi import * #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumbering2023GeometryDB_cfi import * -trackerSLHCGeometryDB.applyAlignment = cms.bool(False) +from Geometry.TrackerNumberingBuilder.trackerNumberingGeometryDB_cfi import * +trackerGeometryDB.applyAlignment = cms.bool(False) # # When there will be an alignment, perhaps, it will use a label -#trackerSLHCGeometryDB.alignmentsLabel = cms.string('fakeForIdeal') +#trackerGeometryDB.alignmentsLabel = cms.string('fakeForIdeal') #Muon from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * @@ -22,7 +22,7 @@ from Geometry.EcalMapping.EcalMappingRecord_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometryDB_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometryDB_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometryDB_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometryDB_cff import * diff --git a/Configuration/Geometry/python/GeometrySLHCReco_cff.py b/Configuration/Geometry/python/GeometrySLHCReco_cff.py index 407c74c7136fe..94e65061f89b0 100644 --- a/Configuration/Geometry/python/GeometrySLHCReco_cff.py +++ b/Configuration/Geometry/python/GeometrySLHCReco_cff.py @@ -2,14 +2,11 @@ from SLHCUpgradeSimulations.Geometry.Phase1_cmsSimIdealGeometryXML_cfi import * - # Reconstruction geometry services # Tracking Geometry -from Geometry.CommonDetUnit.globalTracking2023Geometry_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumbering2023Geometry_cfi import * -trackerSLHCGeometry.applyAlignment = cms.bool(False) -#es_prefer_TrackerEP = cms.ESPrefer("TrackerGeometricDetESModule", "trackerNumberingGeometry") -#es_prefer_Trackerdigi = cms.ESPrefer("TrackerDigiGeometryESModule","trackerSLHCGeometry") +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * +from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * +trackerGeometry.applyAlignment = cms.bool(False) #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * @@ -19,7 +16,7 @@ from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * # Alignment -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * @@ -35,7 +32,7 @@ ## es_prefer_ZdcEP = cms.ESPrefer("ZdcHardcodeGeometryEP") es_prefer_HcalEP = cms.ESPrefer("HcalHardcodeGeometryEP") -es_prefer_TrackerEP = cms.ESPrefer("TrackerGeometricDetESModule", "trackerNumbering2023Geometry") +es_prefer_TrackerEP = cms.ESPrefer("TrackerGeometricDetESModule", "trackerNumberingGeometry") es_prefer_CaloTowerEP = cms.ESPrefer("CaloTowerHardcodeGeometryEP") es_prefer_EcalBarrelEP = cms.ESPrefer("EcalBarrelGeometryEP") es_prefer_EcalEndcapEP = cms.ESPrefer("EcalEndcapGeometryEP") diff --git a/DPGAnalysis/SiStripTools/plugins/TrackerDpgAnalysis.cc b/DPGAnalysis/SiStripTools/plugins/TrackerDpgAnalysis.cc index 5f4c036fec52f..20aae86f7fd12 100644 --- a/DPGAnalysis/SiStripTools/plugins/TrackerDpgAnalysis.cc +++ b/DPGAnalysis/SiStripTools/plugins/TrackerDpgAnalysis.cc @@ -70,7 +70,7 @@ #include #include #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include #include #include @@ -962,7 +962,7 @@ TrackerDpgAnalysis::beginRun(const edm::Run& iRun, const edm::EventSetup& iSetup //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); //geometry diff --git a/Geometry/CommonDetUnit/python/globalTracking2017Geometry_cfi.py b/Geometry/CommonDetUnit/python/globalTracking2017Geometry_cfi.py deleted file mode 100644 index 646c1dc3e9e2f..0000000000000 --- a/Geometry/CommonDetUnit/python/globalTracking2017Geometry_cfi.py +++ /dev/null @@ -1,13 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# -# This cfi is should be included to build the GlobalTrackingGeometry with all -# concrete TrackingGeometries for muon and tracker. -# -from Geometry.CSCGeometry.cscGeometry_cfi import * -from Geometry.RPCGeometry.rpcGeometry_cfi import * -from Geometry.DTGeometry.dtGeometry_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from Geometry.TrackerGeometryBuilder.trackerSLHCGeometry_cfi import * -from Geometry.CommonDetUnit.bareGlobalTrackingGeometry_cfi import * - diff --git a/Geometry/CommonDetUnit/python/globalTracking2023Geometry_cfi.py b/Geometry/CommonDetUnit/python/globalTracking2023Geometry_cfi.py deleted file mode 100644 index ba35b98575727..0000000000000 --- a/Geometry/CommonDetUnit/python/globalTracking2023Geometry_cfi.py +++ /dev/null @@ -1,13 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# -# This cfi is should be included to build the GlobalTrackingGeometry with all -# concrete TrackingGeometries for muon and tracker. -# -from Geometry.CSCGeometry.cscGeometry_cfi import * -from Geometry.RPCGeometry.rpcGeometry_cfi import * -from Geometry.DTGeometry.dtGeometry_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumbering2023Geometry_cfi import * -from Geometry.TrackerGeometryBuilder.trackerSLHCGeometry_cfi import * -from Geometry.CommonDetUnit.bareGlobalTrackingGeometry_cfi import * - diff --git a/Geometry/TrackerGeometryBuilder/python/idealForDigiTrackerSLHCGeometry_cff.py b/Geometry/TrackerGeometryBuilder/python/idealForDigiTrackerSLHCGeometry_cff.py deleted file mode 100644 index 5aef290346f71..0000000000000 --- a/Geometry/TrackerGeometryBuilder/python/idealForDigiTrackerSLHCGeometry_cff.py +++ /dev/null @@ -1,20 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -import Geometry.TrackerGeometryBuilder.trackerSLHCGeometry_cfi -# -# This cff provides a TrackerGeometry with the label 'idealForDigi' that is for sure matching -# the ideal one and thus should be used in the digitisers. -# -idealForDigiTrackerGeometry = Geometry.TrackerGeometryBuilder.trackerSLHCGeometry_cfi.trackerSLHCGeometry.clone() -# The es_module providing fake (i.e. empty) alignment constants: -from Alignment.CommonAlignmentProducer.fakeForIdealAlignmentProducer_cfi import * -# need to set to False, see below: -idealForDigiTrackerGeometry.applyAlignment = False -# Label of the produced TrackerGeometry: -idealForDigiTrackerGeometry.appendToDataLabel = 'idealForDigi' -# Alignments are looked for with this label: -idealForDigiTrackerGeometry.alignmentsLabel = 'fakeForIdeal' - -import Geometry.TrackerGeometryBuilder.trackerSLHCGeometryConstants_cfi as trackerGeometryConstants_cfi -idealForDigiTrackerGeometry.trackerGeometryConstants = cms.PSet(trackerGeometryConstants_cfi.trackerGeometryConstants) - diff --git a/SLHCUpgradeSimulations/Geometry/test/writeFile_phase1_cfg.py b/SLHCUpgradeSimulations/Geometry/test/writeFile_phase1_cfg.py index 3688c9596adf7..571414f4c083c 100644 --- a/SLHCUpgradeSimulations/Geometry/test/writeFile_phase1_cfg.py +++ b/SLHCUpgradeSimulations/Geometry/test/writeFile_phase1_cfg.py @@ -16,8 +16,8 @@ #rocess.TrackerGeometricDetESModule = cms.ESProducer( "TrackerGeometricDetESModule", # fromDDD = cms.bool( False ) #) -process.load('Geometry.TrackerGeometryBuilder.trackerSLHCGeometry_cfi') -process.trackerSLHCGeometry.applyAlignment = cms.bool(False) +process.load('Geometry.TrackerGeometryBuilder.trackerGeometry_cfi') +process.trackerGeometry.applyAlignment = cms.bool(False) from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag From 1ed729ba51ba74165c77b60776e921b5a857745c Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Thu, 5 Mar 2015 18:09:56 +0100 Subject: [PATCH 07/21] * Update configurations --- .../SiStripTools/test/overlapproblem_pixelphase1_cfg.py | 2 -- .../python/Phase1_R30F12_cmsSimIdealGeometryXML_cff.py | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/DPGAnalysis/SiStripTools/test/overlapproblem_pixelphase1_cfg.py b/DPGAnalysis/SiStripTools/test/overlapproblem_pixelphase1_cfg.py index 101e93efc2368..cef06caaabe8b 100644 --- a/DPGAnalysis/SiStripTools/test/overlapproblem_pixelphase1_cfg.py +++ b/DPGAnalysis/SiStripTools/test/overlapproblem_pixelphase1_cfg.py @@ -43,8 +43,6 @@ process.refittedTracks.TTRHBuilder = cms.string('WithTrackAngle') process.load('SLHCUpgradeSimulations.Geometry.fakeConditions_Phase1_R30F12_cff') -process.trackerTopologyConstants.pxb_layerStartBit = cms.uint32(18) # check if they induce a difference -process.trackerTopologyConstants.pxb_ladderMask = cms.uint32(1023) # check if they induce a difference #process.KFFittingSmootherWithOutliersRejectionAndRK.LogPixelProbabilityCut = cms.double(-16.0) diff --git a/SLHCUpgradeSimulations/Geometry/python/Phase1_R30F12_cmsSimIdealGeometryXML_cff.py b/SLHCUpgradeSimulations/Geometry/python/Phase1_R30F12_cmsSimIdealGeometryXML_cff.py index 0413396d11b4f..0e2f1768e16d9 100644 --- a/SLHCUpgradeSimulations/Geometry/python/Phase1_R30F12_cmsSimIdealGeometryXML_cff.py +++ b/SLHCUpgradeSimulations/Geometry/python/Phase1_R30F12_cmsSimIdealGeometryXML_cff.py @@ -4,11 +4,9 @@ from SLHCUpgradeSimulations.Geometry.Phase1_cmsSimIdealGeometryXML_cfi import * #from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * #from Geometry.CommonDetUnit.globalTrackingGeometryDB_cfi import * -from Geometry.CommonDetUnit.globalTrackingSLHCGeometry_cfi import * -#from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import * -#es_prefer_TrackerEP = cms.ESPrefer("TrackerGeometricDetESModule", "trackerNumberingSLHCGeometry") +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * es_prefer_TrackerEP = cms.ESPrefer("TrackerGeometricDetESModule", "trackerNumberingGeometry") -es_prefer_Trackerdigi = cms.ESPrefer("TrackerDigiGeometryESModule","trackerSLHCGeometry") +es_prefer_Trackerdigi = cms.ESPrefer("TrackerDigiGeometryESModule","trackerGeometry") #hardwire these here #trackerGeometry.trackerGeometryConstants = cms.PSet( @@ -28,7 +26,7 @@ trackerNumberingGeometry.fromDDD = cms.bool(True) trackerNumberingGeometry.layerNumberPXB = cms.uint32(18) trackerNumberingGeometry.totalBlade = cms.uint32(56) -trackerSLHCGeometry.applyAlignment = cms.bool(False) +trackerGeometry.applyAlignment = cms.bool(False) #Muon from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * From 370be9bf0618618a06476809bf9e98491802df38 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Fri, 6 Mar 2015 12:43:09 +0100 Subject: [PATCH 08/21] * Use Tracker topology record --- DQM/Physics/src/B2GDQM.h | 1 - DQM/Physics/src/ExoticaDQM.h | 1 - DQM/Physics/src/HiggsDQM.h | 1 - DQM/Physics/src/QcdLowPtDQM.cc | 4 ++-- DQM/Physics/src/QcdPhotonsDQM.cc | 1 - DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h | 3 --- DQM/SiPixelMonitorCluster/src/SiPixelClusterModule.cc | 4 +++- DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc | 3 ++- DQM/SiPixelMonitorDigi/src/SiPixelDigiModule.cc | 5 +++-- DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc | 5 +++-- DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorSource.cc | 3 ++- DQM/SiPixelMonitorRecHit/src/SiPixelRecHitModule.cc | 3 ++- DQM/SiPixelMonitorRecHit/src/SiPixelRecHitSource.cc | 3 ++- DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencyModule.cc | 4 ++-- DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc | 4 ++-- DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualModule.cc | 4 ++-- DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc | 7 +++---- DQM/SiStripCommon/src/SiStripFolderOrganizer.cc | 1 - DQM/SiStripCommon/src/SiStripHistoId.cc | 1 - DQM/SiStripMonitorClient/src/SiStripActionExecutor.cc | 2 -- DQM/SiStripMonitorClient/src/SiStripAnalyser.cc | 2 -- DQM/SiStripMonitorClient/src/SiStripCertificationInfo.cc | 4 ++-- DQM/SiStripMonitorClient/src/SiStripDaqInfo.cc | 6 +++--- DQM/SiStripMonitorClient/src/SiStripDcsInfo.cc | 5 +++-- DQM/SiStripMonitorClient/src/SiStripQualityChecker.cc | 4 ++-- DQM/SiStripMonitorClient/src/SiStripTrackerMapCreator.cc | 6 +++--- DQM/SiStripMonitorClient/src/SiStripUtility.cc | 2 +- DQM/SiStripMonitorCluster/src/SiStripMonitorCluster.cc | 5 +++-- DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc | 5 +++-- DQM/SiStripMonitorHardware/src/FEDErrors.cc | 1 - DQM/SiStripMonitorHardware/src/SiStripCMMonitor.cc | 4 ++-- DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc | 4 ++-- DQM/SiStripMonitorHardware/src/SiStripFEDMonitor.cc | 4 ++-- DQM/SiStripMonitorPedestals/src/SiStripMonitorPedestals.cc | 3 ++- DQM/SiStripMonitorPedestals/src/SiStripMonitorQuality.cc | 5 +++-- .../interface/SiStripBaseCondObjDQM.h | 2 +- .../plugins/SiStripCorrelateBadStripAndNoise.cc | 4 ++-- DQM/SiStripMonitorSummary/plugins/SiStripCorrelateNoise.cc | 4 ++-- DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.cc | 4 ++-- DQM/SiStripMonitorSummary/src/SiStripApvGainsDQM.cc | 6 +++--- .../src/SiStripBackPlaneCorrectionDQM.cc | 3 ++- DQM/SiStripMonitorSummary/src/SiStripBaseCondObjDQM.cc | 5 +++-- DQM/SiStripMonitorSummary/src/SiStripCablingDQM.cc | 3 ++- DQM/SiStripMonitorSummary/src/SiStripLorentzAngleDQM.cc | 3 ++- DQM/SiStripMonitorSummary/src/SiStripPedestalsDQM.cc | 5 +++-- DQM/SiStripMonitorSummary/src/SiStripQualityDQM.cc | 7 ++++--- DQM/SiStripMonitorSummary/src/SiStripThresholdDQM.cc | 5 +++-- DQM/SiStripMonitorTrack/interface/SiStripMonitorMuonHLT.h | 2 -- DQM/SiStripMonitorTrack/src/SiStripMonitorMuonHLT.cc | 5 +++-- DQM/SiStripMonitorTrack/src/SiStripMonitorTrack.cc | 7 ++++--- DQM/TrackerMonitorTrack/src/MonitorTrackResiduals.cc | 5 +++-- DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.cc | 2 -- DQM/TrackingMonitorClient/src/TrackingActionExecutor.cc | 2 -- DQM/TrackingMonitorClient/src/TrackingCertificationInfo.cc | 2 -- DQM/TrackingMonitorClient/src/TrackingQualityChecker.cc | 2 -- DQM/TrackingMonitorClient/src/TrackingUtility.cc | 2 -- 56 files changed, 98 insertions(+), 102 deletions(-) diff --git a/DQM/Physics/src/B2GDQM.h b/DQM/Physics/src/B2GDQM.h index b0191c297fa15..9dbaac4c11a85 100644 --- a/DQM/Physics/src/B2GDQM.h +++ b/DQM/Physics/src/B2GDQM.h @@ -20,7 +20,6 @@ #include "FWCore/Framework/interface/DataKeyTags.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "DataFormats/MuonReco/interface/Muon.h" #include "DataFormats/MuonReco/interface/MuonFwd.h" #include diff --git a/DQM/Physics/src/ExoticaDQM.h b/DQM/Physics/src/ExoticaDQM.h index db4c5720cfa22..457f7cbc766ec 100644 --- a/DQM/Physics/src/ExoticaDQM.h +++ b/DQM/Physics/src/ExoticaDQM.h @@ -21,7 +21,6 @@ #include "FWCore/Framework/interface/DataKeyTags.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "DataFormats/MuonReco/interface/Muon.h" #include "DataFormats/MuonReco/interface/MuonFwd.h" #include diff --git a/DQM/Physics/src/HiggsDQM.h b/DQM/Physics/src/HiggsDQM.h index fd56d8a747b69..f54b06fd70d62 100644 --- a/DQM/Physics/src/HiggsDQM.h +++ b/DQM/Physics/src/HiggsDQM.h @@ -25,7 +25,6 @@ #include "FWCore/Framework/interface/DataKeyTags.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "DataFormats/GeometryCommonDetAlgo/interface/Measurement1D.h" diff --git a/DQM/Physics/src/QcdLowPtDQM.cc b/DQM/Physics/src/QcdLowPtDQM.cc index 36504caf84196..70cd47424a366 100644 --- a/DQM/Physics/src/QcdLowPtDQM.cc +++ b/DQM/Physics/src/QcdLowPtDQM.cc @@ -4,7 +4,7 @@ #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "DataFormats/VertexReco/interface/Vertex.h" @@ -822,7 +822,7 @@ void QcdLowPtDQM::fillPixels(const Event &iEvent, // Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology *const tTopo = tTopoHandle.product(); const SiPixelRecHitCollection *hits = hRecHits.product(); diff --git a/DQM/Physics/src/QcdPhotonsDQM.cc b/DQM/Physics/src/QcdPhotonsDQM.cc index 141f92f9c1ba8..e4c62327ffc14 100644 --- a/DQM/Physics/src/QcdPhotonsDQM.cc +++ b/DQM/Physics/src/QcdPhotonsDQM.cc @@ -37,7 +37,6 @@ // geometry //#include "Geometry/CaloGeometry/interface/CaloGeometry.h" -//#include "Geometry/Records/interface/IdealGeometryRecord.h" //#include "Geometry/Records/interface/CaloGeometryRecord.h" //#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" //#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" diff --git a/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h b/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h index c1c0afb5c0dc4..653774f7573b1 100644 --- a/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h +++ b/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h @@ -36,7 +36,6 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" class SiPixelClusterModule { public: @@ -74,8 +73,6 @@ class SiPixelClusterModule { private: - const TrackerTopology *pTT; - uint32_t id_; int ncols_; int nrows_; diff --git a/DQM/SiPixelMonitorCluster/src/SiPixelClusterModule.cc b/DQM/SiPixelMonitorCluster/src/SiPixelClusterModule.cc index 717f22b2e938a..c69c97f179b66 100644 --- a/DQM/SiPixelMonitorCluster/src/SiPixelClusterModule.cc +++ b/DQM/SiPixelMonitorCluster/src/SiPixelClusterModule.cc @@ -36,6 +36,8 @@ #include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" +#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" // // Constructors // @@ -66,7 +68,7 @@ SiPixelClusterModule::~SiPixelClusterModule() {} void SiPixelClusterModule::book(const edm::ParameterSet& iConfig, const edm::EventSetup& iSetup, DQMStore::IBooker & iBooker, int type, bool twoD, bool reducedSet, bool isUpgrade) { edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); pTT = tTopoHandle.product(); bool barrel = DetId(id_).subdetId() == static_cast(PixelSubdetector::PixelBarrel); diff --git a/DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc b/DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc index d0b90becc6feb..ccf15e72b5a77 100644 --- a/DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc +++ b/DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc @@ -27,6 +27,7 @@ // Geometry #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" // DataFormats @@ -200,7 +201,7 @@ void SiPixelClusterSource::buildStructure(const edm::EventSetup& iSetup){ iSetup.get().get( pDD ); edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology *pTT = tTopoHandle.product(); LogVerbatim ("PixelDQM") << " *** Geometry node for TrackerGeom is "<<&(*pDD)<("isUpgrade"); edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology *pTT = tTopoHandle.product(); bool barrel = DetId(id_).subdetId() == static_cast(PixelSubdetector::PixelBarrel); @@ -321,7 +322,7 @@ int SiPixelDigiModule::fill(const edm::DetSetVector& input, const edm bool twoD, bool reducedSet, bool twoDimModOn, bool twoDimOnlyLayDisk, int &nDigisA, int &nDigisB, bool isUpgrade) { edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology *pTT = tTopoHandle.product(); bool barrel = DetId(id_).subdetId() == static_cast(PixelSubdetector::PixelBarrel); diff --git a/DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc b/DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc index 4606da95e19dc..27d0b572820cf 100644 --- a/DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc +++ b/DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc @@ -28,6 +28,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" // DataFormats #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" @@ -181,7 +182,7 @@ void SiPixelDigiSource::bookHistograms(DQMStore::IBooker & iBooker, edm::Run con void SiPixelDigiSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology *pTT = tTopoHandle.product(); eventNo++; @@ -571,7 +572,7 @@ void SiPixelDigiSource::analyze(const edm::Event& iEvent, const edm::EventSetup& void SiPixelDigiSource::buildStructure(const edm::EventSetup& iSetup){ edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology *pTT = tTopoHandle.product(); LogInfo ("PixelDQM") <<" SiPixelDigiSource::buildStructure" ; diff --git a/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorSource.cc b/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorSource.cc index d627a0c6a3344..615d254ee2d82 100755 --- a/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorSource.cc +++ b/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorSource.cc @@ -35,6 +35,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" // DataFormats #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" @@ -175,7 +176,7 @@ void SiPixelRawDataErrorSource::buildStructure(const edm::EventSetup& iSetup){ edm::ESHandle tTopoHandle; iSetup.get().get( pDD ); - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology *pTT = tTopoHandle.product(); diff --git a/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitModule.cc b/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitModule.cc index c1a482a4cac1b..a65e87552e25d 100644 --- a/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitModule.cc +++ b/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitModule.cc @@ -22,6 +22,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "FWCore/Framework/interface/EDProducer.h" #include "FWCore/Framework/interface/Event.h" @@ -51,7 +52,7 @@ void SiPixelRecHitModule::book(const edm::ParameterSet& iConfig, DQMStore::IBook edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology *pTT = tTopoHandle.product(); bool barrel = DetId(id_).subdetId() == static_cast(PixelSubdetector::PixelBarrel); diff --git a/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitSource.cc b/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitSource.cc index 441b4af4041a7..ecaeecd3b9bba 100644 --- a/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitSource.cc +++ b/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitSource.cc @@ -32,6 +32,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" // DataFormats #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" @@ -179,7 +180,7 @@ void SiPixelRecHitSource::buildStructure(const edm::EventSetup& iSetup){ edm::ESHandle tTopoHandle; iSetup.get().get( pDD ); - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology *pTT = tTopoHandle.product(); diff --git a/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencyModule.cc b/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencyModule.cc index 8fe9e2cc0d280..275a65dafc014 100644 --- a/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencyModule.cc +++ b/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencyModule.cc @@ -33,7 +33,7 @@ #include "DataFormats/VertexReco/interface/Vertex.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" using namespace std; @@ -57,7 +57,7 @@ SiPixelHitEfficiencyModule::~SiPixelHitEfficiencyModule() { void SiPixelHitEfficiencyModule::book(const edm::ParameterSet& iConfig, edm::EventSetup const & iSetup, DQMStore::IBooker & iBooker,int type, bool isUpgrade) { edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology *pTT = tTopoHandle.product(); bool barrel = DetId(id_).subdetId() == static_cast(PixelSubdetector::PixelBarrel); diff --git a/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc b/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc index ffea7a2e8bb8d..9114cca587c9f 100644 --- a/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc +++ b/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc @@ -24,7 +24,7 @@ #include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h" @@ -190,7 +190,7 @@ void SiPixelHitEfficiencySource::bookHistograms(DQMStore::IBooker & iBooker, edm void SiPixelHitEfficiencySource::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology *pTT = tTopoHandle.product(); edm::Handle vertexCollectionHandle; diff --git a/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualModule.cc b/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualModule.cc index dc6d1348f5d60..0ba5d2f70e142 100644 --- a/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualModule.cc +++ b/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualModule.cc @@ -22,7 +22,7 @@ #include "DQM/SiPixelCommon/interface/SiPixelHistogramId.h" #include "DQM/SiPixelMonitorTrack/interface/SiPixelTrackResidualModule.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" // Data Formats #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h" @@ -55,7 +55,7 @@ SiPixelTrackResidualModule::~SiPixelTrackResidualModule() { void SiPixelTrackResidualModule::book(const edm::ParameterSet& iConfig, edm::EventSetup const& iSetup, DQMStore::IBooker & iBooker, bool reducedSet, int type, bool isUpgrade) { edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology *pTT = tTopoHandle.product(); bool barrel = DetId(id_).subdetId() == static_cast(PixelSubdetector::PixelBarrel); diff --git a/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc b/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc index ccf64cb666bec..864687343a65d 100644 --- a/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc +++ b/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc @@ -25,9 +25,8 @@ #include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" //#include "DataFormats/SiPixelDetId/interface/PixelBarrelNameWrapper.h" #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h" #include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h" @@ -124,7 +123,7 @@ void SiPixelTrackResidualSource::dqmBeginRun(const edm::Run& r, edm::EventSetup iSetup.get().get(TG); if (debug_) LogVerbatim("PixelDQM") << "TrackerGeometry "<< &(*TG) <<" size is "<< TG->dets().size() << endl; edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology *pTT = tTopoHandle.product(); // build theSiPixelStructure with the pixel barrel and endcap dets from TrackerGeometry @@ -608,7 +607,7 @@ void SiPixelTrackResidualSource::bookHistograms(DQMStore::IBooker & iBooker, edm void SiPixelTrackResidualSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // retrieve TrackerGeometry again and MagneticField for use in transforming diff --git a/DQM/SiStripCommon/src/SiStripFolderOrganizer.cc b/DQM/SiStripCommon/src/SiStripFolderOrganizer.cc index e20d70dadb1e7..6f74e9f06e88a 100644 --- a/DQM/SiStripCommon/src/SiStripFolderOrganizer.cc +++ b/DQM/SiStripCommon/src/SiStripFolderOrganizer.cc @@ -18,7 +18,6 @@ #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/DQM/SiStripCommon/src/SiStripHistoId.cc b/DQM/SiStripCommon/src/SiStripHistoId.cc index 82502ea442b64..229be9a936ca3 100644 --- a/DQM/SiStripCommon/src/SiStripHistoId.cc +++ b/DQM/SiStripCommon/src/SiStripHistoId.cc @@ -18,7 +18,6 @@ #include "DQM/SiStripCommon/interface/SiStripHistoId.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" SiStripHistoId::SiStripHistoId() { diff --git a/DQM/SiStripMonitorClient/src/SiStripActionExecutor.cc b/DQM/SiStripMonitorClient/src/SiStripActionExecutor.cc index 9cfed462a066d..d560cd718cc9b 100644 --- a/DQM/SiStripMonitorClient/src/SiStripActionExecutor.cc +++ b/DQM/SiStripMonitorClient/src/SiStripActionExecutor.cc @@ -5,8 +5,6 @@ #include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "DQM/SiStripCommon/interface/SiStripFolderOrganizer.h" #include "DQM/SiStripMonitorClient/interface/SiStripUtility.h" diff --git a/DQM/SiStripMonitorClient/src/SiStripAnalyser.cc b/DQM/SiStripMonitorClient/src/SiStripAnalyser.cc index c16fe8e1d9836..d5805b986cf09 100644 --- a/DQM/SiStripMonitorClient/src/SiStripAnalyser.cc +++ b/DQM/SiStripMonitorClient/src/SiStripAnalyser.cc @@ -24,8 +24,6 @@ #include "DQMServices/Core/interface/DQMStore.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h" #include "DataFormats/FEDRawData/interface/FEDRawData.h" diff --git a/DQM/SiStripMonitorClient/src/SiStripCertificationInfo.cc b/DQM/SiStripMonitorClient/src/SiStripCertificationInfo.cc index b74dec7304b8d..ca25f1d8b393b 100644 --- a/DQM/SiStripMonitorClient/src/SiStripCertificationInfo.cc +++ b/DQM/SiStripMonitorClient/src/SiStripCertificationInfo.cc @@ -14,7 +14,7 @@ #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" //Run Info #include "CondFormats/DataRecord/interface/RunSummaryRcd.h" @@ -201,7 +201,7 @@ void SiStripCertificationInfo::fillSiStripCertificationMEs(edm::EventSetup const //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - eSetup.get().get(tTopoHandle); + eSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); resetSiStripCertificationMEs(); diff --git a/DQM/SiStripMonitorClient/src/SiStripDaqInfo.cc b/DQM/SiStripMonitorClient/src/SiStripDaqInfo.cc index aadf6f7068ebd..6567f90cf24ec 100644 --- a/DQM/SiStripMonitorClient/src/SiStripDaqInfo.cc +++ b/DQM/SiStripMonitorClient/src/SiStripDaqInfo.cc @@ -9,7 +9,7 @@ #include "DQM/SiStripMonitorClient/interface/SiStripUtility.h" #include "DQM/SiStripCommon/interface/SiStripFolderOrganizer.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" //Run Info #include "CondFormats/DataRecord/interface/RunSummaryRcd.h" @@ -179,7 +179,7 @@ void SiStripDaqInfo::readFedIds(const edm::ESHandle& fedcabli //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); auto feds = fedCabling_->fedIds(); @@ -205,7 +205,7 @@ void SiStripDaqInfo::readSubdetFedFractions(std::vector& fed_ids, edm::Even //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); const int siStripFedIdMin = FEDNumbering::MINSiStripFEDID; diff --git a/DQM/SiStripMonitorClient/src/SiStripDcsInfo.cc b/DQM/SiStripMonitorClient/src/SiStripDcsInfo.cc index 70244827b87c2..13b94bc1d86e7 100644 --- a/DQM/SiStripMonitorClient/src/SiStripDcsInfo.cc +++ b/DQM/SiStripMonitorClient/src/SiStripDcsInfo.cc @@ -18,6 +18,7 @@ #include "CondFormats/DataRecord/interface/RunSummaryRcd.h" #include "CondFormats/RunInfo/interface/RunSummary.h" #include "CondFormats/RunInfo/interface/RunInfo.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include #include @@ -206,7 +207,7 @@ void SiStripDcsInfo::readCabling(edm::EventSetup const& eSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - eSetup.get().get(tTopoHandle); + eSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); unsigned long long cacheID = eSetup.get().cacheIdentifier(); @@ -247,7 +248,7 @@ void SiStripDcsInfo::readStatus(edm::EventSetup const& eSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - eSetup.get().get(tTopoHandle); + eSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); eSetup.get().get(siStripDetVOff_); diff --git a/DQM/SiStripMonitorClient/src/SiStripQualityChecker.cc b/DQM/SiStripMonitorClient/src/SiStripQualityChecker.cc index 8087fedc35f20..8689b6ed87c8b 100644 --- a/DQM/SiStripMonitorClient/src/SiStripQualityChecker.cc +++ b/DQM/SiStripMonitorClient/src/SiStripQualityChecker.cc @@ -10,7 +10,7 @@ #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DQM/SiStripCommon/interface/SiStripFolderOrganizer.h" #include "DQM/SiStripMonitorClient/interface/SiStripUtility.h" @@ -409,7 +409,7 @@ void SiStripQualityChecker::fillFaultyModuleStatus(DQMStore* dqm_store, const ed //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - eSetup.get().get(tTopoHandle); + eSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); dqm_store->cd(); diff --git a/DQM/SiStripMonitorClient/src/SiStripTrackerMapCreator.cc b/DQM/SiStripMonitorClient/src/SiStripTrackerMapCreator.cc index 353cdaf844ce4..360cf9e3146df 100644 --- a/DQM/SiStripMonitorClient/src/SiStripTrackerMapCreator.cc +++ b/DQM/SiStripMonitorClient/src/SiStripTrackerMapCreator.cc @@ -14,7 +14,7 @@ #include "DataFormats/SiStripDetId/interface/SiStripDetId.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DQM/SiStripMonitorClient/interface/SiStripTrackerMapCreator.h" #include @@ -203,7 +203,7 @@ void SiStripTrackerMapCreator::setTkMapFromAlarm(DQMStore* dqm_store, const edm: //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - eSetup.get().get(tTopoHandle); + eSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); nDet = 0; @@ -243,7 +243,7 @@ void SiStripTrackerMapCreator::printBadModuleList(std::map tTopoHandle; - eSetup.get().get(tTopoHandle); + eSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); bool tibDone=false,tidSide1Done=false,tidSide2Done=false,tobDone=false,tecSide1Done=false,tecSide2Done=false; diff --git a/DQM/SiStripMonitorClient/src/SiStripUtility.cc b/DQM/SiStripMonitorClient/src/SiStripUtility.cc index 43d39d54529f5..b443df3b38dc8 100644 --- a/DQM/SiStripMonitorClient/src/SiStripUtility.cc +++ b/DQM/SiStripMonitorClient/src/SiStripUtility.cc @@ -4,7 +4,7 @@ #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" + // // Get a list of MEs in a folder // diff --git a/DQM/SiStripMonitorCluster/src/SiStripMonitorCluster.cc b/DQM/SiStripMonitorCluster/src/SiStripMonitorCluster.cc index 2f0123661dc85..284cac15737a5 100644 --- a/DQM/SiStripMonitorCluster/src/SiStripMonitorCluster.cc +++ b/DQM/SiStripMonitorCluster/src/SiStripMonitorCluster.cc @@ -35,6 +35,7 @@ #include "DPGAnalysis/SiStripTools/interface/EventWithHistory.h" #include "CommonTools/TriggerUtils/interface/GenericTriggerEventFlag.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "TMath.h" #include @@ -226,7 +227,7 @@ void SiStripMonitorCluster::createMEs(const edm::EventSetup& es , DQMStore::IBoo //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // take from eventSetup the SiStripDetCabling object - here will use SiStripDetControl later on @@ -470,7 +471,7 @@ void SiStripMonitorCluster::analyze(const edm::Event& iEvent, const edm::EventSe { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // Filter out events if Trigger Filtering is requested diff --git a/DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc b/DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc index 00539303fac86..08a033ff446a8 100644 --- a/DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc +++ b/DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc @@ -38,6 +38,7 @@ #include "DataFormats/L1GlobalTrigger/interface/L1GtFdlWord.h" #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h" #include "CondFormats/RunInfo/interface/RunInfo.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" /* mia: but is there not a smarter way ?!?!?! */ const double NORBITS_PER_SECOND = 11223.; @@ -327,7 +328,7 @@ void SiStripMonitorDigi::createMEs(DQMStore::IBooker & ibooker , const edm::Even //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // take from eventSetup the SiStripDetCabling object - here will use SiStripDetControl later on @@ -562,7 +563,7 @@ void SiStripMonitorDigi::analyze(const edm::Event& iEvent, const edm::EventSetup //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); TotalNShots=0; diff --git a/DQM/SiStripMonitorHardware/src/FEDErrors.cc b/DQM/SiStripMonitorHardware/src/FEDErrors.cc index fbb9f4fcec542..e648fb6cf1e71 100644 --- a/DQM/SiStripMonitorHardware/src/FEDErrors.cc +++ b/DQM/SiStripMonitorHardware/src/FEDErrors.cc @@ -4,7 +4,6 @@ #include "DataFormats/FEDRawData/interface/FEDNumbering.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "EventFilter/SiStripRawToDigi/interface/PipeAddrToTimeLookupTable.h" diff --git a/DQM/SiStripMonitorHardware/src/SiStripCMMonitor.cc b/DQM/SiStripMonitorHardware/src/SiStripCMMonitor.cc index 93117fccd6723..f2e537045ffa9 100644 --- a/DQM/SiStripMonitorHardware/src/SiStripCMMonitor.cc +++ b/DQM/SiStripMonitorHardware/src/SiStripCMMonitor.cc @@ -49,7 +49,7 @@ #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/SiStripDigi/interface/SiStripDigi.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DQM/SiStripMonitorHardware/interface/CMHistograms.hh" @@ -197,7 +197,7 @@ SiStripCMMonitorPlugin::analyze(const edm::Event& iEvent, { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); //static bool firstEvent = true; diff --git a/DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc b/DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc index 1086929f99df8..8bee6523d6f51 100644 --- a/DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc +++ b/DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc @@ -33,7 +33,7 @@ #include "DataFormats/FEDRawData/interface/FEDNumbering.h" #include "DataFormats/SiStripCommon/interface/ConstantsForHardwareSystems.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "CondFormats/DataRecord/interface/SiStripFedCablingRcd.h" #include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h" @@ -176,7 +176,7 @@ SiStripFEDCheckPlugin::analyze(const edm::Event& iEvent, const edm::EventSetup& { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); //update cabling diff --git a/DQM/SiStripMonitorHardware/src/SiStripFEDMonitor.cc b/DQM/SiStripMonitorHardware/src/SiStripFEDMonitor.cc index 79b4b90fc2312..4f54c0c7e013d 100644 --- a/DQM/SiStripMonitorHardware/src/SiStripFEDMonitor.cc +++ b/DQM/SiStripMonitorHardware/src/SiStripFEDMonitor.cc @@ -40,7 +40,7 @@ #include "DataFormats/FEDRawData/interface/FEDNumbering.h" #include "DataFormats/SiStripCommon/interface/SiStripFedKey.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "CondFormats/DataRecord/interface/SiStripFedCablingRcd.h" #include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h" @@ -183,7 +183,7 @@ SiStripFEDMonitorPlugin::analyze(const edm::Event& iEvent, { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); //update cabling diff --git a/DQM/SiStripMonitorPedestals/src/SiStripMonitorPedestals.cc b/DQM/SiStripMonitorPedestals/src/SiStripMonitorPedestals.cc index 2a18b5d7b5944..361a53155ccd6 100644 --- a/DQM/SiStripMonitorPedestals/src/SiStripMonitorPedestals.cc +++ b/DQM/SiStripMonitorPedestals/src/SiStripMonitorPedestals.cc @@ -37,6 +37,7 @@ #include "CondFormats/SiStripObjects/interface/SiStripPedestals.h" #include "CondFormats/SiStripObjects/interface/SiStripNoises.h" #include "CalibFormats/SiStripObjects/interface/SiStripQuality.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "TProfile.h" // std @@ -115,7 +116,7 @@ void SiStripMonitorPedestals::createMEs(DQMStore::IBooker & ibooker , const edm: //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); std::vector SelectedDetIds; diff --git a/DQM/SiStripMonitorPedestals/src/SiStripMonitorQuality.cc b/DQM/SiStripMonitorPedestals/src/SiStripMonitorQuality.cc index cc2684e03ff4b..27c3ab07db46d 100644 --- a/DQM/SiStripMonitorPedestals/src/SiStripMonitorQuality.cc +++ b/DQM/SiStripMonitorPedestals/src/SiStripMonitorQuality.cc @@ -33,6 +33,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "DQM/SiStripMonitorPedestals/interface/SiStripMonitorQuality.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" // std #include @@ -70,7 +71,7 @@ void SiStripMonitorQuality::bookHistograms(DQMStore::IBooker & ibooker , const e //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - eSetup.get().get(tTopoHandle); + eSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); m_cacheID_ = cacheID; @@ -136,7 +137,7 @@ void SiStripMonitorQuality::analyze(edm::Event const& iEvent, edm::EventSetup co //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - eSetup.get().get(tTopoHandle); + eSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); m_cacheID_ = cacheID; diff --git a/DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h b/DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h index cdbc799f77ff9..183fc826ee176 100644 --- a/DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h +++ b/DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h @@ -11,7 +11,7 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/SiStripDetId/interface/SiStripDetId.h" #include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h" diff --git a/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.cc b/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.cc index 5752f283bb5a1..ce07cb69112ac 100644 --- a/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.cc +++ b/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.cc @@ -1,7 +1,7 @@ #include "DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" @@ -49,7 +49,7 @@ SiStripCorrelateBadStripAndNoise::DoAnalysis(const edm::EventSetup& es){ //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); //Loop on quality bad stirps diff --git a/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateNoise.cc b/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateNoise.cc index 708833f980e68..81d74eacbd955 100644 --- a/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateNoise.cc +++ b/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateNoise.cc @@ -1,7 +1,7 @@ #include "DQM/SiStripMonitorSummary/plugins/SiStripCorrelateNoise.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "FWCore/Framework/interface/Run.h" #include "TCanvas.h" @@ -122,7 +122,7 @@ SiStripCorrelateNoise::DoAnalysis(const edm::EventSetup& es, const SiStripNoises //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); std::vectorhistos; diff --git a/DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.cc b/DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.cc index 860febe776d7e..78e391e64c20a 100644 --- a/DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.cc +++ b/DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.cc @@ -1,7 +1,7 @@ #include "DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" @@ -50,7 +50,7 @@ SiStripPlotGain::DoAnalysis(const edm::EventSetup& es, const SiStripApvGain& gai //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); std::vectorhistos; diff --git a/DQM/SiStripMonitorSummary/src/SiStripApvGainsDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripApvGainsDQM.cc index 116c365698dfc..827dd4b9ff5cd 100644 --- a/DQM/SiStripMonitorSummary/src/SiStripApvGainsDQM.cc +++ b/DQM/SiStripMonitorSummary/src/SiStripApvGainsDQM.cc @@ -1,5 +1,5 @@ #include "DQM/SiStripMonitorSummary/interface/SiStripApvGainsDQM.h" - +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DQMServices/Core/interface/MonitorElement.h" #include "TCanvas.h" @@ -37,7 +37,7 @@ void SiStripApvGainsDQM::fillModMEs(const std::vector & selectedDetIds //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); ModMEs CondObj_ME; @@ -82,7 +82,7 @@ void SiStripApvGainsDQM::fillSummaryMEs(const std::vector & selectedDe //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); for(std::vector::const_iterator detIter_ = selectedDetIds.begin(); diff --git a/DQM/SiStripMonitorSummary/src/SiStripBackPlaneCorrectionDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripBackPlaneCorrectionDQM.cc index a9ebb512ce9f8..ec5c4cf9c8b38 100644 --- a/DQM/SiStripMonitorSummary/src/SiStripBackPlaneCorrectionDQM.cc +++ b/DQM/SiStripMonitorSummary/src/SiStripBackPlaneCorrectionDQM.cc @@ -1,4 +1,5 @@ #include "DQM/SiStripMonitorSummary/interface/SiStripBackPlaneCorrectionDQM.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DQMServices/Core/interface/MonitorElement.h" #include "TCanvas.h" @@ -43,7 +44,7 @@ void SiStripBackPlaneCorrectionDQM::fillSummaryMEs(const std::vector & //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // ----- diff --git a/DQM/SiStripMonitorSummary/src/SiStripBaseCondObjDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripBaseCondObjDQM.cc index ea7c7ecc094f2..37b17130f231e 100644 --- a/DQM/SiStripMonitorSummary/src/SiStripBaseCondObjDQM.cc +++ b/DQM/SiStripMonitorSummary/src/SiStripBaseCondObjDQM.cc @@ -1,4 +1,5 @@ #include "DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h" +#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "TCanvas.h" @@ -1250,7 +1251,7 @@ void SiStripBaseCondObjDQM::fillModMEs(const std::vector & selectedDet //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); ModMEs CondObj_ME; @@ -1266,7 +1267,7 @@ void SiStripBaseCondObjDQM::fillSummaryMEs(const std::vector & selecte //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); for(std::vector::const_iterator detIter_ = selectedDetIds.begin(); diff --git a/DQM/SiStripMonitorSummary/src/SiStripCablingDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripCablingDQM.cc index c54ec5ad616d1..91572b3431045 100644 --- a/DQM/SiStripMonitorSummary/src/SiStripCablingDQM.cc +++ b/DQM/SiStripMonitorSummary/src/SiStripCablingDQM.cc @@ -1,5 +1,6 @@ #include "DQM/SiStripMonitorSummary/interface/SiStripCablingDQM.h" #include "DQMServices/Core/interface/MonitorElement.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "TCanvas.h" using namespace std; // ----- @@ -25,7 +26,7 @@ void SiStripCablingDQM::getActiveDetIds(const edm::EventSetup & eSetup){ //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - eSetup.get().get(tTopoHandle); + eSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // Get active and total detIds diff --git a/DQM/SiStripMonitorSummary/src/SiStripLorentzAngleDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripLorentzAngleDQM.cc index 6199679a194c3..aaacaa751304e 100644 --- a/DQM/SiStripMonitorSummary/src/SiStripLorentzAngleDQM.cc +++ b/DQM/SiStripMonitorSummary/src/SiStripLorentzAngleDQM.cc @@ -1,5 +1,6 @@ #include "DQM/SiStripMonitorSummary/interface/SiStripLorentzAngleDQM.h" #include "DQMServices/Core/interface/MonitorElement.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "TCanvas.h" // ----- @@ -43,7 +44,7 @@ void SiStripLorentzAngleDQM::fillSummaryMEs(const std::vector & select //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // ----- diff --git a/DQM/SiStripMonitorSummary/src/SiStripPedestalsDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripPedestalsDQM.cc index 1ca3d8fbbbb2c..67fa36371ebb0 100644 --- a/DQM/SiStripMonitorSummary/src/SiStripPedestalsDQM.cc +++ b/DQM/SiStripMonitorSummary/src/SiStripPedestalsDQM.cc @@ -1,5 +1,6 @@ #include "DQM/SiStripMonitorSummary/interface/SiStripPedestalsDQM.h" #include "DQMServices/Core/interface/MonitorElement.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "TCanvas.h" // ----- @@ -34,7 +35,7 @@ void SiStripPedestalsDQM::fillModMEs(const std::vector & selectedDetId //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); ModMEs CondObj_ME; @@ -75,7 +76,7 @@ void SiStripPedestalsDQM::fillSummaryMEs(const std::vector & selectedD //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); for(std::vector::const_iterator detIter_ = selectedDetIds.begin(); diff --git a/DQM/SiStripMonitorSummary/src/SiStripQualityDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripQualityDQM.cc index e7dda5a8bccdb..6b636ee12adaf 100644 --- a/DQM/SiStripMonitorSummary/src/SiStripQualityDQM.cc +++ b/DQM/SiStripMonitorSummary/src/SiStripQualityDQM.cc @@ -1,5 +1,6 @@ #include "DQM/SiStripMonitorSummary/interface/SiStripQualityDQM.h" #include "DQMServices/Core/interface/MonitorElement.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "TCanvas.h" // ----- @@ -35,7 +36,7 @@ void SiStripQualityDQM::fillModMEs(const std::vector & selectedDetIds, //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); ModMEs CondObj_ME; @@ -73,7 +74,7 @@ void SiStripQualityDQM::fillSummaryMEs(const std::vector & selectedDet //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); for(std::vector::const_iterator detIter_ = selectedDetIds.begin(); @@ -194,7 +195,7 @@ void SiStripQualityDQM::fillGrandSummaryMEs(const edm::EventSetup& eSetup){ //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - eSetup.get().get(tTopoHandle); + eSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); std::string hSummary_BadObjects_xTitle = hPSet_.getParameter("Summary_BadObjects_histo_xTitle"); diff --git a/DQM/SiStripMonitorSummary/src/SiStripThresholdDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripThresholdDQM.cc index 47ff2e93c21e1..2b894f6a01284 100644 --- a/DQM/SiStripMonitorSummary/src/SiStripThresholdDQM.cc +++ b/DQM/SiStripMonitorSummary/src/SiStripThresholdDQM.cc @@ -1,5 +1,6 @@ #include "DQM/SiStripMonitorSummary/interface/SiStripThresholdDQM.h" #include "DQMServices/Core/interface/MonitorElement.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "TCanvas.h" @@ -41,7 +42,7 @@ void SiStripThresholdDQM::fillModMEs(const std::vector & selectedDetId //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); ModMEs CondObj_ME; @@ -100,7 +101,7 @@ void SiStripThresholdDQM::fillSummaryMEs(const std::vector & selectedD //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); for(std::vector::const_iterator detIter_ = selectedDetIds.begin(); diff --git a/DQM/SiStripMonitorTrack/interface/SiStripMonitorMuonHLT.h b/DQM/SiStripMonitorTrack/interface/SiStripMonitorMuonHLT.h index 81cd0327b9bd8..704dc355eb909 100644 --- a/DQM/SiStripMonitorTrack/interface/SiStripMonitorMuonHLT.h +++ b/DQM/SiStripMonitorTrack/interface/SiStripMonitorMuonHLT.h @@ -51,8 +51,6 @@ //needed for normalisation //Id #include -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" //BoundPlane #include #include diff --git a/DQM/SiStripMonitorTrack/src/SiStripMonitorMuonHLT.cc b/DQM/SiStripMonitorTrack/src/SiStripMonitorMuonHLT.cc index fe58038f30382..0b21764858a7d 100644 --- a/DQM/SiStripMonitorTrack/src/SiStripMonitorMuonHLT.cc +++ b/DQM/SiStripMonitorTrack/src/SiStripMonitorMuonHLT.cc @@ -16,7 +16,8 @@ // #include "DQM/SiStripMonitorTrack/interface/SiStripMonitorMuonHLT.h" - +#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" // // constructors and destructor @@ -604,7 +605,7 @@ SiStripMonitorMuonHLT::GeometryFromTrackGeom (const std::vector& Dets,con //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); std::vector v_LabelHisto; diff --git a/DQM/SiStripMonitorTrack/src/SiStripMonitorTrack.cc b/DQM/SiStripMonitorTrack/src/SiStripMonitorTrack.cc index 16bfaed1bae28..dfacfef83c9ef 100755 --- a/DQM/SiStripMonitorTrack/src/SiStripMonitorTrack.cc +++ b/DQM/SiStripMonitorTrack/src/SiStripMonitorTrack.cc @@ -2,6 +2,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/GluedGeomDet.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "CalibTracker/Records/interface/SiStripDetCablingRcd.h" #include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h" @@ -80,7 +81,7 @@ void SiStripMonitorTrack::bookHistograms(DQMStore::IBooker & ibooker , const edm { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); book(ibooker , tTopo); } @@ -867,7 +868,7 @@ template void SiStripMonitorTrack::RecHitInfo(const T* tkrecHit, Local //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); //Get SiStripCluster from SiStripRecHit @@ -893,7 +894,7 @@ void SiStripMonitorTrack::AllClusters(const edm::Event& ev, const edm::EventSetu //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); edm::Handle< edmNew::DetSetVector > siStripClusterHandle; diff --git a/DQM/TrackerMonitorTrack/src/MonitorTrackResiduals.cc b/DQM/TrackerMonitorTrack/src/MonitorTrackResiduals.cc index b41e40212c0ba..a30783d3159d2 100644 --- a/DQM/TrackerMonitorTrack/src/MonitorTrackResiduals.cc +++ b/DQM/TrackerMonitorTrack/src/MonitorTrackResiduals.cc @@ -8,6 +8,7 @@ #include "DQM/SiStripCommon/interface/SiStripHistoId.h" #include "DQM/TrackerMonitorTrack/interface/MonitorTrackResiduals.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "RecoTracker/TransientTrackingRecHit/interface/TkTransientTrackingRecHitBuilder.h" #include "TrackingTools/TrackFitters/interface/TrajectoryFitter.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" @@ -55,7 +56,7 @@ void MonitorTrackResiduals::createMEs( DQMStore::IBooker & ibooker , const edm:: //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); Parameters = conf_.getParameter("TH1ResModules"); @@ -154,7 +155,7 @@ void MonitorTrackResiduals::analyze(const edm::Event& iEvent, const edm::EventSe //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); TrackerValidationVariables avalidator_(iSetup,conf_); diff --git a/DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.cc b/DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.cc index 7ccd7fcf5f9f3..9549f707aef13 100644 --- a/DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.cc +++ b/DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.cc @@ -14,8 +14,6 @@ #include "DQMServices/Core/interface/DQMStore.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h" #include "DataFormats/FEDRawData/interface/FEDRawData.h" diff --git a/DQM/TrackingMonitorClient/src/TrackingActionExecutor.cc b/DQM/TrackingMonitorClient/src/TrackingActionExecutor.cc index 3342ffcd55bb4..88a0d5014bfd4 100644 --- a/DQM/TrackingMonitorClient/src/TrackingActionExecutor.cc +++ b/DQM/TrackingMonitorClient/src/TrackingActionExecutor.cc @@ -4,8 +4,6 @@ #include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "DQM/SiStripCommon/interface/SiStripFolderOrganizer.h" #include "DQM/SiStripMonitorClient/interface/SiStripUtility.h" diff --git a/DQM/TrackingMonitorClient/src/TrackingCertificationInfo.cc b/DQM/TrackingMonitorClient/src/TrackingCertificationInfo.cc index fbfd230526b61..520a6240ad7ee 100644 --- a/DQM/TrackingMonitorClient/src/TrackingCertificationInfo.cc +++ b/DQM/TrackingMonitorClient/src/TrackingCertificationInfo.cc @@ -13,8 +13,6 @@ #include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" //Run Info #include "CondFormats/DataRecord/interface/RunSummaryRcd.h" diff --git a/DQM/TrackingMonitorClient/src/TrackingQualityChecker.cc b/DQM/TrackingMonitorClient/src/TrackingQualityChecker.cc index f3ced86aaada3..19978b1660b92 100644 --- a/DQM/TrackingMonitorClient/src/TrackingQualityChecker.cc +++ b/DQM/TrackingMonitorClient/src/TrackingQualityChecker.cc @@ -8,8 +8,6 @@ #include "CalibTracker/SiStripCommon/interface/TkDetMap.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "DQM/TrackingMonitorClient/interface/TrackingUtility.h" diff --git a/DQM/TrackingMonitorClient/src/TrackingUtility.cc b/DQM/TrackingMonitorClient/src/TrackingUtility.cc index be35bab556cee..778a7a650f4c6 100644 --- a/DQM/TrackingMonitorClient/src/TrackingUtility.cc +++ b/DQM/TrackingMonitorClient/src/TrackingUtility.cc @@ -2,8 +2,6 @@ #include "DQMServices/Core/interface/MonitorElement.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" // // Get a list of MEs in a folder // From 961cf437a2418c2680b46ca772963b89d20ac27c Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Fri, 6 Mar 2015 17:11:15 +0100 Subject: [PATCH 09/21] * Use Tracker topology record --- DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h | 3 +++ DQM/SiPixelMonitorCluster/src/SiPixelClusterModule.cc | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h b/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h index 653774f7573b1..5fb676dd904ea 100644 --- a/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h +++ b/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h @@ -36,6 +36,8 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" + class SiPixelClusterModule { public: @@ -73,6 +75,7 @@ class SiPixelClusterModule { private: + const TrackerTopology *pTT; uint32_t id_; int ncols_; int nrows_; diff --git a/DQM/SiPixelMonitorCluster/src/SiPixelClusterModule.cc b/DQM/SiPixelMonitorCluster/src/SiPixelClusterModule.cc index c69c97f179b66..8288639336fcb 100644 --- a/DQM/SiPixelMonitorCluster/src/SiPixelClusterModule.cc +++ b/DQM/SiPixelMonitorCluster/src/SiPixelClusterModule.cc @@ -36,7 +36,6 @@ #include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" // // Constructors From f4bbaa1cb57098b1be1a3fb927b5681936859646 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Fri, 6 Mar 2015 17:27:23 +0100 Subject: [PATCH 10/21] * Use Tracker topology record --- .../EgammaElectronAlgos/src/FastElectronSeedProducer.cc | 3 ++- FastSimulation/EventProducer/src/FamosProducer.cc | 4 ++-- .../Tracking/interface/TrajectorySeedHitCandidate.h | 1 - FastSimulation/Tracking/plugins/TrackCandidateProducer.cc | 3 ++- FastSimulation/Tracking/plugins/TrajectorySeedProducer.cc | 3 ++- FastSimulation/Tracking/src/TrackingLayer.cc | 4 +--- FastSimulation/Tracking/test/FastTrackAnalyzer.cc | 4 ++-- FastSimulation/Tracking/test/testGeneralTracks.cc | 3 +-- FastSimulation/Tracking/test/testTrackingIterations.cc | 5 +++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/FastSimulation/EgammaElectronAlgos/src/FastElectronSeedProducer.cc b/FastSimulation/EgammaElectronAlgos/src/FastElectronSeedProducer.cc index 94d64ef13bca4..2439eae1b509d 100644 --- a/FastSimulation/EgammaElectronAlgos/src/FastElectronSeedProducer.cc +++ b/FastSimulation/EgammaElectronAlgos/src/FastElectronSeedProducer.cc @@ -28,6 +28,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" @@ -129,7 +130,7 @@ FastElectronSeedProducer::produce(edm::Event& e, const edm::EventSetup& iSetup) //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - iSetup.get().get(tTopoHand); + iSetup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); diff --git a/FastSimulation/EventProducer/src/FamosProducer.cc b/FastSimulation/EventProducer/src/FamosProducer.cc index a0a870b94ddab..602c5fc758e98 100644 --- a/FastSimulation/EventProducer/src/FamosProducer.cc +++ b/FastSimulation/EventProducer/src/FamosProducer.cc @@ -20,7 +20,7 @@ #include "FastSimulation/Calorimetry/interface/CalorimetryManager.h" #include "FastSimulation/TrajectoryManager/interface/TrajectoryManager.h" #include "FastSimulation/Utilities/interface/RandomEngineAndDistribution.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "HepMC/GenVertex.h" #include "HepMC/GenEvent.h" @@ -88,7 +88,7 @@ void FamosProducer::produce(edm::Event & iEvent, const edm::EventSetup & es) //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - es.get().get(tTopoHand); + es.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); diff --git a/FastSimulation/Tracking/interface/TrajectorySeedHitCandidate.h b/FastSimulation/Tracking/interface/TrajectorySeedHitCandidate.h index d58c5dfce3a95..cbbd9fa56a274 100644 --- a/FastSimulation/Tracking/interface/TrajectorySeedHitCandidate.h +++ b/FastSimulation/Tracking/interface/TrajectorySeedHitCandidate.h @@ -4,7 +4,6 @@ #include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "DataFormats/TrackerRecHit2D/interface/SiTrackerGSRecHit2D.h" #include "DataFormats/TrackerRecHit2D/interface/SiTrackerGSMatchedRecHit2D.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" diff --git a/FastSimulation/Tracking/plugins/TrackCandidateProducer.cc b/FastSimulation/Tracking/plugins/TrackCandidateProducer.cc index 50f62b3cba4e0..75967c0621c5e 100644 --- a/FastSimulation/Tracking/plugins/TrackCandidateProducer.cc +++ b/FastSimulation/Tracking/plugins/TrackCandidateProducer.cc @@ -16,6 +16,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "FastSimulation/Tracking/interface/TrajectorySeedHitCandidate.h" //#include "FastSimulation/Tracking/interface/TrackerRecHitSplit.h" @@ -134,7 +135,7 @@ TrackCandidateProducer::produce(edm::Event& e, const edm::EventSetup& es) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - es.get().get(tTopoHand); + es.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); diff --git a/FastSimulation/Tracking/plugins/TrajectorySeedProducer.cc b/FastSimulation/Tracking/plugins/TrajectorySeedProducer.cc index 1f3d632023e45..9e41707d636ef 100644 --- a/FastSimulation/Tracking/plugins/TrajectorySeedProducer.cc +++ b/FastSimulation/Tracking/plugins/TrajectorySeedProducer.cc @@ -13,6 +13,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "FastSimulation/ParticlePropagator/interface/MagneticFieldMapRecord.h" @@ -157,7 +158,7 @@ TrajectorySeedProducer::beginRun(edm::Run const&, const edm::EventSetup & es) es.get().get(magneticFieldHandle); es.get().get(trackerGeometryHandle); es.get().get(magneticFieldMapHandle); - es.get().get(trackerTopologyHandle); + es.get().get(trackerTopologyHandle); magneticField = &(*magneticFieldHandle); trackerGeometry = &(*trackerGeometryHandle); diff --git a/FastSimulation/Tracking/src/TrackingLayer.cc b/FastSimulation/Tracking/src/TrackingLayer.cc index 617fa1d724816..d37848c219e47 100644 --- a/FastSimulation/Tracking/src/TrackingLayer.cc +++ b/FastSimulation/Tracking/src/TrackingLayer.cc @@ -1,8 +1,6 @@ #include "FastSimulation/Tracking/interface/TrackingLayer.h" -const TrackingLayer::eqfct TrackingLayer::_eqfct; -const TrackingLayer::hashfct TrackingLayer::_hashfct; - + TrackingLayer::TrackingLayer(): _subDet(Det::UNKNOWN), _side(Side::BARREL), diff --git a/FastSimulation/Tracking/test/FastTrackAnalyzer.cc b/FastSimulation/Tracking/test/FastTrackAnalyzer.cc index 9a154008360e0..f2ef205f6ceb3 100755 --- a/FastSimulation/Tracking/test/FastTrackAnalyzer.cc +++ b/FastSimulation/Tracking/test/FastTrackAnalyzer.cc @@ -25,7 +25,7 @@ // Numbering scheme #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "TH1F.h" #include "TFile.h" @@ -319,7 +319,7 @@ void FastTrackAnalyzer::analyze(const edm::Event& event, const edm::EventSetup& //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - setup.get().get(tTopoHand); + setup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); std::cout << "\nEvent ID = "<< event.id() << std::endl ; diff --git a/FastSimulation/Tracking/test/testGeneralTracks.cc b/FastSimulation/Tracking/test/testGeneralTracks.cc index c0b1c98057902..5df938639197e 100644 --- a/FastSimulation/Tracking/test/testGeneralTracks.cc +++ b/FastSimulation/Tracking/test/testGeneralTracks.cc @@ -9,8 +9,6 @@ #include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "SimDataFormats/Track/interface/SimTrackContainer.h" @@ -50,6 +48,7 @@ public : // See RecoParticleFlow/PFProducer/interface/PFProducer.h edm::ParameterSet particleFilter_; std::vector allTracks; + bool saveNU; std::vector mySimEvent; std::string simModuleLabel_; // Histograms diff --git a/FastSimulation/Tracking/test/testTrackingIterations.cc b/FastSimulation/Tracking/test/testTrackingIterations.cc index b721a594313ac..f66bc447fdc44 100644 --- a/FastSimulation/Tracking/test/testTrackingIterations.cc +++ b/FastSimulation/Tracking/test/testTrackingIterations.cc @@ -10,7 +10,7 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "SimDataFormats/Track/interface/SimTrackContainer.h" #include "DataFormats/TrackerRecHit2D/interface/SiTrackerGSRecHit2DCollection.h" @@ -57,6 +57,7 @@ public : std::vector thirdTracks; std::vector fourthTracks; std::vector fifthTracks; + bool saveNU; std::vector mySimEvent; std::string simModuleLabel_; // Histograms @@ -347,7 +348,7 @@ testTrackingIterations::analyze(const edm::Event& iEvent, const edm::EventSetup& //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - iSetup.get().get(tTopoHand); + iSetup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); From 1825d493a9baab9f92c750d51ac0ab63f745c515 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Fri, 6 Mar 2015 17:35:15 +0100 Subject: [PATCH 11/21] * Use Tracker topology record --- PhysicsTools/RecoUtils/src/CheckHitPattern.cc | 4 ++-- RecoEgamma/EgammaElectronAlgos/src/ElectronSeedGenerator.cc | 3 ++- .../plugins/SiStripElectronProducer.cc | 3 ++- RecoEgamma/Examples/plugins/ElectronSeedAnalyzer.cc | 4 ++-- RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.cc | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/PhysicsTools/RecoUtils/src/CheckHitPattern.cc b/PhysicsTools/RecoUtils/src/CheckHitPattern.cc index c7f313f39f9b8..c1409fa123c92 100644 --- a/PhysicsTools/RecoUtils/src/CheckHitPattern.cc +++ b/PhysicsTools/RecoUtils/src/CheckHitPattern.cc @@ -11,7 +11,7 @@ #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" //#include "DataFormats/SiStripDetId/interface/SiStripDetId.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "TrackingTools/Records/interface/TransientTrackRecord.h" #include "DataFormats/Math/interface/deltaPhi.h" @@ -26,7 +26,7 @@ void CheckHitPattern::init(const edm::EventSetup& iSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // diff --git a/RecoEgamma/EgammaElectronAlgos/src/ElectronSeedGenerator.cc b/RecoEgamma/EgammaElectronAlgos/src/ElectronSeedGenerator.cc index 798c3901bd78b..bbc58c5c57ba8 100644 --- a/RecoEgamma/EgammaElectronAlgos/src/ElectronSeedGenerator.cc +++ b/RecoEgamma/EgammaElectronAlgos/src/ElectronSeedGenerator.cc @@ -33,6 +33,7 @@ #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "TrackingTools/KalmanUpdators/interface/KFUpdator.h" #include "TrackingTools/Records/interface/TrackingComponentsRecord.h" @@ -232,7 +233,7 @@ void ElectronSeedGenerator::run //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - setup.get().get(tTopoHand); + setup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); theSetup= &setup; diff --git a/RecoEgamma/EgammaElectronProducers/plugins/SiStripElectronProducer.cc b/RecoEgamma/EgammaElectronProducers/plugins/SiStripElectronProducer.cc index 36738e8a7eec2..84bf2188c1010 100644 --- a/RecoEgamma/EgammaElectronProducers/plugins/SiStripElectronProducer.cc +++ b/RecoEgamma/EgammaElectronProducers/plugins/SiStripElectronProducer.cc @@ -28,6 +28,7 @@ #include "DataFormats/EgammaReco/interface/SuperCluster.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2DCollection.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" @@ -141,7 +142,7 @@ SiStripElectronProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSet //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - iSetup.get().get(tTopoHand); + iSetup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); // counter for electron candidates diff --git a/RecoEgamma/Examples/plugins/ElectronSeedAnalyzer.cc b/RecoEgamma/Examples/plugins/ElectronSeedAnalyzer.cc index d8f76d87c9255..8d5ba4bdc374b 100644 --- a/RecoEgamma/Examples/plugins/ElectronSeedAnalyzer.cc +++ b/RecoEgamma/Examples/plugins/ElectronSeedAnalyzer.cc @@ -34,7 +34,7 @@ #include "TrackingTools/MaterialEffects/interface/PropagatorWithMaterial.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" @@ -184,7 +184,7 @@ void ElectronSeedAnalyzer::analyze( const edm::Event& e, const edm::EventSetup& { //Retrieve tracker topology from geometry edm::ESHandle tTopo; - iSetup.get().get(tTopo); + iSetup.get().get(tTopo); diff --git a/RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.cc b/RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.cc index e5b8471be8d4d..233c3e85cb660 100644 --- a/RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.cc +++ b/RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.cc @@ -48,7 +48,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h" @@ -326,7 +326,7 @@ SiStripElectronAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup { //Retrieve tracker topology from geometry edm::ESHandle tTopo; - iSetup.get().get(tTopo); + iSetup.get().get(tTopo); using namespace std; // so you can say "cout" and "endl" From 302af6cc33cabb2369f8663ca013d7be39fefa5e Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Fri, 6 Mar 2015 17:45:22 +0100 Subject: [PATCH 12/21] * Use Tracker topology record --- RecoLocalTracker/SiPixelClusterizer/test/ReadPixClusters.cc | 4 ++-- RecoLocalTracker/SiPixelClusterizer/test/TestClusters.cc | 4 ++-- .../SiPixelRecHits/plugins/PixelCPEGenericESProducer.cc | 3 ++- .../SiPixelRecHits/plugins/PixelCPETemplateRecoESProducer.cc | 3 ++- RecoMuon/GlobalMuonProducer/src/TevMuonProducer.cc | 3 ++- .../GlobalTrackingTools/plugins/GlobalTrackQualityProducer.cc | 4 ++-- RecoMuon/GlobalTrackingTools/src/GlobalMuonRefitter.cc | 1 - .../GlobalTrackingTools/src/GlobalTrajectoryBuilderBase.cc | 4 ++-- RecoMuon/TrackerSeedGenerator/plugins/TSGFromL2Muon.cc | 3 ++- RecoMuon/TrackerSeedGenerator/plugins/TSGFromL2Muon.h | 1 - 10 files changed, 16 insertions(+), 14 deletions(-) diff --git a/RecoLocalTracker/SiPixelClusterizer/test/ReadPixClusters.cc b/RecoLocalTracker/SiPixelClusterizer/test/ReadPixClusters.cc index 26927b31e43e3..9fe3ced0d5f7e 100644 --- a/RecoLocalTracker/SiPixelClusterizer/test/ReadPixClusters.cc +++ b/RecoLocalTracker/SiPixelClusterizer/test/ReadPixClusters.cc @@ -70,7 +70,7 @@ #define NEW_ID #ifdef NEW_ID #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #else #include "DataFormats/SiPixelDetId/interface/PXBDetId.h" #include "DataFormats/SiPixelDetId/interface/PXFDetId.h" @@ -392,7 +392,7 @@ void ReadPixClusters::analyze(const edm::Event& e, #ifdef NEW_ID //Retrieve tracker topology from geometry edm::ESHandle tTopo; - es.get().get(tTopo); + es.get().get(tTopo); #endif diff --git a/RecoLocalTracker/SiPixelClusterizer/test/TestClusters.cc b/RecoLocalTracker/SiPixelClusterizer/test/TestClusters.cc index dfb6da293e391..794b81a7292fe 100644 --- a/RecoLocalTracker/SiPixelClusterizer/test/TestClusters.cc +++ b/RecoLocalTracker/SiPixelClusterizer/test/TestClusters.cc @@ -87,7 +87,7 @@ #define NEW_ID #ifdef NEW_ID #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #else #include "DataFormats/SiPixelDetId/interface/PXBDetId.h" #include "DataFormats/SiPixelDetId/interface/PXFDetId.h" @@ -2288,7 +2288,7 @@ void TestClusters::analyze(const edm::Event& e, #ifdef NEW_ID //Retrieve tracker topology from geometry edm::ESHandle tTopo; - es.get().get(tTopo); + es.get().get(tTopo); #endif //--------------------------------------- diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/PixelCPEGenericESProducer.cc b/RecoLocalTracker/SiPixelRecHits/plugins/PixelCPEGenericESProducer.cc index 22fc3cc47ef33..da2eb2a07f8b1 100644 --- a/RecoLocalTracker/SiPixelRecHits/plugins/PixelCPEGenericESProducer.cc +++ b/RecoLocalTracker/SiPixelRecHits/plugins/PixelCPEGenericESProducer.cc @@ -4,6 +4,7 @@ #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "FWCore/Framework/interface/EventSetup.h" @@ -53,7 +54,7 @@ PixelCPEGenericESProducer::produce(const TkPixelCPERecord & iRecord){ iRecord.getRecord().get( pDD ); edm::ESHandle hTT; - iRecord.getRecord().getRecord().get(hTT); + iRecord.getRecord().getRecord().get(hTT); // Lorant angle for offsets ESHandle lorentzAngle; diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/PixelCPETemplateRecoESProducer.cc b/RecoLocalTracker/SiPixelRecHits/plugins/PixelCPETemplateRecoESProducer.cc index 2e4c21f765c81..3e79dcf715f95 100644 --- a/RecoLocalTracker/SiPixelRecHits/plugins/PixelCPETemplateRecoESProducer.cc +++ b/RecoLocalTracker/SiPixelRecHits/plugins/PixelCPETemplateRecoESProducer.cc @@ -4,6 +4,7 @@ #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "FWCore/Framework/interface/EventSetup.h" @@ -44,7 +45,7 @@ PixelCPETemplateRecoESProducer::produce(const TkPixelCPERecord & iRecord){ iRecord.getRecord().get( pDD ); edm::ESHandle hTT; - iRecord.getRecord().getRecord().get(hTT); + iRecord.getRecord().getRecord().get(hTT); edm::ESHandle lorentzAngle; const SiPixelLorentzAngle * lorentzAngleProduct = 0; diff --git a/RecoMuon/GlobalMuonProducer/src/TevMuonProducer.cc b/RecoMuon/GlobalMuonProducer/src/TevMuonProducer.cc index e4285e9bc01ed..628105ff702aa 100644 --- a/RecoMuon/GlobalMuonProducer/src/TevMuonProducer.cc +++ b/RecoMuon/GlobalMuonProducer/src/TevMuonProducer.cc @@ -14,6 +14,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "DataFormats/Common/interface/Handle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "RecoMuon/GlobalMuonProducer/src/TevMuonProducer.h" @@ -102,7 +103,7 @@ void TevMuonProducer::produce(Event& event, const EventSetup& eventSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - eventSetup.get().get(tTopoHand); + eventSetup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); diff --git a/RecoMuon/GlobalTrackingTools/plugins/GlobalTrackQualityProducer.cc b/RecoMuon/GlobalTrackingTools/plugins/GlobalTrackQualityProducer.cc index 8a7ae7bf25e6a..fedd4bb438d17 100644 --- a/RecoMuon/GlobalTrackingTools/plugins/GlobalTrackQualityProducer.cc +++ b/RecoMuon/GlobalTrackingTools/plugins/GlobalTrackQualityProducer.cc @@ -21,7 +21,7 @@ #include "TrackingTools/PatternTools/interface/TrajectoryMeasurement.h" #include "TrackingTools/PatternTools/interface/Trajectory.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" GlobalTrackQualityProducer::GlobalTrackQualityProducer(const edm::ParameterSet& iConfig): @@ -76,7 +76,7 @@ GlobalTrackQualityProducer::produce(edm::Event& iEvent, const edm::EventSetup& i //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - iSetup.get().get(tTopoHand); + iSetup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); diff --git a/RecoMuon/GlobalTrackingTools/src/GlobalMuonRefitter.cc b/RecoMuon/GlobalTrackingTools/src/GlobalMuonRefitter.cc index 1475c04eb3ea4..c225983e96fa8 100644 --- a/RecoMuon/GlobalTrackingTools/src/GlobalMuonRefitter.cc +++ b/RecoMuon/GlobalTrackingTools/src/GlobalMuonRefitter.cc @@ -46,7 +46,6 @@ #include #include #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackReco/interface/TrackExtraFwd.h" diff --git a/RecoMuon/GlobalTrackingTools/src/GlobalTrajectoryBuilderBase.cc b/RecoMuon/GlobalTrackingTools/src/GlobalTrajectoryBuilderBase.cc index e3a356bc51ecf..1d80ec02cc15e 100644 --- a/RecoMuon/GlobalTrackingTools/src/GlobalTrajectoryBuilderBase.cc +++ b/RecoMuon/GlobalTrackingTools/src/GlobalTrajectoryBuilderBase.cc @@ -53,7 +53,7 @@ #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackReco/interface/TrackExtraFwd.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "RecoTracker/TkTrackingRegions/interface/RectangularEtaPhiTrackingRegion.h" @@ -159,7 +159,7 @@ void GlobalTrajectoryBuilderBase::setEvent(const edm::Event& event) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - theService->eventSetup().get().get(tTopoHand); + theService->eventSetup().get().get(tTopoHand); tTopo_=tTopoHand.product(); } diff --git a/RecoMuon/TrackerSeedGenerator/plugins/TSGFromL2Muon.cc b/RecoMuon/TrackerSeedGenerator/plugins/TSGFromL2Muon.cc index 25db7459cd415..4c5bc2ee5f7fd 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/TSGFromL2Muon.cc +++ b/RecoMuon/TrackerSeedGenerator/plugins/TSGFromL2Muon.cc @@ -1,4 +1,5 @@ #include "TSGFromL2Muon.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" TSGFromL2Muon::TSGFromL2Muon(const edm::ParameterSet& cfg) : theConfig(cfg), theService(0), theRegionBuilder(0), theTkSeedGenerator(0), theSeedCleaner(0) @@ -66,7 +67,7 @@ void TSGFromL2Muon::produce(edm::Event& ev, const edm::EventSetup& es) //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - es.get().get(tTopoHand); + es.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); diff --git a/RecoMuon/TrackerSeedGenerator/plugins/TSGFromL2Muon.h b/RecoMuon/TrackerSeedGenerator/plugins/TSGFromL2Muon.h index b6a357a897c18..ce853251cc716 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/TSGFromL2Muon.h +++ b/RecoMuon/TrackerSeedGenerator/plugins/TSGFromL2Muon.h @@ -23,7 +23,6 @@ #include "RecoMuon/TrackerSeedGenerator/interface/TrackerSeedGeneratorFactory.h" #include "RecoMuon/TrackerSeedGenerator/interface/TrackerSeedCleaner.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" From 3d60851259ca63cba36425eb9c17c68d40862914 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Mon, 9 Mar 2015 12:45:01 +0100 Subject: [PATCH 13/21] * Use Topology record --- .../plugins/PixelVertexProducerClusters.cc | 4 ++-- .../PixelLowPtUtilities/src/ClusterShapeHitFilter.cc | 3 --- .../src/LowPtClusterShapeSeedComparitor.cc | 6 ++++-- .../PixelLowPtUtilities/src/PixelTripletLowPtGenerator.cc | 4 ++-- .../src/StripSubClusterShapeTrajectoryFilter.cc | 3 ++- .../PixelLowPtUtilities/src/ValidHitPairFilter.cc | 4 ++-- .../PixelTrackFitting/src/PixelTrackReconstruction.cc | 3 ++- .../PixelTriplets/plugins/PixelTripletLargeTipGenerator.cc | 3 ++- RecoPixelVertexing/PixelTriplets/src/CosmicLayerTriplets.cc | 2 -- .../PixelTriplets/src/QuadrupletSeedMerger.cc | 3 ++- RecoTracker/DebugTools/plugins/TestHits.cc | 4 ++-- RecoTracker/DebugTools/plugins/TestOutliers.cc | 4 ++-- RecoTracker/DebugTools/plugins/TestSmoothHits.cc | 4 ++-- RecoTracker/DebugTools/plugins/TestTrackHits.cc | 4 ++-- RecoTracker/DebugTools/src/FixTrackHitPattern.cc | 2 -- RecoTracker/DebugTools/src/GetTrackTrajInfo.cc | 2 -- RecoTracker/FinalTrackSelectors/plugins/TrackMerger.cc | 3 ++- .../FinalTrackSelectors/plugins/TrackerTrackHitFilter.cc | 6 +++--- .../plugins/TrackerRecoGeometryESProducer.cc | 4 ++-- RecoTracker/Record/interface/TrackerRecoGeometryRecord.h | 4 ++-- .../SpecialSeedGenerators/src/CtfSpecialSeedGenerator.cc | 4 ++-- RecoTracker/SpecialSeedGenerators/src/MuonReSeeder.cc | 4 ++-- RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer.cc | 4 ++-- RecoTracker/TkSeedingLayers/src/HitExtractorSTRP.cc | 4 ++-- SimG4CMS/Tracker/test/SimHitTrackerAnalyzer.cc | 3 --- SimG4Core/Application/test/SimTrackSimVertexDumper.cc | 4 ---- SimG4Core/GFlash/TB/TreeProducerCalibSimul.h | 1 - .../TrackingAnalysis/plugins/TrackingTruthAccumulator.cc | 4 ++-- .../plugins/MuonToTrackingParticleAssociatorEDProducer.cc | 4 ++-- SimMuon/MCTruth/src/MuonAssociatorByHits.cc | 6 +++--- SimMuon/MCTruth/src/MuonToSimAssociatorByHits.cc | 4 ++-- 31 files changed, 52 insertions(+), 62 deletions(-) diff --git a/RecoPixelVertexing/PixelLowPtUtilities/plugins/PixelVertexProducerClusters.cc b/RecoPixelVertexing/PixelLowPtUtilities/plugins/PixelVertexProducerClusters.cc index 007f9fb44f669..de02592910ec8 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/plugins/PixelVertexProducerClusters.cc +++ b/RecoPixelVertexing/PixelLowPtUtilities/plugins/PixelVertexProducerClusters.cc @@ -20,7 +20,7 @@ #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "SimDataFormats/Vertex/interface/SimVertexContainer.h" @@ -96,7 +96,7 @@ void PixelVertexProducerClusters::produce { //Retrieve tracker topology from geometry edm::ESHandle tTopo; - es.get().get(tTopo); + es.get().get(tTopo); // Get pixel hit collections diff --git a/RecoPixelVertexing/PixelLowPtUtilities/src/ClusterShapeHitFilter.cc b/RecoPixelVertexing/PixelLowPtUtilities/src/ClusterShapeHitFilter.cc index bffb0ff280008..22c7f0fd711d0 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/src/ClusterShapeHitFilter.cc +++ b/RecoPixelVertexing/PixelLowPtUtilities/src/ClusterShapeHitFilter.cc @@ -5,9 +5,6 @@ #include "FWCore/ParameterSet/interface/FileInPath.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" - #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h" diff --git a/RecoPixelVertexing/PixelLowPtUtilities/src/LowPtClusterShapeSeedComparitor.cc b/RecoPixelVertexing/PixelLowPtUtilities/src/LowPtClusterShapeSeedComparitor.cc index 7289caece5844..f5a9b9814a140 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/src/LowPtClusterShapeSeedComparitor.cc +++ b/RecoPixelVertexing/PixelLowPtUtilities/src/LowPtClusterShapeSeedComparitor.cc @@ -13,6 +13,9 @@ #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h" #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" +#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" + #include "RecoTracker/TkSeedingLayers/interface/SeedingHitSet.h" #include "RecoTracker/Record/interface/CkfComponentsRecord.h" @@ -20,7 +23,6 @@ #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "DataFormats/GeometryVector/interface/GlobalVector.h" #include "DataFormats/GeometryVector/interface/Basic2DVector.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include @@ -110,7 +112,7 @@ LowPtClusterShapeSeedComparitor::LowPtClusterShapeSeedComparitor(const edm::Para /*****************************************************************************/ void LowPtClusterShapeSeedComparitor::init(const edm::Event& e, const edm::EventSetup& es) { es.get().get("ClusterShapeHitFilter", theShapeFilter); - es.get().get(theTTopo); + es.get().get(theTTopo); e.getByToken(thePixelClusterShapeCacheToken, thePixelClusterShapeCache); } diff --git a/RecoPixelVertexing/PixelLowPtUtilities/src/PixelTripletLowPtGenerator.cc b/RecoPixelVertexing/PixelLowPtUtilities/src/PixelTripletLowPtGenerator.cc index 87bcd73d9cc59..32d85c8ca7716 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/src/PixelTripletLowPtGenerator.cc +++ b/RecoPixelVertexing/PixelLowPtUtilities/src/PixelTripletLowPtGenerator.cc @@ -11,7 +11,7 @@ #include "FWCore/Framework/interface/ConsumesCollector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "FWCore/Framework/interface/Event.h" #include "DataFormats/SiPixelCluster/interface/SiPixelClusterShapeCache.h" @@ -88,7 +88,7 @@ void PixelTripletLowPtGenerator::hitTriplets( //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - es.get().get(tTopoHand); + es.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); edm::Handle clusterShapeCache; diff --git a/RecoPixelVertexing/PixelLowPtUtilities/src/StripSubClusterShapeTrajectoryFilter.cc b/RecoPixelVertexing/PixelLowPtUtilities/src/StripSubClusterShapeTrajectoryFilter.cc index 5fe01ba8ebabd..ef517bfb2b4d8 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/src/StripSubClusterShapeTrajectoryFilter.cc +++ b/RecoPixelVertexing/PixelLowPtUtilities/src/StripSubClusterShapeTrajectoryFilter.cc @@ -18,6 +18,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeHitFilter.h" #include "RecoTracker/Record/interface/CkfComponentsRecord.h" @@ -292,7 +293,7 @@ void StripSubClusterShapeFilterBase::setEventBase es.get().get("ClusterShapeHitFilter",theFilter); //Retrieve tracker topology from geometry - es.get().get(theTopology); + es.get().get(theTopology); es.get().get(theNoise); diff --git a/RecoPixelVertexing/PixelLowPtUtilities/src/ValidHitPairFilter.cc b/RecoPixelVertexing/PixelLowPtUtilities/src/ValidHitPairFilter.cc index 3bb454bbefc24..08d542d09d87b 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/src/ValidHitPairFilter.cc +++ b/RecoPixelVertexing/PixelLowPtUtilities/src/ValidHitPairFilter.cc @@ -24,7 +24,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/GeometrySurface/interface/Cylinder.h" @@ -61,7 +61,7 @@ ValidHitPairFilter::~ValidHitPairFilter() void ValidHitPairFilter::update(const edm::Event& ev, const edm::EventSetup& es) { //Retrieve tracker topology from geometry edm::ESHandle tTopo; - es.get().get(tTopo); + es.get().get(tTopo); // Get tracker diff --git a/RecoPixelVertexing/PixelTrackFitting/src/PixelTrackReconstruction.cc b/RecoPixelVertexing/PixelTrackFitting/src/PixelTrackReconstruction.cc index 8e042b011460a..827bfb833775c 100644 --- a/RecoPixelVertexing/PixelTrackFitting/src/PixelTrackReconstruction.cc +++ b/RecoPixelVertexing/PixelTrackFitting/src/PixelTrackReconstruction.cc @@ -24,6 +24,7 @@ #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/TrackReco/interface/TrackExtra.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "RecoPixelVertexing/PixelTriplets/interface/QuadrupletSeedMerger.h" @@ -104,7 +105,7 @@ void PixelTrackReconstruction::run(TracksWithTTRHs& tracks, edm::Event& ev, cons //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - es.get().get(tTopoHand); + es.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); if (theFilter) theFilter->update(ev, es); diff --git a/RecoPixelVertexing/PixelTriplets/plugins/PixelTripletLargeTipGenerator.cc b/RecoPixelVertexing/PixelTriplets/plugins/PixelTripletLargeTipGenerator.cc index fcef58add1da4..bcbc85b102086 100644 --- a/RecoPixelVertexing/PixelTriplets/plugins/PixelTripletLargeTipGenerator.cc +++ b/RecoPixelVertexing/PixelTriplets/plugins/PixelTripletLargeTipGenerator.cc @@ -7,6 +7,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "RecoPixelVertexing/PixelTriplets/plugins/ThirdHitCorrection.h" #include "RecoTracker/TkHitPairs/interface/RecHitsSortedInPhi.h" @@ -90,7 +91,7 @@ void PixelTripletLargeTipGenerator::hitTriplets(const TrackingRegion& region, //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - es.get().get(tTopoHand); + es.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); auto const & doublets = thePairGenerator->doublets(region,ev,es); diff --git a/RecoPixelVertexing/PixelTriplets/src/CosmicLayerTriplets.cc b/RecoPixelVertexing/PixelTriplets/src/CosmicLayerTriplets.cc index f0de90630acae..89b86f5776d6c 100644 --- a/RecoPixelVertexing/PixelTriplets/src/CosmicLayerTriplets.cc +++ b/RecoPixelVertexing/PixelTriplets/src/CosmicLayerTriplets.cc @@ -3,8 +3,6 @@ #include "RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h" #include "RecoTracker/Record/interface/TrackerRecoGeometryRecord.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" diff --git a/RecoPixelVertexing/PixelTriplets/src/QuadrupletSeedMerger.cc b/RecoPixelVertexing/PixelTriplets/src/QuadrupletSeedMerger.cc index 25edda2c16cbf..93c9e94bd40d7 100644 --- a/RecoPixelVertexing/PixelTriplets/src/QuadrupletSeedMerger.cc +++ b/RecoPixelVertexing/PixelTriplets/src/QuadrupletSeedMerger.cc @@ -2,6 +2,7 @@ #include "RecoPixelVertexing/PixelTriplets/plugins/KDTreeLinkerAlgo.h" #include "RecoPixelVertexing/PixelTriplets/plugins/KDTreeLinkerTools.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "RecoTracker/TkSeedGenerator/interface/SeedCreatorFactory.h" @@ -110,7 +111,7 @@ const OrderedSeedingHits& QuadrupletSeedMerger::mergeTriplets( const OrderedSeed //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - es.get().get(tTopoHand); + es.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); // the list of layers on which quadruplets should be formed diff --git a/RecoTracker/DebugTools/plugins/TestHits.cc b/RecoTracker/DebugTools/plugins/TestHits.cc index d791a2f9f5b9a..86cf2a8978c6c 100644 --- a/RecoTracker/DebugTools/plugins/TestHits.cc +++ b/RecoTracker/DebugTools/plugins/TestHits.cc @@ -14,7 +14,7 @@ #include "TrackingTools/TrackFitters/interface/TrajectoryFitter.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" typedef TrajectoryStateOnSurface TSOS; typedef TransientTrackingRecHit::ConstRecHitPointer CTTRHp; @@ -189,7 +189,7 @@ void TestHits::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopo; - iSetup.get().get(tTopo); + iSetup.get().get(tTopo); LogTrace("TestHits") << "\nnew event"; diff --git a/RecoTracker/DebugTools/plugins/TestOutliers.cc b/RecoTracker/DebugTools/plugins/TestOutliers.cc index bb4196b259a4a..1dca813cbbc8c 100644 --- a/RecoTracker/DebugTools/plugins/TestOutliers.cc +++ b/RecoTracker/DebugTools/plugins/TestOutliers.cc @@ -44,7 +44,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/GeometryCommonDetAlgo/interface/ErrorFrameTransformer.h" #include "CommonTools/RecoAlgos/interface/RecoTrackSelector.h" #include "DataFormats/BeamSpot/interface/BeamSpot.h" @@ -160,7 +160,7 @@ void TestOutliers::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopo; - iSetup.get().get(tTopo); + iSetup.get().get(tTopo); diff --git a/RecoTracker/DebugTools/plugins/TestSmoothHits.cc b/RecoTracker/DebugTools/plugins/TestSmoothHits.cc index 84cd5c2d2559a..e9678674fed27 100644 --- a/RecoTracker/DebugTools/plugins/TestSmoothHits.cc +++ b/RecoTracker/DebugTools/plugins/TestSmoothHits.cc @@ -13,7 +13,7 @@ #include "TrackingTools/TrackFitters/interface/TrajectoryFitter.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" typedef TrajectoryStateOnSurface TSOS; typedef TransientTrackingRecHit::ConstRecHitPointer CTTRHp; @@ -190,7 +190,7 @@ void TestSmoothHits::analyze(const edm::Event& iEvent, const edm::EventSetup& iS { //Retrieve tracker topology from geometry edm::ESHandle tTopo; - iSetup.get().get(tTopo); + iSetup.get().get(tTopo); LogTrace("TestSmoothHits") << "new event" << std::endl; diff --git a/RecoTracker/DebugTools/plugins/TestTrackHits.cc b/RecoTracker/DebugTools/plugins/TestTrackHits.cc index 34a1625746c02..1ccf65a147bc3 100644 --- a/RecoTracker/DebugTools/plugins/TestTrackHits.cc +++ b/RecoTracker/DebugTools/plugins/TestTrackHits.cc @@ -7,7 +7,7 @@ #include #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/BeamSpot/interface/BeamSpot.h" typedef TrajectoryStateOnSurface TSOS; @@ -250,7 +250,7 @@ void TestTrackHits::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe { //Retrieve tracker topology from geometry edm::ESHandle tTopo; - iSetup.get().get(tTopo); + iSetup.get().get(tTopo); LogDebug("TestTrackHits") << "new event" ; diff --git a/RecoTracker/DebugTools/src/FixTrackHitPattern.cc b/RecoTracker/DebugTools/src/FixTrackHitPattern.cc index 8f7e4495249fd..35db28290be05 100644 --- a/RecoTracker/DebugTools/src/FixTrackHitPattern.cc +++ b/RecoTracker/DebugTools/src/FixTrackHitPattern.cc @@ -12,8 +12,6 @@ #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" //#include "DataFormats/SiStripDetId/interface/SiStripDetId.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "TrackingTools/KalmanUpdators/interface/Chi2MeasurementEstimator.h" #include "TrackingTools/GeomPropagators/interface/AnalyticalPropagator.h" diff --git a/RecoTracker/DebugTools/src/GetTrackTrajInfo.cc b/RecoTracker/DebugTools/src/GetTrackTrajInfo.cc index f8dffc83a0fba..448a410b69f1e 100644 --- a/RecoTracker/DebugTools/src/GetTrackTrajInfo.cc +++ b/RecoTracker/DebugTools/src/GetTrackTrajInfo.cc @@ -8,8 +8,6 @@ #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" //#include "DataFormats/SiStripDetId/interface/SiStripDetId.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "TrackingTools/KalmanUpdators/interface/Chi2MeasurementEstimator.h" #include "TrackingTools/GeomPropagators/interface/AnalyticalPropagator.h" diff --git a/RecoTracker/FinalTrackSelectors/plugins/TrackMerger.cc b/RecoTracker/FinalTrackSelectors/plugins/TrackMerger.cc index e55b9ca7a6ed3..ca8c287ed073e 100644 --- a/RecoTracker/FinalTrackSelectors/plugins/TrackMerger.cc +++ b/RecoTracker/FinalTrackSelectors/plugins/TrackMerger.cc @@ -4,6 +4,7 @@ #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" @@ -32,7 +33,7 @@ void TrackMerger::init(const edm::EventSetup &iSetup) iSetup.get().get(theGeometry); iSetup.get().get(theMagField); iSetup.get().get(theBuilderName,theBuilder); - iSetup.get().get(theTrkTopo); + iSetup.get().get(theTrkTopo); } TrackCandidate TrackMerger::merge(const reco::Track &inner, const reco::Track &outer) const diff --git a/RecoTracker/FinalTrackSelectors/plugins/TrackerTrackHitFilter.cc b/RecoTracker/FinalTrackSelectors/plugins/TrackerTrackHitFilter.cc index 77202806d8beb..89ff6e7524eca 100644 --- a/RecoTracker/FinalTrackSelectors/plugins/TrackerTrackHitFilter.cc +++ b/RecoTracker/FinalTrackSelectors/plugins/TrackerTrackHitFilter.cc @@ -21,7 +21,7 @@ #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" //for S/N cut #include "DataFormats/TrackerRecHit2D/interface/ProjectedSiStripRecHit2D.h" @@ -594,7 +594,7 @@ void TrackerTrackHitFilter::produceFromTrajectory(const edm::EventSetup &iSetup, //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - iSetup.get().get(tTopoHand); + iSetup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); @@ -704,7 +704,7 @@ int TrackerTrackHitFilter::checkHit(const edm::EventSetup &iSetup,const DetId & //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - iSetup.get().get(tTopoHand); + iSetup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); int hitresult=0; diff --git a/RecoTracker/GeometryESProducer/plugins/TrackerRecoGeometryESProducer.cc b/RecoTracker/GeometryESProducer/plugins/TrackerRecoGeometryESProducer.cc index c7a12cdad4d17..2a3b813a342a3 100644 --- a/RecoTracker/GeometryESProducer/plugins/TrackerRecoGeometryESProducer.cc +++ b/RecoTracker/GeometryESProducer/plugins/TrackerRecoGeometryESProducer.cc @@ -1,10 +1,10 @@ #include "RecoTracker/GeometryESProducer/plugins/TrackerRecoGeometryESProducer.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "RecoTracker/TkDetLayers/interface/GeometricSearchTrackerBuilder.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" @@ -39,7 +39,7 @@ TrackerRecoGeometryESProducer::produce(const TrackerRecoGeometryRecord & iRecord iRecord.getRecord().get( geoLabel, tG ); edm::ESHandle tTopoHand; - iRecord.getRecord().get(tTopoHand); + iRecord.getRecord().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); GeometricSearchTrackerBuilder builder; diff --git a/RecoTracker/Record/interface/TrackerRecoGeometryRecord.h b/RecoTracker/Record/interface/TrackerRecoGeometryRecord.h index ed44c42eabc6d..3e6eccedd21ad 100644 --- a/RecoTracker/Record/interface/TrackerRecoGeometryRecord.h +++ b/RecoTracker/Record/interface/TrackerRecoGeometryRecord.h @@ -4,13 +4,13 @@ #include "FWCore/Framework/interface/EventSetupRecordImplementation.h" #include "FWCore/Framework/interface/DependentRecordImplementation.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "boost/mpl/vector.hpp" class TrackerRecoGeometryRecord : public edm::eventsetup::DependentRecordImplementation > {}; + boost::mpl::vector > {}; #endif diff --git a/RecoTracker/SpecialSeedGenerators/src/CtfSpecialSeedGenerator.cc b/RecoTracker/SpecialSeedGenerators/src/CtfSpecialSeedGenerator.cc index d654291dcb48a..04fc78b8ec00d 100644 --- a/RecoTracker/SpecialSeedGenerators/src/CtfSpecialSeedGenerator.cc +++ b/RecoTracker/SpecialSeedGenerators/src/CtfSpecialSeedGenerator.cc @@ -1,6 +1,6 @@ #include "RecoTracker/SpecialSeedGenerators/interface/CtfSpecialSeedGenerator.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/GeometrySurface/interface/RectangularPlaneBounds.h" #include "TrackingTools/GeomPropagators/interface/StraightLinePlaneCrossing.h" @@ -204,7 +204,7 @@ bool CtfSpecialSeedGenerator::buildSeeds(const edm::EventSetup& iSetup, bool CtfSpecialSeedGenerator::preliminaryCheck(const SeedingHitSet& shs, const edm::EventSetup &es ){ edm::ESHandle tTopo; - es.get().get(tTopo); + es.get().get(tTopo); std::vector > vSubdetLayer; //std::vector vSeedLayerNames; diff --git a/RecoTracker/SpecialSeedGenerators/src/MuonReSeeder.cc b/RecoTracker/SpecialSeedGenerators/src/MuonReSeeder.cc index 400702340cc43..25ac769566ad6 100644 --- a/RecoTracker/SpecialSeedGenerators/src/MuonReSeeder.cc +++ b/RecoTracker/SpecialSeedGenerators/src/MuonReSeeder.cc @@ -25,7 +25,7 @@ #include "TrackingTools/PatternTools/interface/TrajectoryMeasurement.h" #include "CommonTools/Utils/interface/StringCutObjectSelector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" class MuonReSeeder : public edm::stream::EDProducer<> { @@ -79,7 +79,7 @@ MuonReSeeder::produce(edm::Event & iEvent, const edm::EventSetup & iSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopo; - iSetup.get().get(tTopo); + iSetup.get().get(tTopo); auto_ptr > out(new vector()); unsigned int nsrc = src->size(); diff --git a/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer.cc b/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer.cc index 45f34dec9e364..d33fa7c8e9383 100644 --- a/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer.cc +++ b/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer.cc @@ -34,7 +34,7 @@ #include #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/MuonDetId/interface/RPCDetId.h" #include "DataFormats/MuonDetId/interface/CSCDetId.h" #include "DataFormats/MuonDetId/interface/DTChamberId.h" @@ -268,7 +268,7 @@ void NavigationSchoolAnalyzer::analyze(const edm::Event& iEvent, const edm::Even void NavigationSchoolAnalyzer::beginRun(edm::Run & run, const edm::EventSetup& iSetup) { edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); tTopo = tTopoHandle.product(); //get the navigation school diff --git a/RecoTracker/TkSeedingLayers/src/HitExtractorSTRP.cc b/RecoTracker/TkSeedingLayers/src/HitExtractorSTRP.cc index 7a342d987680f..7af4a6e910e51 100644 --- a/RecoTracker/TkSeedingLayers/src/HitExtractorSTRP.cc +++ b/RecoTracker/TkSeedingLayers/src/HitExtractorSTRP.cc @@ -13,7 +13,7 @@ #include "TrackingTools/TransientTrackingRecHit/interface/TrackingRecHitProjector.h" #include "RecoTracker/TransientTrackingRecHit/interface/ProjectedRecHit2D.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "FWCore/Framework/interface/ESHandle.h" #include "DataFormats/SiStripCluster/interface/SiStripClusterTools.h" @@ -142,7 +142,7 @@ HitExtractor::Hits HitExtractorSTRP::hits(const TkTransientTrackingRecHitBuilder //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // diff --git a/SimG4CMS/Tracker/test/SimHitTrackerAnalyzer.cc b/SimG4CMS/Tracker/test/SimHitTrackerAnalyzer.cc index 45937f951654e..268b91a8a0fa7 100644 --- a/SimG4CMS/Tracker/test/SimHitTrackerAnalyzer.cc +++ b/SimG4CMS/Tracker/test/SimHitTrackerAnalyzer.cc @@ -31,11 +31,8 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "DetectorDescription/Core/interface/DDCompactView.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" -#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "SimDataFormats/TrackingHit/interface/PSimHit.h" #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h" -#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h" diff --git a/SimG4Core/Application/test/SimTrackSimVertexDumper.cc b/SimG4Core/Application/test/SimTrackSimVertexDumper.cc index 24f71ab2e8518..85698d37785ec 100644 --- a/SimG4Core/Application/test/SimTrackSimVertexDumper.cc +++ b/SimG4Core/Application/test/SimTrackSimVertexDumper.cc @@ -28,12 +28,8 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "DetectorDescription/Core/interface/DDCompactView.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" -#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "SimDataFormats/TrackingHit/interface/PSimHit.h" #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h" -#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "SimDataFormats/Track/interface/SimTrack.h" #include "SimDataFormats/Track/interface/SimTrackContainer.h" diff --git a/SimG4Core/GFlash/TB/TreeProducerCalibSimul.h b/SimG4Core/GFlash/TB/TreeProducerCalibSimul.h index 1b236d33d998c..1347848310bde 100644 --- a/SimG4Core/GFlash/TB/TreeProducerCalibSimul.h +++ b/SimG4Core/GFlash/TB/TreeProducerCalibSimul.h @@ -23,7 +23,6 @@ #include "TBDataFormats/EcalTBObjects/interface/EcalTBEventHeader.h" // geometry -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" diff --git a/SimGeneral/TrackingAnalysis/plugins/TrackingTruthAccumulator.cc b/SimGeneral/TrackingAnalysis/plugins/TrackingTruthAccumulator.cc index 489010db6fca2..e75d441437b7e 100644 --- a/SimGeneral/TrackingAnalysis/plugins/TrackingTruthAccumulator.cc +++ b/SimGeneral/TrackingAnalysis/plugins/TrackingTruthAccumulator.cc @@ -46,7 +46,7 @@ #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/HepMCCandidate/interface/GenParticle.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "FWCore/Framework/interface/ESHandle.h" @@ -411,7 +411,7 @@ template void TrackingTruthAccumulator::accumulateEvent( const T& event //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - setup.get().get(tTopoHandle); + setup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); diff --git a/SimMuon/MCTruth/plugins/MuonToTrackingParticleAssociatorEDProducer.cc b/SimMuon/MCTruth/plugins/MuonToTrackingParticleAssociatorEDProducer.cc index 364473273393d..358baa4ee6474 100644 --- a/SimMuon/MCTruth/plugins/MuonToTrackingParticleAssociatorEDProducer.cc +++ b/SimMuon/MCTruth/plugins/MuonToTrackingParticleAssociatorEDProducer.cc @@ -32,7 +32,7 @@ #include "SimMuon/MCTruth/interface/TrackerMuonHitExtractor.h" #include "SimDataFormats/Associations/interface/MuonToTrackingParticleAssociator.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "MuonToTrackingParticleAssociatorByHitsImpl.h" // @@ -243,7 +243,7 @@ MuonToTrackingParticleAssociatorEDProducer::produce(edm::Event& iEvent, const ed //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - iSetup.get().get(tTopoHand); + iSetup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); bool printRtS = true; diff --git a/SimMuon/MCTruth/src/MuonAssociatorByHits.cc b/SimMuon/MCTruth/src/MuonAssociatorByHits.cc index 1e1c0a658cf4e..3f0ee33b5538d 100644 --- a/SimMuon/MCTruth/src/MuonAssociatorByHits.cc +++ b/SimMuon/MCTruth/src/MuonAssociatorByHits.cc @@ -7,7 +7,7 @@ #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/DTRecHit/interface/DTRecSegment4D.h" #include "DataFormats/CSCRecHit/interface/CSCSegment.h" #include "SimMuon/MCTruth/interface/TrackerMuonHitExtractor.h" @@ -178,7 +178,7 @@ MuonAssociatorByHits::associateRecoToSim( const edm::RefToBaseVector tTopoHand; - setup->get().get(tTopoHand); + setup->get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); @@ -224,7 +224,7 @@ MuonAssociatorByHits::associateSimToReco( const edm::RefToBaseVector tTopoHand; - setup->get().get(tTopoHand); + setup->get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); // Tracker hit association diff --git a/SimMuon/MCTruth/src/MuonToSimAssociatorByHits.cc b/SimMuon/MCTruth/src/MuonToSimAssociatorByHits.cc index ed8cc004581f4..77011c641ec7d 100644 --- a/SimMuon/MCTruth/src/MuonToSimAssociatorByHits.cc +++ b/SimMuon/MCTruth/src/MuonToSimAssociatorByHits.cc @@ -7,7 +7,7 @@ #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/DTRecHit/interface/DTRecSegment4D.h" #include "DataFormats/CSCRecHit/interface/CSCSegment.h" #include "SimMuon/MCTruth/interface/TrackerMuonHitExtractor.h" @@ -128,7 +128,7 @@ void MuonToSimAssociatorByHits::associateMuons(MuonToSimCollection & recToSim, S /// PART 2: call the association routines //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - setup->get().get(tTopoHand); + setup->get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); From 58f4be550f34267f270413bdeca29de55279c8be Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Mon, 9 Mar 2015 13:33:48 +0100 Subject: [PATCH 14/21] * Use Tracker topology record --- TrackingTools/TrackFitters/src/KFTrajectoryFitter.cc | 2 -- TrackingTools/TrackFitters/src/KFTrajectorySmoother.cc | 2 -- .../src/TrackTransformerForGlobalCosmicMuons.cc | 4 ++-- Validation/GlobalDigis/src/GlobalDigisAnalyzer.cc | 4 ++-- Validation/GlobalRecHits/src/GlobalRecHitsAnalyzer.cc | 4 ++-- Validation/GlobalRecHits/src/GlobalRecHitsProducer.cc | 4 ++-- Validation/RecoTrack/plugins/SiPixelTrackingRecHitsValid.cc | 4 ++-- Validation/RecoTrack/src/SiStripTrackingRecHitsValid.cc | 5 +++-- Validation/TrackerDigis/plugins/SiPixelDigiValid.cc | 4 ++-- Validation/TrackerRecHits/src/SiPixelRecHitsValid.cc | 4 ++-- Validation/TrackerRecHits/src/SiStripRecHitsValid.cc | 6 +++--- 11 files changed, 20 insertions(+), 23 deletions(-) diff --git a/TrackingTools/TrackFitters/src/KFTrajectoryFitter.cc b/TrackingTools/TrackFitters/src/KFTrajectoryFitter.cc index 9bbe5bf86782e..197e1fca3c0c1 100644 --- a/TrackingTools/TrackFitters/src/KFTrajectoryFitter.cc +++ b/TrackingTools/TrackFitters/src/KFTrajectoryFitter.cc @@ -8,8 +8,6 @@ #include "DataFormats/TrackerRecHit2D/interface/TkCloner.h" #ifdef EDM_ML_DEBUG -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "DataFormats/MuonDetId/interface/CSCDetId.h" #include "DataFormats/MuonDetId/interface/DTWireId.h" #include "DataFormats/MuonDetId/interface/RPCDetId.h" diff --git a/TrackingTools/TrackFitters/src/KFTrajectorySmoother.cc b/TrackingTools/TrackFitters/src/KFTrajectorySmoother.cc index 858a412eb430b..abdf6794768ea 100644 --- a/TrackingTools/TrackFitters/src/KFTrajectorySmoother.cc +++ b/TrackingTools/TrackFitters/src/KFTrajectorySmoother.cc @@ -8,8 +8,6 @@ #include "DataFormats/TrackerRecHit2D/interface/BaseTrackerRecHit.h" #ifdef EDM_ML_DEBUG -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "DataFormats/MuonDetId/interface/CSCDetId.h" #include "DataFormats/MuonDetId/interface/DTWireId.h" #include "DataFormats/MuonDetId/interface/RPCDetId.h" diff --git a/TrackingTools/TrackRefitter/src/TrackTransformerForGlobalCosmicMuons.cc b/TrackingTools/TrackRefitter/src/TrackTransformerForGlobalCosmicMuons.cc index 59c16a2bfd15c..3391f71e59943 100644 --- a/TrackingTools/TrackRefitter/src/TrackTransformerForGlobalCosmicMuons.cc +++ b/TrackingTools/TrackRefitter/src/TrackTransformerForGlobalCosmicMuons.cc @@ -28,7 +28,7 @@ #include "DataFormats/MuonDetId/interface/MuonSubdetId.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" using namespace std; using namespace edm; @@ -99,7 +99,7 @@ void TrackTransformerForGlobalCosmicMuons::setServices(const EventSetup& setup){ //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - setup.get().get(tTopoHand); + setup.get().get(tTopoHand); tTopo_=tTopoHand.product(); } diff --git a/Validation/GlobalDigis/src/GlobalDigisAnalyzer.cc b/Validation/GlobalDigis/src/GlobalDigisAnalyzer.cc index a7eb961d148ed..6cff543c1799d 100644 --- a/Validation/GlobalDigis/src/GlobalDigisAnalyzer.cc +++ b/Validation/GlobalDigis/src/GlobalDigisAnalyzer.cc @@ -8,7 +8,7 @@ #include "Validation/GlobalDigis/interface/GlobalDigisAnalyzer.h" #include "DQMServices/Core/interface/DQMStore.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" GlobalDigisAnalyzer::GlobalDigisAnalyzer(const edm::ParameterSet& iPSet) : fName(""), verbosity(0), frequency(0), label(""), getAllProvenances(false), @@ -1144,7 +1144,7 @@ void GlobalDigisAnalyzer::fillTrk(const edm::Event& iEvent, { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); diff --git a/Validation/GlobalRecHits/src/GlobalRecHitsAnalyzer.cc b/Validation/GlobalRecHits/src/GlobalRecHitsAnalyzer.cc index 28e6b76a51dd6..7801ea6d39597 100644 --- a/Validation/GlobalRecHits/src/GlobalRecHitsAnalyzer.cc +++ b/Validation/GlobalRecHits/src/GlobalRecHitsAnalyzer.cc @@ -11,7 +11,7 @@ using namespace std; #include "DQMServices/Core/interface/MonitorElement.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" GlobalRecHitsAnalyzer::GlobalRecHitsAnalyzer(const edm::ParameterSet& iPSet) : fName(""), verbosity(0), frequency(0), label(""), getAllProvenances(false), @@ -895,7 +895,7 @@ void GlobalRecHitsAnalyzer::fillTrk(const edm::Event& iEvent, { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); diff --git a/Validation/GlobalRecHits/src/GlobalRecHitsProducer.cc b/Validation/GlobalRecHits/src/GlobalRecHitsProducer.cc index 952a1082f428b..663edbda38eb9 100644 --- a/Validation/GlobalRecHits/src/GlobalRecHitsProducer.cc +++ b/Validation/GlobalRecHits/src/GlobalRecHitsProducer.cc @@ -8,7 +8,7 @@ #include "Validation/GlobalRecHits/interface/GlobalRecHitsProducer.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" GlobalRecHitsProducer::GlobalRecHitsProducer(const edm::ParameterSet& iPSet) : fName(""), verbosity(0), frequency(0), label(""), getAllProvenances(false), @@ -874,7 +874,7 @@ void GlobalRecHitsProducer::fillTrk(edm::Event& iEvent, { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); diff --git a/Validation/RecoTrack/plugins/SiPixelTrackingRecHitsValid.cc b/Validation/RecoTrack/plugins/SiPixelTrackingRecHitsValid.cc index 485f54696b694..3182890ced26f 100644 --- a/Validation/RecoTrack/plugins/SiPixelTrackingRecHitsValid.cc +++ b/Validation/RecoTrack/plugins/SiPixelTrackingRecHitsValid.cc @@ -28,7 +28,7 @@ #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" @@ -1073,7 +1073,7 @@ void SiPixelTrackingRecHitsValid::analyze(const edm::Event& e, const edm::EventS { //Retrieve tracker topology from geometry edm::ESHandle tTopo; - es.get().get(tTopo); + es.get().get(tTopo); run = e.id().run(); diff --git a/Validation/RecoTrack/src/SiStripTrackingRecHitsValid.cc b/Validation/RecoTrack/src/SiStripTrackingRecHitsValid.cc index be3f14dca2369..0b718ea6422a9 100644 --- a/Validation/RecoTrack/src/SiStripTrackingRecHitsValid.cc +++ b/Validation/RecoTrack/src/SiStripTrackingRecHitsValid.cc @@ -8,6 +8,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "TrackingTools/Records/interface/TransientRecHitRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/GluedGeomDet.h" @@ -471,7 +472,7 @@ void SiStripTrackingRecHitsValid::analyze(const edm::Event & e, const edm::Event //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); edm::ESHandle < TrackerGeometry > pDD; @@ -1274,7 +1275,7 @@ void SiStripTrackingRecHitsValid::createMEs(DQMStore::IBooker & ibooker,const ed //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // take from eventSetup the SiStripDetCabling object - here will use SiStripDetControl later on diff --git a/Validation/TrackerDigis/plugins/SiPixelDigiValid.cc b/Validation/TrackerDigis/plugins/SiPixelDigiValid.cc index 1c21a127a9295..4d257ddd1299c 100644 --- a/Validation/TrackerDigis/plugins/SiPixelDigiValid.cc +++ b/Validation/TrackerDigis/plugins/SiPixelDigiValid.cc @@ -13,7 +13,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" @@ -282,7 +282,7 @@ void SiPixelDigiValid::endJob() { void SiPixelDigiValid::analyze(const edm::Event& e, const edm::EventSetup& c){ //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - c.get().get(tTopoHandle); + c.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); diff --git a/Validation/TrackerRecHits/src/SiPixelRecHitsValid.cc b/Validation/TrackerRecHits/src/SiPixelRecHitsValid.cc index 2d544cf396ffb..09aca196efb0f 100644 --- a/Validation/TrackerRecHits/src/SiPixelRecHitsValid.cc +++ b/Validation/TrackerRecHits/src/SiPixelRecHitsValid.cc @@ -34,7 +34,7 @@ #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" @@ -284,7 +284,7 @@ void SiPixelRecHitsValid::analyze(const edm::Event& e, const edm::EventSetup& es //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - es.get().get(tTopoHand); + es.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); edm::LogInfo("EventInfo") << " Run = " << e.id().run() << " Event = " << e.id().event(); diff --git a/Validation/TrackerRecHits/src/SiStripRecHitsValid.cc b/Validation/TrackerRecHits/src/SiStripRecHitsValid.cc index 988d6dad3817c..d45326a993b32 100644 --- a/Validation/TrackerRecHits/src/SiStripRecHitsValid.cc +++ b/Validation/TrackerRecHits/src/SiStripRecHitsValid.cc @@ -12,7 +12,7 @@ #include "DataFormats/GeometryVector/interface/LocalPoint.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "DQM/SiStripCommon/interface/SiStripHistoId.h" - +#include "Geometry/Records/interface/TrackerTopologyRcd.h" //--- for RecHit #include "DataFormats/SiStripCluster/interface/SiStripCluster.h" @@ -204,7 +204,7 @@ void SiStripRecHitsValid::analyze(const edm::Event& e, const edm::EventSetup& es //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // Step A: Get Inputs @@ -616,7 +616,7 @@ void SiStripRecHitsValid::createMEs(DQMStore::IBooker & ibooker,const edm::Event //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // take from eventSetup the SiStripDetCabling object - here will use SiStripDetControl later on From 2ecc00a76b887bd4fab67797d625c1d774842dbf Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Mon, 9 Mar 2015 15:00:09 +0100 Subject: [PATCH 15/21] Customizations for Tracker parameters --- .../python/customTrackerParametersRun1.py | 8 ++++++++ .../python/customTrackerParametersRun2.py | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 Geometry/TrackerGeometryBuilder/python/customTrackerParametersRun1.py create mode 100644 Geometry/TrackerGeometryBuilder/python/customTrackerParametersRun2.py diff --git a/Geometry/TrackerGeometryBuilder/python/customTrackerParametersRun1.py b/Geometry/TrackerGeometryBuilder/python/customTrackerParametersRun1.py new file mode 100644 index 0000000000000..f8a12496099c6 --- /dev/null +++ b/Geometry/TrackerGeometryBuilder/python/customTrackerParametersRun1.py @@ -0,0 +1,8 @@ +import FWCore.ParameterSet.Config as cms +def customise(process): + process.GlobalTag.toGet = cms.VPSet(cms.PSet(record = cms.string('PTrackerParametersRcd'), + tag = cms.string('TKParameters_Geometry_Test01'), + connect = cms.untracked.string("sqlite_file:../myfile.db") + ) + ) + return (process) diff --git a/Geometry/TrackerGeometryBuilder/python/customTrackerParametersRun2.py b/Geometry/TrackerGeometryBuilder/python/customTrackerParametersRun2.py new file mode 100644 index 0000000000000..b26d8a8f8f2bf --- /dev/null +++ b/Geometry/TrackerGeometryBuilder/python/customTrackerParametersRun2.py @@ -0,0 +1,8 @@ +import FWCore.ParameterSet.Config as cms +def customise(process): + process.GlobalTag.toGet = cms.VPSet(cms.PSet(record = cms.string('PTrackerParametersRcd'), + tag = cms.string('TKParameters_Geometry_Run2_Test02'), + connect = cms.untracked.string("sqlite_file:../myfilerun2.db") + ) + ) + return (process) From b3528a1b10f998701ba1c602241b2f21febef0a1 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Mon, 9 Mar 2015 17:56:34 +0100 Subject: [PATCH 16/21] Use Tracker topology record. --- Validation/TrackerDigis/plugins/SiStripDigiValid.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Validation/TrackerDigis/plugins/SiStripDigiValid.cc b/Validation/TrackerDigis/plugins/SiStripDigiValid.cc index c639f1eaf8af1..a4fbf4b21cd9e 100644 --- a/Validation/TrackerDigis/plugins/SiStripDigiValid.cc +++ b/Validation/TrackerDigis/plugins/SiStripDigiValid.cc @@ -14,7 +14,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ServiceRegistry/interface/Service.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/CommonTopologies/interface/RectangularStripTopology.h" #include "Geometry/CommonTopologies/interface/TrapezoidalStripTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" @@ -340,7 +340,7 @@ void SiStripDigiValid::endJob() { void SiStripDigiValid::analyze(const edm::Event& e, const edm::EventSetup& c){ //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - c.get().get(tTopoHandle); + c.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); From ea248664394a3c18f3bc5ffa65a1850ad610380f Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Mon, 30 Mar 2015 16:28:45 +0200 Subject: [PATCH 17/21] Remove obsolete record --- Geometry/Records/interface/TrackerDigiGeometryRecord.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/Geometry/Records/interface/TrackerDigiGeometryRecord.h b/Geometry/Records/interface/TrackerDigiGeometryRecord.h index 3f2ba5ac6e58c..9d74e055e6ec6 100644 --- a/Geometry/Records/interface/TrackerDigiGeometryRecord.h +++ b/Geometry/Records/interface/TrackerDigiGeometryRecord.h @@ -4,7 +4,6 @@ #include "FWCore/Framework/interface/EventSetupRecordImplementation.h" #include "FWCore/Framework/interface/DependentRecordImplementation.h" #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h" -#include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorRcd.h" #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h" #include "CondFormats/AlignmentRecord/interface/TrackerSurfaceDeformationRcd.h" #include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h" @@ -17,7 +16,6 @@ class TrackerDigiGeometryRecord : public edm::eventsetup::DependentRecordImplementation Date: Fri, 10 Apr 2015 16:53:41 +0200 Subject: [PATCH 18/21] Fill in empty vectors --- .../TrackerCommonData/data/PhaseII/trackerParameters.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml b/Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml index 2f139112bd467..2049aeac790a8 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml @@ -10,12 +10,18 @@ 23, 18, 12, 10, 2, 0x3, 0xF, 0x3F, 0x3, 0xFF + + 14, 12, 10, 4, 2, 0, 0x7, 0x3, 0x3, 0x3F, 0x3, 0x3 + 23, 18, 12, 10, 2, 0, 0x3, 0xF, 0x3F, 0x3, 0xFF, 0x3 20, 12, 12, 2, 0, 0xF, 0x0, 0xFF, 0x3FF, 0x3 + + 18, 14, 12, 8, 5, 2, 0, 0x3, 0xF, 0x3, 0xF, 0x7, 0x7, 0x3 + -1, 23, -1, 23, -1, 18, From e4e16a79dbe6cceeb626a4921c552cfeb896aeb2 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Tue, 5 May 2015 10:34:06 +0200 Subject: [PATCH 19/21] Use Tracker Topology Rcd --- .../plugins/DataMixingSiPixelMCDigiWorker.cc | 2 +- SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc | 6 +++--- SimTracker/SiPixelDigitizer/test/PixelDigisTest.cc | 4 ++-- SimTracker/SiPixelDigitizer/test/PixelMixedSimHitsTest.cc | 4 ++-- SimTracker/SiPixelDigitizer/test/PixelSimHitsTest.cc | 2 +- SimTracker/SiPixelDigitizer/test/PixelSimHitsTestForward.cc | 4 ++-- SimTracker/SiStripDigitizer/plugins/DigiSimLinkProducer.cc | 2 +- SimTracker/SiStripDigitizer/plugins/SiStripDigitizer.cc | 4 ++-- .../plugins/TrackAssociatorByHitsProducer.cc | 4 ++-- SimTracker/TrackHistory/src/TrackClassifier.cc | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingSiPixelMCDigiWorker.cc b/SimGeneral/DataMixingModule/plugins/DataMixingSiPixelMCDigiWorker.cc index 3ffb14d408a02..53b35a4e7f65b 100644 --- a/SimGeneral/DataMixingModule/plugins/DataMixingSiPixelMCDigiWorker.cc +++ b/SimGeneral/DataMixingModule/plugins/DataMixingSiPixelMCDigiWorker.cc @@ -368,7 +368,7 @@ namespace edm CLHEP::HepRandomEngine* engine = &rng->getEngine(e.streamID()); edm::ESHandle tTopoHand; - iSetup.get().get(tTopoHand); + iSetup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); // set pileup information. diff --git a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc index 4956b52375bd3..a918c64718ad9 100644 --- a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc +++ b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc @@ -140,7 +140,7 @@ namespace cms std::set detIds; std::vector const& simHits = *hSimHits.product(); edm::ESHandle tTopoHand; - iSetup.get().get(tTopoHand); + iSetup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); for(std::vector::const_iterator it = simHits.begin(), itEnd = simHits.end(); it != itEnd; ++it, ++globalSimHitIndex) { unsigned int detId = (*it).detUnitId(); @@ -179,7 +179,7 @@ namespace cms iSetup.get().get(geometryType, pDD); iSetup.get().get(pSetup); edm::ESHandle tTopoHand; - iSetup.get().get(tTopoHand); + iSetup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); // FIX THIS! We only need to clear and (re)fill this map when the geometry type IOV changes. Use ESWatcher to determine this. @@ -249,7 +249,7 @@ namespace cms CLHEP::HepRandomEngine* engine = &rng->getEngine(iEvent.streamID()); edm::ESHandle tTopoHand; - iSetup.get().get(tTopoHand); + iSetup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); std::vector > theDigiVector; diff --git a/SimTracker/SiPixelDigitizer/test/PixelDigisTest.cc b/SimTracker/SiPixelDigitizer/test/PixelDigisTest.cc index 4fc70194315a8..e46cf8d929193 100644 --- a/SimTracker/SiPixelDigitizer/test/PixelDigisTest.cc +++ b/SimTracker/SiPixelDigitizer/test/PixelDigisTest.cc @@ -46,7 +46,7 @@ #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h" // data formats @@ -354,7 +354,7 @@ void PixelDigisTest::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopo; - iSetup.get().get(tTopo); + iSetup.get().get(tTopo); using namespace edm; if(PRINT) cout<<" Analyze PixelDigisTest "< tTopo; - iSetup.get().get(tTopo); + iSetup.get().get(tTopo); const double PI = 3.142; diff --git a/SimTracker/SiPixelDigitizer/test/PixelSimHitsTest.cc b/SimTracker/SiPixelDigitizer/test/PixelSimHitsTest.cc index 3b12af03e117a..7782f9601f074 100644 --- a/SimTracker/SiPixelDigitizer/test/PixelSimHitsTest.cc +++ b/SimTracker/SiPixelDigitizer/test/PixelSimHitsTest.cc @@ -289,7 +289,7 @@ void PixelSimHitsTest::analyze(const edm::Event& iEvent, //Retrieve tracker topology from geometry (for det id) edm::ESHandle tTopo; - iSetup.get().get(tTopo); + iSetup.get().get(tTopo); // Get input data int totalNumOfSimHits = 0; diff --git a/SimTracker/SiPixelDigitizer/test/PixelSimHitsTestForward.cc b/SimTracker/SiPixelDigitizer/test/PixelSimHitsTestForward.cc index 014e66c7b0a71..354cedd65ec56 100644 --- a/SimTracker/SiPixelDigitizer/test/PixelSimHitsTestForward.cc +++ b/SimTracker/SiPixelDigitizer/test/PixelSimHitsTestForward.cc @@ -44,7 +44,7 @@ #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" //#include "Geometry/Surface/interface/Surface.h" // For ROOT @@ -273,7 +273,7 @@ void PixelSimHitsTestForward::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopo; - iSetup.get().get(tTopo); + iSetup.get().get(tTopo); const double PI = 3.142; diff --git a/SimTracker/SiStripDigitizer/plugins/DigiSimLinkProducer.cc b/SimTracker/SiStripDigitizer/plugins/DigiSimLinkProducer.cc index 24b3b6ef739c6..4966a37ecc5d1 100644 --- a/SimTracker/SiStripDigitizer/plugins/DigiSimLinkProducer.cc +++ b/SimTracker/SiStripDigitizer/plugins/DigiSimLinkProducer.cc @@ -152,7 +152,7 @@ void DigiSimLinkProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSe //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - iSetup.get().get(tTopoHand); + iSetup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); theDigiAlgo->setParticleDataTable(&*pdt); diff --git a/SimTracker/SiStripDigitizer/plugins/SiStripDigitizer.cc b/SimTracker/SiStripDigitizer/plugins/SiStripDigitizer.cc index adc30d4871af9..8e0087830e2c6 100644 --- a/SimTracker/SiStripDigitizer/plugins/SiStripDigitizer.cc +++ b/SimTracker/SiStripDigitizer/plugins/SiStripDigitizer.cc @@ -125,7 +125,7 @@ void SiStripDigitizer::accumulateStripHits(edm::Handle > hS SiStripDigitizer::accumulate(edm::Event const& iEvent, edm::EventSetup const& iSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - iSetup.get().get(tTopoHand); + iSetup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); // Step A: Get Inputs @@ -149,7 +149,7 @@ void SiStripDigitizer::accumulateStripHits(edm::Handle > hS SiStripDigitizer::accumulate(PileUpEventPrincipal const& iEvent, edm::EventSetup const& iSetup, edm::StreamID const& streamID) { edm::ESHandle tTopoHand; - iSetup.get().get(tTopoHand); + iSetup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); // Step A: Get Inputs diff --git a/SimTracker/TrackAssociatorProducers/plugins/TrackAssociatorByHitsProducer.cc b/SimTracker/TrackAssociatorProducers/plugins/TrackAssociatorByHitsProducer.cc index 6e90c528545fc..a99ad62627f71 100644 --- a/SimTracker/TrackAssociatorProducers/plugins/TrackAssociatorByHitsProducer.cc +++ b/SimTracker/TrackAssociatorProducers/plugins/TrackAssociatorByHitsProducer.cc @@ -34,7 +34,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "TrackAssociatorByHitsImpl.h" #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h" @@ -137,7 +137,7 @@ TrackAssociatorByHitsProducer::produce(edm::StreamID, edm::Event& iEvent, const std::unique_ptr thAssoc( new TrackerHitAssociator(iEvent,conf_)); edm::ESHandle tTopoHand; - iSetup.get().get(tTopoHand); + iSetup.get().get(tTopoHand); edm::Handle simHitsTPAssoc; //warning: make sure the TP collection used in the map is the same used in the associator! diff --git a/SimTracker/TrackHistory/src/TrackClassifier.cc b/SimTracker/TrackHistory/src/TrackClassifier.cc index d259aee3f7feb..7d8e651ff91f9 100644 --- a/SimTracker/TrackHistory/src/TrackClassifier.cc +++ b/SimTracker/TrackHistory/src/TrackClassifier.cc @@ -68,7 +68,7 @@ void TrackClassifier::newEvent ( edm::Event const & event, edm::EventSetup const //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - setup.get().get(tTopoHand); + setup.get().get(tTopoHand); tTopo_=tTopoHand.product(); } From 2c7c4a08d5735e08bb5ded9526e25fbcaae66539 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Tue, 5 May 2015 13:10:14 +0200 Subject: [PATCH 20/21] Use Tracker Topology Rcd --- Alignment/SurveyAnalysis/test/TestConverter.cpp | 4 ++-- Alignment/SurveyAnalysis/test/TestConverter2.cpp | 4 ++-- Alignment/SurveyAnalysis/test/TestIdealGeometry.cpp | 4 ++-- Alignment/SurveyAnalysis/test/TestIdealGeometry2.cpp | 4 ++-- Alignment/TrackerAlignment/test/ApeAdder.cpp | 2 +- Alignment/TrackerAlignment/test/TestTrackerHierarchy.cpp | 2 +- CalibTracker/Records/interface/SiStripDependentRecords.h | 2 +- .../SiStripESProducers/plugins/geom/SiStripConnectivity.cc | 2 +- DQM/SiStripMonitorClient/src/SiStripTrackerMapCreator.cc | 4 ++-- DQM/SiStripMonitorHardware/src/BuildTrackerMap.cc | 4 ++-- .../plugins/SiStripBadComponentsDQMServiceReader.cc | 4 ++-- .../plugins/SiStripQualityHotStripIdentifierRoot.cc | 2 +- HLTrigger/special/src/HLTTrackerHaloFilter.cc | 3 +-- .../SubCollectionProducers/test/ClusterMCsplitStrips.cc | 4 ++-- SLHCUpgradeSimulations/Geometry/test/ModuleInfo_Phase2.cc | 2 +- SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.cc | 4 ++-- Validation/GlobalDigis/src/GlobalDigisProducer.cc | 4 ++-- 17 files changed, 27 insertions(+), 28 deletions(-) diff --git a/Alignment/SurveyAnalysis/test/TestConverter.cpp b/Alignment/SurveyAnalysis/test/TestConverter.cpp index dc8b1d01f3afd..1ed3618c8f714 100644 --- a/Alignment/SurveyAnalysis/test/TestConverter.cpp +++ b/Alignment/SurveyAnalysis/test/TestConverter.cpp @@ -35,7 +35,7 @@ #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Alignment/SurveyAnalysis/interface/SurveyDataReader.h" // @@ -118,7 +118,7 @@ TestConverter::analyze( const edm::Event& iEvent, const edm::EventSetup& iSetup //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // diff --git a/Alignment/SurveyAnalysis/test/TestConverter2.cpp b/Alignment/SurveyAnalysis/test/TestConverter2.cpp index d54b650de3b2b..c044a1f74b9d2 100644 --- a/Alignment/SurveyAnalysis/test/TestConverter2.cpp +++ b/Alignment/SurveyAnalysis/test/TestConverter2.cpp @@ -40,7 +40,7 @@ #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" // // // class declaration @@ -120,7 +120,7 @@ TestConverter2::analyze( const edm::Event& iEvent, const edm::EventSetup& iSetup { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); diff --git a/Alignment/SurveyAnalysis/test/TestIdealGeometry.cpp b/Alignment/SurveyAnalysis/test/TestIdealGeometry.cpp index 1347f2ad5ad9a..b542a246138c6 100644 --- a/Alignment/SurveyAnalysis/test/TestIdealGeometry.cpp +++ b/Alignment/SurveyAnalysis/test/TestIdealGeometry.cpp @@ -36,7 +36,7 @@ #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h"*/ #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "Alignment/SurveyAnalysis/interface/SurveyDataReader.h" @@ -114,7 +114,7 @@ TestIdealGeometry::analyze( const edm::Event& iEvent, const edm::EventSetup& iSe { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); edm::LogInfo("TrackerAlignment") << "Starting!"; diff --git a/Alignment/SurveyAnalysis/test/TestIdealGeometry2.cpp b/Alignment/SurveyAnalysis/test/TestIdealGeometry2.cpp index 7f8c72be0e3ce..9b16f65a51c81 100644 --- a/Alignment/SurveyAnalysis/test/TestIdealGeometry2.cpp +++ b/Alignment/SurveyAnalysis/test/TestIdealGeometry2.cpp @@ -34,7 +34,7 @@ #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Alignment/SurveyAnalysis/interface/SurveyDataReader.h" // @@ -111,7 +111,7 @@ TestIdealGeometry2::analyze( const edm::Event& iEvent, const edm::EventSetup& iS { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); edm::LogInfo("TrackerAlignment") << "Starting!"; diff --git a/Alignment/TrackerAlignment/test/ApeAdder.cpp b/Alignment/TrackerAlignment/test/ApeAdder.cpp index 0ba96051d88c0..4df7232ee6349 100644 --- a/Alignment/TrackerAlignment/test/ApeAdder.cpp +++ b/Alignment/TrackerAlignment/test/ApeAdder.cpp @@ -70,7 +70,7 @@ void ApeAdder::analyze( const edm::Event& iEvent, const edm::EventSetup& iSetup //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // Get geometry from ES diff --git a/Alignment/TrackerAlignment/test/TestTrackerHierarchy.cpp b/Alignment/TrackerAlignment/test/TestTrackerHierarchy.cpp index fb4df4c25d348..3e3ae45ae2c2d 100644 --- a/Alignment/TrackerAlignment/test/TestTrackerHierarchy.cpp +++ b/Alignment/TrackerAlignment/test/TestTrackerHierarchy.cpp @@ -64,7 +64,7 @@ TestTrackerHierarchy::analyze( const edm::Event&, const edm::EventSetup& setup ) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - setup.get().get(tTopoHandle); + setup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); edm::LogInfo("TrackerHierarchy") << "Starting!"; diff --git a/CalibTracker/Records/interface/SiStripDependentRecords.h b/CalibTracker/Records/interface/SiStripDependentRecords.h index 12f689201f90c..84ed7e9942a4b 100644 --- a/CalibTracker/Records/interface/SiStripDependentRecords.h +++ b/CalibTracker/Records/interface/SiStripDependentRecords.h @@ -14,7 +14,7 @@ class SiStripFecCablingRcd : public edm::eventsetup::DependentRecordImplementati boost::mpl::vector > {}; class SiStripDetCablingRcd : public edm::eventsetup::DependentRecordImplementation > {}; + boost::mpl::vector > {}; class SiStripRegionCablingRcd : public edm::eventsetup::DependentRecordImplementation > {}; diff --git a/CalibTracker/SiStripESProducers/plugins/geom/SiStripConnectivity.cc b/CalibTracker/SiStripESProducers/plugins/geom/SiStripConnectivity.cc index f8437bb1b3fe2..e0ff32192f96f 100644 --- a/CalibTracker/SiStripESProducers/plugins/geom/SiStripConnectivity.cc +++ b/CalibTracker/SiStripESProducers/plugins/geom/SiStripConnectivity.cc @@ -28,7 +28,7 @@ std::auto_ptr SiStripConnectivity::produceDetCabling( const S edm::ESHandle pDD; iRecord.getRecord().get(pDD ); edm::ESHandle tTopoHandle; - iRecord.getRecord().get(tTopoHandle); + iRecord.getRecord().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); //here build an object of type SiStripDetCabling using **ONLY** the information from class SiStripFedCabling, SiStripDetCabling * DetConnections = new SiStripDetCabling( *(pDD.product()),tTopo); diff --git a/DQM/SiStripMonitorClient/src/SiStripTrackerMapCreator.cc b/DQM/SiStripMonitorClient/src/SiStripTrackerMapCreator.cc index 360cf9e3146df..bf210c4a3f1eb 100644 --- a/DQM/SiStripMonitorClient/src/SiStripTrackerMapCreator.cc +++ b/DQM/SiStripMonitorClient/src/SiStripTrackerMapCreator.cc @@ -71,7 +71,7 @@ void SiStripTrackerMapCreator::create(const edm::ParameterSet & tkmapPset, if(!fedcabling) return; edm::ESHandle tTopoHandle; - eSetup.get().get(tTopoHandle); + eSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); if (trackerMap_) delete trackerMap_; @@ -143,7 +143,7 @@ void SiStripTrackerMapCreator::createForOffline(const edm::ParameterSet & tkmapP if(!fedcabling) return; edm::ESHandle tTopoHandle; - eSetup.get().get(tTopoHandle); + eSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); if (trackerMap_) delete trackerMap_; diff --git a/DQM/SiStripMonitorHardware/src/BuildTrackerMap.cc b/DQM/SiStripMonitorHardware/src/BuildTrackerMap.cc index 4f79daea52a18..fde3346689aa7 100644 --- a/DQM/SiStripMonitorHardware/src/BuildTrackerMap.cc +++ b/DQM/SiStripMonitorHardware/src/BuildTrackerMap.cc @@ -38,7 +38,7 @@ #include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h" #include "CondFormats/SiStripObjects/interface/FedChannelConnection.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "CommonTools/TrackerMap/interface/TrackerMap.h" #include "CommonTools/TrackerMap/interface/TmModule.h" @@ -318,7 +318,7 @@ BuildTrackerMapPlugin::analyze(const edm::Event& iEvent, iSetup.get().get(fedcabling ); edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); if (firstEvent) { diff --git a/DQMOffline/CalibTracker/plugins/SiStripBadComponentsDQMServiceReader.cc b/DQMOffline/CalibTracker/plugins/SiStripBadComponentsDQMServiceReader.cc index 0ea52b7a724b1..5efb1f80006db 100755 --- a/DQMOffline/CalibTracker/plugins/SiStripBadComponentsDQMServiceReader.cc +++ b/DQMOffline/CalibTracker/plugins/SiStripBadComponentsDQMServiceReader.cc @@ -4,7 +4,7 @@ #include "DQMOffline/CalibTracker/plugins/SiStripBadComponentsDQMServiceReader.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include #include @@ -23,7 +23,7 @@ void SiStripBadComponentsDQMServiceReader::analyze( const edm::Event& e, const e { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); uint32_t FedErrorMask = 1; // bit 0 diff --git a/DQMOffline/CalibTracker/plugins/SiStripQualityHotStripIdentifierRoot.cc b/DQMOffline/CalibTracker/plugins/SiStripQualityHotStripIdentifierRoot.cc index 9c82aff1be165..e0aa257fcdd6b 100644 --- a/DQMOffline/CalibTracker/plugins/SiStripQualityHotStripIdentifierRoot.cc +++ b/DQMOffline/CalibTracker/plugins/SiStripQualityHotStripIdentifierRoot.cc @@ -201,7 +201,7 @@ SiStripBadStrip* SiStripQualityHotStripIdentifierRoot::getNewObject(){ void SiStripQualityHotStripIdentifierRoot::algoBeginRun(const edm::Run& iRun,const edm::EventSetup& iSetup){ //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); tTopo = tTopoHandle.product(); iSetup.get ().get (theTrackerGeom); diff --git a/HLTrigger/special/src/HLTTrackerHaloFilter.cc b/HLTrigger/special/src/HLTTrackerHaloFilter.cc index e5d23e1825ef1..aa9ddc1caa511 100644 --- a/HLTrigger/special/src/HLTTrackerHaloFilter.cc +++ b/HLTrigger/special/src/HLTTrackerHaloFilter.cc @@ -11,7 +11,6 @@ #include "HLTrigger/special/interface/HLTTrackerHaloFilter.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" typedef edmNew::DetSetVector::Getter Getter; // @@ -58,7 +57,7 @@ bool HLTTrackerHaloFilter::hltFilter(edm::Event& event, const edm::EventSetup& i /* //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // All HLT filters must create and fill an HLT filter object, diff --git a/RecoLocalTracker/SubCollectionProducers/test/ClusterMCsplitStrips.cc b/RecoLocalTracker/SubCollectionProducers/test/ClusterMCsplitStrips.cc index af2e8b3a30640..5bc20a4d1a2ad 100644 --- a/RecoLocalTracker/SubCollectionProducers/test/ClusterMCsplitStrips.cc +++ b/RecoLocalTracker/SubCollectionProducers/test/ClusterMCsplitStrips.cc @@ -16,7 +16,7 @@ #include "DataFormats/Common/interface/DetSetVectorNew.h" #include "DataFormats/SiStripCluster/interface/SiStripCluster.h" #include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include @@ -82,7 +82,7 @@ void ClusterMCsplitStrips:: produce(edm::Event& event, const edm::EventSetup& evSetup) { //Retrieve tracker topology from geometry - evSetup.get().get(tTopoHandle_); + evSetup.get().get(tTopoHandle_); std::auto_ptr< edmNew::DetSetVector > output(new edmNew::DetSetVector()); output->reserve(10000,4*10000); diff --git a/SLHCUpgradeSimulations/Geometry/test/ModuleInfo_Phase2.cc b/SLHCUpgradeSimulations/Geometry/test/ModuleInfo_Phase2.cc index 94052f38299bf..402ca7af5db8a 100644 --- a/SLHCUpgradeSimulations/Geometry/test/ModuleInfo_Phase2.cc +++ b/SLHCUpgradeSimulations/Geometry/test/ModuleInfo_Phase2.cc @@ -120,7 +120,7 @@ ModuleInfo_Phase2::analyze( const edm::Event& iEvent, const edm::EventSetup& iSe { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); diff --git a/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.cc b/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.cc index db69b386abd64..be86c7ad7bc1b 100644 --- a/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.cc +++ b/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.cc @@ -30,7 +30,7 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h" @@ -121,7 +121,7 @@ void StdHitNtuplizer::analyze(const edm::Event& e, const edm::EventSetup& es) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - es.get().get(tTopoHandle); + es.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); diff --git a/Validation/GlobalDigis/src/GlobalDigisProducer.cc b/Validation/GlobalDigis/src/GlobalDigisProducer.cc index 96b3eba406ee5..961f26c59d6a7 100644 --- a/Validation/GlobalDigis/src/GlobalDigisProducer.cc +++ b/Validation/GlobalDigis/src/GlobalDigisProducer.cc @@ -7,7 +7,7 @@ #include "Validation/GlobalDigis/interface/GlobalDigisProducer.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" GlobalDigisProducer::GlobalDigisProducer(const edm::ParameterSet& iPSet) : fName(""), verbosity(0), frequency(0), label(""), getAllProvenances(false), @@ -961,7 +961,7 @@ void GlobalDigisProducer::fillTrk(edm::Event& iEvent, { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); From 34ec0ea0c591ba6a926f3441a365721474161281 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Wed, 6 May 2015 15:56:32 +0200 Subject: [PATCH 21/21] Use Tracker Topology Rcd --- .../plugins/SiTrackerGaussianSmearingRecHitConverter.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FastSimulation/TrackingRecHitProducer/plugins/SiTrackerGaussianSmearingRecHitConverter.cc b/FastSimulation/TrackingRecHitProducer/plugins/SiTrackerGaussianSmearingRecHitConverter.cc index aabdebed2df94..699d8afc500e4 100644 --- a/FastSimulation/TrackingRecHitProducer/plugins/SiTrackerGaussianSmearingRecHitConverter.cc +++ b/FastSimulation/TrackingRecHitProducer/plugins/SiTrackerGaussianSmearingRecHitConverter.cc @@ -41,7 +41,7 @@ // Numbering scheme #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" //For Pileup events #include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h" @@ -595,7 +595,7 @@ void SiTrackerGaussianSmearingRecHitConverter::produce(edm::Event& e, const edm: //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - es.get().get(tTopoHand); + es.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product();