Merge pull request #14181 from davidlange6/addPhIIscenarios

Add phase ii scenarios to runTheMatrix on top of #14098 #14165

Configuration/Geometry/python/GeometryExtended2023devReco_cff.py → Configuration/Geometry/python/GeometryExtended2023tiltedReco_cff.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 # Ideal geometry, needed for transient ECAL alignement
-from Configuration.Geometry.GeometryExtended2023dev_cff import *
+from Configuration.Geometry.GeometryExtended2023tilted_cff import *
 # Reconstruction geometry services
 #  Tracking Geometry
 from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *

Configuration/Geometry/python/GeometryExtended2023dev_cff.py → Configuration/Geometry/python/GeometryExtended2023tilted_cff.py

@@ -4,7 +4,7 @@
 # Geometry master configuration
 #
 # Ideal geometry, needed for simulation
-from Geometry.CMSCommonData.cmsExtendedGeometry2023devXML_cfi import *
+from Geometry.CMSCommonData.cmsExtendedGeometry2023tiltedXML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.HcalCommonData.hcalParameters_cfi      import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *

Configuration/PyReleaseValidation/python/relval_2017.py

@@ -18,6 +18,8 @@
 #2017 WFs to run in IB (TenMuE_0_200, TTbar, ZEE, MinBias, TTbar PU, ZEE PU)
 numWFIB = [10021.0,10024.0,10025.0,10026.0,10023.0,10224.0,10225.0]
 numWFIB.extend([10821.0,10824.0,10825.0,10826.0]) #2023sim scenario
+numWFIB.extend([10621.0,10624.0,10625.0,10626.0]) #2023 with tilted tracker
+numWFIB.extend([11021.0,11024.0,11025.0,11026.0]) #2023lreco
 for i,key in enumerate(upgradeKeys):
     numWF=numWFStart+i*numWFSkip
     for frag in upgradeFragments:

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -1554,7 +1554,7 @@ def identityFS(wf):
     if cust!=None : upgradeStepDict['DigiFull'][k]['--customise']=cust
     if era is not None: upgradeStepDict['DigiFull'][k]['--era']=era
 
