diff --git a/DaVinciTests/tests/refs/test_davinci_control_flow.ref b/DaVinciTests/tests/refs/test_davinci_control_flow.ref
index 6053a6a3fa364ea9abde4e344c7eb17ef6bfe622..770c26655ac6b8108e03835dbddf0ada55ca8590 100644
--- a/DaVinciTests/tests/refs/test_davinci_control_flow.ref
+++ b/DaVinciTests/tests/refs/test_davinci_control_flow.ref
@@ -20,7 +20,7 @@ WARNING DV option file or main function not defined. No user algorithms will be
 |-first_evt              = 0  (default: 0)
 |-histo_file             = 'DVHistos.root'  (default: '')
 |-ignore_dq_flags        = False  (default: False)
-|-input_files            = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst']
+|-input_files            = ['root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst']
 |                        (default: [])
 |-input_raw_format       = 0.3  (default: 0.3)
 |-input_type             = 'ROOT'  (default: 'DST')
@@ -38,6 +38,7 @@ WARNING DV option file or main function not defined. No user algorithms will be
 |-output_level           = 3  (default: 3)
 |-output_type            = ''  (default: '')
 |-overwrite_data_options = False  (default: False)
+|-phoenix_filename       = ''  (default: '')
 |-print_freq             = 1000  (default: 1000)
 |-python_logging_level   = 30  (default: 30)
 |-root_compression_level = 'LZMA:6'  (default: 'LZMA:6')
@@ -65,7 +66,7 @@ ApplicationMgr                         INFO Application Manager Initialized succ
 DeFTDetector                           INFO Current FT geometry version =   63
 ApplicationMgr                         INFO Application Manager Started successfully
 EventPersistencySvc                    INFO Added successfully Conversion service:RootCnvSvc
-EventSelector                          INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
+EventSelector                          INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
 EventSelector                       SUCCESS Reading Event record 1. Record number within stream 1: 1
 ApplicationMgr                         INFO Application Manager Stopped successfully
 FSROutputStreamDstWriter               INFO Set up File Summary Record
diff --git a/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref b/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref
index b3423a60bb940fd5d104935242ef0ab89bf22e2e..a06937d6f08abdfad3a855cd4bb5fd04491e02db 100644
--- a/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref
+++ b/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref
@@ -20,7 +20,7 @@ WARNING DV option file or main function not defined. No user algorithms will be
 |-first_evt              = 0  (default: 0)
 |-histo_file             = 'DVHistos.root'  (default: '')
 |-ignore_dq_flags        = False  (default: False)
-|-input_files            = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst']
+|-input_files            = ['root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst']
 |                        (default: [])
 |-input_raw_format       = 0.3  (default: 0.3)
 |-input_type             = 'ROOT'  (default: 'DST')
@@ -38,6 +38,7 @@ WARNING DV option file or main function not defined. No user algorithms will be
 |-output_level           = 3  (default: 3)
 |-output_type            = ''  (default: '')
 |-overwrite_data_options = False  (default: False)
+|-phoenix_filename       = ''  (default: '')
 |-print_freq             = 1000  (default: 1000)
 |-python_logging_level   = 30  (default: 30)
 |-root_compression_level = 'LZMA:6'  (default: 'LZMA:6')
diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref
index f5cfdb26a0cb172cca3026cfa48224dc14cf0dd4..5621a2380abc8e805fb4b596cf9da84c3d74f19d 100644
--- a/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref
+++ b/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref
@@ -38,6 +38,7 @@ WARNING DV option file or main function not defined. No user algorithms will be
 |-output_level           = 3  (default: 3)
 |-output_type            = ''  (default: '')
 |-overwrite_data_options = False  (default: False)
+|-phoenix_filename       = ''  (default: '')
 |-print_freq             = 1000  (default: 1000)
 |-python_logging_level   = 30  (default: 30)
 |-root_compression_level = 'LZMA:6'  (default: 'LZMA:6')
diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref
index e5fb7554e00b7c49b533b54cdf525ec0f040924e..dd63f01bfecaa95ca5f823bd20a3bcc48fdfad33 100644
--- a/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref
+++ b/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref
@@ -38,6 +38,7 @@ WARNING DV option file or main function not defined. No user algorithms will be
 |-output_level           = 3  (default: 3)
 |-output_type            = ''  (default: '')
 |-overwrite_data_options = False  (default: False)
+|-phoenix_filename       = ''  (default: '')
 |-print_freq             = 1000  (default: 1000)
 |-python_logging_level   = 30  (default: 30)
 |-root_compression_level = 'LZMA:6'  (default: 'LZMA:6')
diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref
index 38193cb5dce58c5c9612e14bde4dbe9cbc7deed4..a0132ddb734a25feb18d5cfc3c2b6730bfec2c2b 100644
--- a/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref
+++ b/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref
@@ -38,6 +38,7 @@ WARNING DV option file or main function not defined. No user algorithms will be
 |-output_level           = 3  (default: 3)
 |-output_type            = ''  (default: '')
 |-overwrite_data_options = False  (default: False)
+|-phoenix_filename       = ''  (default: '')
 |-print_freq             = 1000  (default: 1000)
 |-python_logging_level   = 30  (default: 30)
 |-root_compression_level = 'LZMA:6'  (default: 'LZMA:6')
diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref
index 3c715c7bc198a26aeab16650d4e7734d1d6896a0..dbf2aa41607e399e6e3ce8ea446102291be0c5d0 100644
--- a/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref
+++ b/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref
@@ -20,7 +20,7 @@ WARNING DV option file or main function not defined. No user algorithms will be
 |-first_evt              = 0  (default: 0)
 |-histo_file             = ''  (default: '')
 |-ignore_dq_flags        = False  (default: False)
-|-input_files            = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000002_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000009_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000010_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000011_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000012_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000013_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000016_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000017_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000019_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000021_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000022_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000023_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000024_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000025_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000028_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000032_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000033_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000035_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000037_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000038_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000039_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000040_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000042_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000045_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000046_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000048_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000050_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000051_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000054_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000055_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000056_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000057_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000060_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000062_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000064_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000065_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000066_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000068_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000069_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000071_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000072_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000073_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000075_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000079_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000001_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000015_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000026_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000036_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000049_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000061_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000080_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000081_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000003_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000005_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000027_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000052_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000074_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000004_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000031_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000034_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000044_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000047_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000067_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000070_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000078_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000006_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000020_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000043_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000059_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000076_1.xdigi', 'root://hake12.grid.surfsara.nl:1094/pnfs/grid.sara.nl/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000007_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000008_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000018_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000029_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000041_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000058_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000077_1.xdigi', 'root://door02.pic.es:1094/pnfs/pic.es/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000030_1.xdigi', 'root://door03.pic.es:1094/pnfs/pic.es/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000053_1.xdigi', 'root://door07.pic.es:1094/pnfs/pic.es/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000082_1.xdigi', 'root://shark10.grid.surfsara.nl:1094/pnfs/grid.sara.nl/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000063_1.xdigi']
+|-input_files            = ['root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000002_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000009_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000010_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000011_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000012_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000013_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000016_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000017_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000019_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000021_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000022_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000023_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000024_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000025_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000028_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000032_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000033_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000035_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000037_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000038_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000039_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000040_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000042_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000045_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000046_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000048_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000050_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000051_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000054_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000055_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000056_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000057_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000060_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000062_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000064_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000065_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000066_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000068_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000069_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000071_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000072_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000073_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000075_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000079_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000001_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000015_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000026_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000036_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000049_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000061_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000080_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000081_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000003_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000005_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000027_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000052_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000074_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000004_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000031_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000034_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000044_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000047_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000067_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000070_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000078_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000006_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000020_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000043_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000059_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000076_1.xdigi', 'root://hake12.grid.surfsara.nl:1094/pnfs/grid.sara.nl/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000007_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000008_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000018_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000029_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000041_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000058_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000077_1.xdigi', 'root://door02.pic.es:1094/pnfs/pic.es/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000030_1.xdigi', 'root://door03.pic.es:1094/pnfs/pic.es/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000053_1.xdigi', 'root://door07.pic.es:1094/pnfs/pic.es/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000082_1.xdigi', 'root://shark10.grid.surfsara.nl:1094/pnfs/grid.sara.nl/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000063_1.xdigi']
 |                        (default: [])
 |-input_raw_format       = 0.3  (default: 0.3)
 |-input_type             = 'ROOT'  (default: 'DST')
