Take care of comments from Yana

cms-sw · Oct 9, 2015 · 9551926 · 9551926
1 parent cf61e18
commit 9551926
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 25 deletions.
diff --git a/Configuration/Geometry/python/GeometryExtended2023HGCalMuon_cff.py b/Configuration/Geometry/python/GeometryExtended2023HGCalMuon_cff.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
 from Geometry.CMSCommonData.cmsExtendedGeometry2023HGCalMuonXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.HcalCommonData.hcalParameters_cfi      import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py
@@ -7,12 +7,12 @@
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/CMSCommonData/data/extend/cmsextent.xml',
         'Geometry/CMSCommonData/data/PhaseI/cms.xml',
-        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase.xml',
+        'Geometry/CMSCommonData/data/eta3/etaMax.xml',        
+        'Geometry/CMSCommonData/data/PhaseII/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase.xml',
+        'Geometry/CMSCommonData/data/PhaseII/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
         'Geometry/CMSCommonData/data/PhaseII/beampipe.xml',
@@ -201,42 +201,41 @@
         'Geometry/TrackerCommonData/data/trackertec.xml',
         'Geometry/TrackerCommonData/data/trackerbulkhead.xml',
         'Geometry/TrackerCommonData/data/trackerother.xml',
-        'Geometry/EcalCommonData/data/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable.xml',
+        'Geometry/EcalCommonData/data/PhaseII/eregalgo.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
         'Geometry/EcalCommonData/data/eecon.xml',
-        'Geometry/EcalCommonData/data/eefixed.xml',
-        'Geometry/EcalCommonData/data/eehier.xml',
-        'Geometry/EcalCommonData/data/eealgo.xml',
-        'Geometry/EcalCommonData/data/escon.xml',
-        'Geometry/EcalCommonData/data/esalgo.xml',
-        'Geometry/EcalCommonData/data/eeF.xml',
-        'Geometry/EcalCommonData/data/eeB.xml',
-        'Geometry/EcalCommonData/data/ectkcable.xml',
+        'Geometry/EcalCommonData/data/PhaseII/escon.xml',
+        'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
         'Geometry/HcalCommonData/data/hcalrotations.xml',
-        'Geometry/HcalCommonData/data/PhaseI/hcalalgo.xml',
-        'Geometry/HcalCommonData/data/hcalcablealgo.xml',
+        'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalalgo.xml',
         'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
-        'Geometry/HcalCommonData/data/PhaseI/hcalendcapalgo.xml',
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+        'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalRecNumbering.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/PhaseI/hcalSimNumbering.xml',
-        'Geometry/HcalCommonData/data/PhaseI/hcalRecNumbering.xml',
+        'Geometry/HGCalCommonData/data/v5/hgcal.xml',
+        'Geometry/HGCalCommonData/data/v5/hgcalEE.xml',
+        'Geometry/HGCalCommonData/data/v5/hgcalHEsil.xml',
+        'Geometry/HGCalCommonData/data/v5/hgcalHEsci.xml',
+        'Geometry/HGCalCommonData/data/v5/hgcalCons.xml',
         'Geometry/MuonCommonData/data/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/v1/mb1.xml',
         'Geometry/MuonCommonData/data/v1/mb2.xml',
         'Geometry/MuonCommonData/data/v1/mb3.xml',
         'Geometry/MuonCommonData/data/v1/mb4.xml',
         'Geometry/MuonCommonData/data/design/muonYoke.xml',
-        'Geometry/MuonCommonData/data/PhaseII/NoME0/mf.xml',
+        'Geometry/MuonCommonData/data/PhaseII/mf.xml',
         'Geometry/MuonCommonData/data/PhaseII/rpcf.xml',
         'Geometry/MuonCommonData/data/v2/gemf.xml',
         'Geometry/MuonCommonData/data/v7/gem11.xml',
         'Geometry/MuonCommonData/data/v7/gem21.xml',
         'Geometry/MuonCommonData/data/v2/csc.xml',
-        'Geometry/MuonCommonData/data/PhaseII/NoME0/mfshield.xml',
+        'Geometry/MuonCommonData/data/PhaseII/mfshield.xml',
+        'Geometry/MuonCommonData/data/PhaseII/me0.xml',
         'Geometry/ForwardCommonData/data/forward.xml',
         'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
@@ -254,17 +253,20 @@
         'Geometry/ForwardCommonData/data/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring(
-        'Geometry/MuonCommonData/data/PhaseII/NoME0/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/PhaseII/muonNumbering.xml',
         'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
         'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
-        'Geometry/EcalSimData/data/ecalsens.xml',
-        'Geometry/HcalCommonData/data/Phase0/hcalsenspmf.xml',
+        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
+        'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalsenspmf.xml',
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
         'Geometry/HcalSimData/data/CaloUtil.xml',
-        'Geometry/MuonSimData/data/PhaseII/NoME0/muonSens.xml',
+        'Geometry/HGCalSimData/data/hgcsens.xml',
+        'Geometry/HGCalSimData/data/hgccons.xml',
+        'Geometry/HGCalSimData/data/hgcProdCuts.xml',
+        'Geometry/MuonSimData/data/PhaseII/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
@@ -275,7 +277,6 @@
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/HcalSimData/data/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
-        'Geometry/EcalSimData/data/ESProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',