From 3747e1c9e93f9f4d59a61b45487c4f8c2720ee44 Mon Sep 17 00:00:00 2001
From: Tadej Novak <tadej.novak@cern.ch>
Date: Mon, 7 Dec 2020 19:19:30 +0100
Subject: [PATCH] PyJobTransforms: Fix input/output file parsing from AMI
---
Tools/PyJobTransforms/python/trfAMI.py | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/Tools/PyJobTransforms/python/trfAMI.py b/Tools/PyJobTransforms/python/trfAMI.py
index 2c3fd404496..de453eac1a7 100644
--- a/Tools/PyJobTransforms/python/trfAMI.py
+++ b/Tools/PyJobTransforms/python/trfAMI.py
@@ -356,13 +356,11 @@ def getTrfConfigFromPANDA(tag):
if arg.lstrip('-').startswith('input') and arg.endswith('File'):
value=physics.pop(arg)
msg.debug("Found input file argument %s=%s.", arg, value )
- fmt=arg.lstrip('-').replace('input','').replace('File','')
- trf.inFiles[arg]=getInputFileName(arg)
+ trf.inFiles[arg]=value
elif arg.lstrip('-').startswith('output') and arg.endswith('File'):
value=physics.pop(arg)
msg.debug("Found output file argument %s=%s.", arg, value )
- fmt=arg.lstrip('-').replace('output','').replace('File','')
- trf.outFiles[arg]=getOutputFileName(fmt)
+ trf.outFiles[arg]=value
msg.debug("Checking for not set arguments...")
for arg,value in listitems(physics):
@@ -490,13 +488,11 @@ def getTrfConfigFromAMI(tag, suppressNonJobOptions = True):
if arg.lstrip('-').startswith('input') and arg.endswith('File'):
value = physics.pop(arg)
msg.debug("Found input file argument %s=%s.", arg, value)
- fmt = arg.lstrip('-').replace('input', '').replace('File', '')
- trf.inFiles[arg] = getInputFileName(arg)
+ trf.inFiles[arg] = value
elif arg.lstrip('-').startswith('output') and arg.endswith('File'):
value = physics.pop(arg)
msg.debug("Found output file argument %s=%s.", arg, value)
- fmt = arg.lstrip('-').replace('output', '').replace('File', '')
- trf.outFiles[arg] = getOutputFileName(fmt)
+ trf.outFiles[arg] = value
msg.debug("Checking for not set arguments...")
for arg, value in listitems(physics):
--
GitLab