diff --git a/CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc b/CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc index b54fc63b0ddad..a7eeceb4924bd 100644 --- a/CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc +++ b/CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc @@ -557,9 +557,6 @@ std::unique_ptr HcalHardcodeCalibrations::produceQIEData(const Hcal #ifdef EDM_ML_DEBUG edm::LogVerbatim("HCAL") << "HcalHardcodeCalibrations::produceQIEData-> ..."; #endif - /* - edm::LogVerbatim("HcalCalib") << ">>> HcalHardcodeCalibrations::produceQIEData"; - */ auto const& topo = rcd.get(topoTokens_[kQIEData]); auto const& zdcTopo = rcd.get(zdcTopoTokens_[kQIEData]); diff --git a/CondFormats/HcalObjects/src/HcalCondObjectContainerBase.cc b/CondFormats/HcalObjects/src/HcalCondObjectContainerBase.cc index 032bafd60f12f..50aa8502cead7 100644 --- a/CondFormats/HcalObjects/src/HcalCondObjectContainerBase.cc +++ b/CondFormats/HcalObjects/src/HcalCondObjectContainerBase.cc @@ -21,13 +21,17 @@ HcalCondObjectContainerBase::HcalCondObjectContainerBase(const HcalTopology* top } void HcalCondObjectContainerBase::setTopo(const HcalTopology* topo) { - if ((topo) && (packedIndexVersion_ != 0) && (!topo->denseIdConsistent(packedIndexVersion_))) - edm::LogError("HCAL") << std::string("Inconsistent dense packing between current topology (") << topo->topoVersion() - << ") and calibration object (" << packedIndexVersion_ << ")"; - topo_ = topo; - packedIndexVersion_ = topo_->topoVersion(); - kSizeForDenseIndexing_ = - ((packedIndexVersion_ >= 10) ? HcalZDCDetId::kSizeForDenseIndexingRun3 : HcalZDCDetId::kSizeForDenseIndexingRun1); + if (topo) { + if ((packedIndexVersion_ != 0) && (!topo->denseIdConsistent(packedIndexVersion_))) + edm::LogError("HCAL") << std::string("Inconsistent dense packing between current topology (") + << topo->topoVersion() << ") and calibration object (" << packedIndexVersion_ << ")"; + topo_ = topo; + packedIndexVersion_ = topo->topoVersion(); + kSizeForDenseIndexing_ = ((packedIndexVersion_ >= 10) ? HcalZDCDetId::kSizeForDenseIndexingRun3 + : HcalZDCDetId::kSizeForDenseIndexingRun1); + } else { + edm::LogError("HCAL") << "Illegal call to HcalCondObjectContainerBase with a null pointer"; + } } unsigned int HcalCondObjectContainerBase::indexFor(DetId fId) const { diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py index c33590550d7ac..d486e020f8c77 100644 --- a/Configuration/Geometry/python/dict2021Geometry.py +++ b/Configuration/Geometry/python/dict2021Geometry.py @@ -1320,7 +1320,7 @@ caloDict = { "abbrev" : "C", "name" : "calo", - "default" : 1, + "default" : 2, "C1" : { 1 : [ 'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml', @@ -1388,7 +1388,75 @@ 'from Geometry.EcalMapping.EcalMappingRecord_cfi import *', ], "era" : "run3_HB", - } + }, + "C2" : { + 1 : [ + 'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml', + 'Geometry/EcalCommonData/data/eecon.xml', + 'Geometry/EcalCommonData/data/escon.xml', + 'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml', + 'Geometry/EcalCommonData/data/ebalgo.xml', + 'Geometry/EcalCommonData/data/ebrot.xml', + 'Geometry/EcalCommonData/data/eefixed/2021/v1/eefixed.xml', + 'Geometry/EcalCommonData/data/eehier.xml', + 'Geometry/EcalCommonData/data/eealgo.xml', + 'Geometry/EcalCommonData/data/esalgo.xml', + 'Geometry/EcalCommonData/data/eeF.xml', + 'Geometry/EcalCommonData/data/eeB.xml', + 'Geometry/EcalCommonData/data/ectkcable.xml', + 'Geometry/HcalCommonData/data/hcalrotations.xml', + 'Geometry/HcalCommonData/data/hcal/PhaseI/hcalalgo.xml', + 'Geometry/HcalCommonData/data/hcalcablealgo.xml', + 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', + 'Geometry/HcalCommonData/data/hcalendcap/PhaseI/hcalendcapalgo.xml', + 'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml', + 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', + 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v2/hcalRecNumbering.xml', + ], + 3 : [ + 'Geometry/EcalSimData/data/ecalsens.xml', + 'Geometry/HcalCommonData/data/hcalsens/2021/v2/hcalsenspmf.xml', + 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hfpmt.xml', + 'Geometry/HcalSimData/data/hffibrebundle.xml', + 'Geometry/HcalSimData/data/CaloUtil/2021/v1/CaloUtil.xml', + ], + 4 : [ + 'Geometry/HcalSimData/data/HcalProdCuts/2021/v2/HcalProdCuts.xml', + 'Geometry/EcalSimData/data/EcalProdCuts.xml', + 'Geometry/EcalSimData/data/ESProdCuts.xml', + ], + "sim" : [ + 'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *', + 'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *', + ], + "reco" : [ + 'from Geometry.CaloEventSetup.CaloTopology_cfi import *', + 'from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *', + 'CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",', + ' SelectedCalos = cms.vstring("HCAL",', + ' "ZDC",', + ' "EcalBarrel",', + ' "EcalEndcap",', + ' "EcalPreshower",', + ' "TOWER",', + ' )', + ')', + 'from Geometry.EcalAlgo.EcalGeometry_cfi import *', + 'from Geometry.HcalEventSetup.HcalGeometry_cfi import *', + 'from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *', + 'from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *', + 'from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *', + 'from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *', + 'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *', + 'from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *', + 'from Geometry.EcalMapping.EcalMapping_cfi import *', + 'from Geometry.EcalMapping.EcalMappingRecord_cfi import *', + ], + "era" : "run3_HB", + }, } muonDict = { @@ -1801,12 +1869,12 @@ ("O5","T6","C1","M2","F2","P7") : "2023FlatMinus10Percent", ("O5","T7","C1","M2","F2","P7") : "2023FlatPlus05Percent", ("O5","T8","C1","M2","F2","P7") : "2023FlatPlus10Percent", - ("O6","T3","C1","M4","F3","P7") : "2024", - ("O4","T4","C1","M4","F2","P7") : "2024ZeroMaterial", - ("O5","T5","C1","M4","F2","P7") : "2024FlatMinus05Percent", - ("O5","T6","C1","M4","F2","P7") : "2024FlatMinus10Percent", - ("O5","T7","C1","M4","F2","P7") : "2024FlatPlus05Percent", - ("O5","T8","C1","M4","F2","P7") : "2024FlatPlus10Percent", + ("O6","T3","C2","M4","F3","P7") : "2024", + ("O4","T4","C2","M4","F2","P7") : "2024ZeroMaterial", + ("O5","T5","C2","M4","F2","P7") : "2024FlatMinus05Percent", + ("O5","T6","C2","M4","F2","P7") : "2024FlatMinus10Percent", + ("O5","T7","C2","M4","F2","P7") : "2024FlatPlus05Percent", + ("O5","T8","C2","M4","F2","P7") : "2024FlatPlus10Percent", } deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "P1", "P2", "P3", diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml index c295ee780fb8e..f730196058283 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml @@ -234,7 +234,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.xml index 1b33189dd8342..93520088e94e9 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.xml @@ -234,7 +234,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.xml index 7ab66eca76578..aba3e053d13bf 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.xml @@ -234,7 +234,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.xml index 28ba4782ff227..0b373fa5f5b25 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.xml @@ -234,7 +234,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.xml index 6da00e25ac24e..e0cc06f459fde 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.xml @@ -234,7 +234,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml index f2deefc466045..b14b781cc21a2 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml @@ -234,7 +234,7 @@ - + diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py index 5dfe3fecfd6f4..a1d1df28c057b 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py @@ -235,7 +235,7 @@ 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v2/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py index 26ce0655d3520..821e8b04a6b8c 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py @@ -235,7 +235,7 @@ 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v2/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py index b98ebeddf7f8b..4236b57f8ce45 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py @@ -235,7 +235,7 @@ 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v2/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus10PercentXML_cfi.py index 2a9bbb5bd4a4f..b7f2543ac7f86 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus10PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus10PercentXML_cfi.py @@ -235,7 +235,7 @@ 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v2/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py index 5f4809e555d64..710e52bb52dca 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py @@ -235,7 +235,7 @@ 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v2/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024ZeroMaterialXML_cfi.py index 52e4bebac55da..f01e6e3d51785 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024ZeroMaterialXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024ZeroMaterialXML_cfi.py @@ -235,7 +235,7 @@ 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v2/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml', diff --git a/Geometry/ForwardGeometry/plugins/ZdcTopologyEP.cc b/Geometry/ForwardGeometry/plugins/ZdcTopologyEP.cc index fa126dc293792..f244687b6856a 100644 --- a/Geometry/ForwardGeometry/plugins/ZdcTopologyEP.cc +++ b/Geometry/ForwardGeometry/plugins/ZdcTopologyEP.cc @@ -10,11 +10,6 @@ Implementation: */ -// -// Original Author: Jeremiah Mans -// Created: Mon Oct 3 11:35:27 CDT 2005 -// -// #include "Geometry/ForwardGeometry/plugins/ZdcTopologyEP.h" #include "Geometry/HcalCommonData/interface/HcalDDDRecConstants.h" @@ -23,19 +18,17 @@ #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" -#define EDM_ML_DEBUG +//#define EDM_ML_DEBUG ZdcTopologyEP::ZdcTopologyEP(const edm::ParameterSet& conf) - : m_hdcToken{setWhatProduced(this, &ZdcTopologyEP::produce).consumes(edm::ESInputTag{})}, - m_restrictions(conf.getUntrackedParameter("Exclude")) { + : m_hdcToken{setWhatProduced(this, &ZdcTopologyEP::produce).consumes(edm::ESInputTag{})} { #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HCalGeom") << "ZdcTopologyEP::ZdcTopologyEP with Exclude: " << m_restrictions; + edm::LogVerbatim("HCalGeom") << "ZdcTopologyEP::ZdcTopologyEP"; #endif } void ZdcTopologyEP::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - desc.addUntracked("Exclude", ""); descriptions.add("zdcTopologyEP", desc); } diff --git a/Geometry/ForwardGeometry/plugins/ZdcTopologyEP.h b/Geometry/ForwardGeometry/plugins/ZdcTopologyEP.h index 29539e0435f2e..16ef03f57ab1c 100644 --- a/Geometry/ForwardGeometry/plugins/ZdcTopologyEP.h +++ b/Geometry/ForwardGeometry/plugins/ZdcTopologyEP.h @@ -27,7 +27,5 @@ class ZdcTopologyEP : public edm::ESProducer { private: // ----------member data --------------------------- edm::ESGetToken m_hdcToken; - std::string m_restrictions; - bool m_mergePosition; }; #endif diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index ce48719e55565..5e68d1176a31d 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -262,14 +262,12 @@ def checkHLTfor43774(process): return process # Adding zdc Topology producer -def customizeHLTfor46011(process): +def customizeHLTfor46062(process): """Add topology producer for ZDC""" - if hasattr(process, 'ZdcGeometryFromDBEP'): - process.ZdcTopologyEP = cms.ESProducer( "ZdcTopologyEP", - Exclude = cms.untracked.string( "" ), - appendToDataLabel = cms.string( "" ) - ) + for esprod in esproducers_by_type(process, 'ZdcGeometryFromDBEP'): + process.load("Geometry.ForwardGeometry.zdcTopologyEP_cfi") + break return process @@ -339,6 +337,6 @@ def customizeHLTforCMSSW(process, menuType="GRun"): process = checkHLTfor43774(process) process = customizeHLTfor44576(process) process = customizeHLTfor45063(process) - process = customizeHLTfor46011(process) + process = customizeHLTfor46062(process) return process