@@ -38,6 +38,7 @@ WARNING DV option file or main function not defined. No user algorithms will be
 |-output_level           = 3  (default: 3)
 |-output_type            = ''  (default: '')
 |-overwrite_data_options = False  (default: False)
+|-phoenix_filename       = ''  (default: '')
 |-print_freq             = 1000  (default: 1000)
 |-python_logging_level   = 30  (default: 30)
 |-root_compression_level = 'LZMA:6'  (default: 'LZMA:6')
@@ -61,7 +62,7 @@ ApplicationMgr                         INFO Application Manager Initialized succ
 DeFTDetector                           INFO Current FT geometry version =   64
 ApplicationMgr                         INFO Application Manager Started successfully
 EventPersistencySvc                    INFO Added successfully Conversion service:RootCnvSvc
-EventSelector                          INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000002_1.xdigi' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
+EventSelector                          INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000002_1.xdigi' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
 EventSelector                       SUCCESS Reading Event record 1. Record number within stream 1: 1
 ApplicationMgr                         INFO Application Manager Stopped successfully
 LAZY_AND: DaVinci                                               #=200     Sum=200         Eff=|( 100.0000 +- 0.00000 )%|
diff --git a/DaVinciTests/tests/refs/test_davinci_simplejob.ref b/DaVinciTests/tests/refs/test_davinci_simplejob.ref
index c86426a6e473f310b9fe1c65ddf2b626d5816b2f..3668c62d40a6a28e140210dc3faae2054c22bdd9 100644
--- a/DaVinciTests/tests/refs/test_davinci_simplejob.ref
+++ b/DaVinciTests/tests/refs/test_davinci_simplejob.ref
@@ -20,7 +20,7 @@ WARNING DV option file or main function not defined. No user algorithms will be
 |-first_evt              = 0  (default: 0)
 |-histo_file             = ''  (default: '')
 |-ignore_dq_flags        = False  (default: False)
-|-input_files            = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst']
+|-input_files            = ['root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst']
 |                        (default: [])
 |-input_raw_format       = 0.3  (default: 0.3)
 |-input_type             = 'ROOT'  (default: 'DST')
@@ -38,6 +38,7 @@ WARNING DV option file or main function not defined. No user algorithms will be
 |-output_level           = 3  (default: 3)
 |-output_type            = ''  (default: '')
 |-overwrite_data_options = False  (default: False)
+|-phoenix_filename       = ''  (default: '')
 |-print_freq             = 1000  (default: 1000)
 |-python_logging_level   = 30  (default: 30)
 |-root_compression_level = 'LZMA:6'  (default: 'LZMA:6')
@@ -61,7 +62,7 @@ ApplicationMgr                         INFO Application Manager Initialized succ
 DeFTDetector                           INFO Current FT geometry version =   63
 ApplicationMgr                         INFO Application Manager Started successfully
 EventPersistencySvc                    INFO Added successfully Conversion service:RootCnvSvc
-EventSelector                          INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
+EventSelector                          INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
 EventSelector                       SUCCESS Reading Event record 1. Record number within stream 1: 1
 ApplicationMgr                         INFO Application Manager Stopped successfully
 LAZY_AND: DaVinci                                               #=10      Sum=10          Eff=|( 100.0000 +- 0.00000 )%|
