diff --git a/Reconstruction/RecJobTransforms/python/recTransformUtils.py b/Reconstruction/RecJobTransforms/python/recTransformUtils.py
index e70da0c2a6f7e84c3f197cd3c84055ef39b05553..f19390e873c5f373de9cc3d7754d70a0e252ca18 100644
--- a/Reconstruction/RecJobTransforms/python/recTransformUtils.py
+++ b/Reconstruction/RecJobTransforms/python/recTransformUtils.py
@@ -106,6 +106,9 @@ def addRecoSubsteps(executorSet):
substep = 'a2da', inData = ['AOD'], outData = ['DAOD']))
executorSet.add(reductionFrameworkExecutorNTUP(name = 'NTUPtoRED', skeletonFile = 'PATJobTransforms/skeleton.NTUPtoRED_tf.py',
substep = 'n2n', inData = ['NTUP_COMMON'], outData = ['DNTUP']))
+ executorSet.add(reductionFrameworkExecutor(name = 'EVNTtoDAOD', skeletonFile = 'PATJobTransforms/skeleton.AODtoDAOD_tf.py',
+ substep = 'ev2da', inData = ['EVNT'], outData = ['DAOD']))
+
## @brief The standard suite of reconstruction specific arguments
diff --git a/Reconstruction/RecJobTransforms/scripts/RAWSkim_tf.py b/Reconstruction/RecJobTransforms/scripts/RAWSkim_tf.py
index ba518e1dfcf91aa534bd67e6fa98cc003ba637c3..d6a242759bbcc50a464801566ebe8166aaf7c9cc 100755
--- a/Reconstruction/RecJobTransforms/scripts/RAWSkim_tf.py
+++ b/Reconstruction/RecJobTransforms/scripts/RAWSkim_tf.py
@@ -3,7 +3,7 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
## SkimRAW_tf.py - Bytestream skimmer transform
-# @version $Id: RAWSkim_tf.py 571272 2013-11-19 14:33:37Z graemes $
+# @version $Id: RAWSkim_tf.py 643395 2015-02-01 19:51:21Z graemes $
import sys
import time
@@ -53,13 +53,13 @@ def addMyArgs(parser):
parser.defineArgGroup('SkimRAW', 'Skim RAW Options')
parser.add_argument('--inputBSFile', nargs='+',
type=trfArgClasses.argFactory(trfArgClasses.argBSFile, io='input', type='bs'),
- help='Input bytestream file(s)', group='SkimRAW', metavar='FILE', required=True)
+ help='Input bytestream file(s)', group='SkimRAW', metavar='FILE')
parser.add_argument('--outputBS_SKIMFile', '--outputBSFile',
type=trfArgClasses.argFactory(trfArgClasses.argBSFile, io='output', type='bs'),
- help='Output skimmed bytestream file', group='SkimRAW', metavar='SkimmedFILE', required=True)
+ help='Output skimmed bytestream file', group='SkimRAW', metavar='SkimmedFILE')
parser.add_argument('--filterFile',
type=trfArgClasses.argFactory(trfArgClasses.argString),
- help='Filter file for skimming bytestream', group='SkimRAW', required=True)
+ help='Filter file for skimming bytestream', group='SkimRAW')
if __name__ == '__main__':
diff --git a/Reconstruction/RecJobTransforms/test/RecJobTransforms_TestConfiguration.xml b/Reconstruction/RecJobTransforms/test/RecJobTransforms_TestConfiguration.xml
deleted file mode 100644
index 3ce913714ccd345783236bd7f471e2801bb0dfe7..0000000000000000000000000000000000000000
--- a/Reconstruction/RecJobTransforms/test/RecJobTransforms_TestConfiguration.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE unifiedTestConfiguration SYSTEM "http://www.hep.ucl.ac.uk/atlas/AtlasTesting/DTD/unifiedTestConfiguration.dtd">
-
-<unifiedTestConfiguration>
- <atn></atn>
- <kv></kv>
-
- <rtt xmlns="http://www.hep.ucl.ac.uk/atlas/AtlasTesting/rtt" >
- <rttContactPerson>Graeme Stewart</rttContactPerson>
- <mailto>graeme.andrew.stewart@cern.ch</mailto>
-
- <jobList>
- <jobTransform userJobId="DigiMReco_trf_FCT">
- <doc>Test of DigiMReco from HITS to AOD/TAG</doc>
- <jobTransformJobName>DigiMReco_FCT</jobTransformJobName>
- <jobTransformCmd>
- DigiMReco_trf.py inputHitsFile=root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc11a/mc11_7TeV.105200.T1_McAtNlo_Jimmy.merge.HITS.e835_s1310_s1300/HITS.508808._000857.pool.root.1 tmpRDO=tmp.RDO.pool.root outputESDFile=my.ESD.pool.root outputAODFile=my.ADO.pool.root outputAODFile=my.ADO.pool.root outputTAGFile=my.TAG.root maxEvents=10 triggerConfigByRun='{180164:"MCRECO:DB:TRIGGERDBMC:301,134,246",183003:"MCRECO:DB:TRIGGERDBMC:301,134,246",186169:"MCRECO:DB:TRIGGERDBMC:301,134,246",186275:"MCRECO:DB:TRIGGERDBMC:303,139,248"}' preInclude_h2r='Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInclude.PileUpBunchTrains2011Config8_DigitConfig.py,RunDependentSimData/configLumi_mc11b_v1.py' preExec_h2r='from Digitization.DigitizationFlags import digitizationFlags;digitizationFlags.overrideMetadata+=["SimLayout","PhysicsList"]' postExec_h2r='ToolSvc.LArAutoCorrTotalToolDefault.NMinBias=0' preExec_r2e='rec.Commissioning.set_Value_and_Lock(True);jobproperties.Beam.energy.set_Value_and_Lock(3500*Units.GeV);muonRecFlags.writeSDOs=True;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(8.0);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(50);from InDetTrigRecExample.ConfiguredNewTrackingTrigCuts import L2IDTrackingCuts;L2IDTrackingCuts.setRegSelZmax(225*Units.mm)' postExec_r2e='RegSelSvc=topSequence.allConfigurables.get("RegSelSvcDefault");RegSelSvc.DeltaZ=225*Units.mm' preExec_e2a='TriggerFlags.AODEDMSet="AODSLIM";rec.Commissioning.set_Value_and_Lock(True);jobproperties.Beam.energy.set_Value_and_Lock(3500*Units.GeV);muonRecFlags.writeSDOs=True;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(8.0);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(50)' RunNumber=105200 autoConfiguration=everything conditionsTag=OFLCOND-SDR-BS7T-05-12 geometryVersion=ATLAS-GEO-18-01-00 numberOfLowPtMinBias=29.966 numberOfHighPtMinBias=0.034 LowPtMinbiasHitsFile=root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc11a/mc11_7TeV.108118.Pythia8_minbias_Inelastic_low.merge.HITS.e816_s1299_s1303/HITS.500617._000382.pool.root.1 HighPtMinbiasHitsFile=root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc11a/mc11_7TeV.108119.Pythia8_minbias_Inelastic_high.merge.HITS.e848_s1299_s1303/HITS.500616._001496.pool.root.1 DataRunNumber=-1 jobNumber=41 digiSeedOffset1=41 digiSeedOffset2=41
- </jobTransformCmd>
- <group>DMRTrf</group>
- </jobTransform>
- </jobList>
-
- </rtt>
-</unifiedTestConfiguration>
diff --git a/Reconstruction/RecJobTransforms/test/dmrTest.py b/Reconstruction/RecJobTransforms/test/dmrTest.py
deleted file mode 100755
index 9b330db7839162df07a8a34472106991deece48e..0000000000000000000000000000000000000000
--- a/Reconstruction/RecJobTransforms/test/dmrTest.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /usr/bin/env python
-
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-#
-# First go at making a test for DigiMReco using the python
-# unit test framework
-#
-
-import unittest
-
-from RecJobTransforms.DigiMReco_trf import DigiMultiTriggerRecoTrf
-
-class TestSequenceFunctions(unittest.TestCase):
- def test_momAndApplePie(self):
- self.assertEqual(2, 2)
-
- def test_fullChain(self):
- '''DigiMReco from RDO to ADO/TAG'''
- # Define the inputDictionary
- inDic = {'inputHitsFile' : 'root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc11a/mc11_7TeV.105200.T1_McAtNlo_Jimmy.merge.HITS.e835_s1310_s1300/HITS.508808._000857.pool.root.1',
- 'tmpRDO' : 'tmp.RDO.pool.root',
- 'outputESDFile' : 'my.ESD.pool.root',
- 'outputAODFile' : 'my.ADO.pool.root',
- 'outputTAGFile' : 'my.TAG.root',
- 'maxEvents' : '10',
- 'triggerConfigByRun' : '{180164:"MCRECO:DB:TRIGGERDBMC:301,134,246",183003:"MCRECO:DB:TRIGGERDBMC:301,134,246",186169:"MCRECO:DB:TRIGGERDBMC:301,134,246",186275:"MCRECO:DB:TRIGGERDBMC:303,139,248"}',
- 'preInclude_h2r' : 'Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInclude.PileUpBunchTrains2011Config8_DigitConfig.py,RunDependentSimData/configLumi_mc11b_v1.py',
- 'preExec_h2r' : 'from Digitization.DigitizationFlags import digitizationFlags;digitizationFlags.overrideMetadata+=["SimLayout","PhysicsList"]',
- 'postExec_h2r' : 'ToolSvc.LArAutoCorrTotalToolDefault.NMinBias=0',
- 'preExec_r2e' : 'rec.Commissioning.set_Value_and_Lock(True);jobproperties.Beam.energy.set_Value_and_Lock(3500*Units.GeV);muonRecFlags.writeSDOs=True;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(8.0);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(50);from InDetTrigRecExample.ConfiguredNewTrackingTrigCuts import L2IDTrackingCuts;L2IDTrackingCuts.setRegSelZmax(225*Units.mm)',
- 'postExec_r2e' : 'RegSelSvc=topSequence.allConfigurables.get("RegSelSvcDefault");RegSelSvc.DeltaZ=225*Units.mm',
- 'preExec_e2a' : 'TriggerFlags.AODEDMSet="AODSLIM";rec.Commissioning.set_Value_and_Lock(True);jobproperties.Beam.energy.set_Value_and_Lock(3500*Units.GeV);muonRecFlags.writeSDOs=True;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(8.0);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(50)',
- 'RunNumber' : '105200',
- 'autoConfiguration' : 'everything',
- 'conditionsTag' : 'OFLCOND-SDR-BS7T-05-12',
- 'geometryVersion' : 'ATLAS-GEO-18-01-00',
- 'numberOfLowPtMinBias' : '29.966',
- 'numberOfHighPtMinBias' : '0.034',
- 'LowPtMinbiasHitsFile' : 'root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc11a/mc11_7TeV.108118.Pythia8_minbias_Inelastic_low.merge.HITS.e816_s1299_s1303/HITS.500617._000382.pool.root.1',
- 'HighPtMinbiasHitsFile' : 'root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc11a/mc11_7TeV.108119.Pythia8_minbias_Inelastic_high.merge.HITS.e848_s1299_s1303/HITS.500616._001496.pool.root.1',
- 'DataRunNumber' : '-1',
- 'jobNumber' : '41',
- 'digiSeedOffset1' : '41',
- 'digiSeedOffset2' : '41',
- }
- print inDic
- trf = DigiMultiTriggerRecoTrf(inDic)
- trf._lastInChain=True
- self.assertEqual(trf.exeArgDict(inDic).exitCode(), 0)
-
-if __name__ == '__main__':
- unittest.main()
-
-
-
diff --git a/Reconstruction/RecJobTransforms/test/test_digiMReco b/Reconstruction/RecJobTransforms/test/test_digiMReco
deleted file mode 100755
index fab9c8a8ec0ea87ac82faf3bb753dd315241b67d..0000000000000000000000000000000000000000
--- a/Reconstruction/RecJobTransforms/test/test_digiMReco
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /usr/bin/env bash
-
-INPUTHITS=root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc11a/mc11_7TeV.105200.T1_McAtNlo_Jimmy.merge.HITS.e835_s1310_s1300/HITS.508808._000857.pool.root.1
-LOWPTMB=root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc11a/mc11_7TeV.108118.Pythia8_minbias_Inelastic_low.merge.HITS.e816_s1299_s1303/HITS.500617._000382.pool.root.1
-HIGHPTMB=root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc11a/mc11_7TeV.108119.Pythia8_minbias_Inelastic_high.merge.HITS.e848_s1299_s1303/HITS.500616._001496.pool.root.1
-
-GEO=ATLAS-GEO-18-01-00
-COND=OFLCOND-SDR-BS7T-05-12
-
-TRF=DigiMReco_trf.py
-which $TRF
-if [[ $? -ne 0 ]]; then
- echo "ERROR: $TRF not found"
- exit 2
-fi
-
-cmd="$TRF inputHitsFile=$INPUTHITS tmpRDO=tmp.RDO.pool.root outputESDFile=my.ESD.pool.root \
-outputAODFile=my.ADO.pool.root outputTAGFile=my.TAG.root maxEvents=10 \
-triggerConfigByRun='{180164:\"MCRECO:DB:TRIGGERDBMC:301,134,246\",183003:\"MCRECO:DB:TRIGGERDBMC:301,134,246\",186169:\"MCRECO:DB:TRIGGERDBMC:301,134,246\",186275:\"MCRECO:DB:TRIGGERDBMC:303,139,248\"}' \
-preInclude_h2r='Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInclude.PileUpBunchTrains2011Config8_DigitConfig.py,RunDependentSimData/configLumi_mc11b_v1.py' \
-preExec_h2r='from Digitization.DigitizationFlags import digitizationFlags;digitizationFlags.overrideMetadata+=[\"SimLayout\",\"PhysicsList\"]' \
-postExec_h2r='ToolSvc.LArAutoCorrTotalToolDefault.NMinBias=0' \
-preExec_r2e='rec.Commissioning.set_Value_and_Lock(True);jobproperties.Beam.energy.set_Value_and_Lock(3500*Units.GeV);muonRecFlags.writeSDOs=True;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(8.0);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(50);from InDetTrigRecExample.ConfiguredNewTrackingTrigCuts import L2IDTrackingCuts;L2IDTrackingCuts.setRegSelZmax(225*Units.mm)' \
-postExec_r2e='RegSelSvc=topSequence.allConfigurables.get(\"RegSelSvcDefault\");RegSelSvc.DeltaZ=225*Units.mm' \
-preExec_e2a='TriggerFlags.AODEDMSet=\"AODSLIM\";rec.Commissioning.set_Value_and_Lock(True);jobproperties.Beam.energy.set_Value_and_Lock(3500*Units.GeV);muonRecFlags.writeSDOs=True;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(8.0);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(50)' \
-RunNumber=105200 autoConfiguration=everything \
-conditionsTag=$COND \
-geometryVersion=$GEO \
-numberOfLowPtMinBias=29.966 numberOfHighPtMinBias=0.034 \
-LowPtMinbiasHitsFile=$LOWPTMB \
-HighPtMinbiasHitsFile=$HIGHPTMB \
-DataRunNumber=-1 jobNumber=41 digiSeedOffset1=41 digiSeedOffset2=41"
-
-echo $cmd
-$cmd