From f3a9bf6dca9b4a389e22df30a40fdd8d5c3fe68d Mon Sep 17 00:00:00 2001 From: Mark Grimes Date: Fri, 27 Feb 2015 16:56:05 +0100 Subject: [PATCH 1/2] Fix whitespace --- .../python/upgradeWorkflowComponents.py | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 01826cd9c5e12..39720cfed9c0d 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -18,7 +18,7 @@ 'Extended2023Muon', 'Extended2023HGCalV6Muon', 'Extended2023SHCalNoTaperNoExtPix', - 'Extended2023Pixel', + 'Extended2023Pixel', 'Extended2023SHCalNoTaper', 'Extended2023SHCalNoTaper4Eta', 'Extended2023HGCal', @@ -26,9 +26,9 @@ 'BE5DPixel10DLHCC', 'Extended2023HGCalV4', 'Extended2023HGCalMuonPU', - 'Extended2023SHCalNoTaperPU', + 'Extended2023SHCalNoTaperPU', '2019WithGEMAgingPU' - ] + ] upgradeGeoms={ '2017' : 'Extended2017', @@ -137,9 +137,9 @@ 'SingleMuPt1000Extended_cfi', 'TenMuE_0_200_cfi', 'SinglePiE50HCAL_cfi', - 'QCDForPF_14TeV_cfi', - 'DYToLL_M_50_TuneZ2star_14TeV_pythia6_tauola_cff', - 'DYtoTauTau_M_50_TuneD6T_14TeV_pythia6_tauola_cff' ] + 'QCDForPF_14TeV_cfi', + 'DYToLL_M_50_TuneZ2star_14TeV_pythia6_tauola_cff', + 'DYtoTauTau_M_50_TuneD6T_14TeV_pythia6_tauola_cff' ] @@ -174,7 +174,7 @@ 'BE5DPixel10DLHCC':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'], 'Extended2023HGCalV6Muon':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'], 'Extended2023SHCalNoTaperNoExtPix':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'], - 'Extended2023Pixel':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'], + 'Extended2023Pixel':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'], 'Extended2023SHCalNoTaper':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'], 'Extended2023SHCalNoTaper4Eta':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'], 'Extended2023HGCal':['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'], @@ -249,9 +249,9 @@ 'MinBias_TuneZ2star_14TeV_pythia6_cff':Kby(9,100), 'WM_14TeV_cfi':Kby(9,100), 'ZMM_14TeV_cfi':Kby(18,100), - 'QCDForPF_14TeV_cfi':Kby(9,50), - 'DYToLL_M_50_TuneZ2star_14TeV_pythia6_tauola_cff':Kby(9,100), - 'DYtoTauTau_M_50_TuneD6T_14TeV_pythia6_tauola_cff':Kby(9,100) + 'QCDForPF_14TeV_cfi':Kby(9,50), + 'DYToLL_M_50_TuneZ2star_14TeV_pythia6_tauola_cff':Kby(9,100), + 'DYtoTauTau_M_50_TuneD6T_14TeV_pythia6_tauola_cff':Kby(9,100) } upgradeDatasetFromFragment={'FourMuPt_1_200_cfi': 'FourMuPt1_200', @@ -316,9 +316,9 @@ 'MinBias_TuneZ2star_14TeV_pythia6_cff' : 'MinBias_TuneZ2star_14TeV', 'WM_14TeV_cfi' : 'WM_14TeV', 'ZMM_14TeV_cfi' : 'ZMM_14TeV', - 'QCDForPF_14TeV_cfi' : 'QCDForPF_14TeV', - 'DYToLL_M_50_TuneZ2star_14TeV_pythia6_tauola_cff' : 'DYToLL_M_50_TuneZ2star_14TeV', - 'DYtoTauTau_M_50_TuneD6T_14TeV_pythia6_tauola_cff' : 'DYtoTauTau_M_50_TuneD6T_14TeV' + 'QCDForPF_14TeV_cfi' : 'QCDForPF_14TeV', + 'DYToLL_M_50_TuneZ2star_14TeV_pythia6_tauola_cff' : 'DYToLL_M_50_TuneZ2star_14TeV', + 'DYtoTauTau_M_50_TuneD6T_14TeV_pythia6_tauola_cff' : 'DYtoTauTau_M_50_TuneD6T_14TeV' } From 9beee905a6c865e1b45bf2f0f277c455ecb38339 Mon Sep 17 00:00:00 2001 From: Mark Grimes Date: Fri, 27 Feb 2015 17:49:40 +0100 Subject: [PATCH 2/2] Add workflows for HGCal reconstructed using PandoraPFA (with and without pileup) --- .../PyReleaseValidation/python/relval_steps.py | 1 + .../python/upgradeWorkflowComponents.py | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index dcbb4171e1e52..0b14b77a89b4b 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -1098,6 +1098,7 @@ def genvalid(fragment,d,suffix='all',fi=''): # for each geometry define the GT and processing string here defaultDataSets={} defaultDataSets['Extended2023HGCalMuon']='CMSSW_6_2_0_SLHC20_patch1-DES23_62_V1_refHGCALV5-v' +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' keys=defaultDataSets.keys() diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 39720cfed9c0d..123e3614571cd 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -27,7 +27,9 @@ 'Extended2023HGCalV4', 'Extended2023HGCalMuonPU', 'Extended2023SHCalNoTaperPU', - '2019WithGEMAgingPU' + '2019WithGEMAgingPU', + 'Extended2023HGCalMuonPandora', + 'Extended2023HGCalMuonPandoraPU' ] @@ -55,7 +57,8 @@ 'Extended2023SHCalNoTaper4Eta' : 'Extended2023SHCalNoTaper4Eta,Extended2023SHCalNoTaper4EtaReco', 'Extended2023HGCal' : 'Extended2023HGCal,Extended2023HGCalReco', 'Extended2023HGCalMuon4Eta' : 'Extended2023HGCalMuon4Eta,Extended2023HGCalMuon4EtaReco', - 'Extended2023HGCalV4' : 'Extended2023HGCalV4Muon,Extended2023HGCalV4MuonReco' + 'Extended2023HGCalV4' : 'Extended2023HGCalV4Muon,Extended2023HGCalV4MuonReco', + 'Extended2023HGCalMuonPandora' : 'Extended2023HGCalMuon,Extended2023HGCalMuonReco' } upgradeGTs={ '2017' : 'auto:upgrade2017', '2019' : 'auto:upgrade2019', @@ -81,7 +84,8 @@ 'Extended2023SHCalNoTaper4Eta' : 'auto:upgradePLS3', 'Extended2023HGCal' : 'auto:upgradePLS3', 'Extended2023HGCalMuon4Eta' : 'auto:upgradePLS3', - 'Extended2023HGCalV4' : 'auto:upgradePLS3' + 'Extended2023HGCalV4' : 'auto:upgradePLS3', + 'Extended2023HGCalMuonPandora' : 'PH2_1K_FB_V6::All' #EB aged at 1000fb-1 } upgradeCustoms={ '2017' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2017', '2019' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2019', @@ -107,7 +111,8 @@ 'Extended2023SHCalNoTaper4Eta' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023SHCal', 'Extended2023HGCal' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023HGCal', 'Extended2023HGCalMuon4Eta' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023HGCalMuon', - 'Extended2023HGCalV4' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023HGCalMuon' + 'Extended2023HGCalV4' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023HGCalMuon', + 'Extended2023HGCalMuonPandora' : 'RecoParticleFlow/PandoraTranslator/customizeHGCalPandora_cff.cust_2023HGCalPandoraMuon' } upgradeFragments=['FourMuPt_1_200_cfi','SingleElectronPt10_cfi', @@ -182,7 +187,9 @@ 'Extended2023HGCalV4' : ['GenSimHLBeamSpotFull','DigiFull','RecoFull','HARVESTFull'], 'Extended2023HGCalMuonPU' : ['GenSimHLBeamSpotFull','DigiFullPU','RecoFullPUHGCAL'], 'Extended2023SHCalNoTaperPU' : ['GenSimHLBeamSpotFull','DigiFullPU','RecoFullPU','HARVESTFullPU'], - '2019WithGEMAgingPU':['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU'] + '2019WithGEMAgingPU':['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU'], + 'Extended2023HGCalMuonPandora':['GenSimHLBeamSpotFull','DigiFull','RecoFullHGCAL'], + 'Extended2023HGCalMuonPandoraPU' : ['GenSimHLBeamSpotFull','DigiFullPU','RecoFullPUHGCAL'] } from Configuration.PyReleaseValidation.relval_steps import Kby