diff --git a/DaVinciTests/tests/refs/test_davinci_sprucing.ref b/DaVinciTests/tests/refs/test_davinci_sprucing.ref
index 8c517653372dd08249bb690869b4f4095e4d93ed..1227a422f971d41f41b17d04f53d5289a5f86b24 100644
--- a/DaVinciTests/tests/refs/test_davinci_sprucing.ref
+++ b/DaVinciTests/tests/refs/test_davinci_sprucing.ref
@@ -39,6 +39,7 @@ INFO User algorithm option_davinci_sprucing.main imported successfully!
 |-output_level           = 3  (default: 3)
 |-output_type            = ''  (default: '')
 |-overwrite_data_options = False  (default: False)
+|-phoenix_filename       = ''  (default: '')
 |-print_freq             = 1  (default: 1000)
 |-python_logging_level   = 30  (default: 30)
 |-root_compression_level = 'LZMA:6'  (default: 'LZMA:6')
@@ -133,4 +134,4 @@ UnpackParticlesAndVertices             INFO Number of counters : 8
  | "# UnPacked RecVertices"                        |         5 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
  | "# UnPacked RichPIDs"                           |         5 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
  | "# UnPacked Tracks"                             |         5 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
- | "# UnPacked Vertices"                           |         5 |         83 |     16.600 |     5.1225 |      10.000 |      24.000 |
\ No newline at end of file
+ | "# UnPacked Vertices"                           |         5 |         83 |     16.600 |     5.1225 |      10.000 |      24.000 |
diff --git a/DaVinciTests/tests/refs/test_davinci_testfiledb.ref b/DaVinciTests/tests/refs/test_davinci_testfiledb.ref
index 39cc3296eeb2f80f00b5e37319da4a1417f8e490..601d04e6f9eeb202fb2e598cfd5466d27840b87a 100644
--- a/DaVinciTests/tests/refs/test_davinci_testfiledb.ref
+++ b/DaVinciTests/tests/refs/test_davinci_testfiledb.ref
@@ -20,7 +20,7 @@ WARNING DV option file or main function not defined. No user algorithms will be
 |-first_evt              = 0  (default: 0)
 |-histo_file             = 'ExampleHistos.root'  (default: '')
 |-ignore_dq_flags        = False  (default: False)
-|-input_files            = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst']
+|-input_files            = ['root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst']
 |                        (default: [])
 |-input_raw_format       = 0.3  (default: 0.3)
 |-input_type             = 'ROOT'  (default: 'DST')
@@ -38,6 +38,7 @@ WARNING DV option file or main function not defined. No user algorithms will be
 |-output_level           = 3  (default: 3)
 |-output_type            = ''  (default: '')
 |-overwrite_data_options = False  (default: False)
+|-phoenix_filename       = ''  (default: '')
 |-print_freq             = 1000  (default: 1000)
 |-python_logging_level   = 30  (default: 30)
 |-root_compression_level = 'LZMA:6'  (default: 'LZMA:6')
@@ -65,7 +66,7 @@ ApplicationMgr                         INFO Application Manager Initialized succ
 DeFTDetector                           INFO Current FT geometry version =   63
 ApplicationMgr                         INFO Application Manager Started successfully
 EventPersistencySvc                    INFO Added successfully Conversion service:RootCnvSvc
-EventSelector                          INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
+EventSelector                          INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
 EventSelector                       SUCCESS Reading Event record 1. Record number within stream 1: 1
 ApplicationMgr                         INFO Application Manager Stopped successfully
 FSROutputStreamDstWriter               INFO Set up File Summary Record
