Merge pull request #32351 from bsunanda/Run3-gex41

Run3-gex41 Complementing the geometry scenarios of special cases with the Reco cff's

Configuration/Geometry/python/GeometryExtended2015FlatMinus05PercentReco_cff.py

@@ -0,0 +1,5 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtended2015FlatMinus05Percent_cff import *
+from Configuration.Geometry.GeometryReco_cff import *

Configuration/Geometry/python/GeometryExtended2015FlatMinus10PercentReco_cff.py

@@ -0,0 +1,5 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtended2015FlatMinus10Percent_cff import *
+from Configuration.Geometry.GeometryReco_cff import *

Configuration/Geometry/python/GeometryExtended2015FlatPlus05PercentReco_cff.py

@@ -0,0 +1,5 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtended2015FlatPlus05Percent_cff import *
+from Configuration.Geometry.GeometryReco_cff import *

Configuration/Geometry/python/GeometryExtended2015FlatPlus10PercentReco_cff.py

@@ -0,0 +1,5 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtended2015FlatPlus10Percent_cff import *
+from Configuration.Geometry.GeometryReco_cff import *

Configuration/Geometry/python/GeometryExtended2017Plan1FlatMinus05PercentReco_cff.py

@@ -0,0 +1,31 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtended2017Plan1FlatMinus05Percent_cff import *
+
+# Reconstruction geometry services
+#  Tracking Geometry
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+
+#Tracker
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+
+#Muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+
+#  Alignment
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+#  Calorimeters
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometry_cff import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *

Configuration/Geometry/python/GeometryExtended2017FlatMinus05Percent_cff.py → Configuration/Geometry/python/GeometryExtended2017Plan1FlatMinus05Percent_cff.py

@@ -3,7 +3,7 @@
 #
 # 2017 Geometry configuration with tracker material modified by -5%
 #
-from Geometry.CMSCommonData.cmsExtendedGeometry2017FlatMinus05PercentXML_cfi import *
+from Geometry.CMSCommonData.cmsExtendedGeometry2017Plan1FlatMinus05PercentXML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *

Configuration/Geometry/python/GeometryExtended2017Plan1FlatMinus10PercentReco_cff.py

@@ -0,0 +1,31 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtended2017Plan1FlatMinus10Percent_cff import *
+
+# Reconstruction geometry services
+#  Tracking Geometry
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+
+#Tracker
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+
+#Muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+
+#  Alignment
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+#  Calorimeters
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometry_cff import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *

Configuration/Geometry/python/GeometryExtended2017FlatMinus10Percent_cff.py → Configuration/Geometry/python/GeometryExtended2017Plan1FlatMinus10Percent_cff.py

@@ -3,7 +3,7 @@
 #
 # 2017 Geometry configuration with tracker material modified by -10%
 #
-from Geometry.CMSCommonData.cmsExtendedGeometry2017FlatMinus10PercentXML_cfi import *
+from Geometry.CMSCommonData.cmsExtendedGeometry2017Plan1FlatMinus10PercentXML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *

Configuration/Geometry/python/GeometryExtended2017Plan1FlatPlus05PercentReco_cff.py

@@ -0,0 +1,31 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtended2017Plan1FlatPlus05Percent_cff import *
+
+# Reconstruction geometry services
+#  Tracking Geometry
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+
+#Tracker
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+
+#Muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+
+#  Alignment
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+#  Calorimeters
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometry_cff import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *

Configuration/Geometry/python/GeometryExtended2017FlatPlus05Percent_cff.py → Configuration/Geometry/python/GeometryExtended2017Plan1FlatPlus05Percent_cff.py

@@ -3,7 +3,7 @@
 #
 # 2017 Geometry configuration with tracker material modified by +5%
 #
-from Geometry.CMSCommonData.cmsExtendedGeometry2017FlatPlus05PercentXML_cfi import *
+from Geometry.CMSCommonData.cmsExtendedGeometry2017Plan1FlatPlus05PercentXML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *

Configuration/Geometry/python/GeometryExtended2017Plan1FlatPlus10PercentReco_cff.py

