Drop skeleton.EVNTMerge.py

Tools/PyJobTransforms/python/trfArgClasses.py

@@ -1628,8 +1628,8 @@ class argEVNTFile(argPOOLFile):
         myDataDictionary = {'EVNT' : argEVNTFile(inputs, type=self.type, io='input'),
                             'EVNT_MRG' : argEVNTFile(output, type=self.type, io='output')}
         myMergeConf = executorConfig(myargdict, myDataDictionary)
-        myMerger = athenaExecutor(name = mySubstepName, skeletonFile = 'PyJobTransforms/skeleton.EVNTMerge.py',
-                                  skeletonCA = 'EvgenJobTransforms.EVNTMerge_Skeleton', conf=myMergeConf,
+        myMerger = athenaExecutor(name = mySubstepName, skeletonCA = 'EvgenJobTransforms.EVNTMerge_Skeleton',
+                                  conf=myMergeConf,
                                   inData=set(['EVNT']), outData=set(['EVNT_MRG']),
                                   disableMT=True, disableMP=True)
         myMerger.doAll(input=set(['EVNT']), output=set(['EVNT_MRG']))

Tools/PyJobTransforms/scripts/EVNTMerge_tf.py

 #! /usr/bin/env python
 
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 ## AODMerge_tf.py - AOD merger with optional TAG and DPD outputs
 #  N.B. Do need clarification as to if AODtoDPD is ever run in parallel with AOD merging 
@@ -37,7 +37,7 @@ def main():
 def getTransform():
     executorSet = set()
     print(type(executorSet))
-    executorSet.add(athenaExecutor(name = 'EVNTMerge', skeletonFile = 'PyJobTransforms/skeleton.EVNTMerge.py', skeletonCA = 'EvgenJobTransforms.EVNTMerge_Skeleton', inData = ['EVNT'], outData = ['EVNT_MRG']))
+    executorSet.add(athenaExecutor(name = 'EVNTMerge', skeletonCA = 'EvgenJobTransforms.EVNTMerge_Skeleton', inData = ['EVNT'], outData = ['EVNT_MRG']))
 
     trf = transform(executor = executorSet)
     

Tools/PyJobTransforms/scripts/Merge_tf.py

@@ -44,8 +44,7 @@ def getTransform():
     executorSet.add(hybridPOOLMergeExecutor(name = 'AODMerge', inData = ['AOD'], outData = ['AOD_MRG']))
     executorSet.add(DQMergeExecutor(name = 'DQHistogramMerge', inData = [('HIST_ESD', 'HIST_AOD'), 'HIST'], outData = ['HIST_MRG']))
     executorSet.add(bsMergeExecutor(name = 'RAWFileMerge', exe = 'file_merging', inData = set(['BS']), outData = set(['BS_MRG'])))
-    executorSet.add(athenaExecutor(name = 'EVNTMerge', skeletonFile = 'PyJobTransforms/skeleton.EVNTMerge.py',
-                                   skeletonCA = 'EvgenJobTransforms.EVNTMerge_Skeleton', inData = ['EVNT'], outData = ['EVNT_MRG']))
+    executorSet.add(athenaExecutor(name = 'EVNTMerge', skeletonCA = 'EvgenJobTransforms.EVNTMerge_Skeleton', inData = ['EVNT'], outData = ['EVNT_MRG']))
 
     addDAODMergerSubsteps(executorSet)
     addNTUPMergeSubsteps(executorSet)

Tools/PyJobTransforms/share/skeleton.EVNTMerge.py

-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
-from AthenaCommon.Logging import logging
-## basic jobO configuration
-include("PATJobTransforms/CommonSkeletonJobOptions.py")
-## load pool support
-import AthenaPoolCnvSvc.ReadAthenaPool
-import AthenaPoolCnvSvc.WriteAthenaPool
-
-## input
-ServiceMgr.EventSelector.InputCollections = runArgs.inputEVNTFile
-
-## output stream
-from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-
-outStream = AthenaPoolOutputStream("StreamEVGEN", runArgs.outputEVNT_MRGFile, noTag=True)
-
-## copy everything from the input file
-## must force reading of all input objects
-outStream.TakeItemsFromInput = True
-
-## initialize IOVDbSvc so TagInfoMgr will work
-from IOVDbSvc import IOVDb
-
-#==============================================================
-# Job Configuration parameters:
-#==============================================================
-## Pre-exec
-if hasattr(runArgs, "preExec"):
-    for cmd in runArgs.preExec:
-        exec(cmd)
-
-## Pre-include
-if hasattr(runArgs, "preInclude"):
-    for fragment in runArgs.preInclude:
-        include(fragment)
-
-# Avoid command line preInclude for Event Service
-if hasattr(runArgs, "eventService") and runArgs.eventService:
-    import AthenaMP.EventService
-
-## Post-include
-if hasattr(runArgs, "postInclude"):
-    for fragment in runArgs.postInclude:
-        include(fragment)
-
-## Post-exec
-if hasattr(runArgs, "postExec"):
-    for cmd in runArgs.postExec:
-        exec(cmd)
-
-#==============================================================
-## Special configuration
-from AthenaConfiguration.AutoConfigFlags import GetFileMD
-hepmc_version = GetFileMD(ServiceMgr.EventSelector.InputCollections).get("hepmc_version", None)
-if hepmc_version is not None:
-    log = logging.getLogger('EVNTMerge')
-    if hepmc_version == "2":
-        hepmc_version = "HepMC2"
-    elif hepmc_version == "3":
-        hepmc_version = "HepMC3"
-    log.info('Input file was produced with %s', hepmc_version)
-    ServiceMgr.TagInfoMgr.ExtraTagValuePairs.update({"hepmc_version": hepmc_version})