diff --git a/DaVinciTests/tests/refs/test_davinci_tupling.ref b/DaVinciTests/tests/refs/test_davinci_tupling.ref
index a05843965ebab7cdbea89193003f82f99853c560..bf643fafe5a7da88bddfa3c0cd645bc0b885b8ec 100644
--- a/DaVinciTests/tests/refs/test_davinci_tupling.ref
+++ b/DaVinciTests/tests/refs/test_davinci_tupling.ref
@@ -20,7 +20,7 @@ INFO User algorithm example-tupling-basic-run-mc.main imported successfully!
 |-first_evt              = 0  (default: 0)
 |-histo_file             = 'DV-example-tupling-basic-his.root'  (default: '')
 |-ignore_dq_flags        = False  (default: False)
-|-input_files            = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst']
+|-input_files            = ['root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst']
 |                        (default: [])
 |-input_raw_format       = 4.3  (default: 0.3)
 |-input_type             = 'ROOT'  (default: 'DST')
@@ -38,6 +38,7 @@ INFO User algorithm example-tupling-basic-run-mc.main imported successfully!
 |-output_level           = 3  (default: 3)
 |-output_type            = ''  (default: '')
 |-overwrite_data_options = False  (default: False)
+|-phoenix_filename       = ''  (default: '')
 |-print_freq             = 1000  (default: 1000)
 |-python_logging_level   = 30  (default: 30)
 |-root_compression_level = 'LZMA:6'  (default: 'LZMA:6')
@@ -71,7 +72,7 @@ ApplicationMgr                         INFO Application Manager Initialized succ
 DeFTDetector                           INFO Current FT geometry version =   63
 ApplicationMgr                         INFO Application Manager Started successfully
 EventPersistencySvc                    INFO Added successfully Conversion service:RootCnvSvc
-EventSelector                          INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
+EventSelector                          INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
 EventSelector                       SUCCESS Reading Event record 1. Record number within stream 1: 1
 ToolSvc.LoKi::VertexFitter             INFO Option for Optimised Kalman Filter fit is activated
 RFileCnv                               INFO opening Root file "DV-example-tupling-basic-ntp.root" for writing
diff --git a/DaVinciTests/tests/refs/test_davinci_user_algs.ref b/DaVinciTests/tests/refs/test_davinci_user_algs.ref
index b39ed71b78a163091bc6bb8708ccdaede6aea4db..bed7cd3d5f7e1829bd618a4bfdaab2dadee8daba 100644
--- a/DaVinciTests/tests/refs/test_davinci_user_algs.ref
+++ b/DaVinciTests/tests/refs/test_davinci_user_algs.ref
@@ -20,7 +20,7 @@ INFO User algorithm option_davinci_user_algs.main imported successfully!
 |-first_evt              = 0  (default: 0)
 |-histo_file             = 'DVHistos.root'  (default: '')
 |-ignore_dq_flags        = False  (default: False)
-|-input_files            = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst']
+|-input_files            = ['root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst']
 |                        (default: [])
 |-input_raw_format       = 0.3  (default: 0.3)
 |-input_type             = 'ROOT'  (default: 'DST')
@@ -38,6 +38,7 @@ INFO User algorithm option_davinci_user_algs.main imported successfully!
 |-output_level           = 3  (default: 3)
 |-output_type            = ''  (default: '')
 |-overwrite_data_options = False  (default: False)
+|-phoenix_filename       = ''  (default: '')
 |-print_freq             = 1000  (default: 1000)
 |-python_logging_level   = 30  (default: 30)
 |-root_compression_level = 'LZMA:6'  (default: 'LZMA:6')
@@ -65,7 +66,7 @@ ApplicationMgr                         INFO Application Manager Initialized succ
 DeFTDetector                           INFO Current FT geometry version =   63
 ApplicationMgr                         INFO Application Manager Started successfully
 EventPersistencySvc                    INFO Added successfully Conversion service:RootCnvSvc
-EventSelector                          INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
+EventSelector                          INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
 EventSelector                       SUCCESS Reading Event record 1. Record number within stream 1: 1
 ApplicationMgr                         INFO Application Manager Stopped successfully
 FSROutputStreamDstWriter               INFO Set up File Summary Record