Workflow parser: DDS asset files have .asset extension

Author: davidrohr

DATA/common/setenv.sh

@@ -165,13 +165,11 @@ has_matching_qc()
 has_pid_qc()
 {
     PIDDETECTORS=$(echo $1 | tr "-" "\n")
-    for PIDDETECTOR in $PIDDETECTORS;
-    do
-	echo PIDDETECTOR=$PIDDETECTOR 1>&2
-	if [[ $PIDDETECTOR == "TOF" ]]; then
-	    (! has_detectors_reco ITS TPC TOF || ! has_detector_matching ITSTPCTOF) && return 1
-	fi
-	! has_detector_qc $PIDDETECTOR && return 1
+    for PIDDETECTOR in $PIDDETECTORS; do
+        if [[ $PIDDETECTOR == "TOF" ]]; then
+            (! has_detectors_reco ITS TPC TOF || ! has_detector_matching ITSTPCTOF) && return 1
+        fi
+        ! has_detector_qc $PIDDETECTOR && return 1
     done
     return 0
 }

DATA/tools/parse

@@ -159,7 +159,7 @@ for line in f:
                             print('Error running sed on JSON file')
                         asset_name = 'dpl_json_' + wf[0] + '_' + str(i)
                         command = 'sed -i ' + \
-                                  '-e \'s,^\( *.exe.*sleep [0-9.]*;\).*\(|[^|]*./exe.\)$,\\1 cat ${DDS_LOCATION}/' + asset_name + ' \\2,\' ' + \
+                                  '-e \'s,^\( *.exe.*sleep [0-9.]*;\).*\(|[^|]*./exe.\)$,\\1 cat ${DDS_LOCATION}/' + asset_name + '.asset \\2,\' ' + \
                                   '-e \'/^\( *.decltask name.*>$\)/a <assets><name>' + asset_name + '</name></assets>\' ' + \
                                   '-e \'/^\( *.topology name.*>$\)/a <asset name="' + asset_name + '" type="inline" visibility="global" value="\' ' + \
                                   '-e \'/^\( *.topology name.*>$\)/r ' + filename + '\' ' + \