Skip to content

Commit

Permalink
Merge pull request #10156 from boudoul/hgcal18notrk
Browse files Browse the repository at this point in the history 
New Scenarios for SD: HGCAL ee18 without Tracker Extension
  • Loading branch information
@cmsbuild
cmsbuild committed Jul 13, 2015
2 parents c9d6eb6 + e72cd16 commit 88250f6
Show file tree
Hide file tree
Showing 3 changed files with 165 additions and 27 deletions.
7 changes: 4 additions & 3 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1101,9 +1101,10 @@ def genvalid(fragment,d,suffix='all',fi=''):
defaultDataSets['Extended2023HGCalMuonPandora']=defaultDataSets['Extended2023HGCalMuon'] # Geometry is the same, only reco is different
defaultDataSets['Extended2023SHCalNoTaper']='CMSSW_6_2_0_SLHC20_patch1-DES23_62_V1_refSHNoTaper-v'
defaultDataSets['2019WithGEMAging']='CMSSW_6_2_0_SLHC20-DES19_62_V8_UPG2019withGEM-v'
defaultDataSets['Extended2023HGCalPandoraMuonScopeDoc_ee28_fh12']=defaultDataSets['Extended2023HGCalMuon']
defaultDataSets['Extended2023HGCalPandoraMuonScopeDoc_ee24_fh11']=defaultDataSets['Extended2023HGCalMuon']
defaultDataSets['Extended2023HGCalPandoraMuonScopeDoc_ee18_fh9']=defaultDataSets['Extended2023HGCalMuon']
defaultDataSets['Extended2023HGCalScopeDoc_ee28_fh12']=defaultDataSets['Extended2023HGCalMuon']
defaultDataSets['Extended2023HGCalScopeDoc_ee24_fh11']=defaultDataSets['Extended2023HGCalMuon']
defaultDataSets['Extended2023HGCalScopeDoc_ee18_fh9']=defaultDataSets['Extended2023HGCalMuon']
defaultDataSets['Extended2023HGCalNoExtPix_ee18']=defaultDataSets['Extended2023HGCalMuon']
keys=defaultDataSets.keys()
for key in keys:
defaultDataSets[key+'PU']=defaultDataSets[key]
Expand Down
57 changes: 33 additions & 24 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
'Extended2023',
'Extended2023HGCalMuon',
'Extended2023SHCal',
'Extended2023HGCalPandoraMuonScopeDoc_ee28_fh12',
'Extended2023HGCalScopeDoc_ee28_fh12',
'Extended2023TTI',
'Extended2023Muon',
'Extended2023HGCalV6Muon',
'Extended2023SHCalNoTaperNoExtPix',
'Extended2023Pixel',
'Extended2023SHCalNoTaper',
'Extended2023HGCalPandoraMuonScopeDoc_ee24_fh11',
'Extended2023HGCalScopeDoc_ee24_fh11',
'Extended2023HGCal',
'Extended2023HGCalPandoraMuonScopeDoc_ee18_fh9',
'Extended2023HGCalScopeDoc_ee18_fh9',
'BE5DPixel10DLHCC',
'Extended2023HGCalV4',
'Extended2023HGCalMuonPU',
Expand All @@ -35,9 +35,12 @@
'BE5DPixel10DLHCCNoDefect',
'BE5DPixel10DDefect',
'BE5DPixel10DCoolingDefect',
'Extended2023HGCalPandoraMuonScopeDoc_ee28_fh12PU',
'Extended2023HGCalPandoraMuonScopeDoc_ee24_fh11PU',
'Extended2023HGCalPandoraMuonScopeDoc_ee18_fh9PU'
'Extended2023HGCalScopeDoc_ee28_fh12PU',
'Extended2023HGCalScopeDoc_ee24_fh11PU',
'Extended2023HGCalScopeDoc_ee18_fh9PU',
'Extended2023HGCalNoExtPix_ee18',
'Extended2023HGCalNoExtPix_ee18PU'

]


