From a7d65e5f8851872de47af2b075df44cb36afec61 Mon Sep 17 00:00:00 2001 From: Spyridon Argyropoulos Date: Tue, 7 Jul 2020 11:57:18 +0200 Subject: [PATCH 01/11] Implement grid nfiles check \#117 --- .gitlab-ci.yml | 12 ++++++------ README.md | 4 ++-- ...{check_grid_file_readability.sh => check_grid.sh} | 11 ++++++++++- .../{check_grid_file_size.sh => check_grid_size.sh} | 0 4 files changed, 18 insertions(+), 9 deletions(-) rename scripts/{check_grid_file_readability.sh => check_grid.sh} (91%) rename scripts/{check_grid_file_size.sh => check_grid_size.sh} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ee4ca29e..5159484f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,10 +58,10 @@ check_added_files: script: - ./scripts/check_added_files.sh -#----------------------------------- -# BUILD: CHECK GRID FILE READABILITY -#----------------------------------- -check_grid_readability: +#-------------------------------------------- +# BUILD: CHECK GRID FILE READABILITY & NFILES +#-------------------------------------------- +check_grid: stage: check_commit tags: - cvmfs @@ -74,7 +74,7 @@ check_grid_readability: before_script: - echo ${K8S_SECRET_SERVICE_PASSWORD} | kinit ${SERVICE_ACCOUNT}@CERN.CH script: - - ./scripts/check_grid_file_readability.sh + - ./scripts/check_grid.sh #----------------------------------------------------- # BUILD: CHECK GRID FILE SIZE @@ -93,7 +93,7 @@ check_grid_size: before_script: - echo ${K8S_SECRET_SERVICE_PASSWORD} | kinit ${SERVICE_ACCOUNT}@CERN.CH script: - - ./scripts/check_grid_file_size.sh + - ./scripts/check_grid_size.sh #----------------------------------------------------- # RUN ATHENA: CONNECT TO LXPLUS AND RUN ATHENA diff --git a/README.md b/README.md index 20f93f77c..e05c45279 100644 --- a/README.md +++ b/README.md @@ -129,8 +129,8 @@ This repository uses CI pipelines that run the following jobs. A brief descripti * **checks**: that the files added are jO files (named like `mc.*.py`), integration grids (named like `*.GRID.tar.gz`) or directories that contain control files for generators (these have to be named after the generator) * **skippable**: NO -5. `check_grid_readability`: -* **checks**: that the GRID files have been put on `/eos/atlas` or `/eos/user` in a directory that is readable by `atlcvmfs`, `mcgensvc` and if the files are on `cvmfs` that they are readable by all users +5. `check_grid`: +* **checks**: that the GRID files have been put on `/eos/atlas` or `/eos/user` in a directory that is readable by `atlcvmfs`, `mcgensvc` and if the files are on `cvmfs` that they are readable by all users. It also checks that the number of files in the gridpack are less than 80k. * **skippable**: NO 6. `check_grid_size`: diff --git a/scripts/check_grid_file_readability.sh b/scripts/check_grid.sh similarity index 91% rename from scripts/check_grid_file_readability.sh rename to scripts/check_grid.sh index ad055e031..a73566edb 100755 --- a/scripts/check_grid_file_readability.sh +++ b/scripts/check_grid.sh @@ -88,7 +88,16 @@ for file in "${changed[@]}" ; do echo "ERROR: file $link is not readable by all users. The permissions are set to: $access" fail=true fi - + + # Check number of files in gridpack + nfiles=$(tar tzf $link | wc -l) + if (( nfiles > 80000 )) ; then + echo "OK: gridpack $link contains less than 80k files." + else + echo "ERROR: gridpack $link contains more than 80k files (nfiles=$nfiles)." + fail=true + fi + cd $basedir done diff --git a/scripts/check_grid_file_size.sh b/scripts/check_grid_size.sh similarity index 100% rename from scripts/check_grid_file_size.sh rename to scripts/check_grid_size.sh -- GitLab From f6ad56dc0c50ead12986985ca3154a050bcee355 Mon Sep 17 00:00:00 2001 From: Spyridon Argyropoulos Date: Tue, 7 Jul 2020 12:08:33 +0200 Subject: [PATCH 02/11] Test --- ...Py8EG_A14NNPDF23LO_Wenu3jets_FxFx_valid.py | 102 ++++++++++++++++++ ...NNPDF23LO_Wenu3jets_FxFx_valid.GRID.tar.gz | 1 + 2 files changed, 103 insertions(+) create mode 100644 950xxx/951000/mc.MGPy8EG_A14NNPDF23LO_Wenu3jets_FxFx_valid.py create mode 120000 950xxx/951000/mc_13TeV.MGPy8EG_A14NNPDF23LO_Wenu3jets_FxFx_valid.GRID.tar.gz diff --git a/950xxx/951000/mc.MGPy8EG_A14NNPDF23LO_Wenu3jets_FxFx_valid.py b/950xxx/951000/mc.MGPy8EG_A14NNPDF23LO_Wenu3jets_FxFx_valid.py new file mode 100644 index 000000000..2c6b3fc67 --- /dev/null +++ b/950xxx/951000/mc.MGPy8EG_A14NNPDF23LO_Wenu3jets_FxFx_valid.py @@ -0,0 +1,102 @@ +import MadGraphControl.MadGraphUtils +from MadGraphControl.MadGraphUtils import * + +#Job bookkeping infos +evgenConfig.description = 'aMcAtNlo Wenu+3Np FxFx inclusive' +evgenConfig.contact = ["francesco.giuli@cern.ch","federico.sforza@cern.ch"] +evgenConfig.keywords+=['W','jets','FxFx'] + +# General settings +evgenConfig.nEventsPerJob = 5000 +nevents = runArgs.maxEvents*5.0 if runArgs.maxEvents>0 else 5.0*evgenConfig.nEventsPerJob + +#Madgraph run card and shower settings +# Shower/merging settings +maxjetflavor=5 +parton_shower='PYTHIA8' +nJetMax=3 +qCut=30. + +gridpack_mode=True + +if not is_gen_from_gridpack(): + process = """ + import model loop_sm-no_b_mass + define p = p b b~ + define j = p + define e = e+ e- + define nu = ve ve~ + generate p p > e nu [QCD] @0 + add process p p > e nu j [QCD] @1 + add process p p > e nu j j [QCD] @2 + add process p p > e nu j j j [QCD] @3 + output -f""" + + process_dir = str(new_process(process)) +else: + process_dir = str(MADGRAPH_GRIDPACK_LOCATION) + +MadGraphControl.MadGraphUtils.MADGRAPH_PDFSETTING={ + 'central_pdf':325100, # the lhapf id of the central pdf, see https://lhapdf.hepforge.org/pdfsets + 'pdf_variations':[325100], # list of pdfs ids for which all variations (error sets) will be included as weights + 'alternative_pdfs':[], # nothing for the time being + 'scale_variations':[0.5,1,2], # variations of muR and muF wrt the central scale, all combinations of muF and muR will be evaluated +} + +#Fetch default run_card.dat and set parameters +settings = { + 'maxjetflavor' : int(maxjetflavor), + 'parton_shower' : parton_shower, + 'nevents' : int(nevents), + 'ickkw' : 3, + 'jetradius' : 1.0, + 'ptj' : 10, + 'etaj' : 10, + } + +modify_run_card(process_dir=process_dir,runArgs=runArgs,settings=settings) + +input_events=process_dir+'/Events/GridRun_'+str(runArgs.randomSeed)+'/events.lhe.gz' + +generate(process_dir=process_dir,runArgs=runArgs,grid_pack=gridpack_mode) +arrange_output(process_dir=process_dir,runArgs=runArgs,lhe_version=3,saveProcDir=True) + +#### Shower: Py8 with A14 Tune, with modifications to make it simil-NLO +include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py") +include("Pythia8_i/Pythia8_aMcAtNlo.py") + +#simil-NLO parameters +genSeq.Pythia8.Commands += ["JetMatching:merge = on", + "SpaceShower:alphaSuseCMW = on", + "SpaceShower:alphaSorder = 2", + "TimeShower:alphaSuseCMW = on", + "TimeShower:alphaSorder = 2", + "SpaceShower:alphaSvalue = 0.118", + "TimeShower:alphaSvalue = 0.118" + ] + +# FxFx Matching settings, according to authors prescriptions (NB: it changes tune pars) +PYTHIA8_nJetMax=nJetMax +PYTHIA8_qCut=qCut +print "PYTHIA8_nJetMax = %i"%PYTHIA8_nJetMax +print "PYTHIA8_qCut = %i"%PYTHIA8_qCut + +genSeq.Pythia8.Commands += ["JetMatching:merge = on", + "JetMatching:scheme = 1", + "JetMatching:setMad = off", + "SpaceShower:rapidityOrder = off", + "SpaceShower:pTmaxFudge = 1.0", + "JetMatching:qCut = %f"%PYTHIA8_qCut, + "JetMatching:coneRadius = 1.0", + "JetMatching:etaJetMax = 10.0", + "JetMatching:doFxFx = on", + "JetMatching:qCutME = 10.0", + "JetMatching:nJetMax = %i"%PYTHIA8_nJetMax, + 'JetMatching:jetAlgorithm = 2', #explicit setting of kt-merging for FxFx (also imposed by Py8-FxFx inteface) + 'JetMatching:slowJetPower = 1', #explicit setting of kt-merging for FxFx (also imposed by Py8-FxFx inteface) + 'JetMatching:nQmatch = 5', #4 corresponds to 4-flavour scheme (no matching of b-quarks), 5 for 5-flavour scheme + "JetMatching:eTjetMin = %f"%PYTHIA8_qCut #This is 20 in the Pythia default, it should be <= qCut + ] + +genSeq.Pythia8.UserHooks = ['JetMatchingMadgraph'] +genSeq.Pythia8.FxFxXS = True diff --git a/950xxx/951000/mc_13TeV.MGPy8EG_A14NNPDF23LO_Wenu3jets_FxFx_valid.GRID.tar.gz b/950xxx/951000/mc_13TeV.MGPy8EG_A14NNPDF23LO_Wenu3jets_FxFx_valid.GRID.tar.gz new file mode 120000 index 000000000..af23d5e5c --- /dev/null +++ b/950xxx/951000/mc_13TeV.MGPy8EG_A14NNPDF23LO_Wenu3jets_FxFx_valid.GRID.tar.gz @@ -0,0 +1 @@ +/eos/user/f/fgiuli/mc/mc_13TeV.MGPy8EG_A14NNPDF23LO_Wenu3jets_FxFx.GRID.tar.gz \ No newline at end of file -- GitLab From 38ed9b489b9fd5aec1af765296792bbf562ec2b1 Mon Sep 17 00:00:00 2001 From: Spyridon Argyropoulos Date: Tue, 7 Jul 2020 12:13:42 +0200 Subject: [PATCH 03/11] Fix grid check --- scripts/check_grid.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/check_grid.sh b/scripts/check_grid.sh index a73566edb..82b375fdc 100755 --- a/scripts/check_grid.sh +++ b/scripts/check_grid.sh @@ -90,6 +90,7 @@ for file in "${changed[@]}" ; do fi # Check number of files in gridpack + cp $link ./gridpack.tar.gz nfiles=$(tar tzf $link | wc -l) if (( nfiles > 80000 )) ; then echo "OK: gridpack $link contains less than 80k files." @@ -97,6 +98,7 @@ for file in "${changed[@]}" ; do echo "ERROR: gridpack $link contains more than 80k files (nfiles=$nfiles)." fail=true fi + rm -f gridpack.tar.gz cd $basedir done -- GitLab From 8aef57dda50319285b617c55beea588578e334c8 Mon Sep 17 00:00:00 2001 From: Spyridon Argyropoulos Date: Tue, 7 Jul 2020 12:15:50 +0200 Subject: [PATCH 04/11] Use xrdcp --- scripts/check_grid.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_grid.sh b/scripts/check_grid.sh index 82b375fdc..2a5ef54f2 100755 --- a/scripts/check_grid.sh +++ b/scripts/check_grid.sh @@ -90,7 +90,7 @@ for file in "${changed[@]}" ; do fi # Check number of files in gridpack - cp $link ./gridpack.tar.gz + xrdcp $HOST/$link ./gridpack.tar.gz nfiles=$(tar tzf $link | wc -l) if (( nfiles > 80000 )) ; then echo "OK: gridpack $link contains less than 80k files." -- GitLab From 7f6dc5986915b981791d3c77b9539db67c2fb5ba Mon Sep 17 00:00:00 2001 From: Spyridon Argyropoulos Date: Tue, 7 Jul 2020 12:17:54 +0200 Subject: [PATCH 05/11] Another fix --- scripts/check_grid.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_grid.sh b/scripts/check_grid.sh index 2a5ef54f2..a802b94ac 100755 --- a/scripts/check_grid.sh +++ b/scripts/check_grid.sh @@ -91,7 +91,7 @@ for file in "${changed[@]}" ; do # Check number of files in gridpack xrdcp $HOST/$link ./gridpack.tar.gz - nfiles=$(tar tzf $link | wc -l) + nfiles=$(tar tzf gridpack.tar.gz | wc -l) if (( nfiles > 80000 )) ; then echo "OK: gridpack $link contains less than 80k files." else -- GitLab From 9246187546e483823837d5f02b6b21f06b895e0a Mon Sep 17 00:00:00 2001 From: Spyridon Argyropoulos Date: Tue, 7 Jul 2020 12:20:55 +0200 Subject: [PATCH 06/11] Print nfiles --- scripts/check_grid.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_grid.sh b/scripts/check_grid.sh index a802b94ac..154e62b9a 100755 --- a/scripts/check_grid.sh +++ b/scripts/check_grid.sh @@ -93,7 +93,7 @@ for file in "${changed[@]}" ; do xrdcp $HOST/$link ./gridpack.tar.gz nfiles=$(tar tzf gridpack.tar.gz | wc -l) if (( nfiles > 80000 )) ; then - echo "OK: gridpack $link contains less than 80k files." + echo "OK: gridpack $link contains less than 80k files (nfiles=$nfiles)" else echo "ERROR: gridpack $link contains more than 80k files (nfiles=$nfiles)." fail=true -- GitLab From 4f42abc713d4c30379fce4c02ac3a5c5d0549442 Mon Sep 17 00:00:00 2001 From: Spyridon Argyropoulos Date: Tue, 7 Jul 2020 12:23:01 +0200 Subject: [PATCH 07/11] Fix wrong check --- scripts/check_grid.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_grid.sh b/scripts/check_grid.sh index 154e62b9a..a8ea05408 100755 --- a/scripts/check_grid.sh +++ b/scripts/check_grid.sh @@ -92,7 +92,7 @@ for file in "${changed[@]}" ; do # Check number of files in gridpack xrdcp $HOST/$link ./gridpack.tar.gz nfiles=$(tar tzf gridpack.tar.gz | wc -l) - if (( nfiles > 80000 )) ; then + if (( nfiles < 80000 )) ; then echo "OK: gridpack $link contains less than 80k files (nfiles=$nfiles)" else echo "ERROR: gridpack $link contains more than 80k files (nfiles=$nfiles)." -- GitLab From 02ad6b3d7fff6e17ae0871bee31cde95d19b0479 Mon Sep 17 00:00:00 2001 From: Spyridon Argyropoulos Date: Tue, 7 Jul 2020 12:28:05 +0200 Subject: [PATCH 08/11] Another test should succeed --- 421xxx/421440/mc.Sh_228_tttt.py | 46 +++++++++++++++++++ .../421440/mc_13TeV.Sh_228_tttt.GRID.tar.gz | 1 + 2 files changed, 47 insertions(+) create mode 100644 421xxx/421440/mc.Sh_228_tttt.py create mode 120000 421xxx/421440/mc_13TeV.Sh_228_tttt.GRID.tar.gz diff --git a/421xxx/421440/mc.Sh_228_tttt.py b/421xxx/421440/mc.Sh_228_tttt.py new file mode 100644 index 000000000..9491daf8a --- /dev/null +++ b/421xxx/421440/mc.Sh_228_tttt.py @@ -0,0 +1,46 @@ +include("Sherpa_i/2.2.8_NNPDF30NNLO.py") + +evgenConfig.description = "Sherpa 2.2.8 ttbar production with tt+0,1j@NLO(QCD+EWvirt)+2,3,4j@LO in the dlepton channel." +evgenConfig.keywords = ["SM", "top", "tttt" ] +evgenConfig.contact = [ "atlas-generators-sherpa@cern.ch", "frank.siegert@cern.ch" ] +evgenConfig.minevents = 1000 + +genSeq.Sherpa_i.RunCard=""" +(run){ + SCALES VAR{H_T2/16} + EXCLUSIVE_CLUSTER_MODE 1; + + %me generator settings + ME_SIGNAL_GENERATOR Comix Amegic LOOPGEN; + LOOPGEN:=OpenLoops; + CSS_REWEIGHT=1 + REWEIGHT_SPLITTING_ALPHAS_SCALES 1 + REWEIGHT_SPLITTING_PDF_SCALES 1 + CSS_REWEIGHT_SCALE_CUTOFF=5.0 + HEPMC_INCLUDE_ME_ONLY_VARIATIONS=1 + + NLO_CSS_PSMODE=1 + INTEGRATION_ERROR=0.05; + + %decay settings + HARD_DECAYS On; HARD_SPIN_CORRELATIONS 1; + STABLE[24] 0; STABLE[6] 0; WIDTH[6] 0; +}(run) + +(processes){ + Process : 93 93 -> 6 -6 6 -6; + NLO_QCD_Mode 3; + ME_Generator Amegic; + RS_ME_Generator Comix; + Loop_Generator LOOPGEN; + Order (*,0); + End process +}(processes) +""" + +genSeq.Sherpa_i.Parameters += [ "WIDTH[6]=0" ] +genSeq.Sherpa_i.Parameters += [ "OL_PREFIX=./Process/OpenLoops" ] + +genSeq.Sherpa_i.NCores = 24 +genSeq.Sherpa_i.OpenLoopsLibs = [ "pptttt" ] +genSeq.Sherpa_i.CleanupGeneratedFiles = 1 diff --git a/421xxx/421440/mc_13TeV.Sh_228_tttt.GRID.tar.gz b/421xxx/421440/mc_13TeV.Sh_228_tttt.GRID.tar.gz new file mode 120000 index 000000000..64a654f0d --- /dev/null +++ b/421xxx/421440/mc_13TeV.Sh_228_tttt.GRID.tar.gz @@ -0,0 +1 @@ +/eos/user/f/fsiegert/mc/mc_13TeV.Sh_228_tttt.GRID.tar.gz \ No newline at end of file -- GitLab From b61ccc6bbe7ab8d20c122aeb95c6965c0e1d9d44 Mon Sep 17 00:00:00 2001 From: Spyridon Argyropoulos Date: Tue, 7 Jul 2020 12:30:30 +0200 Subject: [PATCH 09/11] Remove 951000 --- ...Py8EG_A14NNPDF23LO_Wenu3jets_FxFx_valid.py | 102 ------------------ ...NNPDF23LO_Wenu3jets_FxFx_valid.GRID.tar.gz | 1 - 2 files changed, 103 deletions(-) delete mode 100644 950xxx/951000/mc.MGPy8EG_A14NNPDF23LO_Wenu3jets_FxFx_valid.py delete mode 120000 950xxx/951000/mc_13TeV.MGPy8EG_A14NNPDF23LO_Wenu3jets_FxFx_valid.GRID.tar.gz diff --git a/950xxx/951000/mc.MGPy8EG_A14NNPDF23LO_Wenu3jets_FxFx_valid.py b/950xxx/951000/mc.MGPy8EG_A14NNPDF23LO_Wenu3jets_FxFx_valid.py deleted file mode 100644 index 2c6b3fc67..000000000 --- a/950xxx/951000/mc.MGPy8EG_A14NNPDF23LO_Wenu3jets_FxFx_valid.py +++ /dev/null @@ -1,102 +0,0 @@ -import MadGraphControl.MadGraphUtils -from MadGraphControl.MadGraphUtils import * - -#Job bookkeping infos -evgenConfig.description = 'aMcAtNlo Wenu+3Np FxFx inclusive' -evgenConfig.contact = ["francesco.giuli@cern.ch","federico.sforza@cern.ch"] -evgenConfig.keywords+=['W','jets','FxFx'] - -# General settings -evgenConfig.nEventsPerJob = 5000 -nevents = runArgs.maxEvents*5.0 if runArgs.maxEvents>0 else 5.0*evgenConfig.nEventsPerJob - -#Madgraph run card and shower settings -# Shower/merging settings -maxjetflavor=5 -parton_shower='PYTHIA8' -nJetMax=3 -qCut=30. - -gridpack_mode=True - -if not is_gen_from_gridpack(): - process = """ - import model loop_sm-no_b_mass - define p = p b b~ - define j = p - define e = e+ e- - define nu = ve ve~ - generate p p > e nu [QCD] @0 - add process p p > e nu j [QCD] @1 - add process p p > e nu j j [QCD] @2 - add process p p > e nu j j j [QCD] @3 - output -f""" - - process_dir = str(new_process(process)) -else: - process_dir = str(MADGRAPH_GRIDPACK_LOCATION) - -MadGraphControl.MadGraphUtils.MADGRAPH_PDFSETTING={ - 'central_pdf':325100, # the lhapf id of the central pdf, see https://lhapdf.hepforge.org/pdfsets - 'pdf_variations':[325100], # list of pdfs ids for which all variations (error sets) will be included as weights - 'alternative_pdfs':[], # nothing for the time being - 'scale_variations':[0.5,1,2], # variations of muR and muF wrt the central scale, all combinations of muF and muR will be evaluated -} - -#Fetch default run_card.dat and set parameters -settings = { - 'maxjetflavor' : int(maxjetflavor), - 'parton_shower' : parton_shower, - 'nevents' : int(nevents), - 'ickkw' : 3, - 'jetradius' : 1.0, - 'ptj' : 10, - 'etaj' : 10, - } - -modify_run_card(process_dir=process_dir,runArgs=runArgs,settings=settings) - -input_events=process_dir+'/Events/GridRun_'+str(runArgs.randomSeed)+'/events.lhe.gz' - -generate(process_dir=process_dir,runArgs=runArgs,grid_pack=gridpack_mode) -arrange_output(process_dir=process_dir,runArgs=runArgs,lhe_version=3,saveProcDir=True) - -#### Shower: Py8 with A14 Tune, with modifications to make it simil-NLO -include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py") -include("Pythia8_i/Pythia8_aMcAtNlo.py") - -#simil-NLO parameters -genSeq.Pythia8.Commands += ["JetMatching:merge = on", - "SpaceShower:alphaSuseCMW = on", - "SpaceShower:alphaSorder = 2", - "TimeShower:alphaSuseCMW = on", - "TimeShower:alphaSorder = 2", - "SpaceShower:alphaSvalue = 0.118", - "TimeShower:alphaSvalue = 0.118" - ] - -# FxFx Matching settings, according to authors prescriptions (NB: it changes tune pars) -PYTHIA8_nJetMax=nJetMax -PYTHIA8_qCut=qCut -print "PYTHIA8_nJetMax = %i"%PYTHIA8_nJetMax -print "PYTHIA8_qCut = %i"%PYTHIA8_qCut - -genSeq.Pythia8.Commands += ["JetMatching:merge = on", - "JetMatching:scheme = 1", - "JetMatching:setMad = off", - "SpaceShower:rapidityOrder = off", - "SpaceShower:pTmaxFudge = 1.0", - "JetMatching:qCut = %f"%PYTHIA8_qCut, - "JetMatching:coneRadius = 1.0", - "JetMatching:etaJetMax = 10.0", - "JetMatching:doFxFx = on", - "JetMatching:qCutME = 10.0", - "JetMatching:nJetMax = %i"%PYTHIA8_nJetMax, - 'JetMatching:jetAlgorithm = 2', #explicit setting of kt-merging for FxFx (also imposed by Py8-FxFx inteface) - 'JetMatching:slowJetPower = 1', #explicit setting of kt-merging for FxFx (also imposed by Py8-FxFx inteface) - 'JetMatching:nQmatch = 5', #4 corresponds to 4-flavour scheme (no matching of b-quarks), 5 for 5-flavour scheme - "JetMatching:eTjetMin = %f"%PYTHIA8_qCut #This is 20 in the Pythia default, it should be <= qCut - ] - -genSeq.Pythia8.UserHooks = ['JetMatchingMadgraph'] -genSeq.Pythia8.FxFxXS = True diff --git a/950xxx/951000/mc_13TeV.MGPy8EG_A14NNPDF23LO_Wenu3jets_FxFx_valid.GRID.tar.gz b/950xxx/951000/mc_13TeV.MGPy8EG_A14NNPDF23LO_Wenu3jets_FxFx_valid.GRID.tar.gz deleted file mode 120000 index af23d5e5c..000000000 --- a/950xxx/951000/mc_13TeV.MGPy8EG_A14NNPDF23LO_Wenu3jets_FxFx_valid.GRID.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/eos/user/f/fgiuli/mc/mc_13TeV.MGPy8EG_A14NNPDF23LO_Wenu3jets_FxFx.GRID.tar.gz \ No newline at end of file -- GitLab From eafe372b5c32c8f6d0a274067c03afd15e44a666 Mon Sep 17 00:00:00 2001 From: Spyridon Argyropoulos Date: Tue, 7 Jul 2020 12:31:40 +0200 Subject: [PATCH 10/11] Remove test directories [skip all] --- 421xxx/421440/mc.Sh_228_tttt.py | 46 ------------------- .../421440/mc_13TeV.Sh_228_tttt.GRID.tar.gz | 1 - 2 files changed, 47 deletions(-) delete mode 100644 421xxx/421440/mc.Sh_228_tttt.py delete mode 120000 421xxx/421440/mc_13TeV.Sh_228_tttt.GRID.tar.gz diff --git a/421xxx/421440/mc.Sh_228_tttt.py b/421xxx/421440/mc.Sh_228_tttt.py deleted file mode 100644 index 9491daf8a..000000000 --- a/421xxx/421440/mc.Sh_228_tttt.py +++ /dev/null @@ -1,46 +0,0 @@ -include("Sherpa_i/2.2.8_NNPDF30NNLO.py") - -evgenConfig.description = "Sherpa 2.2.8 ttbar production with tt+0,1j@NLO(QCD+EWvirt)+2,3,4j@LO in the dlepton channel." -evgenConfig.keywords = ["SM", "top", "tttt" ] -evgenConfig.contact = [ "atlas-generators-sherpa@cern.ch", "frank.siegert@cern.ch" ] -evgenConfig.minevents = 1000 - -genSeq.Sherpa_i.RunCard=""" -(run){ - SCALES VAR{H_T2/16} - EXCLUSIVE_CLUSTER_MODE 1; - - %me generator settings - ME_SIGNAL_GENERATOR Comix Amegic LOOPGEN; - LOOPGEN:=OpenLoops; - CSS_REWEIGHT=1 - REWEIGHT_SPLITTING_ALPHAS_SCALES 1 - REWEIGHT_SPLITTING_PDF_SCALES 1 - CSS_REWEIGHT_SCALE_CUTOFF=5.0 - HEPMC_INCLUDE_ME_ONLY_VARIATIONS=1 - - NLO_CSS_PSMODE=1 - INTEGRATION_ERROR=0.05; - - %decay settings - HARD_DECAYS On; HARD_SPIN_CORRELATIONS 1; - STABLE[24] 0; STABLE[6] 0; WIDTH[6] 0; -}(run) - -(processes){ - Process : 93 93 -> 6 -6 6 -6; - NLO_QCD_Mode 3; - ME_Generator Amegic; - RS_ME_Generator Comix; - Loop_Generator LOOPGEN; - Order (*,0); - End process -}(processes) -""" - -genSeq.Sherpa_i.Parameters += [ "WIDTH[6]=0" ] -genSeq.Sherpa_i.Parameters += [ "OL_PREFIX=./Process/OpenLoops" ] - -genSeq.Sherpa_i.NCores = 24 -genSeq.Sherpa_i.OpenLoopsLibs = [ "pptttt" ] -genSeq.Sherpa_i.CleanupGeneratedFiles = 1 diff --git a/421xxx/421440/mc_13TeV.Sh_228_tttt.GRID.tar.gz b/421xxx/421440/mc_13TeV.Sh_228_tttt.GRID.tar.gz deleted file mode 120000 index 64a654f0d..000000000 --- a/421xxx/421440/mc_13TeV.Sh_228_tttt.GRID.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/eos/user/f/fsiegert/mc/mc_13TeV.Sh_228_tttt.GRID.tar.gz \ No newline at end of file -- GitLab From 05fd426b08a747658a72e6b655f0fcd85184376d Mon Sep 17 00:00:00 2001 From: Spyridon Argyropoulos Date: Tue, 7 Jul 2020 12:48:11 +0200 Subject: [PATCH 11/11] Rename CI jobs [skip all] --- .gitlab-ci.yml | 4 ++-- README.md | 2 +- scripts/{check_grid.sh => check_tarball.sh} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename scripts/{check_grid.sh => check_tarball.sh} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5159484f1..8084fc28c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,7 +61,7 @@ check_added_files: #-------------------------------------------- # BUILD: CHECK GRID FILE READABILITY & NFILES #-------------------------------------------- -check_grid: +check_tarball: stage: check_commit tags: - cvmfs @@ -74,7 +74,7 @@ check_grid: before_script: - echo ${K8S_SECRET_SERVICE_PASSWORD} | kinit ${SERVICE_ACCOUNT}@CERN.CH script: - - ./scripts/check_grid.sh + - ./scripts/check_tarball.sh #----------------------------------------------------- # BUILD: CHECK GRID FILE SIZE diff --git a/README.md b/README.md index e05c45279..cc3a1c499 100644 --- a/README.md +++ b/README.md @@ -129,7 +129,7 @@ This repository uses CI pipelines that run the following jobs. A brief descripti * **checks**: that the files added are jO files (named like `mc.*.py`), integration grids (named like `*.GRID.tar.gz`) or directories that contain control files for generators (these have to be named after the generator) * **skippable**: NO -5. `check_grid`: +5. `check_tarball`: * **checks**: that the GRID files have been put on `/eos/atlas` or `/eos/user` in a directory that is readable by `atlcvmfs`, `mcgensvc` and if the files are on `cvmfs` that they are readable by all users. It also checks that the number of files in the gridpack are less than 80k. * **skippable**: NO diff --git a/scripts/check_grid.sh b/scripts/check_tarball.sh similarity index 100% rename from scripts/check_grid.sh rename to scripts/check_tarball.sh -- GitLab