@@ -0,0 +1,31 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtended2017Plan1FlatPlus10Percent_cff import *
+
+# Reconstruction geometry services
+#  Tracking Geometry
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+
+#Tracker
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+
+#Muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+
+#  Alignment
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+#  Calorimeters
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometry_cff import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *

Configuration/Geometry/python/GeometryExtended2017FlatPlus10Percent_cff.py → Configuration/Geometry/python/GeometryExtended2017Plan1FlatPlus10Percent_cff.py

@@ -3,7 +3,7 @@
 #
 # 2017 Geometry configuration with tracker material modified by +10%
 #
-from Geometry.CMSCommonData.cmsExtendedGeometry2017FlatPlus10PercentXML_cfi import *
+from Geometry.CMSCommonData.cmsExtendedGeometry2017Plan1FlatPlus10PercentXML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *

Configuration/Geometry/python/GeometryExtended2018FlatMinus05PercentReco_cff.py

@@ -0,0 +1,32 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtended2018FlatMinus05Percent_cff import *
+
+# Reconstruction geometry services
+#  Tracking Geometry
+#bah - well, this is not a cfi!
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+
+#Tracker
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+
+#Muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+
+#  Alignment
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+#  Calorimeters
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometry_cff import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *

Configuration/Geometry/python/GeometryExtended2018FlatMinus10PercentReco_cff.py

@@ -0,0 +1,32 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtended2018FlatMinus10Percent_cff import *
+
+# Reconstruction geometry services
+#  Tracking Geometry
+#bah - well, this is not a cfi!
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+
+#Tracker
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+
+#Muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+
+#  Alignment
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+#  Calorimeters
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometry_cff import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *

Configuration/Geometry/python/GeometryExtended2018FlatPlus05PercentReco_cff.py

@@ -0,0 +1,32 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtended2018FlatPlus05Percent_cff import *
+
+# Reconstruction geometry services
+#  Tracking Geometry
+#bah - well, this is not a cfi!
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+
+#Tracker
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+
+#Muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+
+#  Alignment
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+#  Calorimeters
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometry_cff import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *

Configuration/Geometry/python/GeometryExtended2018FlatPlus10PercentReco_cff.py

@@ -0,0 +1,32 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtended2018FlatPlus10Percent_cff import *
+
+# Reconstruction geometry services
+#  Tracking Geometry
+#bah - well, this is not a cfi!
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+
+#Tracker
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+
+#Muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+
+#  Alignment
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+#  Calorimeters
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometry_cff import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *

Geometry/CMSCommonData/python/cmsExtendedGeometry2017FlatMinus05PercentXML_cfi.py → Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatMinus05PercentXML_cfi.py

@@ -223,7 +223,7 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/hcalSimNumbering/2017Plan0/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering/2017Plan1/hcalSimNumbering.xml', 
         'Geometry/HcalCommonData/data/hcalRecNumbering/2017/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2017/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',

Geometry/CMSCommonData/python/cmsExtendedGeometry2017FlatMinus10PercentXML_cfi.py → Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatMinus10PercentXML_cfi.py

@@ -223,7 +223,7 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/hcalSimNumbering/2017Plan0/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering/2017Plan1/hcalSimNumbering.xml', 
         'Geometry/HcalCommonData/data/hcalRecNumbering/2017/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2017/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',

Geometry/CMSCommonData/python/cmsExtendedGeometry2017FlatPlus05PercentXML_cfi.py → Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatPlus05PercentXML_cfi.py

@@ -223,7 +223,7 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/hcalSimNumbering/2017Plan0/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering/2017Plan1/hcalSimNumbering.xml', 
         'Geometry/HcalCommonData/data/hcalRecNumbering/2017/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2017/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',

Geometry/CMSCommonData/python/cmsExtendedGeometry2017FlatPlus10PercentXML_cfi.py → Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatPlus10PercentXML_cfi.py

@@ -223,7 +223,7 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/hcalSimNumbering/2017Plan0/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering/2017Plan1/hcalSimNumbering.xml', 
         'Geometry/HcalCommonData/data/hcalRecNumbering/2017/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2017/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',