Expand All @@ -54,24 +57,26 @@
'Extended2023' : 'Extended2023,Extended2023Reco',
'Extended2023HGCalMuon' : 'Extended2023HGCalMuon,Extended2023HGCalMuonReco',
'Extended2023SHCal' : 'Extended2023SHCal,Extended2023SHCalReco',
'Extended2023HGCalPandoraMuonScopeDoc_ee28_fh12' : 'Extended2023HGCalMuon,Extended2023HGCalMuonReco',
'Extended2023HGCalScopeDoc_ee28_fh12' : 'Extended2023HGCalMuon,Extended2023HGCalMuonReco',
'Extended2023TTI' : 'Extended2023TTI,Extended2023TTIReco',
'Extended2023Muon' : 'Extended2023Muon,Extended2023MuonReco',
'BE5DPixel10DLHCC' : 'ExtendedPhase2TkBE5DPixel10DLHCC',
'Extended2023HGCalV6Muon' : 'Extended2023HGCalV6Muon,Extended2023HGCalV6MuonReco',
'Extended2023SHCalNoTaperNoExtPix' : 'Extended2023SHCalNoTaperNoExtPix',
'Extended2023Pixel' : 'Extended2023Pixel,Extended2023PixelReco',
'Extended2023SHCalNoTaper' : 'Extended2023SHCalNoTaper,Extended2023SHCalNoTaperReco',
'Extended2023HGCalPandoraMuonScopeDoc_ee24_fh11' : 'Extended2023HGCalMuon,Extended2023HGCalMuonReco',
'Extended2023HGCalScopeDoc_ee24_fh11' : 'Extended2023HGCalMuon,Extended2023HGCalMuonReco',
'Extended2023HGCal' : 'Extended2023HGCal,Extended2023HGCalReco',
'Extended2023HGCalPandoraMuonScopeDoc_ee18_fh9' : 'Extended2023HGCalMuon,Extended2023HGCalMuonReco',
'Extended2023HGCalScopeDoc_ee18_fh9' : 'Extended2023HGCalMuon,Extended2023HGCalMuonReco',
'Extended2023HGCalV4' : 'Extended2023HGCalV4Muon,Extended2023HGCalV4MuonReco',
'Extended2023HGCalMuonPandora' : 'Extended2023HGCalMuon,Extended2023HGCalMuonReco',
'Extended2023SHCalNoTaperFast' : 'Extended2023SHCalNoTaper,Extended2023SHCalNoTaperReco',
'Extended2023HGCalNoExtPix' : 'Extended2023HGCalNoExtPix',
'BE5DPixel10DLHCCNoDefect' : 'ExtendedPhase2TkBE5DPixel10DLHCC',
'BE5DPixel10DDefect' : 'ExtendedPhase2TkBE5DPixel10D',
'BE5DPixel10DCoolingDefect' : 'ExtendedPhase2TkBE5DPixel10D'
'BE5DPixel10DCoolingDefect' : 'ExtendedPhase2TkBE5DPixel10D',
'Extended2023HGCalNoExtPix_ee18' : 'Extended2023HGCalNoExtPix'

}
upgradeGTs={ '2017' : 'auto:upgrade2017',
'2019' : 'auto:upgrade2019',
Expand All @@ -86,24 +91,25 @@
'Extended2023' : 'auto:upgradePLS3',
'Extended2023HGCalMuon' : 'PH2_1K_FB_V6::All', #EB aged at 1000fb-1
'Extended2023SHCal' : 'auto:upgradePLS3',
'Extended2023HGCalPandoraMuonScopeDoc_ee28_fh12' : 'PH2_1K_FB_V6::All', #EB aged at 1000fb-1
'Extended2023HGCalScopeDoc_ee28_fh12' : 'PH2_1K_FB_V6::All', #EB aged at 1000fb-1
'Extended2023TTI' : 'auto:upgradePLS3',
'Extended2023Muon' : 'auto:upgradePLS3',
'BE5DPixel10DLHCC' : 'auto:upgradePLS3',
'Extended2023HGCalV6Muon' : 'PH2_1K_FB_V6::All', #EB aged at 1000fb-1
'Extended2023SHCalNoTaperNoExtPix' : 'auto:upgradePLS3',
'Extended2023Pixel' : 'auto:upgradePLS3',
'Extended2023SHCalNoTaper' : 'PH2_1K_FB_V6::All',#EB aged at 1000fb-1
'Extended2023HGCalPandoraMuonScopeDoc_ee24_fh11' : 'PH2_1K_FB_V6::All', #EB aged at 1000fb-1
'Extended2023HGCalScopeDoc_ee24_fh11' : 'PH2_1K_FB_V6::All', #EB aged at 1000fb-1
'Extended2023HGCal' : 'auto:upgradePLS3',
'Extended2023HGCalPandoraMuonScopeDoc_ee18_fh9' : 'PH2_1K_FB_V6::All', #EB aged at 1000fb-1
'Extended2023HGCalScopeDoc_ee18_fh9' : 'PH2_1K_FB_V6::All', #EB aged at 1000fb-1
'Extended2023HGCalV4' : 'auto:upgradePLS3',
'Extended2023HGCalMuonPandora' : 'PH2_1K_FB_V6::All', #EB aged at 1000fb-1
'Extended2023SHCalNoTaperFast' : 'auto:upgradePLS3',
'Extended2023HGCalNoExtPix' : 'auto:upgradePLS3',
'BE5DPixel10DLHCCNoDefect' : 'auto:upgradePLS3',
'BE5DPixel10DDefect' : 'auto:upgradePLS3',
'BE5DPixel10DCoolingDefect' : 'auto:upgradePLS3'
'BE5DPixel10DCoolingDefect' : 'auto:upgradePLS3',
'Extended2023HGCalNoExtPix_ee18' : 'PH2_1K_FB_V6::All' #EB aged at 1000fb-1
}
upgradeCustoms={ '2017' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2017',
'2019' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2019',
Expand All @@ -118,24 +124,25 @@
'Extended2023' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023',
'Extended2023HGCalMuon' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023HGCalMuon',
'Extended2023SHCal' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023SHCal',
'Extended2023HGCalPandoraMuonScopeDoc_ee28_fh12' : 'RecoParticleFlow/PandoraTranslator/customizeHGCalPandora_cff.cust_2023HGCalPandoraMuonScopeDoc_ee28_fh12',
'Extended2023HGCalScopeDoc_ee28_fh12' : 'RecoParticleFlow/PandoraTranslator/customizeHGCalPandora_cff.cust_2023HGCalPandoraMuonScopeDoc_ee28_fh12',
'Extended2023TTI' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023TTI',
'Extended2023Muon' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023Muon',
'BE5DPixel10DLHCC' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_phase2_BE5DPixel10DLHCC',
'Extended2023HGCalV6Muon' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023HGCalV6Muon',
'Extended2023SHCalNoTaperNoExtPix' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023SHCalNoExtPix',
'Extended2023Pixel' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023Pixel',
'Extended2023SHCalNoTaper' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023SHCal',
'Extended2023HGCalPandoraMuonScopeDoc_ee24_fh11' : 'RecoParticleFlow/PandoraTranslator/customizeHGCalPandora_cff.cust_2023HGCalPandoraMuonScopeDoc_ee24_fh11',
'Extended2023HGCalScopeDoc_ee24_fh11' : 'RecoParticleFlow/PandoraTranslator/customizeHGCalPandora_cff.cust_2023HGCalPandoraMuonScopeDoc_ee24_fh11',
'Extended2023HGCal' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023HGCal',
'Extended2023HGCalPandoraMuonScopeDoc_ee18_fh9' : 'RecoParticleFlow/PandoraTranslator/customizeHGCalPandora_cff.cust_2023HGCalPandoraMuonScopeDoc_ee18_fh9',
'Extended2023HGCalScopeDoc_ee18_fh9' : 'RecoParticleFlow/PandoraTranslator/customizeHGCalPandora_cff.cust_2023HGCalPandoraMuonScopeDoc_ee18_fh9',
'Extended2023HGCalV4' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023HGCalMuon',
'Extended2023HGCalMuonPandora' : 'RecoParticleFlow/PandoraTranslator/customizeHGCalPandora_cff.cust_2023HGCalPandoraMuon',
'Extended2023SHCalNoTaperFast' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023SHCalTime',
'Extended2023HGCalNoExtPix' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023HGCalPandoraMuonNoExtPix',
'BE5DPixel10DLHCCNoDefect' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_phase2_BE5DPixel10DLHCCNoDefect',
'BE5DPixel10DDefect' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_phase2_BE5DPixel10DDefect',
'BE5DPixel10DCoolingDefect' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_phase2_BE5DPixel10DCoolingDefect'
'BE5DPixel10DCoolingDefect' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_phase2_BE5DPixel10DCoolingDefect',
'Extended2023HGCalNoExtPix_ee18' : 'RecoParticleFlow/PandoraTranslator/customizeHGCalPandora_cff.cust_2023HGCalNoExtPix_ee18_fh9'
}

