From eb8df5bc1d767c1026cb3cff8eb4567fab8dd85d Mon Sep 17 00:00:00 2001 From: Spyros Argyropoulos <spyridon.argyropoulos@cern.ch> Date: Wed, 11 May 2022 10:33:09 +0200 Subject: [PATCH 01/19] Improve new jO template and documentation --- .gitlab/merge_request_templates/new_jO.md | 19 ++++++++++--------- README.md | 18 +++++++++++------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.gitlab/merge_request_templates/new_jO.md b/.gitlab/merge_request_templates/new_jO.md index d7c18c9147..9870090c62 100644 --- a/.gitlab/merge_request_templates/new_jO.md +++ b/.gitlab/merge_request_templates/new_jO.md @@ -1,21 +1,22 @@ +Make sure that all the items in the checklists are duly followed: +follow the instructions of each checklist item and report potential issues to the repository mainteners. + ## JIRA ticket -ATLMCPROD-**please fill this** +ATLMCPROD-**PLEASE FILL THIS** + +## Checklist for approval -## Checklist for requesters +This checklist should be normally filled by MC contacts (but it can also be done by the person opening the merge request). +If something is unclear get in touch with the repository maintainers. - [ ] I have followed the [guidelines in McSampleRequestProcedure](https://twiki.cern.ch/twiki/bin/view/AtlasProtected/McSampleRequestProcedure) - [ ] I have provided the ATLMCPROD JIRA ticket where the request has been discussed - [ ] The request has been approved by the PA/CP group - -## Checklist for approvers - -- [ ] All the items in the "Checklist for requesters" have been completed successfully -- [ ] The pipeline has run and the status is green (if it is orange look at the CI job output and iterate with the requesters to sort out the issues if possible) +- [ ] The pipeline has run and the status is green (still check the CI job output - if you see any errors report to the repository maintainers) +- [ ] If the pipeline is orange: check the CI job output to sort out the issues. If the issue is unclear contact the repository maintainers - [ ] CI jobs have not been skipped (if jobs have been skipped, the requesters should provide a reason for skipping and confirmation from the PMG conveners is necessary before merging) -- [ ] Look at the output of the child pipeline created by `run_child_pipeline` and make sure that **at least one `run_athena_DSID` job has run**. If it's not the case, confirmation from the PMG conveners is necessary before merging - [ ] Check that no `log.generate.short` files are included in the commit to be merged to master. If such files are present, it indicates that something went wrong in the pipeline. Check the job logs and contact the package maintainers if needed. -- [ ] Check that no file has been modified or deleted - [ ] Check that the title of the MR is descriptive enough (if not ask the requester to modify it) - [ ] Check that the DSID range assigned is correct (500000-999999) and corresponds to [right generator block](https://twiki.cern.ch/twiki/bin/view/AtlasProtected/PmgMcSoftware#DSID_blocks) diff --git a/README.md b/README.md index 172e209214..93cc79f336 100644 --- a/README.md +++ b/README.md @@ -154,32 +154,36 @@ This repository uses CI pipelines that run the following jobs. A brief descripti * **checks**: that no pre-existing files have been modified or deleted (excluding files listed in `scripts/modifiable.txt`) and that no files have been added in pre-existing DSID directories * **skippable**: with `[skip modfiles]` -5. `check_added_files:` +5. `notify_changes`: +* **checks**: runs only when `[skip modfiles]` is added to the commit. It checks if the modified files are in pre-existing DSID directories and sends an email to the PMG conveners. This will always cause the pipeline to be orange, and in this case you need to wait for the PMG conveners to approve the MR. +* **skippable**: NO + +6. `check_added_files:` * **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 -6. `check_tarball`: +7. `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 -7. `check_grid_size`: +8. `check_grid_size`: * **checks**: that the GRID file size is less than 100 MB * **skippable**:NO (but the job is allowed to fail) -8. `setup_athena`: +9. `setup_athena`: * **checks**: if new jO are added in a commit with a `log.generate.short` file in the respective DSID directory, this job will create the configuration for a dynamic child pipeline that will consist of the `run_athena_DSID` and `check_logParser_DSID` jobs described below. A maximum of 5 jobs are created. If there are no new jO committed, a `dummy` job will be created in the child pipeline, which will always succeed. * **skippable**: with `[skip athena]` -9. `run_athena_DSID`: +10. `run_athena_DSID`: * **checks**: that `Gen_tf.py` can run successfully with the `DSID` file. `Gen_tf.py` will run **only if `log.generate.short` is provided with the commit**. * **skippable**: with `[skip athena]` -10. `check_logParser_DSID`: +11. `check_logParser_DSID`: * **checks**: that the `run_athena_DSID` job produced no error * **skippable**: with `[skip logparser]`. The job is also not run when `[skip athena]` is used -11. `remove_logs`: +12. `remove_logs`: * **checks**: if `log.generate.short` files are present in the branch it will remove them * **skippable**: NO -- GitLab From d391526d0aa9f15fa3a7035f6c907f933d8fe8f1 Mon Sep 17 00:00:00 2001 From: Spyros Argyropoulos <spyridon.argyropoulos@cern.ch> Date: Wed, 11 May 2022 10:48:55 +0200 Subject: [PATCH 02/19] Chris's suggestion + comment --- .gitlab/merge_request_templates/new_jO.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab/merge_request_templates/new_jO.md b/.gitlab/merge_request_templates/new_jO.md index 9870090c62..57d5664b66 100644 --- a/.gitlab/merge_request_templates/new_jO.md +++ b/.gitlab/merge_request_templates/new_jO.md @@ -3,7 +3,9 @@ follow the instructions of each checklist item and report potential issues to th ## JIRA ticket -ATLMCPROD-**PLEASE FILL THIS** +<!-- Fill the line below with the JIRA ticket number, e.g. ATLMCPROD-1234 --> + +ATLMCPROD-**{\*PLEASE FILL THIS\*}** ## Checklist for approval -- GitLab From 13a15bd8b22bca9f6e60453d8f550c4693d36aee Mon Sep 17 00:00:00 2001 From: Spyros Argyropoulos <spyridon.argyropoulos@cern.ch> Date: Wed, 11 May 2022 15:55:50 +0200 Subject: [PATCH 03/19] test --- 700xxx/700999/log.generate.short | 8 +++++++ 700xxx/700999/mc.Sh_2212_test.py | 36 ++++++++++++++++++++++++++++++++ scripts/run_athena.sh | 4 +++- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 700xxx/700999/log.generate.short create mode 100644 700xxx/700999/mc.Sh_2212_test.py diff --git a/700xxx/700999/log.generate.short b/700xxx/700999/log.generate.short new file mode 100644 index 0000000000..7c3bec257b --- /dev/null +++ b/700xxx/700999/log.generate.short @@ -0,0 +1,8 @@ +- estimated CPU for CI job = 0.02 hrs +- using release = AthGeneration-22.6.15 +- ecmEnergy = 13000 +- inputEVNT_PreFile = /nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._037200.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._034017.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._035538.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._037142.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._038826.pool.root.1 +INFO: randomSeed is missing +- EVNT to EVNT = True +- LHEonly = False + diff --git a/700xxx/700999/mc.Sh_2212_test.py b/700xxx/700999/mc.Sh_2212_test.py new file mode 100644 index 0000000000..226607ea60 --- /dev/null +++ b/700xxx/700999/mc.Sh_2212_test.py @@ -0,0 +1,36 @@ + +evgenConfig.description = "Sherpa W+/W- -> e nu + 0,1,2j@NLO + 3,4,5j@LO with b-jet filter taking input from existing unfiltered input file." +evgenConfig.keywords = ["SM", "W", "electron", "jets", "NLO" ] +evgenConfig.contact = [ "atlas-generators-sherpa@cern.ch", "matthew.gignac@cern.ch", "chris.g@cern.ch" ] +evgenConfig.nEventsPerJob = 5000 +evgenConfig.inputFilesPerJob = 14 + +if runArgs.trfSubstepName == 'generate' : + print("ERROR: These JO require an input file. Please use the --afterburn option") + +if runArgs.trfSubstepName == 'afterburn': + evgenConfig.generators += ["Sherpa"] + + ## Loop removal should not be necessary anymore with HEPMC_TREE_LIKE=1 below + if hasattr(testSeq, "FixHepMC"): + fixSeq.FixHepMC.LoopsByBarcode = False + + ## Disable TestHepMC for the time being, cf. + ## https://its.cern.ch/jira/browse/ATLMCPROD-1862 + if hasattr(testSeq, "TestHepMC"): + testSeq.remove(TestHepMC()) + + include("GeneratorFilters/FindJets.py") + CreateJets(prefiltSeq, 0.4) + include("GeneratorFilters/BHadronFilter.py") + HeavyFlavorBHadronFilter.BottomEtaMax = 2.9 + HeavyFlavorBHadronFilter.BottomPtMin = 5*GeV + HeavyFlavorBHadronFilter.RequireTruthJet = True + HeavyFlavorBHadronFilter.JetPtMin = 10*GeV + HeavyFlavorBHadronFilter.JetEtaMax = 2.9 + HeavyFlavorBHadronFilter.TruthContainerName = "AntiKt4TruthJets" + HeavyFlavorBHadronFilter.DeltaRFromTruth = 0.4 + filtSeq += HeavyFlavorBHadronFilter + + postSeq.CountHepMC.CorrectRunNumber = True + diff --git a/scripts/run_athena.sh b/scripts/run_athena.sh index 9dd5ead581..c4db14f03c 100755 --- a/scripts/run_athena.sh +++ b/scripts/run_athena.sh @@ -34,7 +34,7 @@ fi # Check if the job is expected to last more than 1 hour cpu=$(grep CPU $DSID/log.generate.short | awk '{print $8}') -if [ -z "$cpu"]; then +if [ -z $cpu ]; then printWarning "WARNING: No CPU information was provided - fingers crossed you know what you're doing ..." else if (( $(echo "$cpu > 1.0" | bc -l) )) ; then @@ -136,6 +136,8 @@ case "${ecmEnergy%.*}" in ;; esac +echo "ECMENERGY = $ECMENERGY" + # Check if external LHE/EVNT files are used inputGeneratorFile=$(grep inputGeneratorFile ../$DSID/log.generate.short) inputEVNT_PreFile=$(grep inputEVNT_PreFile ../$DSID/log.generate.short) -- GitLab From 80621bb1bc0c74a399b7c52bee8a8865f0dfe3de Mon Sep 17 00:00:00 2001 From: Spyros Argyropoulos <spyridon.argyropoulos@cern.ch> Date: Wed, 11 May 2022 16:01:26 +0200 Subject: [PATCH 04/19] Fix ecmEnergy extraction for E2E jobs --- scripts/run_athena.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/run_athena.sh b/scripts/run_athena.sh index c4db14f03c..4f5200642d 100755 --- a/scripts/run_athena.sh +++ b/scripts/run_athena.sh @@ -136,8 +136,6 @@ case "${ecmEnergy%.*}" in ;; esac -echo "ECMENERGY = $ECMENERGY" - # Check if external LHE/EVNT files are used inputGeneratorFile=$(grep inputGeneratorFile ../$DSID/log.generate.short) inputEVNT_PreFile=$(grep inputEVNT_PreFile ../$DSID/log.generate.short) @@ -172,9 +170,9 @@ if [[ ! -z $inputGeneratorFile || ! -z $inputEVNT_PreFile ]] ; then # Input files for EVNT-to-EVNT job # 13TeV EVNT files had mc16_ECMENERGY scope but sometimes might have mc15_ECMENERGY (if not merged) # 13p6TeV input files always have mc21 in the scope - echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' '{printf "mc16_$ECMENERGY:%s\n", $NF}' >> filesToDownload - echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' '{printf "mc15_$ECMENERGY:%s\n", $NF}' >> filesToDownload - echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' '{printf "mc21_$ECMENERGY:%s\n", $NF}' >> filesToDownload + echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' -v energy=$ECMENERGY '{printf "mc16_%s:%s\n", energy, $NF}' >> filesToDownload + echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' -v energy=$ECMENERGY '{printf "mc15_%s:%s\n", energy, $NF}' >> filesToDownload + echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' -v energy=$ECMENERGY '{printf "mc21_%s:%s\n", energy, $NF}' >> filesToDownload fi # Download the file printInfo "Will download the following files:" -- GitLab From 6863430e8277159d5fceba10685663b3fee13f0d Mon Sep 17 00:00:00 2001 From: Spyros Argyropoulos <spyridon.argyropoulos@cern.ch> Date: Wed, 11 May 2022 18:42:12 +0200 Subject: [PATCH 05/19] Hardcode ecmEnergy for E2E jobs --- scripts/run_athena.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/run_athena.sh b/scripts/run_athena.sh index 4f5200642d..84294372bb 100755 --- a/scripts/run_athena.sh +++ b/scripts/run_athena.sh @@ -169,10 +169,10 @@ if [[ ! -z $inputGeneratorFile || ! -z $inputEVNT_PreFile ]] ; then if [[ ! -z $inputEVNT_PreFile ]] ; then # Input files for EVNT-to-EVNT job # 13TeV EVNT files had mc16_ECMENERGY scope but sometimes might have mc15_ECMENERGY (if not merged) - # 13p6TeV input files always have mc21 in the scope - echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' -v energy=$ECMENERGY '{printf "mc16_%s:%s\n", energy, $NF}' >> filesToDownload - echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' -v energy=$ECMENERGY '{printf "mc15_%s:%s\n", energy, $NF}' >> filesToDownload - echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' -v energy=$ECMENERGY '{printf "mc21_%s:%s\n", energy, $NF}' >> filesToDownload + # 13p6TeV input files always have mc21 in the scope - the ecmEnergy is hardcoded since it's not printed in log.afterburn + echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' '{printf "mc16_13TeV:%s\n", $NF}' >> filesToDownload + echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' '{printf "mc15_13Tev:%s\n", $NF}' >> filesToDownload + echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' '{printf "mc21_13p6TeV:%s\n", $NF}' >> filesToDownload fi # Download the file printInfo "Will download the following files:" -- GitLab From cc4471b2da0bff74ad8bf31b487a0027fed33be3 Mon Sep 17 00:00:00 2001 From: Spyros Argyropoulos <spyridon.argyropoulos@cern.ch> Date: Wed, 11 May 2022 19:33:02 +0200 Subject: [PATCH 06/19] fix --- scripts/run_athena.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/run_athena.sh b/scripts/run_athena.sh index 84294372bb..2966e519ff 100755 --- a/scripts/run_athena.sh +++ b/scripts/run_athena.sh @@ -179,9 +179,7 @@ if [[ ! -z $inputGeneratorFile || ! -z $inputEVNT_PreFile ]] ; then cat filesToDownload echo "----------------------------------" rucio get `cat filesToDownload` - mv mc15_$ECMENERGY/* . && rm -rf mc15_$ECMENERGY - mv mc16_$ECMENERGY/* . && rm -rf mc16_$ECMENERGY - mv mc21_$ECMENERGY/* . && rm -rf mc21_$ECMENERGY + mv mc*_*/* . && rm -rf mc*_* mv group.phys-gener/* . && rm -rf group.phys-gener # Check if the file has been downloaded - if not exit with error for file in `cat filesToDownload | sed "s/mc15_$ECMENERGY://" | sed "s/mc16_$ECMENERGY://" | sed "s/mc21_$ECMENERGY://" | sed "s/group.phys-gener://"` ; do -- GitLab From 04f528e7715d7e3bda31f6e24631022ed0a9ce47 Mon Sep 17 00:00:00 2001 From: Spyros Argyropoulos <spyridon.argyropoulos@cern.ch> Date: Wed, 11 May 2022 19:38:56 +0200 Subject: [PATCH 07/19] fix --- scripts/run_athena.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run_athena.sh b/scripts/run_athena.sh index 2966e519ff..184b16bf85 100755 --- a/scripts/run_athena.sh +++ b/scripts/run_athena.sh @@ -182,7 +182,7 @@ if [[ ! -z $inputGeneratorFile || ! -z $inputEVNT_PreFile ]] ; then mv mc*_*/* . && rm -rf mc*_* mv group.phys-gener/* . && rm -rf group.phys-gener # Check if the file has been downloaded - if not exit with error - for file in `cat filesToDownload | sed "s/mc15_$ECMENERGY://" | sed "s/mc16_$ECMENERGY://" | sed "s/mc21_$ECMENERGY://" | sed "s/group.phys-gener://"` ; do + for file in `cat filesToDownload | sed "s/mc15_13TeV://" | sed "s/mc16_13TeV://" | sed "s/mc21_13p6TeV://" | sed "s/group.phys-gener://"` ; do if [ ! -f "$file" ] ; then printError "ERROR: file $file could not be downloaded from the grid" exit 1 -- GitLab From a2cc02fb69b5cf35117bf623f02e4a1d5853311a Mon Sep 17 00:00:00 2001 From: Spyros Argyropoulos <spyridon.argyropoulos@cern.ch> Date: Wed, 11 May 2022 19:46:28 +0200 Subject: [PATCH 08/19] fix --- scripts/run_athena.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run_athena.sh b/scripts/run_athena.sh index 184b16bf85..b2ccea16ab 100755 --- a/scripts/run_athena.sh +++ b/scripts/run_athena.sh @@ -182,7 +182,7 @@ if [[ ! -z $inputGeneratorFile || ! -z $inputEVNT_PreFile ]] ; then mv mc*_*/* . && rm -rf mc*_* mv group.phys-gener/* . && rm -rf group.phys-gener # Check if the file has been downloaded - if not exit with error - for file in `cat filesToDownload | sed "s/mc15_13TeV://" | sed "s/mc16_13TeV://" | sed "s/mc21_13p6TeV://" | sed "s/group.phys-gener://"` ; do + for file in `cat filesToDownload | awk -F ':' '{print $2}' | uniq` ; do if [ ! -f "$file" ] ; then printError "ERROR: file $file could not be downloaded from the grid" exit 1 -- GitLab From d5a4d4e42dedec18874dd38efe9ceda75f4b465d Mon Sep 17 00:00:00 2001 From: Spyros Argyropoulos <spyridon.argyropoulos@cern.ch> Date: Wed, 11 May 2022 19:57:07 +0200 Subject: [PATCH 09/19] Add log.afterburn to artifacts --- scripts/generateYaml.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/generateYaml.py b/scripts/generateYaml.py index f7fb23e1d2..ebb3993e85 100644 --- a/scripts/generateYaml.py +++ b/scripts/generateYaml.py @@ -24,6 +24,7 @@ run_athena_{_jobNumber}: paths: - "{_prefix}/**/log.generate_ci" - "{_prefix}/**/log.generate" + - "{_prefix}/**/log.afterburn" expire_in: 1 week before_script: - echo ${{K8S_SECRET_SERVICE_PASSWORD}} | kinit ${{SERVICE_ACCOUNT}}@CERN.CH -- GitLab From 2ceb238343dc2d57461642e44dc85004ea684529 Mon Sep 17 00:00:00 2001 From: Spyros Argyropoulos <spyridon.argyropoulos@cern.ch> Date: Wed, 11 May 2022 20:58:31 +0200 Subject: [PATCH 10/19] Try with 22.6.11 --- 700xxx/700999/log.generate.short | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/700xxx/700999/log.generate.short b/700xxx/700999/log.generate.short index 7c3bec257b..877fad8a7e 100644 --- a/700xxx/700999/log.generate.short +++ b/700xxx/700999/log.generate.short @@ -1,5 +1,5 @@ - estimated CPU for CI job = 0.02 hrs -- using release = AthGeneration-22.6.15 +- using release = AthGeneration-22.6.11 - ecmEnergy = 13000 - inputEVNT_PreFile = /nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._037200.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._034017.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._035538.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._037142.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._038826.pool.root.1 INFO: randomSeed is missing -- GitLab From 29bc04e9833c99ff1df3bbc8a5a169fc439c79d6 Mon Sep 17 00:00:00 2001 From: mcgensvc <mcgensvc@cern.ch> Date: Wed, 11 May 2022 21:03:44 +0200 Subject: [PATCH 11/19] Pipeline for 2ceb2383 succeeded. Removing log.generate files [skip all] --- 700xxx/700999/log.generate.short | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 700xxx/700999/log.generate.short diff --git a/700xxx/700999/log.generate.short b/700xxx/700999/log.generate.short deleted file mode 100644 index 877fad8a7e..0000000000 --- a/700xxx/700999/log.generate.short +++ /dev/null @@ -1,8 +0,0 @@ -- estimated CPU for CI job = 0.02 hrs -- using release = AthGeneration-22.6.11 -- ecmEnergy = 13000 -- inputEVNT_PreFile = /nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._037200.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._034017.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._035538.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._037142.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._038826.pool.root.1 -INFO: randomSeed is missing -- EVNT to EVNT = True -- LHEonly = False - -- GitLab From 72ad2536bf63117af6d1e823d0246b068f8c3f55 Mon Sep 17 00:00:00 2001 From: Spyros Argyropoulos <spyridon.argyropoulos@cern.ch> Date: Wed, 11 May 2022 21:04:29 +0200 Subject: [PATCH 12/19] clean up --- 700xxx/700999/mc.Sh_2212_test.py | 36 -------------------------------- 1 file changed, 36 deletions(-) delete mode 100644 700xxx/700999/mc.Sh_2212_test.py diff --git a/700xxx/700999/mc.Sh_2212_test.py b/700xxx/700999/mc.Sh_2212_test.py deleted file mode 100644 index 226607ea60..0000000000 --- a/700xxx/700999/mc.Sh_2212_test.py +++ /dev/null @@ -1,36 +0,0 @@ - -evgenConfig.description = "Sherpa W+/W- -> e nu + 0,1,2j@NLO + 3,4,5j@LO with b-jet filter taking input from existing unfiltered input file." -evgenConfig.keywords = ["SM", "W", "electron", "jets", "NLO" ] -evgenConfig.contact = [ "atlas-generators-sherpa@cern.ch", "matthew.gignac@cern.ch", "chris.g@cern.ch" ] -evgenConfig.nEventsPerJob = 5000 -evgenConfig.inputFilesPerJob = 14 - -if runArgs.trfSubstepName == 'generate' : - print("ERROR: These JO require an input file. Please use the --afterburn option") - -if runArgs.trfSubstepName == 'afterburn': - evgenConfig.generators += ["Sherpa"] - - ## Loop removal should not be necessary anymore with HEPMC_TREE_LIKE=1 below - if hasattr(testSeq, "FixHepMC"): - fixSeq.FixHepMC.LoopsByBarcode = False - - ## Disable TestHepMC for the time being, cf. - ## https://its.cern.ch/jira/browse/ATLMCPROD-1862 - if hasattr(testSeq, "TestHepMC"): - testSeq.remove(TestHepMC()) - - include("GeneratorFilters/FindJets.py") - CreateJets(prefiltSeq, 0.4) - include("GeneratorFilters/BHadronFilter.py") - HeavyFlavorBHadronFilter.BottomEtaMax = 2.9 - HeavyFlavorBHadronFilter.BottomPtMin = 5*GeV - HeavyFlavorBHadronFilter.RequireTruthJet = True - HeavyFlavorBHadronFilter.JetPtMin = 10*GeV - HeavyFlavorBHadronFilter.JetEtaMax = 2.9 - HeavyFlavorBHadronFilter.TruthContainerName = "AntiKt4TruthJets" - HeavyFlavorBHadronFilter.DeltaRFromTruth = 0.4 - filtSeq += HeavyFlavorBHadronFilter - - postSeq.CountHepMC.CorrectRunNumber = True - -- GitLab From 5a07800172fd9ce39b4f5ae0d9a0e8fbbb590f9f Mon Sep 17 00:00:00 2001 From: Spyros Argyropoulos <spyridon.argyropoulos@cern.ch> Date: Thu, 12 May 2022 07:48:14 +0200 Subject: [PATCH 13/19] Fix typo --- scripts/run_athena.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run_athena.sh b/scripts/run_athena.sh index b2ccea16ab..1bcedb08c7 100755 --- a/scripts/run_athena.sh +++ b/scripts/run_athena.sh @@ -171,7 +171,7 @@ if [[ ! -z $inputGeneratorFile || ! -z $inputEVNT_PreFile ]] ; then # 13TeV EVNT files had mc16_ECMENERGY scope but sometimes might have mc15_ECMENERGY (if not merged) # 13p6TeV input files always have mc21 in the scope - the ecmEnergy is hardcoded since it's not printed in log.afterburn echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' '{printf "mc16_13TeV:%s\n", $NF}' >> filesToDownload - echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' '{printf "mc15_13Tev:%s\n", $NF}' >> filesToDownload + echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' '{printf "mc15_13TeV:%s\n", $NF}' >> filesToDownload echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' '{printf "mc21_13p6TeV:%s\n", $NF}' >> filesToDownload fi # Download the file -- GitLab From 7ba30dc2336c0778159852eda4c5d5ab279dae11 Mon Sep 17 00:00:00 2001 From: Spyros Argyropoulos <spyridon.argyropoulos@cern.ch> Date: Tue, 17 May 2022 15:20:55 +0200 Subject: [PATCH 14/19] Use grep to extract scope from EVNT files --- 700xxx/700999/log.generate.short | 5 +++++ 700xxx/700999/mc.Sh_2212_test.py | 36 ++++++++++++++++++++++++++++++++ scripts/run_athena.sh | 11 +++++++--- 3 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 700xxx/700999/log.generate.short create mode 100644 700xxx/700999/mc.Sh_2212_test.py diff --git a/700xxx/700999/log.generate.short b/700xxx/700999/log.generate.short new file mode 100644 index 0000000000..4cc472525b --- /dev/null +++ b/700xxx/700999/log.generate.short @@ -0,0 +1,5 @@ +- estimated CPU for CI job = 0.02 hrs +- using release = AthGeneration-22.6.11 +- ecmEnergy = 13000 +- inputEVNT_PreFile = /nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._037200.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._034017.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._035538.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._037142.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._038826.pool.root.1 +INFO: randomSeed is missing diff --git a/700xxx/700999/mc.Sh_2212_test.py b/700xxx/700999/mc.Sh_2212_test.py new file mode 100644 index 0000000000..226607ea60 --- /dev/null +++ b/700xxx/700999/mc.Sh_2212_test.py @@ -0,0 +1,36 @@ + +evgenConfig.description = "Sherpa W+/W- -> e nu + 0,1,2j@NLO + 3,4,5j@LO with b-jet filter taking input from existing unfiltered input file." +evgenConfig.keywords = ["SM", "W", "electron", "jets", "NLO" ] +evgenConfig.contact = [ "atlas-generators-sherpa@cern.ch", "matthew.gignac@cern.ch", "chris.g@cern.ch" ] +evgenConfig.nEventsPerJob = 5000 +evgenConfig.inputFilesPerJob = 14 + +if runArgs.trfSubstepName == 'generate' : + print("ERROR: These JO require an input file. Please use the --afterburn option") + +if runArgs.trfSubstepName == 'afterburn': + evgenConfig.generators += ["Sherpa"] + + ## Loop removal should not be necessary anymore with HEPMC_TREE_LIKE=1 below + if hasattr(testSeq, "FixHepMC"): + fixSeq.FixHepMC.LoopsByBarcode = False + + ## Disable TestHepMC for the time being, cf. + ## https://its.cern.ch/jira/browse/ATLMCPROD-1862 + if hasattr(testSeq, "TestHepMC"): + testSeq.remove(TestHepMC()) + + include("GeneratorFilters/FindJets.py") + CreateJets(prefiltSeq, 0.4) + include("GeneratorFilters/BHadronFilter.py") + HeavyFlavorBHadronFilter.BottomEtaMax = 2.9 + HeavyFlavorBHadronFilter.BottomPtMin = 5*GeV + HeavyFlavorBHadronFilter.RequireTruthJet = True + HeavyFlavorBHadronFilter.JetPtMin = 10*GeV + HeavyFlavorBHadronFilter.JetEtaMax = 2.9 + HeavyFlavorBHadronFilter.TruthContainerName = "AntiKt4TruthJets" + HeavyFlavorBHadronFilter.DeltaRFromTruth = 0.4 + filtSeq += HeavyFlavorBHadronFilter + + postSeq.CountHepMC.CorrectRunNumber = True + diff --git a/scripts/run_athena.sh b/scripts/run_athena.sh index 1bcedb08c7..0c46d1f9d2 100755 --- a/scripts/run_athena.sh +++ b/scripts/run_athena.sh @@ -152,6 +152,13 @@ if [[ ! -z $inputGeneratorFile ]] ; then printError "ERROR: could not find scope" exit 1 fi + printInfo "Scope for GRID file: $scope" +fi + +# Find scope for EVNT files for E2E jobs +if [[ ! -z $inputGeneratorFile ]] ; then + scope=$(echo $inputEVNT_PreFile | grep -o -E 'mc[0-9]{2}_.[0-9]*p?[0-9]*TeV' | head -1) + printInfo "Scope for EVNT file: $scope" fi # If external LHE/EVNT is used setup rucio and download file @@ -170,9 +177,7 @@ if [[ ! -z $inputGeneratorFile || ! -z $inputEVNT_PreFile ]] ; then # Input files for EVNT-to-EVNT job # 13TeV EVNT files had mc16_ECMENERGY scope but sometimes might have mc15_ECMENERGY (if not merged) # 13p6TeV input files always have mc21 in the scope - the ecmEnergy is hardcoded since it's not printed in log.afterburn - echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' '{printf "mc16_13TeV:%s\n", $NF}' >> filesToDownload - echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' '{printf "mc15_13TeV:%s\n", $NF}' >> filesToDownload - echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' '{printf "mc21_13p6TeV:%s\n", $NF}' >> filesToDownload + echo $inputEVNT_PreFile | awk -F'inputEVNT_PreFile = ' '{print $NF}' | tr ',' '\n' | awk -F'/' -v scope=$scope '{printf "%s:%s\n", scope, $NF}' > filesToDownload fi # Download the file printInfo "Will download the following files:" -- GitLab From beeb34844d8e7f2cf100310489db02b9abdd25bd Mon Sep 17 00:00:00 2001 From: Spyros Argyropoulos <spyridon.argyropoulos@cern.ch> Date: Tue, 17 May 2022 15:24:52 +0200 Subject: [PATCH 15/19] fix --- scripts/run_athena.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run_athena.sh b/scripts/run_athena.sh index 0c46d1f9d2..9c8ecc60ec 100755 --- a/scripts/run_athena.sh +++ b/scripts/run_athena.sh @@ -156,7 +156,7 @@ if [[ ! -z $inputGeneratorFile ]] ; then fi # Find scope for EVNT files for E2E jobs -if [[ ! -z $inputGeneratorFile ]] ; then +if [[ ! -z $inputEVNT_PreFile ]] ; then scope=$(echo $inputEVNT_PreFile | grep -o -E 'mc[0-9]{2}_.[0-9]*p?[0-9]*TeV' | head -1) printInfo "Scope for EVNT file: $scope" fi -- GitLab From 44f4ca154dd7eff18c09ff6d971ff8229bf6d797 Mon Sep 17 00:00:00 2001 From: Spyros Argyropoulos <spyridon.argyropoulos@cern.ch> Date: Tue, 17 May 2022 15:31:43 +0200 Subject: [PATCH 16/19] fix --- 700xxx/700999/log.generate.short | 3 +++ scripts/generateYaml.py | 2 +- scripts/run_athena.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/700xxx/700999/log.generate.short b/700xxx/700999/log.generate.short index 4cc472525b..877fad8a7e 100644 --- a/700xxx/700999/log.generate.short +++ b/700xxx/700999/log.generate.short @@ -3,3 +3,6 @@ - ecmEnergy = 13000 - inputEVNT_PreFile = /nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._037200.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._034017.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._035538.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._037142.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._038826.pool.root.1 INFO: randomSeed is missing +- EVNT to EVNT = True +- LHEonly = False + diff --git a/scripts/generateYaml.py b/scripts/generateYaml.py index ebb3993e85..aa451ddcc1 100644 --- a/scripts/generateYaml.py +++ b/scripts/generateYaml.py @@ -24,7 +24,7 @@ run_athena_{_jobNumber}: paths: - "{_prefix}/**/log.generate_ci" - "{_prefix}/**/log.generate" - - "{_prefix}/**/log.afterburn" + - "{_prefix}/**/log.afterburn_ci" expire_in: 1 week before_script: - echo ${{K8S_SECRET_SERVICE_PASSWORD}} | kinit ${{SERVICE_ACCOUNT}}@CERN.CH diff --git a/scripts/run_athena.sh b/scripts/run_athena.sh index 9c8ecc60ec..3eb99e4290 100755 --- a/scripts/run_athena.sh +++ b/scripts/run_athena.sh @@ -273,7 +273,7 @@ let jobsProcessed=$jobsProcessed+1 if [ -f log.generate ] ; then mv log.generate ../$DSID/log.generate_ci elif [ -f log.afterburn ] ; then - mv log.afterburn ../$DSID/log.generate_ci + mv log.afterburn ../$DSID/log.afterburn_ci else printError "ERROR: no log file produced" exit 1 -- GitLab From e4212d5468d61206abb31b3ef60f190ae09df6bc Mon Sep 17 00:00:00 2001 From: Spyros Argyropoulos <spyridon.argyropoulos@cern.ch> Date: Tue, 17 May 2022 15:39:33 +0200 Subject: [PATCH 17/19] fix artifact handling --- scripts/generateYaml.py | 2 -- scripts/run_athena.sh | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/generateYaml.py b/scripts/generateYaml.py index aa451ddcc1..93325cfa91 100644 --- a/scripts/generateYaml.py +++ b/scripts/generateYaml.py @@ -23,8 +23,6 @@ run_athena_{_jobNumber}: when: always paths: - "{_prefix}/**/log.generate_ci" - - "{_prefix}/**/log.generate" - - "{_prefix}/**/log.afterburn_ci" expire_in: 1 week before_script: - echo ${{K8S_SECRET_SERVICE_PASSWORD}} | kinit ${{SERVICE_ACCOUNT}}@CERN.CH diff --git a/scripts/run_athena.sh b/scripts/run_athena.sh index 3eb99e4290..83418791e7 100755 --- a/scripts/run_athena.sh +++ b/scripts/run_athena.sh @@ -273,7 +273,8 @@ let jobsProcessed=$jobsProcessed+1 if [ -f log.generate ] ; then mv log.generate ../$DSID/log.generate_ci elif [ -f log.afterburn ] ; then - mv log.afterburn ../$DSID/log.afterburn_ci + # NB: we name the file log.generate_ci so that the next job (logParser) can find it + mv log.afterburn ../$DSID/log.generate_ci else printError "ERROR: no log file produced" exit 1 -- GitLab From 200c315815a452d9ddeb51f4a6bf5cc22f92c448 Mon Sep 17 00:00:00 2001 From: mcgensvc <mcgensvc@cern.ch> Date: Tue, 17 May 2022 15:42:53 +0200 Subject: [PATCH 18/19] Pipeline for e4212d54 succeeded. Removing log.generate files [skip all] --- 700xxx/700999/log.generate.short | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 700xxx/700999/log.generate.short diff --git a/700xxx/700999/log.generate.short b/700xxx/700999/log.generate.short deleted file mode 100644 index 877fad8a7e..0000000000 --- a/700xxx/700999/log.generate.short +++ /dev/null @@ -1,8 +0,0 @@ -- estimated CPU for CI job = 0.02 hrs -- using release = AthGeneration-22.6.11 -- ecmEnergy = 13000 -- inputEVNT_PreFile = /nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._037200.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._034017.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._035538.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._037142.pool.root.1,/nfs/slac/atlas/fs1/d/mgignac/integrations/Sh2211/R22/E2E/Vjets/EVNT/mc21_13p6TeV.700553.Sh_2212_Wenu_maxHTpTV2.evgen.EVNT.e8453_tid28848624_00/EVNT.28848624._038826.pool.root.1 -INFO: randomSeed is missing -- EVNT to EVNT = True -- LHEonly = False - -- GitLab From 0d1d2e057ec86c0b1ac24460334bb479005e9b27 Mon Sep 17 00:00:00 2001 From: Spyros Argyropoulos <spyridon.argyropoulos@cern.ch> Date: Tue, 17 May 2022 15:44:10 +0200 Subject: [PATCH 19/19] cleanup --- 700xxx/700999/mc.Sh_2212_test.py | 36 -------------------------------- 1 file changed, 36 deletions(-) delete mode 100644 700xxx/700999/mc.Sh_2212_test.py diff --git a/700xxx/700999/mc.Sh_2212_test.py b/700xxx/700999/mc.Sh_2212_test.py deleted file mode 100644 index 226607ea60..0000000000 --- a/700xxx/700999/mc.Sh_2212_test.py +++ /dev/null @@ -1,36 +0,0 @@ - -evgenConfig.description = "Sherpa W+/W- -> e nu + 0,1,2j@NLO + 3,4,5j@LO with b-jet filter taking input from existing unfiltered input file." -evgenConfig.keywords = ["SM", "W", "electron", "jets", "NLO" ] -evgenConfig.contact = [ "atlas-generators-sherpa@cern.ch", "matthew.gignac@cern.ch", "chris.g@cern.ch" ] -evgenConfig.nEventsPerJob = 5000 -evgenConfig.inputFilesPerJob = 14 - -if runArgs.trfSubstepName == 'generate' : - print("ERROR: These JO require an input file. Please use the --afterburn option") - -if runArgs.trfSubstepName == 'afterburn': - evgenConfig.generators += ["Sherpa"] - - ## Loop removal should not be necessary anymore with HEPMC_TREE_LIKE=1 below - if hasattr(testSeq, "FixHepMC"): - fixSeq.FixHepMC.LoopsByBarcode = False - - ## Disable TestHepMC for the time being, cf. - ## https://its.cern.ch/jira/browse/ATLMCPROD-1862 - if hasattr(testSeq, "TestHepMC"): - testSeq.remove(TestHepMC()) - - include("GeneratorFilters/FindJets.py") - CreateJets(prefiltSeq, 0.4) - include("GeneratorFilters/BHadronFilter.py") - HeavyFlavorBHadronFilter.BottomEtaMax = 2.9 - HeavyFlavorBHadronFilter.BottomPtMin = 5*GeV - HeavyFlavorBHadronFilter.RequireTruthJet = True - HeavyFlavorBHadronFilter.JetPtMin = 10*GeV - HeavyFlavorBHadronFilter.JetEtaMax = 2.9 - HeavyFlavorBHadronFilter.TruthContainerName = "AntiKt4TruthJets" - HeavyFlavorBHadronFilter.DeltaRFromTruth = 0.4 - filtSeq += HeavyFlavorBHadronFilter - - postSeq.CountHepMC.CorrectRunNumber = True - -- GitLab