Merge pull request #90 from cms-sw/CMSSW_6_2_X_SLHC

Cmssw 6 2 x slhc

Configuration/Geometry/python/GeometryExtended2023MuonReco_cff.py

@@ -15,7 +15,8 @@
 #Muon
 from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+from Geometry.GEMGeometry.gemGeometry_cfi import *
+from Geometry.GEMGeometry.me0Geometry_cfi import *
 
 #  Alignment
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
@@ -48,5 +49,5 @@
 from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
 from Geometry.EcalMapping.EcalMapping_cfi import *
 from Geometry.EcalMapping.EcalMappingRecord_cfi import *
-from Geometry.HcalCommonData.hcalNumberingInitialization_cfi import *
+from Geometry.HcalCommonData.hcalRecNumberingInitialization_cfi import *
 

Configuration/Geometry/python/GeometryExtendedPhase1Pixel10DReco_cff.py

@@ -0,0 +1,33 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtendedPhase1Pixel10D_cff import *
+
+
+
+# Reconstruction geometry services
+#  Tracking Geometry
+#bah - well, this is not a cfi!
+from Geometry.CommonDetUnit.globalTrackingSLHCGeometry_cfi import *
+
+#Tracker
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerTopologyConstants_cfi import *
+
+#Muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+
+#  Alignment
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+trackerSLHCGeometry.applyAlignment = cms.bool(False)
+
+#  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.hcalRecNumberingInitialization_cfi import *

Configuration/Geometry/python/GeometryExtendedPhase1Pixel10D_cff.py

@@ -0,0 +1,9 @@
+import FWCore.ParameterSet.Config as cms
+
+#
+# Geometry master configuration
+#
+# Ideal geometry, needed for simulation
+from Geometry.CMSCommonData.cmsExtendedGeometryPhase1Pixel10DXML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
+from Geometry.HcalCommonData.hcalSimNumberingInitialization_cfi import *

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -1085,8 +1085,27 @@ def genvalid(fragment,d,suffix='all',fi=''):
 
 
 
-# you will need separate scenarios HERE for full and fast 
-upgradeKeys=['2017','2019','BE5D','2017Fast','BE5DFast','BE5DForwardFast','2019WithGEM','BE5DPixel10D','2017Aging','2019Aging','Extended2023','Extended2023HGCalMuon','Extended2023SHCal','Extended2023SHCal4Eta','Extended2023TTI','Extended2023Muon']
+# You will need separate scenarios HERE for full and fast. DON'T CHANGE THE ORDER, only
+# append new keys. Otherwise the numbering for the runTheMatrix tests will change.
+upgradeKeys=['2017',
+             '2019',
+             'BE5D',
+             '2017Fast',
+             'BE5DFast',
+             'BE5DForwardFast',
+             '2019WithGEM',
+             'BE5DPixel10D',
+             '2017Aging',
+             '2019Aging',
+             'Extended2023',
+             'Extended2023HGCalMuon',
+             'Extended2023SHCal',
+             'Extended2023SHCal4Eta',
+             'Extended2023TTI',
+             'Extended2023Muon',
+             'Extended2023CFCal',
+             'Extended2023CFCal4Eta'
+             ]
 upgradeGeoms={ '2017' : 'Extended2017',
                '2019' : 'Extended2019',
                '2019WithGEM' : 'Extended2019',
@@ -1102,7 +1121,9 @@ def genvalid(fragment,d,suffix='all',fi=''):
                'Extended2023SHCal' : 'Extended2023SHCal,Extended2023SHCalReco',
                'Extended2023SHCal4Eta' : 'Extended2023SHCal4Eta,Extended2023SHCalReco',
                'Extended2023TTI' : 'Extended2023TTI,Extended2023TTIReco',
-               'Extended2023Muon' : 'Extended2023Muon,Extended2023MuonReco'
+               'Extended2023Muon' : 'Extended2023Muon,Extended2023MuonReco',
+               'Extended2023CFCal' : 'Extended2023CFCal,Extended2023CFCalReco',
+               'Extended2023CFCal4Eta' : 'Extended2023CFCal4Eta,Extended2023CFCal4EtaReco'
                }
 upgradeGTs={ '2017' : 'auto:upgrade2017',
              '2019' : 'auto:upgrade2019',
@@ -1119,7 +1140,9 @@ def genvalid(fragment,d,suffix='all',fi=''):
              'Extended2023SHCal' : 'auto:upgradePLS3',
              'Extended2023SHCal4Eta' : 'auto:upgradePLS3',
              'Extended2023TTI' : 'auto:upgradePLS3',
-             'Extended2023Muon' : 'auto:upgradePLS3'
+             'Extended2023Muon' : 'auto:upgradePLS3',
+             'Extended2023CFCal' : 'auto:upgradePLS3',
+             'Extended2023CFCal4Eta' : 'auto:upgradePLS3'
              }
 upgradeCustoms={ '2017' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2017',
                  '2019' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2019',
@@ -1136,7 +1159,9 @@ def genvalid(fragment,d,suffix='all',fi=''):
                  'Extended2023SHCal' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023',
                  'Extended2023SHCal4Eta' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023',
                  'Extended2023TTI' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms_TTI.cust_phase2_BE5D',
-                 'Extended2023Muon' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023Muon'
+                 'Extended2023Muon' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023Muon',
+                 'Extended2023CFCal' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023',
+                 'Extended2023CFCal4Eta' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023'
                  }
 ### remember that you need to add a new step for phase 2 to include the track trigger
 ### remember that you need to add fastsim