-    upgradeStepDict['DigiFulllocalreco'][k] = {'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,RAW2DIGI,L1Reco,RECO:trackerlocalreco',
+    upgradeStepDict['DigiFulllocalreco'][k] = {'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,RAW2DIGI,L1Reco,RECO:localreco',
                                       '--conditions':gt,
                                       '--datatier':'GEN-SIM-DIGI-RAW',
                                       '-n':'10',

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -3,7 +3,7 @@
 upgradeKeys=['2017',
              '2017PU',
 	     '2023',   
-	     '2023dev', 
+	     '2023tilted', 
 	     '2023sim',
 	     '2023LReco',
 	     '2023Reco'
@@ -12,31 +12,31 @@
 
 upgradeGeoms={ '2017' : 'Extended2017',
                '2023' : 'Extended2023',   
-               '2023dev' : 'Extended2023dev', 
+               '2023tilted' : 'Extended2023tilted', 
                '2023sim' : 'Extended2023sim',
                '2023LReco': 'Extended2023LReco',
                '2023Reco' : 'Extended2023Reco'
                }
 
 upgradeGTs={ '2017' : 'auto:phase1_2017_realistic',
 	     '2023' :  'auto:run2_mc',
-	     '2023dev' :  'auto:run2_mc',
+	     '2023tilted' :  'auto:run2_mc',
 	     '2023sim' : 'auto:run2_mc',
 	     '2023LReco': 'auto:run2_mc',
 	     '2023Reco' : 'auto:run2_mc'
              }
 upgradeCustoms={ '2017' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2017',
  		 '2023' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023',
- 		 '2023dev' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023dev',
+ 		 '2023tilted' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023tilted',
  		 '2023sim' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023sim',
  		 '2023LReco' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023LReco',
  		 '2023Reco' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023Reco'
 
                  }
 upgradeEras={ '2017' : 'Run2_2017',
-	      '2023sim' : 'Run2_25ns',
-	      '2023dev' : 'Run2_25ns',
-	      '2023LReco' : 'Run2_25ns'
+	      '2023sim' : 'Phase2',
+	      '2023tilted' : 'Phase2',
+	      '2023LReco' : 'Phase2'
               }
 
 upgradeFragments=['FourMuPt_1_200_pythia8_cfi',
@@ -105,7 +105,7 @@
                    #'2017':['GenSimFull'],
 		   '2017PU':['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU'],#full sequence
 		   '2023':['GenSimFull','DigiFull','RecoFull'],#full sequence
-		   '2023dev':['GenSimFull','DigiFulllocalreco'],#dev scenario
+		   '2023tilted':['GenSimFull','DigiFulllocalreco'],#dev scenario
 		   '2023sim':['GenSimFull'],#sim scenario
 		   '2023LReco':['GenSimFull','DigiFulllocalreco'],#local reco scneario
 		   '2023Reco':['GenSimFull','DigiFull','RecoFull']#full reco scenario

Configuration/StandardSequences/python/GeometryConf.py

@@ -32,7 +32,7 @@
     'TrackerOnly' : 'Configuration.Geometry.GeometrySimTracker_cff,Configuration.Geometry.GeometryRecoTracker_cff',
     'HCal'        : 'Configuration.Geometry.GeometrySimHCAL_cff,Configuration.Geometry.GeometryRecoHCAL_cff',
     'Extended2023sim'   : 'Extended2023sim,Extended2023simReco',
-    'Extended2023dev'   : 'Extended2023dev,Extended2023devReco',
+    'Extended2023tilted'   : 'Extended2023tilted,Extended2023tiltedReco',
     'Extended2023LReco'   : 'Extended2023LReco,Extended2023LRecoReco'
 
     }

Configuration/StandardSequences/python/Reconstruction_cff.py

@@ -43,7 +43,7 @@
 
 from RecoLocalCalo.CastorReco.CastorSimpleReconstructor_cfi import *
 
-localreco = cms.Sequence(trackerlocalreco+muonlocalreco+calolocalreco+castorreco)
+localreco = cms.Sequence(bunchSpacingProducer+trackerlocalreco+muonlocalreco+calolocalreco+castorreco)
 localreco_HcalNZS = cms.Sequence(trackerlocalreco+muonlocalreco+calolocalrecoNZS+castorreco)
 
 #
@@ -98,9 +98,9 @@
 from FWCore.Modules.logErrorHarvester_cfi import *
 
 # "Export" Section
-reconstruction         = cms.Sequence(bunchSpacingProducer*localreco*globalreco*highlevelreco*logErrorHarvester)
+reconstruction         = cms.Sequence(localreco*globalreco*highlevelreco*logErrorHarvester)
 
-reconstruction_trackingOnly = cms.Sequence(bunchSpacingProducer*localreco*globalreco_tracking)
+reconstruction_trackingOnly = cms.Sequence(localreco*globalreco_tracking)
 
 #need a fully expanded sequence copy
 modulesToRemove = list() # copy does not work well
@@ -193,5 +193,3 @@
 # modules instead of sequences
 #
 reconstruction_standard_candle = cms.Sequence(localreco*globalreco*vertexreco*recoJetAssociations*btagging*electronSequence*photonSequence)
-
-

RecoLocalCalo/Configuration/python/RecoLocalCalo_cff.py

@@ -43,6 +43,7 @@ def _modifyRecoLocalCaloConfigurationReconstructorsForPhase2CommonHF( obj ):
 
 def _modifyRecoLocalCaloConfigurationReconstructorsForPhase2CommonZDC( obj ):
     obj.digiLabel = cms.InputTag('simHcalUnsuppressedDigis')
+    obj.digiLabelhcal = cms.InputTag('simHcalUnsuppressedDigis')
 
 def _modifyRecoLocalCaloConfigurationProcessForPhase2Common( theProcess ):
     theProcess.load("RecoLocalCalo.HcalRecProducers.HBHEUpgradeReconstructor_cfi")

RecoLocalCalo/EcalRecProducers/python/ecalRecHit_cfi.py

@@ -80,3 +80,15 @@
     cleaningConfig=cleaningAlgoConfig,
 
     )
+
+from Configuration.StandardSequences.Eras import eras
+# disable workerRecover_ which requires EcalEndcapGeometryRecord
+eras.phase2_common.toModify( ecalRecHit,
+    recoverEBIsolatedChannels = cms.bool(False), 
+    recoverEEIsolatedChannels = cms.bool(False), 
+    recoverEBVFE = cms.bool(False), 
+    recoverEEVFE = cms.bool(False), 
+    recoverEBFE = cms.bool(False), 
+    recoverEEFE = cms.bool(False), 
+    killDeadChannels = cms.bool(False)
+)

RecoLocalMuon/GEMSegment/plugins/ME0SegFit.cc

@@ -343,7 +343,8 @@ ME0SegFit::SMatrixSym12 ME0SegFit::weightMatrix() {
   int row = 0;
 
   for (ME0SetOfHits::const_iterator it = hits_.begin(); it != hits_.end(); ++it) {
-
+    if (row > 11) break; // temp due to max size of matrix
+
     const ME0RecHit& hit = (**it);
 
 // Note scaleXError allows rescaling the x error if necessary
@@ -373,6 +374,7 @@ ME0SegFit::SMatrix12by4 ME0SegFit::derivativeMatrix() {
   int row = 0;
 
   for( ME0SetOfHits::const_iterator it = hits_.begin(); it != hits_.end(); ++it) {
+    if (row > 11) break; // temp due to max size of matrix
 
     const ME0RecHit& hit = (**it);
     ME0DetId d = ME0DetId(hit.rawId());

SLHCUpgradeSimulations/Configuration/python/combinedCustoms.py

@@ -26,7 +26,7 @@ def cust_2023sim(process):
     # To allow simulatenous use of customisation and era while the era migration is in progress
     return process
 
-def cust_2023dev(process):
+def cust_2023tilted(process):
     # To allow simulatenous use of customisation and era while the era migration is in progress
     process=customiseTiltedTK(process)
     return process

SLHCUpgradeSimulations/Geometry/test/writeFile_phase2Tilted_cfg.py

@@ -4,7 +4,7 @@
 process.load("Configuration.StandardSequences.Services_cff")
 #process.load('Configuration.Geometry.GeometryExtendedPhase2TkBE5D_cff')
 #process.load('Configuration.Geometry.GeometryExtended2023TiltedTKReco_cff')
-process.load('Configuration.Geometry.GeometryExtended2023devReco_cff')
+process.load('Configuration.Geometry.GeometryExtended2023tiltedReco_cff')
 
 #process.load('Geometry.TrackerGeometryBuilder.trackerSLHCGeometry_cfi')
 #process.trackerSLHCGeometry.applyAlignment = cms.bool(False)