Skip to content

Extract nEventsPerJob as in ProdSys and move minevents check to check_jo_consistency

Spyros Argyropoulos requested to merge nevents into master

Changes introduced

  • Use code from ProdSys to extract nEventsPerJob from file (!580 (merged))
  • logParser extracts nEventsPerJob using the jo_utils.py script which mimics what's done in ProdSys
  • The check for evgenConfig.minevents has been moved from logParser to check_jo_consistency which is always run. This is done because ProdSys will first check minevents and only then check nEventsPerJob, so a file that contains minevents which was not tested (run with Gen_tf) locally or in the CI, might end up in the production system with the wrong settings.

Tests

ERROR when minevents is found in jO

Screenshot_2020-07-18_at_15.18.23 https://gitlab.cern.ch/atlas-physics/pmg/mcjoboptions/-/jobs/9302962

logParser correctly extracts nEventsPerJob from log.generate

Complete pipeline here: https://gitlab.cern.ch/atlas-physics/pmg/mcjoboptions/pipelines/1806615

run_athena.sh runs with correct number of events

Screenshot_2020-07-18_at_17.48.19 Successful pipeline here: https://gitlab.cern.ch/atlas-physics/pmg/mcjoboptions/-/jobs/9303042

Todos

  • Re-introduce ERROR when minEvents is used
  • Test logParser
  • Test athena

Issues resolved

Closes #98 (closed)

Edited by Spyros Argyropoulos

Merge request reports