@@ -1149,24 +1174,26 @@ def genvalid(fragment,d,suffix='all',fi=''):
 # step6 is fastsim
 # step7 is fastsim harvesting
 
-upgradeSteps=['GenSimFull','DigiFull','RecoFull','HarvFull','DigiTrkTrigFull','FastSim','HarvFast']
-
-upgradeScenToRun={ '2017':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   '2019':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   '2019WithGEM':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   '2017Aging':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   '2019Aging':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   'BE5D':['GenSimFull','DigiTrkTrigFull','RecoFull','HarvFull'],
-                   'BE5DPixel10D':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   '2017Fast':['FastSim','HarvFast'],
-                   'BE5DFast':['FastSim','HarvFast'],
-                   'BE5DForwardFast':['FastSim','HarvFast'],
-                   'Extended2023':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   'Extended2023HGCalMuon':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   'Extended2023SHCal':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   'Extended2023SHCal4Eta':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   'Extended2023TTI':['GenSimFull','DigiTrkTrigFull','RecoFull','HarvFull'],
-                   'Extended2023Muon':['GenSimFull','DigiFull','RecoFull','HarvFull']
+upgradeSteps=['GenSimFull','DigiFull','RecoFull','HARVESTFull','DigiTrkTrigFull','FastSim','HARVESTFast']
+
+upgradeScenToRun={ '2017':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   '2019':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   '2019WithGEM':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   '2017Aging':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   '2019Aging':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   'BE5D':['GenSimFull','DigiTrkTrigFull','RecoFull','HARVESTFull'],
+                   'BE5DPixel10D':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   '2017Fast':['FastSim','HARVESTFast'],
+                   'BE5DFast':['FastSim','HARVESTFast'],
+                   'BE5DForwardFast':['FastSim','HARVESTFast'],
+                   'Extended2023':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   'Extended2023HGCalMuon':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   'Extended2023SHCal':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   'Extended2023SHCal4Eta':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   'Extended2023TTI':['GenSimFull','DigiTrkTrigFull','RecoFull','HARVESTFull'],
+                   'Extended2023Muon':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   'Extended2023CFCal':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   'Extended2023CFCal4Eta':['GenSimFull','DigiFull','RecoFull','HARVESTFull']
                    }
 
 upgradeStepDict={}
@@ -1217,14 +1244,14 @@ def genvalid(fragment,d,suffix='all',fi=''):
                                       }
     if upgradeCustoms[k]!=None : upgradeStepDict['RecoFull'][k]['--customise']=upgradeCustoms[k]
 
