Minor fixes

Author: davidrohr

DATA/tools/epn/gen_topo.sh

@@ -16,7 +16,7 @@
 [[ -z "$GEN_TOPO_STDERR_LOGGING" ]] && export GEN_TOPO_STDERR_LOGGING=1 # Enable logging of stderr messages
 [[ -z "$IS_SIMULATED_DATA" ]] && export IS_SIMULATED_DATA=0 # by default we are processing raw data
 [[ -z "$GEN_TOPO_ODC_EPN_TOPO_ARGS" ]] && export GEN_TOPO_ODC_EPN_TOPO_ARGS="--recown 'wn_(?"'!'"online-calib).*_.*' --calibwn 'wn_online-calib_.*'" # Arguments to pass to odc-epn-topo command
-[[ -z "$GEN_TOPO_EPN_CCDB_SERVER" ]] && export GEN_TOPO_EPN_CCDB_SERVER="http://o2-ccdb.internal" # CCDB server to use
+[[ -z "$GEN_TOPO_EPN_CCDB_SERVER" ]] && export GEN_TOPO_EPN_CCDB_SERVER="http://localhost:8084" # CCDB server to use
 
 # GEN_TOPO_RUN_HOME is a debug setting used in some tests. This is not needed for online running.
 if [[ "0$GEN_TOPO_RUN_HOME" == "01" ]]; then

DATA/tools/epn/run.sh

@@ -41,4 +41,6 @@ else
 fi
 if [[ $? == 0 ]]; then
   echo Generated XML topology $OUTPUT_FILE_NAME
+else
+  cat $OUTPUT_FILE_NAME
 fi

DATA/tools/parse

@@ -142,15 +142,13 @@ for line in f:
                     raise
                 if 'GEN_TOPO_OOM_WORKAROUND' in os.environ and int(os.environ['GEN_TOPO_OOM_WORKAROUND']):
                     command = 'cat ' + filename + ' | o2-dpl-run -b --dds --dds-workflow-suffix _' + wf[0] + str(i) + ' --resources-monitoring 15 '  + ' | grep -v ' + command_log_filter + ' > ' + filename_xml
-                    print('Running DPL command', command)
+                    print('Running CAT command', command)
                     if os.system(command) != 0:
                         print('Error running command', command)
                     command = 'sed -i \'s,^\( *.exe.*sleep [0-9.]*;\).*\(|[^|]*./exe.\)$,\\1 cat ' + filename + ' \\2,\' ' + filename_xml
-                    os.system('cat ' + filename_xml)
                     print('Running SED command', command)
                     if os.system(command) != 0:
                         print('Error running sed on XML file')
-                    os.system('cat ' + filename_xml)
                     filename = filename_xml
             if reco_num_nodes_override > 0:
                 reconodes = reco_num_nodes_override