From d89ee3e2b3e4b6896b0833ed35851a3e835e8626 Mon Sep 17 00:00:00 2001 From: Efe Date: Mon, 15 Jan 2024 14:32:37 +0100 Subject: [PATCH 1/2] req ch. scri. wf with a more restricted set of requests --- .github/workflows/main.yml | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 03a1b21ecc48..1a828902e5a1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,12 +11,14 @@ on: - '.github/workflows/**' - 'bin/Powheg/**' - '!**/*.input' + - 'bin/utils/**' pull_request: branches: [ master ] paths: - '.github/workflows/**' - 'bin/Powheg/**' - '!**/*.input' + - 'bin/utils/**' # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -44,8 +46,16 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 - + - uses: dorny/paths-filter@v2 + id: filter + with: + filters: | + powheg1: + - 'bin/Powheg/**' + workflow: + - '.github/workflows/**' - name: Build gridpack + if: steps.filter.outputs.powheg1 == 'true' || steps.filter.outputs.workflow == 'true' uses: nick-fields/retry@v2 with: max_attempts: 5 @@ -54,6 +64,7 @@ jobs: command: docker run --rm -v /cvmfs:/cvmfs -v $PWD:$PWD -w $PWD gitlab-registry.cern.ch/cms-cloud/cmssw-docker/cc7-cms bash bin/Powheg/test/test_build.sh -r ${{ matrix.cmssw_release }} -a ${{ matrix.scram_arch }} -p ${{ matrix.proc }} - name: Check pwg-stat.dat + if: steps.filter.outputs.powheg1 == 'true' || steps.filter.outputs.workflow == 'true' run: git diff --exit-code bin/Powheg/test/pwg-stat.dat.${{ matrix.proc }}_${{ matrix.scram_arch }}_${{ matrix.cmssw_release }} - name: Create Pull Request @@ -66,4 +77,26 @@ jobs: title: Automated addition ${{ matrix.proc }}_${{ matrix.scram_arch }}_${{ matrix.cmssw_release }} body: | Automated addition by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action. - Please review the cross section file carefully! \ No newline at end of file + Please review the cross section file carefully! + ############################################################# + req_check_script: + # The type of runner that the job will run on + runs-on: [self-hosted, linux, x64] + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v3 + - uses: dorny/paths-filter@v2 + id: filter + with: + filters: | + bin: + - 'bin/utils/**' + workflow: + - '.github/workflows/**' + - name: Run the request checking script on local mcm requests + #shell: python# + if: steps.filter.outputs.bin == 'true' || steps.filter.outputs.workflow == 'true' + run: | + python3 bin/utils/request_fragment_check.py --bypass_status --develop --local --prepid SUS-RunIISummer20UL16wmLHEGEN-00768 From 8cf1dfe9fb03ff0785a1bff929977cab45d43610 Mon Sep 17 00:00:00 2001 From: Efe Date: Mon, 15 Jan 2024 15:11:44 +0100 Subject: [PATCH 2/2] update the wf with more requests --- .github/workflows/main.yml | 12 +++++ bin/utils/GEN-Run3Summer22EEwmLHEGS-00118 | 47 +++++++++++++++++ bin/utils/SUS-RunIISummer20UL16wmLHEGEN-00754 | 51 +++++++++++++++++++ bin/utils/TRK-Run3Summer23wmLHEGS-00002 | 47 +++++++++++++++++ 4 files changed, 157 insertions(+) create mode 100644 bin/utils/GEN-Run3Summer22EEwmLHEGS-00118 create mode 100644 bin/utils/SUS-RunIISummer20UL16wmLHEGEN-00754 create mode 100644 bin/utils/TRK-Run3Summer23wmLHEGS-00002 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1a828902e5a1..5fffd50a96f2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -100,3 +100,15 @@ jobs: if: steps.filter.outputs.bin == 'true' || steps.filter.outputs.workflow == 'true' run: | python3 bin/utils/request_fragment_check.py --bypass_status --develop --local --prepid SUS-RunIISummer20UL16wmLHEGEN-00768 + python3 bin/utils/request_fragment_check.py --bypass_status --develop --local --prepid SUS-RunIISummer20UL16wmLHEGEN-00754 + python3 bin/utils/request_fragment_check.py --bypass_status --develop --local --prepid TOP-RunIISummer20UL16wmLHEGEN-00118 + python3 bin/utils/request_fragment_check.py --bypass_status --develop --local --prepid EXO-Run3Summer22wmLHEGS-01444 + python3 bin/utils/request_fragment_check.py --bypass_status --develop --local --prepid B2G-RunIISummer20UL18wmLHEGEN-03308 + python3 bin/utils/request_fragment_check.py --bypass_status --develop --local --prepid HIG-RunIISummer20UL16wmLHEGEN-14374 + python3 bin/utils/request_fragment_check.py --bypass_status --develop --local --prepid SMP-RunIISummer20UL16GEN-00050 + python3 bin/utils/request_fragment_check.py --bypass_status --develop --local --prepid GEN-Run3Summer22EEwmLHEGS-00226 + python3 bin/utils/request_fragment_check.py --bypass_status --develop --local --prepid GEN-Run3Summer22EEwmLHEGS-00118 + python3 bin/utils/request_fragment_check.py --bypass_status --develop --local --prepid GEN-Run3Summer22EEwmLHEGS-00403 + python3 bin/utils/request_fragment_check.py --bypass_status --develop --local --prepid TRK-Run3Summer23wmLHEGS-00002 + python3 bin/utils/request_fragment_check.py --bypass_status --develop --local --prepid TSG-Run3Summer23BPixGS-00007 + python3 bin/utils/request_fragment_check.py --bypass_status --develop --local --prepid TSG-Run3Summer23BPixGS-00045 diff --git a/bin/utils/GEN-Run3Summer22EEwmLHEGS-00118 b/bin/utils/GEN-Run3Summer22EEwmLHEGS-00118 new file mode 100644 index 000000000000..5591b48b4b5f --- /dev/null +++ b/bin/utils/GEN-Run3Summer22EEwmLHEGS-00118 @@ -0,0 +1,47 @@ +import FWCore.ParameterSet.Config as cms + +externalLHEProducer = cms.EDProducer('ExternalLHEProducer', + args = cms.vstring('/cvmfs/cms.cern.ch/phys_generator/gridpacks/PdmV/Run3Summer22/WtoLNu-4Jets_madgraphMLM-pythia8_slc7_amd64_gcc10_CMSSW_12_4_8_tarball.tar.xz'), + nEvents = cms.untracked.uint32(5000), + numberOfParameters = cms.uint32(1), + outputFile = cms.string('cmsgrid_final.lhe'), + scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh'), + generateConcurrently = cms.untracked.bool(False), +) + +from Configuration.Generator.Pythia8CommonSettings_cfi import * +from Configuration.Generator.MCTunesRun3ECM13p6TeV.PythiaCP5Settings_cfi import * +from Configuration.Generator.PSweightsPythia.PythiaPSweightsSettings_cfi import * + +generator = cms.EDFilter("Pythia8ConcurrentHadronizerFilter", + PythiaParameters = cms.PSet( + pythia8CommonSettingsBlock, + pythia8CP5SettingsBlock, + pythia8PSweightsSettingsBlock, + processParameters = cms.vstring( + 'JetMatching:setMad = off', + 'JetMatching:scheme = 1', + 'JetMatching:merge = on', + 'JetMatching:jetAlgorithm = 2', + 'JetMatching:etaJetMax = 5.', + 'JetMatching:coneRadius = 1.', + 'JetMatching:slowJetPower = 1', + 'JetMatching:doShowerKt = off', + 'JetMatching:qCut = 19.', + 'JetMatching:nQmatch = 5', + 'JetMatching:nJetMax = 4', + 'TimeShower:mMaxGamma = 4.0' + ), + parameterSets = cms.vstring( + 'pythia8CommonSettings', + 'pythia8CP5Settings', + 'processParameters', + 'pythia8PSweightsSettings' + ) + ), + comEnergy = cms.double(13600), + maxEventsToPrint = cms.untracked.int32(1), + pythiaHepMCVerbosity = cms.untracked.bool(False), + pythiaPylistVerbosity = cms.untracked.int32(1), +) + diff --git a/bin/utils/SUS-RunIISummer20UL16wmLHEGEN-00754 b/bin/utils/SUS-RunIISummer20UL16wmLHEGEN-00754 new file mode 100644 index 000000000000..c70267d13168 --- /dev/null +++ b/bin/utils/SUS-RunIISummer20UL16wmLHEGEN-00754 @@ -0,0 +1,51 @@ +import FWCore.ParameterSet.Config as cms + + +externalLHEProducer = cms.EDProducer("ExternalLHEProducer", + args = cms.vstring('/cvmfs/cms.cern.ch/phys_generator/gridpacks/UL/13TeV/powheg/V2/VBF_H_slc7_amd64_gcc820_CMSSW_10_6_20_VBF_H_M110/v1/VBF_H_slc7_amd64_gcc820_CMSSW_10_6_20_VBF_H_M110.tgz'), + nEvents = cms.untracked.uint32(5000), + numberOfParameters = cms.uint32(1), + outputFile = cms.string('cmsgrid_final.lhe'), + generateConcurrently = cms.untracked.bool(True), + scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh') +) + +from Configuration.Generator.Pythia8CommonSettings_cfi import * +from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * +from Configuration.Generator.PSweightsPythia.PythiaPSweightsSettings_cfi import * +from Configuration.Generator.Pythia8PowhegEmissionVetoSettings_cfi import * + +generator = cms.EDFilter("Pythia8ConcurrentHadronizerFilter", + comEnergy = cms.double(13000.0), + filterEfficiency = cms.untracked.double(1), + maxEventsToPrint = cms.untracked.int32(1), + pythiaHepMCVerbosity = cms.untracked.bool(False), + pythiaPylistVerbosity = cms.untracked.int32(1), + PythiaParameters = cms.PSet( + pythia8CommonSettingsBlock, + pythia8CP5SettingsBlock, + pythia8PSweightsSettingsBlock, + pythia8PowhegEmissionVetoSettingsBlock, + processParameters = cms.vstring('POWHEG:nFinal = 3', + 'SpaceShower:dipoleRecoil = on', + 'TauDecays:mode = 2', + 'TauDecays:tauPolarization = 0', + 'TauDecays:tauMother = 25', + '25:m0 = 110.0', + '25:mWidth = 0.0175', + '25:addChannel 1 0.1 100 13 -15', + '25:addChannel 1 0.1 100 15 -13', + '25:onMode = off', + '25:onIfMatch 13 15'), + + parameterSets = cms.vstring( + 'pythia8PowhegEmissionVetoSettings', + 'pythia8CommonSettings', + 'pythia8CP5Settings', + 'pythia8PSweightsSettings', + 'processParameters', + ) + ) + ) + +ProductionFilterSequence = cms.Sequence(generator) \ No newline at end of file diff --git a/bin/utils/TRK-Run3Summer23wmLHEGS-00002 b/bin/utils/TRK-Run3Summer23wmLHEGS-00002 new file mode 100644 index 000000000000..fc1dd7ee3261 --- /dev/null +++ b/bin/utils/TRK-Run3Summer23wmLHEGS-00002 @@ -0,0 +1,47 @@ +import FWCore.ParameterSet.Config as cms + +externalLHEProducer = cms.EDProducer("ExternalLHEProducer", + args = cms.vstring('/cvmfs/cms.cern.ch/phys_generator/gridpacks/13p6TeV/madgraph/V5_2.9.13/DYJetsToMuMu/DYto2L-4Jets_MLL-50_madgraphMLM-pythia8_slc7_amd64_gcc10_CMSSW_12_4_8_tarball.tar.xz'), + nEvents = cms.untracked.uint32(5000), + numberOfParameters = cms.uint32(1), + generateConcurrently = cms.untracked.bool(False), + outputFile = cms.string('cmsgrid_final.lhe'), + scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh') +) + + +from Configuration.Generator.Pythia8CommonSettings_cfi import * +from Configuration.Generator.MCTunesRun3ECM13p6TeV.PythiaCP5Settings_cfi import * +from Configuration.Generator.PSweightsPythia.PythiaPSweightsSettings_cfi import * + +generator = cms.EDFilter("Pythia8ConcurrentHadronizerFilter", + maxEventsToPrint = cms.untracked.int32(1), + pythiaPylistVerbosity = cms.untracked.int32(1), + filterEfficiency = cms.untracked.double(1.0), + pythiaHepMCVerbosity = cms.untracked.bool(False), + comEnergy = cms.double(13600.), + PythiaParameters = cms.PSet( + pythia8CommonSettingsBlock, + pythia8CP5SettingsBlock, + pythia8PSweightsSettingsBlock, + processParameters = cms.vstring( + 'JetMatching:setMad = off', + 'JetMatching:scheme = 1', + 'JetMatching:merge = on', + 'JetMatching:jetAlgorithm = 2', + 'JetMatching:etaJetMax = 5.', + 'JetMatching:coneRadius = 1.', + 'JetMatching:slowJetPower = 1', + 'JetMatching:qCut = 19.', #this is the actual merging scale + 'JetMatching:nQmatch = 5', #4 corresponds to 4-flavour scheme (no matching of b-quarks), 5 for 5-flavour scheme + 'JetMatching:nJetMax = 4', #number of partons in born matrix element for highest multiplicity + 'JetMatching:doShowerKt = off', #off for MLM matching, turn on for shower-kT matching + 'TimeShower:mMaxGamma = 4.0' + ), + parameterSets = cms.vstring('pythia8CommonSettings', + 'pythia8CP5Settings', + 'pythia8PSweightsSettings', + 'processParameters', + ) + ) +) \ No newline at end of file