-    upgradeStepDict['HarvFull'][k]={'-s':'HARVESTING:validationHarvesting+dqmHarvesting',
+    upgradeStepDict['HARVESTFull'][k]={'-s':'HARVESTING:validationHarvesting+dqmHarvesting',
                                     '--conditions':upgradeGTs[k],
                                     '--mc':'',
                                     '--magField' : '38T_PostLS1',
                                     '--geometry' : upgradeGeoms[k],
                                     '--scenario' : 'pp'
                                     }
-    if upgradeCustoms[k]!=None : upgradeStepDict['HarvFull'][k]['--customise']=upgradeCustoms[k]
+    if upgradeCustoms[k]!=None : upgradeStepDict['HARVESTFull'][k]['--customise']=upgradeCustoms[k]
 
     upgradeStepDict['FastSim'][k]={'-s':'GEN,SIM,RECO,VALIDATION',
                                    '--eventcontent':'FEVTDEBUGHLT,DQM',
@@ -1235,14 +1262,14 @@ def genvalid(fragment,d,suffix='all',fi=''):
                                    '--relval':'27000,3000'}
     if upgradeCustoms[k]!=None : upgradeStepDict['FastSim'][k]['--customise']=upgradeCustoms[k]
 
-    upgradeStepDict['HarvFast'][k]={'-s':'HARVESTING:validationHarvestingFS',
+    upgradeStepDict['HARVESTFast'][k]={'-s':'HARVESTING:validationHarvestingFS',
                                     '--conditions':upgradeGTs[k],
                                     '--mc':'',
                                     '--magField' : '38T_PostLS1',
                                     '--geometry' : upgradeGeoms[k],
                                     '--scenario' : 'pp'
                                     }
-    if upgradeCustoms[k]!=None : upgradeStepDict['HarvFast'][k]['--customise']=upgradeCustoms[k]
+    if upgradeCustoms[k]!=None : upgradeStepDict['HARVESTFast'][k]['--customise']=upgradeCustoms[k]
 
 
 upgradeFragments=['FourMuPt_1_200_cfi','SingleElectronPt10_cfi',

Configuration/StandardSequences/python/GeometryConf.py

@@ -26,6 +26,7 @@
     'Extended2023CFCal'   : 'Extended2023CFCal,Extended2023CFCalReco',
     'Extended2023CFCal4Eta'   : 'Extended2023CFCal4Eta,Extended2023CFCal4EtaReco',
     'Extended2023RPCUpscope'   : 'Extended2023RPCUpscope,Extended2023RPCUpscopeReco',
+    'ExtendedPhase1Pixel10D'   : 'ExtendedPhase1Pixel10D,ExtendedPhase1Pixel10DReco',
     'ExtendedPhase2TkBE'   : 'ExtendedPhase2TkBE,ExtendedPhase2TkBEReco',
     'ExtendedPhase2TkBE5D'   : 'ExtendedPhase2TkBE5D,ExtendedPhase2TkBE5DReco',
     'ExtendedPhase2TkBE5DPixel10D'   : 'ExtendedPhase2TkBE5DPixel10D,ExtendedPhase2TkBE5DPixel10DReco',

DataFormats/EcalDetId/interface/EcalSubdetector.h

@@ -9,6 +9,6 @@
  */
 
 
-enum EcalSubdetector { EcalBarrel=1, EcalEndcap=2, EcalPreshower=3, EcalTriggerTower=4, EcalLaserPnDiode=5 };
+enum EcalSubdetector { EcalBarrel=1, EcalEndcap=2, EcalPreshower=3, EcalTriggerTower=4, EcalLaserPnDiode=5, EcalShashlik=6 };
 
 #endif

Geometry/CMSCommonData/data/PhaseI/cms.xml

@@ -39,7 +39,7 @@
  <Constant name="TotemBeamZ2"  value="13.381*m"/>
  <Constant name="TotemBeamZ3"  value="13.439*m"/>
  <Constant name="TotemBeamZ4"  value="13.465*m"/>
- <Constant name="TotemBeamR1"  value="11.64*cm"/>
+ <Constant name="TotemBeamR1"  value="11.785*cm"/>
  <Constant name="TotemBeamR2"  value="12.15*cm"/>
  <Constant name="TotemBeamR3"  value="12.20*cm"/>
  <Constant name="TotemBeamR4"  value="3.675*cm"/>

Geometry/CMSCommonData/python/cmsExtendedGeometry2023MuonXML_cfi.py

@@ -20,20 +20,38 @@
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdMaterials.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdMaterials.xml',
         'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdCylinder.xml', 
-        'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixfwd.xml', 
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdDisks.xml', 
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDisk1.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDisk2.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDisk3.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk1.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk2.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk3.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdblade1.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdblade2.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdblade3.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdCylinder.xml', 
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwd.xml', 
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdDisks.xml', 
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk1.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk2.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk3.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk4.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk5.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk6.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk7.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk1.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk2.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk3.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk4.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk5.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk6.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk7.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk8.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk9.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk10.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade1.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade2.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade3.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade4.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade5.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade6.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade7.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade8.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade9.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade10.xml',
         'Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml', 
         'Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml', 
         'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml', 
@@ -50,14 +68,14 @@
         'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/tracker.xml',
         'Geometry/TrackerCommonData/data/trackerpixbar.xml',
         'Geometry/TrackerCommonData/data/PhaseI/trackerpixfwd.xml',
-        'Geometry/EcalCommonData/data/eregalgo.xml',
+        'Geometry/EcalCommonData/data/PhaseII/ShortEE/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/ectkcable.xml',
-        'Geometry/EcalCommonData/data/eefixed.xml',
-        'Geometry/EcalCommonData/data/eehier.xml',
+        'Geometry/EcalCommonData/data/PhaseII/ShortEE/eefixed.xml',
+        'Geometry/EcalCommonData/data/PhaseII/ShortEE/eehier.xml',
         'Geometry/EcalCommonData/data/eealgo.xml',
         'Geometry/EcalCommonData/data/escon.xml',
         'Geometry/EcalCommonData/data/esalgo.xml',
@@ -79,7 +97,7 @@
         'Geometry/MuonCommonData/data/v1/mb3.xml',
         'Geometry/MuonCommonData/data/v1/mb4.xml',
         'Geometry/MuonCommonData/data/design/muonYoke.xml',
-        'Geometry/MuonCommonData/data/v7/mf.xml',
+        'Geometry/MuonCommonData/data/PhaseII/v3/mf.xml',
         'Geometry/MuonCommonData/data/PhaseII/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/v2/gemf.xml',
         'Geometry/MuonCommonData/data/v5/gem11.xml',
@@ -104,10 +122,10 @@
         'Geometry/ForwardCommonData/data/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring(
-        'Geometry/MuonCommonData/data/PhaseII/v2/muonNumbering.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/trackerStructureTopology.xml',
-        'Geometry/TrackerSimData/data/PhaseII/BarrelEndcap5D/trackersens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/BarrelEndcap5D/trackerRecoMaterial.xml',
+        'Geometry/MuonCommonData/data/PhaseII/v3/muonNumbering.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/trackerStructureTopology.xml',
+        'Geometry/TrackerSimData/data/PhaseII/Pixel10D/trackersens.xml',
+        'Geometry/TrackerRecoData/data/PhaseII/Pixel10D/trackerRecoMaterial.xml',
         'Geometry/EcalSimData/data/ecalsens.xml',
         'Geometry/HcalCommonData/data/hcalsenspmf.xml',
         'Geometry/HcalSimData/data/hf.xml',