diff --git a/Reconstruction/Jet/JetValidation/CMakeLists.txt b/Reconstruction/Jet/JetValidation/CMakeLists.txt index e0362e04f5f846e0089fa0fca1b4cec49f7e48fc..8a352220d2e38591dc1df211396b83fc4d0a4844 100644 --- a/Reconstruction/Jet/JetValidation/CMakeLists.txt +++ b/Reconstruction/Jet/JetValidation/CMakeLists.txt @@ -1,26 +1,9 @@ -################################################################################ -# Package: JetValidation -################################################################################ +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # Declare the package name: atlas_subdir( JetValidation ) -# Declare the package's dependencies: -atlas_depends_on_subdirs( PRIVATE - GaudiKernel ) - -# External dependencies: -find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread ) - -# Component(s) in the package: -atlas_add_component( JetValidation - src/components/*.cxx - INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} - LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel ) - # Install files from the package: atlas_install_python_modules( python/*.py ) atlas_install_joboptions( share/*.py ) -atlas_install_runtime( test/JetValidation_TestConfiguration.xml ) atlas_install_scripts( scripts/jetMakeRefSamples.py ) - diff --git a/Reconstruction/Jet/JetValidation/src/components/JetValidation_entries.cxx b/Reconstruction/Jet/JetValidation/src/components/JetValidation_entries.cxx deleted file mode 100644 index 626fb54a9d431b3d21a40632b606c50ab4bd39fa..0000000000000000000000000000000000000000 --- a/Reconstruction/Jet/JetValidation/src/components/JetValidation_entries.cxx +++ /dev/null @@ -1,13 +0,0 @@ -//#include "JetValidation/JetTests.h" -//#include "JetValidation/JetCalibratorAthenaExample.h" - - -//DECLARE_COMPONENT( JetTests ) -//DECLARE_COMPONENT( JetSkeletonAlg ) - -//DECLARE_COMPONENT( JetCalibratorAthenaExample ) -//DECLARE_COMPONENT( JetCollectionTester ) - - - - diff --git a/Reconstruction/Jet/JetValidation/test/JetValidation_TestConfiguration.xml b/Reconstruction/Jet/JetValidation/test/JetValidation_TestConfiguration.xml deleted file mode 100755 index d35293d5d7a93bb45b31e494b222d9fa5ca42b23..0000000000000000000000000000000000000000 --- a/Reconstruction/Jet/JetValidation/test/JetValidation_TestConfiguration.xml +++ /dev/null @@ -1,213 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE unifiedTestConfiguration SYSTEM "http://www.hep.ucl.ac.uk/atlas/AtlasTesting/DTD/unifiedTestConfiguration.dtd"> -<unifiedTestConfiguration> - <atn/> - <kv/> - <rtt xmlns="http://www.hep.ucl.ac.uk/atlas/AtlasTesting/rtt"> - <rttContactPerson>Hilal Kucuk (hilal.kucuk.09 AT ucl.ac.uk)</rttContactPerson> - <rttContactPerson>Steven Schramm (steven.schramm AT cern.ch)</rttContactPerson> - <mailto>hilal.kucuk.09@NOSPAMucl.ac.uk,steven.schramm@NOSPAMcern.ch</mailto> - <jobList> - <!-- - Data reconstruction tests - 1. RAW to ESD - Ref input dir: /afs/cern.ch/atlas/groups/JetEtmiss/ReferenceFiles/RTT/DATA/RAW/ - 2. ESD to AOD - Ref input dir: /afs/cern.ch/atlas/groups/JetEtmiss/ReferenceFiles/RTT/DATA/ESD/ - 3. AOD to D3PD - Ref input dir: /afs/cern.ch/atlas/groups/JetEtmiss/ReferenceFiles/RTT/DATA/AOD/ - --> - <chain> - <chainName>JetValidationRecoDATA</chainName> - <sequential> - <chainElement> - <jobTransform userJobId="JetValidationData_RAWtoESD"> - <doc>JetValidationData_RAWtoESD</doc> - <jobTransformJobName>JetValidationData_RAWtoESD</jobTransformJobName> - <jobTransformCmd> - Reco_trf.py preExec='from RecExConfig.RecFlags import rec;rec.doTrigger=False' inputBSFile=/afs/cern.ch/atlas/groups/JetEtmiss/ReferenceFiles/RTT/DATA/RAW/data12_8TeV.CurrentRef.RAW outputESDFile=data12_8TeV.TestFile.ESD.pool.root maxEvents=50 skipEvents=0 autoConfiguration=everything - </jobTransformCmd> - <group>JetTransformTests</group> - <dataset_info> - <jobTransformData/> - <datasetName>/afs/cern.ch/atlas/groups/JetEtmiss/ReferenceFiles/RTT/DATA/RAW/data12_8TeV.CurrentRef.RAW</datasetName> - </dataset_info> - <queue>long</queue> - </jobTransform> - <chainfileout>ESD.pool.root</chainfileout> - </chainElement> - - <chainElement> - <jobTransform userJobId="JetValidationData_ESDtoAOD"> - <doc>JetValidationData_ESDtoAOD</doc> - <jobTransformJobName>JetValidationData_ESDtoAOD</jobTransformJobName> - <jobTransformCmd> - Reco_trf.py preExec='from RecExConfig.RecFlags import rec;rec.doTrigger=False;from JetValidation.RTTConfig import scheduleRTTJetTests;rec.UserExecs = ["scheduleRTTJetTests()"]' inputESDFile=/afs/cern.ch/user/d/delsart/dev/valid19.0.1.1./run/testReco_trf/RAWtoESD/data12_8TeV.CurrentRef.ESD.pool.root outputAODFile=data12_8TeV.TestFile.AOD.pool.root maxEvents=50 skipEvents=0 autoConfiguration=everything - </jobTransformCmd> - <group>JetTransformTests</group> - <chaindataset_info> - <jobTransformData/> - <chaindatasetName>ESD.pool.root</chaindatasetName> - <dataset_info> - <jobTransformData/> - <datasetName>/afs/cern.ch/atlas/groups/JetEtmiss/ReferenceFiles/RTT/DATA/ESD/data12_8TeV.CurrentRef.ESD.pool.root</datasetName> - </dataset_info> - </chaindataset_info> - <queue>long</queue> - </jobTransform> - <chainfileout>AOD.pool.root</chainfileout> - </chainElement> - - <!--<chainElement> - <jobTransform userJobId="JetValidationData_AODtoD3PD"> - <doc>JetValidationData_AODtoD3PD</doc> - <jobTransformJobName>JetValidationData_AODtoD3PD</jobTransformJobName> - <jobTransformCmd> - </jobTransformCmd> - <group>JetTransformTests</group> - <queue>long</queue> - <chaindataset_info> - <jobTransformData/> - <chaindatasetName>AOD.pool.root</chaindatasetName> - <dataset_info> - <jobTransformData/> - <datasetName>/afs/cern.ch/atlas/groups/JetEtmiss/ReferenceFiles/RTT/DATA/AOD/data12_8TeV.CurrentRef.AOD.pool.root</datasetName> - </dataset_info> - </chaindataset_info> - </jobTransform> - </chainElement>--> - </sequential> - </chain> - - <!-- - MC reconstruction tests - 0. G4 hits to RDO - Start from the RDO - just do this once outside of RTT and store it - Then use this RDO file as the input to the below steps - 1. RDO to ESD - Ref input dir: /afs/cern.ch/atlas/groups/JetEtmiss/ReferenceFiles/RTT/MC/RDO/ - 2. ESD to AOD - Ref input dir: /afs/cern.ch/atlas/groups/JetEtmiss/ReferenceFiles/RTT/MC/ESD/ - 3. AOD to D3PD - Ref input dir: /afs/cern.ch/atlas/groups/JetEtmiss/ReferenceFiles/RTT/MC/AOD/ - --> - <chain> - <chainName>JetValidationRecoMC</chainName> - <sequential> - <chainElement> - <jobTransform userJobId="JetValidationMC_RDOtoESD"> - <doc>JetValidationMC_RDOtoESD</doc> - <jobTransformJobName>JetValidationMC_RDOtoESD</jobTransformJobName> - <jobTransformCmd> - Reco_trf.py preExec='from RecExConfig.RecFlags import rec;rec.doTrigger=False' inputBSFile=/afs/cern.ch/atlas/groups/JetEtmiss/ReferenceFiles/RTT/DATA/RAW/data12_8TeV.CurrentRef.RAW outputESDFile=data12_8TeV.TestFile.ESD.pool.root maxEvents=50 skipEvents=0 autoConfiguration=everything - </jobTransformCmd> - <group>JetTransformTests</group> - <dataset_info> - <jobTransformData/> - <datasetName>/afs/cern.ch/atlas/groups/JetEtmiss/ReferenceFiles/RTT/MC/RDO/mc12_8TeV.CurrentRef.RDO.pool.root</datasetName> - </dataset_info> - <queue>long</queue> - </jobTransform> - <chainfileout>ESD.pool.root</chainfileout> - </chainElement> - - <chainElement> - <jobTransform userJobId="JetValidationMC_ESDtoAOD"> - <doc>JetValidationMC_ESDtoAOD</doc> - <jobTransformJobName>JetValidationMC_ESDtoAOD</jobTransformJobName> - <jobTransformCmd> - Reco_trf.py preExec='from RecExConfig.RecFlags import rec;rec.doTrigger=False;from JetValidation.RTTConfig import scheduleRTTJetTests;rec.UserExecs = ["scheduleRTTJetTests()"]' inputESDFile=/afs/cern.ch/user/d/delsart/dev/valid19.0.1.1./run/testReco_trf/RAWtoESD/data12_8TeV.CurrentRef.ESD.pool.root outputAODFile=data12_8TeV.TestFile.AOD.pool.root maxEvents=50 skipEvents=0 autoConfiguration=everything - </jobTransformCmd> - <group>JetTransformTests</group> - <chaindataset_info> - <jobTransformData/> - <chaindatasetName>ESD.pool.root</chaindatasetName> - <dataset_info> - <jobTransformData/> - <datasetName>/afs/cern.ch/atlas/groups/JetEtmiss/ReferenceFiles/RTT/MC/ESD/mc12_8TeV.CurrentRef.ESD.pool.root</datasetName> - </dataset_info> - </chaindataset_info> - <queue>long</queue> - </jobTransform> - <chainfileout>AOD.pool.root</chainfileout> - </chainElement> - - - <!--<chainElement> - <jobTransform userJobId="JetValidationMC_AODtoD3PD"> - <doc>JetValidationMC_AODtoD3PD</doc> - <jobTransformJobName>JetValidationMC_AODtoD3PD</jobTransformJobName> - <jobTransformCmd> - </jobTransformCmd> - <group>JetTransformTests</group> - <chaindataset_info> - <jobTransformData/> - <chaindatasetName>AOD.pool.root</chaindatasetName> - <dataset_info> - <jobTransformData/> - <datasetName>/afs/cern.ch/atlas/groups/JetEtmiss/ReferenceFiles/RTT/MC/AOD/mc12_8TeV.CurrentRef.AOD.pool.root</datasetName> - </dataset_info> - </chaindataset_info> - <queue>long</queue> - </jobTransform> - </chainElement>--> - </sequential> - </chain> - </jobList> - <jobGroups> - <jobGroup name="JetAthenaTests" parent="RTT:Athena"> - <!-- Compare against reference DATA test nTuple (for all steps) --> - <!-- <test> --> - <!-- <modulename>JetValidation/CompareJetTestFiles</modulename> --> - <!-- <testname>CompareJetTestFiles</testname> --> - <!-- <testdoc>Compare data sample against the reference file</testdoc> --> - <!-- <testidentifier>CompareJetTestFilesData</testidentifier> --> - <!-- <arg> --> - <!-- <argname>ReferenceFile</argname> --> - <!-- <argvalue>/afs/cern.ch/atlas/groups/JetEtmiss/ReferenceFiles/RTT/DATA/ESD/data12_8TeV.CurrentRef.ESD.pool.root</argvalue> --> - <!-- </arg> --> - <!-- <arg> --> - <!-- <argname>NewFile</argname> --> - <!-- <argvalue>data12_8TeV.TestFile.ESD.pool.root</argvalue> --> - <!-- </arg> --> - <!-- <arg> --> - <!-- <argname>LogFile</argname> --> - <!-- <argvalue>comparison.log</argvalue> --> - <!-- </arg> --> - <!-- <keepFilePattern>comparison.log</keepFilePattern> --> - <!-- </test> --> - - <!-- File patterns to keep --> - <keepFilePattern>*.root</keepFilePattern> - <keepFilePattern>*.log</keepFilePattern> - </jobGroup> - - <jobGroup name="JetTransformTests" parent="RTT:Transform"> - <!-- Compare against reference MC test nTuple (for all steps) --> - <!-- <test> --> - <!-- <modulename>JetValidation/CompareJetTestFiles</modulename> --> - <!-- <testname>CompareJetTestFiles</testname> --> - <!-- <testdoc>Compare MC sample against the reference file</testdoc> --> - <!-- <testidentifier>CompareJetTestFilesMC</testidentifier> --> - <!-- <arg> --> - <!-- <argname>ReferenceFile</argname> --> - <!-- <argvalue>/afs/cern.ch/atlas/groups/JetEtmiss/ReferenceFiles/RTT/MC/ESD/mc12_8TeV.CurrentRef.ESD.pool.root</argvalue> --> - <!-- </arg> --> - <!-- <arg> --> - <!-- <argname>NewFile</argname> --> - <!-- <argvalue>mc12_8TeV.TestFile.ESD.pool.root</argvalue> --> - <!-- </arg> --> - <!-- <arg> --> - <!-- <argname>LogFile</argname> --> - <!-- <argvalue>comparison.log</argvalue> --> - <!-- </arg> --> - <!-- <keepFilePattern>comparison.log</keepFilePattern> --> - <!-- </test> --> - - <!-- File patterns to keep --> - <keepFilePattern>*.root</keepFilePattern> - <keepFilePattern>*.log</keepFilePattern> - </jobGroup> - </jobGroups> - </rtt> -</unifiedTestConfiguration>