upgradeFragments=['FourMuPt_1_200_cfi','SingleElectronPt10_cfi',
Expand Down Expand Up @@ -196,17 +203,17 @@
'Extended2023':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'],
'Extended2023HGCalMuon':['GenSimHLBeamSpotFull','DigiFull','RecoFullHGCAL'],
'Extended2023SHCal':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'],
'Extended2023HGCalPandoraMuonScopeDoc_ee28_fh12':['GenSimHLBeamSpotFull','DigiFull','RecoFullHGCAL'],
'Extended2023HGCalScopeDoc_ee28_fh12':['GenSimHLBeamSpotFull','DigiFull','RecoFullHGCAL'],
'Extended2023TTI':['GenSimHLBeamSpotFull','DigiTrkTrigFull'], ##no need to go beyond local reco
'Extended2023Muon':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'],
'BE5DPixel10DLHCC':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'],
'Extended2023HGCalV6Muon':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'],
'Extended2023SHCalNoTaperNoExtPix':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'],
'Extended2023Pixel':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'],
'Extended2023SHCalNoTaper':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'],
'Extended2023HGCalPandoraMuonScopeDoc_ee24_fh11':['GenSimHLBeamSpotFull','DigiFull','RecoFullHGCAL'],
'Extended2023HGCalScopeDoc_ee24_fh11':['GenSimHLBeamSpotFull','DigiFull','RecoFullHGCAL'],
'Extended2023HGCal':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'],
'Extended2023HGCalPandoraMuonScopeDoc_ee18_fh9':['GenSimHLBeamSpotFull','DigiFull','RecoFullHGCAL'],
'Extended2023HGCalScopeDoc_ee18_fh9':['GenSimHLBeamSpotFull','DigiFull','RecoFullHGCAL'],
'Extended2023HGCalV4' : ['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'],
'Extended2023HGCalMuonPU' : ['GenSimHLBeamSpotFull','DigiFullPU','RecoFullPUHGCAL'],
'Extended2023SHCalNoTaperPU' : ['GenSimHLBeamSpotFull','DigiFullPU','RecoFullPU','HARVESTFullPU'],
Expand All @@ -218,9 +225,11 @@
'BE5DPixel10DLHCCNoDefect':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'],
'BE5DPixel10DDefect':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'],
'BE5DPixel10DCoolingDefect':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'],
'Extended2023HGCalPandoraMuonScopeDoc_ee28_fh12PU': ['GenSimHLBeamSpotFull','DigiFullPU','RecoFullPUHGCAL'],
'Extended2023HGCalPandoraMuonScopeDoc_ee24_fh11PU': ['GenSimHLBeamSpotFull','DigiFullPU','RecoFullPUHGCAL'],
'Extended2023HGCalPandoraMuonScopeDoc_ee18_fh9PU': ['GenSimHLBeamSpotFull','DigiFullPU','RecoFullPUHGCAL']
'Extended2023HGCalScopeDoc_ee28_fh12PU': ['GenSimHLBeamSpotFull','DigiFullPU','RecoFullPUHGCAL'],
'Extended2023HGCalScopeDoc_ee24_fh11PU': ['GenSimHLBeamSpotFull','DigiFullPU','RecoFullPUHGCAL'],
'Extended2023HGCalScopeDoc_ee18_fh9PU': ['GenSimHLBeamSpotFull','DigiFullPU','RecoFullPUHGCAL'],
'Extended2023HGCalNoExtPix_ee18' : ['GenSimHLBeamSpotFull','DigiFull','RecoFullHGCAL'],
'Extended2023HGCalNoExtPix_ee18PU' : ['GenSimHLBeamSpotFull','DigiFullPU','RecoFullPUHGCAL']
}

from Configuration.PyReleaseValidation.relval_steps import Kby
Expand Down
Loading

0 comments on commit 88250f6

Please sign in to comment.