Commit 89c2d091 authored by Tadej Novak's avatar Tadej Novak
Browse files

Setup ESD, AOD and digest comparisons for Run 3 data and MC tests

parent c2cca6b8
Pipeline #4024855 failed with stage
in 0 seconds
......@@ -22,9 +22,17 @@ atlas_add_citest( G4ExHive
atlas_add_citest( FastChain
SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/test/FastChain.sh )
atlas_add_citest( SimulationRun2FullSim
SCRIPT RunWorkflowTests_Run2.py --CI -s -w FullSim -e '--maxEvents 10'
LOG_IGNORE_PATTERN "WARNING FPE INVALID" ) # ignore FPEs from Geant4
atlas_add_citest( SimulationRun2AF3
SCRIPT RunWorkflowTests_Run2.py --CI -s -w AF3 )
atlas_add_citest( SimulationRun3FullSim
SCRIPT RunWorkflowTests_Run3.py --CI -s -w FullSim -e '--maxEvents 10'
LOG_IGNORE_PATTERN "WARNING FPE INVALID" ) # ignore FPEs from Geant4
atlas_add_citest( SimulationRun4FullSim
SCRIPT RunWorkflowTests_Run4.py --CI -s -w FullSim -e '--maxEvents 5'
LOG_IGNORE_PATTERN "WARNING FPE INVALID" ) # ignore FPEs from Geant4
......
......@@ -4,4 +4,4 @@
# Pilot beam collisions need a special export and preExec
export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-admin
RunWorkflowTests_Run3.py -a q449 --CI -r -w DataReco -e '--maxEvents 500 --preExec "from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.triggerConfig = \"DB\"; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;"' --threads 8 --no-output-checks
RunWorkflowTests_Run3.py -a q449 --CI -r -w DataReco -e '--maxEvents 500 --skipEvents 60 --preExec "from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.triggerConfig = \"DB\"; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;"' --threads 8
#!/usr/bin/env bash
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
# Run-3 MC but with AODFULL so it can be used as input to the HLT DQ monitoring.
# Once ATLASDQ-879 is fixed, this script can be deleted and the test defintion
# (without the --preExec) moved to Athena.cmake.
RunWorkflowTests_Run3.py --CI -r -w MCReco -e '--maxEvents 25 --preExec="all:from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.AODEDMSet=\"AODFULL\""' --no-output-checks
RunWorkflowTests_Run3.py --CI -r -w MCReco -e '--maxEvents 25 --preExec="all:from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.AODEDMSet=\"AODFULL\""'
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
run event nTopo nIdTracks nTauTracks nTaus nMuons nElec nTrueElec nFakeElec nPhot nTruePhot nFakePhot
421739 11578317 6 0 0 0 0 0 0 0 0 0 0
421739 11578318 7 0 0 0 0 0 0 0 0 0 0
421739 11578335 8 0 0 0 0 0 0 0 0 0 0
421739 11578339 11 0 0 0 0 0 0 0 0 0 0
421739 11578344 4 0 0 0 0 0 0 0 0 0 0
421739 11578356 10 0 0 0 0 0 0 0 0 0 0
421739 11578357 6 0 0 0 1 0 0 0 0 0 0
421739 11578373 7 0 0 0 0 0 0 0 0 0 0
421739 11578384 10 0 0 0 1 0 0 0 0 0 0
421739 11578404 7 0 0 0 0 0 0 0 0 0 0
421739 11578410 8 0 0 0 0 0 0 0 0 0 0
421739 11578414 6 0 0 0 0 0 0 0 0 0 0
421739 11578431 12 0 0 0 0 0 0 0 0 0 0
421739 11578434 5 0 0 0 0 0 0 0 0 0 0
421739 11578435 8 0 0 0 0 0 0 0 0 0 0
421739 11578456 13 0 0 0 0 0 0 0 0 0 0
421739 11578468 4 0 0 0 0 0 0 0 0 0 0
421739 11578474 6 0 0 0 0 0 0 0 0 0 0
421739 11578480 6 0 0 0 0 0 0 0 0 0 0
421739 11578482 5 0 0 0 0 0 0 0 0 0 0
421739 11578505 12 0 0 0 1 0 0 0 0 0 0
421739 11578520 7 0 0 0 0 0 0 0 0 0 0
421739 11578532 1 0 0 0 0 0 0 0 0 0 0
421739 11578533 7 0 0 0 0 0 0 0 0 0 0
421739 11578542 6 0 0 0 0 0 0 0 0 0 0
This diff is collapsed.
run event nTopo nIdTracks nTauTracks nTaus nMuons nElec nTrueElec nFakeElec nPhot nTruePhot nFakePhot
421734 9173772 7 0 0 0 0 0 0 0 0 0 0
421734 9179116 12 0 0 0 0 0 0 0 0 0 0
421734 9213903 9 0 0 0 0 0 0 0 0 0 0
421734 9230456 12 0 0 0 0 0 0 0 0 0 0
421734 9234878 8 0 0 0 0 0 0 0 0 0 0
421734 9237909 13 0 0 0 0 0 0 0 0 0 0
421734 9252453 4 0 0 0 0 0 0 0 0 0 0
421734 9252914 6 0 0 0 0 0 0 0 0 0 0
421734 9260756 7 0 0 0 0 0 0 0 0 0 0
421734 9296103 13 0 0 0 0 0 0 0 0 0 0
421734 9349478 8 0 0 0 0 0 0 0 0 0 0
421734 9351877 5 0 0 0 0 0 0 0 0 0 0
421734 9360077 7 0 0 0 0 0 0 0 0 0 0
421734 9370984 9 0 0 0 0 0 0 0 0 0 0
421734 9377582 8 0 0 0 0 0 0 0 0 0 0
421734 9418844 8 0 0 0 0 0 0 0 0 0 0
421734 9430650 8 0 0 0 0 0 0 0 0 0 0
421734 9434851 13 0 0 0 0 0 0 0 0 0 0
421734 9477162 9 0 0 0 0 0 0 0 0 0 0
421734 9481150 16 0 0 0 0 0 0 0 0 0 0
421734 9510488 15 0 0 0 0 0 0 0 0 0 0
421734 9517905 10 0 0 0 0 0 0 0 0 0 0
421734 9528657 8 0 0 0 0 0 0 0 0 0 0
421734 9544194 12 0 0 0 0 0 0 0 0 0 0
421734 9550471 14 0 0 0 0 0 0 0 0 0 0
......@@ -137,7 +137,7 @@ class FrozenTier0PolicyCheck(WorkflowCheck):
log_file = test.validation_path / f"diff-root-{test.ID}.{self.format}.log"
exclusion_list = " ".join(exclusion_list)
comparison_command = f"acmd.py diff-root {reference_file} {validation_file} --nan-equal --error-mode resilient --ignore-leaves {exclusion_list} --entries {self.max_events} > {log_file} 2>&1"
comparison_command = f"acmd.py diff-root {reference_file} {validation_file} --order-trees --nan-equal --error-mode resilient --ignore-leaves {exclusion_list} --entries {self.max_events} > {log_file} 2>&1"
output, error = subprocess.Popen(["/bin/bash", "-c", comparison_command], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
output, error = output.decode("utf-8"), error.decode("utf-8")
......@@ -184,7 +184,7 @@ class AODContentCheck(WorkflowCheck):
self.logger.info(f"Running {test.ID} AOD content check")
file_name = "myAOD.pool.root"
output_name = f"{self.setup.release_ID}_{test.ID}_AOD_content.txt"
output_name = f"{test.ID}_AOD_content.txt"
validation_file = test.validation_path / file_name
validation_output = test.validation_path / output_name
......@@ -200,7 +200,7 @@ class AODContentCheck(WorkflowCheck):
if self.setup.validation_only:
# try to get the reference
reference_path = test.validation_path
reference_output_name = f"{self.setup.release_ID}_{test.ID}_AOD_content.ref"
reference_output_name = f"{test.ID}_AOD_content.ref"
reference_output = reference_path / reference_output_name
subprocess.Popen(["/bin/bash", "-c", f"cd {reference_path}; get_files -remove -data {reference_output_name}"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
if not reference_output.exists():
......@@ -261,7 +261,7 @@ class AODDigestCheck(WorkflowCheck):
self.logger.info(f"Running {test.ID} AOD digest")
file_name = "myAOD.pool.root"
output_name = f"{self.setup.release_ID}_{test.ID}_AOD_digest.txt"
output_name = f"{test.ID}_AOD_digest.txt"
validation_file = test.validation_path / file_name
validation_output = test.validation_path / output_name
......@@ -278,7 +278,7 @@ class AODDigestCheck(WorkflowCheck):
if self.setup.validation_only:
# try to get the reference
reference_path = test.validation_path
reference_output_name = f"{self.setup.release_ID}_{test.ID}_AOD_digest.ref"
reference_output_name = f"{test.ID}_AOD_digest.ref"
reference_output = reference_path / reference_output_name
subprocess.Popen(["/bin/bash", "-c", f"cd {reference_path}; get_files -remove -data {reference_output_name}"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
if not reference_output.exists():
......
......@@ -8,13 +8,16 @@
# Then the subfolders follow the format branch/test/version, i.e. for s3760 in master the reference files are under
# /eos/atlas/atlascerngroupdisk/data-art/grid-input/WorkflowReferences/master/s3760/v1 for v1 version
# Format is "test-branch" : "version"
# Format is "test" : "version"
references_map = {
# Simulation
"s3759": "v9",
"s3760": "v7",
"s3779": "v4",
"s3759": "v1",
"s3760": "v1",
"s3779": "v1",
# Overlay
"d1590": "v9",
"d1726": "v4",
"d1590": "v1",
"d1726": "v1",
# Reco
"q445": "v1",
"q449": "v1",
}
......@@ -24,7 +24,7 @@ class TestSetup:
self.checks_only = False
self.release_reference = ""
self.release_validation = ""
self.release_ID = "master" # The following is not flexible enough, can probably be hardcoded: environ["AtlasVersion"][0:4]
self.release_ID = "22.0" # The following is not flexible enough, can probably be hardcoded: environ["AtlasVersion"][0:4]
self.parallel_execution = False
self.disable_output_checks = False
self.custom_threads = None
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment