diff --git a/AtlasTest/ControlTest/share/DataLink_test.ref b/AtlasTest/ControlTest/share/DataLink_test.ref
index 22c2f1bb3acf7a26a7c0fb0c51b7ec4005c78a4d..aebe2225790cbe25a451d8262ae44b959e3474f8 100644
Binary files a/AtlasTest/ControlTest/share/DataLink_test.ref and b/AtlasTest/ControlTest/share/DataLink_test.ref differ
diff --git a/AtlasTest/ControlTest/share/HelloWorld.ref b/AtlasTest/ControlTest/share/HelloWorld.ref
index 351a208fa2f8e519ff7878f82d17b4204c9c1d62..e8eb8bbcce2c0ac1883b6ef7680b0af2be7ab54f 100644
--- a/AtlasTest/ControlTest/share/HelloWorld.ref
+++ b/AtlasTest/ControlTest/share/HelloWorld.ref
@@ -7,7 +7,7 @@ JobOptionsSvc INFO
//==============================================================
//no EventSelector
-ApplicationMgr.DLLs += { "AthenaServices" };
+ApplicationMgr.Dlls += { "AthenaServices" };
ApplicationMgr.EventLoop = "AthenaEventLoopMgr";
//--------------------------------------------------------------
// StoreGate services configuration
@@ -15,7 +15,7 @@ ApplicationMgr.EventLoop = "AthenaEventLoopMgr";
// --> Including file StoreGate/StoreGate_jobOptions.txt
-ApplicationMgr.DLLs += { "StoreGate", "CLIDSvc" };
+ApplicationMgr.Dlls += { "StoreGate", "CLIDSvc" };
ApplicationMgr.ExtSvc += { "ClassIDSvc" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore" };
ApplicationMgr.ExtSvc += { "ActiveStoreSvc" };
@@ -30,7 +30,7 @@ ApplicationMgr.ExtSvc += { "ActiveStoreSvc" };
// Load the Interval of Validity Service
//
//------------------------------------------------------------------------
-ApplicationMgr.DLLs += { "IOVSvc" };
+ApplicationMgr.Dlls += { "IOVSvc" };
ApplicationMgr.ExtSvc += { "IOVSvc" };
@@ -50,7 +50,7 @@ ApplicationMgr.ExtSvc += { "EvtPersistencySvc/EventPersistencySvc",
//--------------------------------------------------------------
//load relevant libraries
-ApplicationMgr.DLLs += { "AthExHelloWorld" };
+ApplicationMgr.Dlls += { "AthExHelloWorld" };
//top algorithms to be run
ApplicationMgr.TopAlg = { "HelloWorld" };
diff --git a/AtlasTest/ControlTest/share/HistNtup.ref b/AtlasTest/ControlTest/share/HistNtup.ref
index 6616b32c4962650893f19f1fd938e0e23e5181e3..89e881fc33e3917ffb3c7d83e71b55959deb50b1 100644
--- a/AtlasTest/ControlTest/share/HistNtup.ref
+++ b/AtlasTest/ControlTest/share/HistNtup.ref
@@ -36,7 +36,7 @@ ApplicationMgr.ExtSvc += { "IncidentSvc/IncidentSvc",
"ChronoStatSvc/ChronoStatSvc"
};
-ApplicationMgr.DLLs += { "AthenaServices" };
+ApplicationMgr.Dlls += { "AthenaServices" };
ApplicationMgr.EventLoop = "AthenaEventLoopMgr";
ApplicationMgr.OutStreamType = "AthenaOutputStream";
AthenaEventLoopMgr.OutStreamType = "AthenaOutputStream";
@@ -47,7 +47,7 @@ AthenaEventLoopMgr.OutStreamType = "AthenaOutputStream";
// --> Including file StoreGate/StoreGate_jobOptions.txt
-ApplicationMgr.DLLs += { "StoreGate", "CLIDSvc" };
+ApplicationMgr.Dlls += { "StoreGate", "CLIDSvc" };
ApplicationMgr.ExtSvc += { "ClassIDSvc" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore" };
ApplicationMgr.ExtSvc += { "ActiveStoreSvc" };
@@ -62,7 +62,7 @@ ApplicationMgr.ExtSvc += { "ActiveStoreSvc" };
// Load the Interval of Validity Service
//
//------------------------------------------------------------------------
-ApplicationMgr.DLLs += { "IOVSvc" };
+ApplicationMgr.Dlls += { "IOVSvc" };
ApplicationMgr.ExtSvc += { "IOVSvc" };
@@ -84,7 +84,7 @@ ApplicationMgr.ExtSvc += { "IOVSvc" };
//
// DLLs
-ApplicationMgr.DLLs += { "DetDescrCnvSvc" };
+ApplicationMgr.Dlls += { "DetDescrCnvSvc" };
// Add in services
// (NOTE: the following does not yet work for the detector store)
@@ -111,7 +111,7 @@ DetDescrCnvSvc.IdDictName = "IdDictParser/ATLAS_IDS.xml";
//
// DLLs
-ApplicationMgr.DLLs += { "IdDictDetDescrCnv" };
+ApplicationMgr.Dlls += { "IdDictDetDescrCnv" };
// <-- End of including file IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.txt
@@ -136,7 +136,7 @@ ApplicationMgr.DLLs += { "IdDictDetDescrCnv" };
// General Application Configuration options
//--------------------------------------------------------------
-ApplicationMgr.DLLs += { "ZebraTDRCnv" , "HbookCnv"};
+ApplicationMgr.Dlls += { "ZebraTDRCnv" , "HbookCnv"};
ApplicationMgr.ExtSvc += { "ZebraTDRCnvSvc",
"ZebraTDREventSelector/EventSelector" };
ApplicationMgr.EvtSel = "EventSelector";
@@ -171,7 +171,7 @@ JobOptionsSvc INFO // <-- End of including file IdDictDetDescrCnv/IdDictD
//
// DLLs
-ApplicationMgr.DLLs += { "InDetMgrDetDescrCnv" };
+ApplicationMgr.Dlls += { "InDetMgrDetDescrCnv" };
// Add InDet to list of DetectorManagers to be loaded at startup
DetDescrCnvSvc.DetectorManagers += { "InDetMgr" };
@@ -186,7 +186,7 @@ DetDescrCnvSvc.DetectorManagers += { "InDetMgr" };
//
// DLLs
-ApplicationMgr.DLLs += { "LArDetMgrDetDescrCnv" };
+ApplicationMgr.Dlls += { "LArDetMgrDetDescrCnv" };
// Add InDet to list of DetectorManagers to be loaded at startup
DetDescrCnvSvc.DetectorManagers += { "LArMgr" };
@@ -199,7 +199,7 @@ DetDescrCnvSvc.DetectorManagers += { "LArMgr" };
//
// DLLs
-ApplicationMgr.DLLs += { "CaloDetMgrDetDescrCnv" };
+ApplicationMgr.Dlls += { "CaloDetMgrDetDescrCnv" };
// Add InDet to list of DetectorManagers to be loaded at startup
DetDescrCnvSvc.DetectorManagers += { "CaloMgr" };
@@ -218,7 +218,7 @@ DetDescrCnvSvc.DetectorManagers += { "CaloMgr" };
//
// DLLs
-ApplicationMgr.DLLs += { "MuonDetMgrDetDescrCnv" };
+ApplicationMgr.Dlls += { "MuonDetMgrDetDescrCnv" };
// Add InDet to list of DetectorManagers to be loaded at startup
DetDescrCnvSvc.DetectorManagers += { "MuonMgr" };
@@ -233,11 +233,11 @@ DetDescrCnvSvc.DecodeIdDict = true;
// Private Application Configuration options
//--------------------------------------------------------------
//load relevant libraries
-ApplicationMgr.DLLs += { "AthExHistNtup" };
+ApplicationMgr.Dlls += { "AthExHistNtup" };
// Select the appropriate shared library
-ApplicationMgr.DLLs += { "HbookCnv" };
-////ApplicationMgr.DLLs += { "RootHistCnv" };
+ApplicationMgr.Dlls += { "HbookCnv" };
+////ApplicationMgr.Dlls += { "RootHistCnv" };
// Select HBOOK or ROOT persistency (HBOOK is default)
ApplicationMgr.HistogramPersistency = "HBOOK";
diff --git a/AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref b/AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref
index bd6986a7717ea9410bc609bcd51dcc567a1a25ad..d878a6df7cc3c62a1c4257f0f03771bfc8e49769 100644
--- a/AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref
+++ b/AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref
@@ -1,43 +1,54 @@
-Initializing Gaudi ApplicationMgr using job opts ../share/ProxyProviderSvc_test.txt
-JobOptionsSvc INFO # =======> /home/sss/atlas/dvtest/build/joboptions/ControlTest/StoreGateTestCommon.txt
+Initializing Gaudi ApplicationMgr using job opts /build/GMR/577.3/athena/AtlasTest/ControlTest/share/ProxyProviderSvc_test.txt
+JobOptionsSvc INFO # =======> /build/GMR/577.3/build/build/Athena/x86_64-centos7-gcc8-opt/jobOptions/ControlTest/StoreGateTestCommon.txt
JobOptionsSvc INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore", "StoreGateSvc/ConditionStore"]
JobOptionsSvc INFO # (6,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
JobOptionsSvc INFO # (7,1): StoreGateSvc.OutputLevel = 1
JobOptionsSvc INFO # (8,1): StoreGateSvc.ActivateHistory = 0
JobOptionsSvc INFO # (9,1): CLIDSvc.OutputLevel = 2
JobOptionsSvc INFO # (10,1): MessageSvc.useColors = 1
-JobOptionsSvc INFO # =======> /home/sss/atlas/dvtest/build/joboptions/ToyConversion/ToyConversionOpts.txt
+JobOptionsSvc INFO # =======> /build/GMR/577.3/build/build/Athena/x86_64-centos7-gcc8-opt/jobOptions/ToyConversion/ToyConversionOpts.txt
JobOptionsSvc INFO # (5,1): EventPersistencySvc.CnvServices += ["ToyConversionSvc"]
-JobOptionsSvc INFO # =======> /home/sss/atlas/dvtest/build/../tests/../share/ProxyProviderSvc_test.txt
+JobOptionsSvc INFO # =======> /build/GMR/577.3/athena/AtlasTest/ControlTest/share/ProxyProviderSvc_test.txt
JobOptionsSvc INFO # (7,1): ProxyProviderSvc.OutputLevel = 1
JobOptionsSvc INFO # (9,1): ClassIDSvc.OutputLevel = 2
JobOptionsSvc INFO # (10,1): MessageSvc.setVerbose = ["DataProxy", "EventPersistencySvc", "ToyConversionSvc", "StoreGateSvc", "EventDataSvc", "HistogramDataSvc", "ServiceManager", "HistogramPersistencySvc", "HistoryStore", "DetectorStore", "ApplicationMgr", "ProxyProviderSvc"]
JobOptionsSvc INFO # (11,1): MessageSvc.setDebug = ["ClassIDSvc"]
-JobOptionsSvc INFO Job options successfully read in from ../share/ProxyProviderSvc_test.txt
+JobOptionsSvc INFO Job options successfully read in from /build/GMR/577.3/athena/AtlasTest/ControlTest/share/ProxyProviderSvc_test.txt
ApplicationMgr DEBUG Getting my own properties[m
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
- running on karma on Tue Jul 17 15:42:25 2018
+ Welcome to ApplicationMgr (GaudiCoreSvc v33r2)
+ running on zeus on Tue Jul 28 09:01:40 2020
====================================================================================================================================[m
ApplicationMgr INFO Application Manager Configured successfully[m
ServiceManager DEBUG Initializing service DetectorStore[m
DetectorStore DEBUG Service base class initialized successfully[m
DetectorStore VERBOSE Initializing DetectorStore - package version StoreGate-00-00-00[m
DetectorStore DEBUG trying to create store SGImplSvc/DetectorStore_Impl[m
+DetectorStore_Impl DEBUG Property update for OutputLevel : new value = 1[m
+DetectorStore_ImplVERBOSE Initializing DetectorStore_Impl - package version StoreGate-00-00-00[m
+DetectorStore_Impl DEBUG Service base class initialized successfully[m
EventPersistenc... DEBUG 'CnvServices':[ 'ToyConversionSvc' ][m
EventPersistenc... DEBUG Service base class initialized successfully[m
+DetectorStore_ImplVERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc[m
ClassIDSvc DEBUG Service base class initialized successfully[m
-ClassIDSvc INFO getRegistryEntries: read 2468 CLIDRegistry entries for module ALL[m
-ClassIDSvc DEBUG processCLIDDB: read 702 entries from CLIDDB file: /home/sss/atlas/dvtest/build/share/clid.db[m
+ClassIDSvc INFO getRegistryEntries: read 808 CLIDRegistry entries for module ALL[m
+ClassIDSvc DEBUG processCLIDDB: read 1747 entries from CLIDDB file: /build/GMR/577.3/build/build/Athena/x86_64-centos7-gcc8-opt/share/clid.db[m
+DetectorStore_ImplVERBOSE ServiceLocatorHelper::service: found service ClassIDSvc[m
ProxyProviderSvc VERBOSE Initializing ProxyProviderSvc - package version SGComps-00-00-00[m
ProxyProviderSvc VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc[m
+ProxyProviderSvc DEBUG Service base class initialized successfully[m
ServiceManager DEBUG Initializing service HistoryStore[m
HistoryStore DEBUG Service base class initialized successfully[m
HistoryStore VERBOSE Initializing HistoryStore - package version StoreGate-00-00-00[m
HistoryStore DEBUG trying to create store SGImplSvc/HistoryStore_Impl[m
+HistoryStore_Impl DEBUG Property update for OutputLevel : new value = 1[m
+HistoryStore_Impl VERBOSE Initializing HistoryStore_Impl - package version StoreGate-00-00-00[m
+HistoryStore_Impl DEBUG Service base class initialized successfully[m
+HistoryStore_Impl VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc[m
+HistoryStore_Impl VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc[m
ServiceManager DEBUG Initializing service ConditionStore[m
ServiceManager DEBUG Initializing service AppMgrRunable[m
ServiceManager DEBUG Initializing service EventLoopMgr[m
@@ -48,7 +59,7 @@ EventDataSvc VERBOSE ServiceLocatorHelper::service: found service IncidentS
HistogramDataSvc DEBUG Service base class initialized successfully[m
HistogramDataSvc VERBOSE ServiceLocatorHelper::service: found service IncidentSvc[m
HistogramPersis... DEBUG Service base class initialized successfully[m
-[93;1mHistogramPersis...WARNING Histograms saving not required.[m
+HistogramPersis... DEBUG Histograms saving not required.[m
HistogramDataSvc VERBOSE ServiceLocatorHelper::service: found service HistogramPersistencySvc[m
ApplicationMgr INFO Application Manager Initialized successfully[m
ApplicationMgr Ready
@@ -60,15 +71,15 @@ StoreGateSvc_Impl VERBOSE Initializing StoreGateSvc_Impl - package version Store
StoreGateSvc_Impl DEBUG Service base class initialized successfully[m
StoreGateSvc_Impl VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc[m
StoreGateSvc_Impl VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc[m
-StoreGateSvc_Impl DEBUG Bound handle 0x7ffc9a030060 to proxy 0x955930[m
+ClassIDSvc INFO getRegistryEntries: read 1019 CLIDRegistry entries for module ALL[m
ToyConversionSvc DEBUG Service base class initialized successfully[m
EventPersistenc...VERBOSE ServiceLocatorHelper::service: found service ToyConversionSvc[m
EventPersistenc... INFO Added successfully Conversion service:ToyConversionSvc[m
-ClassIDSvc INFO getRegistryEntries: read 374 CLIDRegistry entries for module ALL[m
+ClassIDSvc INFO getRegistryEntries: read 2 CLIDRegistry entries for module ALL[m
<<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>>
SGImplSvc(StoreGateSvc_Impl)::dump():
Found 1 proxy for ClassID 8107 (Bar):
- flags: ( valid, locked, reset) --- data: 0x957570 --- key: aBar
+ flags: ( valid, locked, reset) --- data: 0x4bb7d50 --- key: aBar
<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>
StoreGateSvc DEBUG Retrieved const pointer to object aFoo of type Foo(CLID 8101)[m
@@ -77,18 +88,15 @@ Now we expect to see an error message:
ToyConversionSvc INFO No converter for object CLID= 8109[m
[93;1mDataProxy WARNING accessData: conversion failed for data object 8109/aFooBar
Returning NULL DataObject pointer [m
-[93;1mSG::DataProxy_castWARNING this proxy 0x967500 has a NULL data object ptr[m
+[93;1mSG::DataProxy_castWARNING this proxy 0x512fb80 has a NULL data object ptr[m
<<---Error Message Ends-------
*** ProxyProviderSvc_test OK ***
*** ProxyProviderSvc_test RecordBeforeRead BEGINS ***
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=0[m
-DataProxy VERBOSE requestRelease(): reset object aBar CLID 8107 address 0x957570[m
-DataProxy VERBOSE requestRelease(): reset object aFoo CLID 8101 address 0x963fd0[m
-DataProxy VERBOSE requestRelease(): reset object aFooBar CLID 8109 address 0[m
[93;1mStoreGateSvc_Impl WARNING record_impl: you are recording an object with key existingFoo, type Foo (CLID 8101)
There is already a persistent version of this object. Recording a duplicate may lead to unreproducible results and it is deprecated.[m
-StoreGateSvc DEBUG Recorded object @0x955c10 with key existingFoo of type Foo(CLID 8101)
- in DataObject @0x963fd0
+StoreGateSvc DEBUG Recorded object @0x4e61ac0 with key existingFoo of type Foo(CLID 8101)
+ in DataObject @0x4f560f0
object modifiable when retrieved[m
StoreGateSvc DEBUG Retrieved const pointer to object existingFoo of type Foo(CLID 8101)[m
6.28
@@ -103,15 +111,15 @@ Now we expect to see an error message:
<<---Error Message Ends-------
[93;1mStoreGateSvc_Impl WARNING record_impl: you are recording an object with key privFoo, type Foo (CLID 8101)
There is already a persistent version of this object. Recording a duplicate may lead to unreproducible results and it is deprecated.[m
-StoreGateSvc DEBUG Recorded object @0x971af0 with key privFoo of type Foo(CLID 8101)
- in DataObject @0x96fe90
+StoreGateSvc DEBUG Recorded object @0x4da0030 with key privFoo of type Foo(CLID 8101)
+ in DataObject @0x4ed9a00
object modifiable when retrieved[m
-StoreGateSvc DEBUG overwrite: Recorded object @0x971ab0 with key privFoo of type Foo(CLID 8101)
- in DataObject @0x967d80
+StoreGateSvc DEBUG overwrite: Recorded object @0x4dbd370 with key privFoo of type Foo(CLID 8101)
+ in DataObject @0x4ff46e0
object modifiable when retrieved[m
StoreGateSvc DEBUG Retrieved non-const pointer to object privFoo of type Foo(CLID 8101)[m
-StoreGateSvc DEBUG Recorded object @0x971ad0 with key silly33 of type Foo(CLID 8101)
- in DataObject @0x969e00
+StoreGateSvc DEBUG Recorded object @0x1d4f000 with key silly33 of type Foo(CLID 8101)
+ in DataObject @0x509ef70
object modifiable when retrieved[m
StoreGateSvc DEBUG Retrieved non-const pointer to object silly33 of type Foo(CLID 8101)[m
Now we expect to see an error message:
@@ -130,18 +138,7 @@ Now we expect to see an error message:
*** ProxyProviderSvc_test HLTAutoKeyReset BEGINS ***
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=1[m
-DataProxy VERBOSE requestRelease(): release object aBar CLID 8107 address 0[m
-DataProxy VERBOSE requestRelease(): release object silly33 CLID 8101 address 0[m
-DataProxy VERBOSE requestRelease(): release object privFoo CLID 8101 address 0x967d80[m
-DataProxy VERBOSE requestRelease(): release object diskFoo CLID 8101 address 0[m
-DataProxy VERBOSE requestRelease(): release object existingFoo CLID 8101 address 0x963fd0[m
-DataProxy VERBOSE requestRelease(): release object aFooBar CLID 8109 address 0[m
-DataProxy VERBOSE requestRelease(): release object aFoo CLID 8101 address 0[m
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=0[m
-DataProxy VERBOSE requestRelease(): release object HLTAutoKey_1 CLID 8101 address 0[m
-DataProxy VERBOSE requestRelease(): reset object NOT_HLTAutoKey_3 CLID 8101 address 0[m
-DataProxy VERBOSE requestRelease(): release object HLTAutoKey_2 CLID 8101 address 0[m
-DataProxy VERBOSE requestRelease(): release object HLTAutoKey_3 CLID 8101 address 0[m
*** ProxyProviderSvc_test HLTAutoKeyReset OK ***
@@ -149,31 +146,26 @@ DataProxy VERBOSE requestRelease(): release object HLTAutoKey_3 CLID 8
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=1[m
-DataProxy VERBOSE requestRelease(): release object NOT_HLTAutoKey_3 CLID 8101 address 0[m
-DataProxy VERBOSE requestRelease(): release object HLTAutoKey_1 CLID 8101 address 0[m
=============Event #0 starts
-StoreGateSvc DEBUG overwrite: Recorded object @0x971ad0 with key toOverwrite of type FooBar(CLID 8109)
- in DataObject @0x965c10
+StoreGateSvc DEBUG overwrite: Recorded object @0x4dfc8d0 with key toOverwrite of type FooBar(CLID 8109)
+ in DataObject @0x4f0e360
object modifiable when retrieved[m
Overwritten FooBar i=0
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=0[m
-DataProxy VERBOSE requestRelease(): release object toOverwrite CLID 8109 address 0x965c10[m
FooBar i=0 deleted
=============Event #1 starts
-StoreGateSvc DEBUG overwrite: Recorded object @0x949920 with key toOverwrite of type FooBar(CLID 8109)
- in DataObject @0x965c10
+StoreGateSvc DEBUG overwrite: Recorded object @0x4ea01f0 with key toOverwrite of type FooBar(CLID 8109)
+ in DataObject @0x4f0e360
object modifiable when retrieved[m
Overwritten FooBar i=1
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=0[m
-DataProxy VERBOSE requestRelease(): release object toOverwrite CLID 8109 address 0x965c10[m
FooBar i=1 deleted
=============Event #2 starts
-StoreGateSvc DEBUG overwrite: Recorded object @0x96fd00 with key toOverwrite of type FooBar(CLID 8109)
- in DataObject @0x965c10
+StoreGateSvc DEBUG overwrite: Recorded object @0x4ee38b0 with key toOverwrite of type FooBar(CLID 8109)
+ in DataObject @0x4f0e360
object modifiable when retrieved[m
Overwritten FooBar i=2
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=0[m
-DataProxy VERBOSE requestRelease(): release object toOverwrite CLID 8109 address 0x965c10[m
FooBar i=2 deleted
*** ProxyProviderSvc_test Overwrite OK ***
diff --git a/AtlasTest/ControlTest/share/StoreGatePileUp.ref b/AtlasTest/ControlTest/share/StoreGatePileUp.ref
index c39372fa1705d5167ea0bf050ecabb8285a439c1..8f8dae5f060c9a52bed6fe8536ec96271d1435b3 100644
--- a/AtlasTest/ControlTest/share/StoreGatePileUp.ref
+++ b/AtlasTest/ControlTest/share/StoreGatePileUp.ref
@@ -36,7 +36,7 @@ ApplicationMgr.ExtSvc += { "IncidentSvc/IncidentSvc",
"ChronoStatSvc/ChronoStatSvc"
};
-ApplicationMgr.DLLs += { "AthenaServices" };
+ApplicationMgr.Dlls += { "AthenaServices" };
ApplicationMgr.EventLoop = "AthenaEventLoopMgr";
ApplicationMgr.OutStreamType = "AthenaOutputStream";
AthenaEventLoopMgr.OutStreamType = "AthenaOutputStream";
@@ -47,7 +47,7 @@ AthenaEventLoopMgr.OutStreamType = "AthenaOutputStream";
// --> Including file $STOREGATEROOT/share/StoreGate_jobOptions.txt
-ApplicationMgr.DLLs += { "StoreGate", "CLIDSvc" };
+ApplicationMgr.Dlls += { "StoreGate", "CLIDSvc" };
ApplicationMgr.ExtSvc += { "ClassIDSvc" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore" };
ApplicationMgr.ExtSvc += { "ActiveStoreSvc" };
@@ -70,7 +70,7 @@ ApplicationMgr.ExtSvc += { "ActiveStoreSvc" };
//
// DLLs
-ApplicationMgr.DLLs += { "DetDescrCnvSvc" };
+ApplicationMgr.Dlls += { "DetDescrCnvSvc" };
// Add in services
// (NOTE: the following does not yet work for the detector store)
@@ -97,7 +97,7 @@ DetDescrCnvSvc.IdDictName = "ATLAS_IDS.xml";
//
// DLLs
-ApplicationMgr.DLLs += { "IdDictDetDescrCnv" };
+ApplicationMgr.Dlls += { "IdDictDetDescrCnv" };
// <-- End of including file $IDDICTDETDESCRCNVROOT/share/IdDictDetDescrCnv_joboptions.txt
@@ -124,7 +124,7 @@ DetDescrCnvSvc.CompactIDsOnly = true;
// General Application Configuration options
//--------------------------------------------------------------
-ApplicationMgr.DLLs += { "ZebraTDRCnv" , "HbookCnv"};
+ApplicationMgr.Dlls += { "ZebraTDRCnv" , "HbookCnv"};
ApplicationMgr.ExtSvc += { "ZebraTDRCnvSvc",
"ZebraTDREventSelector/EventSelector" };
//--------------------------------------------------------------
@@ -154,7 +154,7 @@ JobOptionsSvc INFO
//
// DLLs
-ApplicationMgr.DLLs += { "IdDictDetDescrCnv" };
+ApplicationMgr.Dlls += { "IdDictDetDescrCnv" };
// <-- End of including file $IDDICTDETDESCRCNVROOT/share/IdDictDetDescrCnv_joboptions.txt
@@ -167,7 +167,7 @@ ApplicationMgr.DLLs += { "IdDictDetDescrCnv" };
//
// DLLs
-ApplicationMgr.DLLs += { "InDetMgrDetDescrCnv" };
+ApplicationMgr.Dlls += { "InDetMgrDetDescrCnv" };
// Add InDet to list of DetectorManagers to be loaded at startup
DetDescrCnvSvc.DetectorManagers += { "InDetMgr" };
@@ -182,7 +182,7 @@ DetDescrCnvSvc.DetectorManagers += { "InDetMgr" };
//
// DLLs
-ApplicationMgr.DLLs += { "LArDetMgrDetDescrCnv" };
+ApplicationMgr.Dlls += { "LArDetMgrDetDescrCnv" };
// Add InDet to list of DetectorManagers to be loaded at startup
DetDescrCnvSvc.DetectorManagers += { "LArMgr" };
@@ -198,7 +198,7 @@ DetDescrCnvSvc.DetectorManagers += { "LArMgr" };
//
// DLLs
-ApplicationMgr.DLLs += { "TileDetMgrDetDescrCnv" };
+ApplicationMgr.Dlls += { "TileDetMgrDetDescrCnv" };
// Add Tile to list of DetectorManagers to be loaded at startup
DetDescrCnvSvc.DetectorManagers += { "TileMgr" };
@@ -213,7 +213,7 @@ DetDescrCnvSvc.DetectorManagers += { "TileMgr" };
//
// DLLs
-ApplicationMgr.DLLs += { "MuonDetMgrDetDescrCnv" };
+ApplicationMgr.Dlls += { "MuonDetMgrDetDescrCnv" };
// Add InDet to list of DetectorManagers to be loaded at startup
DetDescrCnvSvc.DetectorManagers += { "MuonMgr" };
@@ -228,7 +228,7 @@ DetDescrCnvSvc.DecodeIdDict = true;
//--------------------------------------------------------------
//load relevant libraries
-ApplicationMgr.DLLs += { "AthenaServices", "AthExStoreGateExample", "PileUpTools"};
+ApplicationMgr.Dlls += { "AthenaServices", "AthExStoreGateExample", "PileUpTools"};
//load pileup merge svc
ApplicationMgr.ExtSvc += { "PileUpMergeSvc" };
diff --git a/AtlasTest/ControlTest/share/SubAlg.ref b/AtlasTest/ControlTest/share/SubAlg.ref
index 0ab96d13a12034fddca3759634dd2fc05893b263..6426e1d6e9f30e108fa533f3b3ee13c68459063b 100644
--- a/AtlasTest/ControlTest/share/SubAlg.ref
+++ b/AtlasTest/ControlTest/share/SubAlg.ref
@@ -6,7 +6,7 @@ JobOptionsSvc INFO
//
//==============================================================
//no EventSelector
-ApplicationMgr.DLLs += { "AthenaServices" };
+ApplicationMgr.Dlls += { "AthenaServices" };
ApplicationMgr.EventLoop = "AthenaEventLoopMgr";
//--------------------------------------------------------------
// StoreGate services configuration
@@ -14,7 +14,7 @@ ApplicationMgr.EventLoop = "AthenaEventLoopMgr";
// --> Including file StoreGate/StoreGate_jobOptions.txt
-ApplicationMgr.DLLs += { "StoreGate", "CLIDSvc" };
+ApplicationMgr.Dlls += { "StoreGate", "CLIDSvc" };
ApplicationMgr.ExtSvc += { "ClassIDSvc" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore" };
ApplicationMgr.ExtSvc += { "ActiveStoreSvc" };
@@ -29,7 +29,7 @@ ApplicationMgr.ExtSvc += { "ActiveStoreSvc" };
// Load the Interval of Validity Service
//
//------------------------------------------------------------------------
-ApplicationMgr.DLLs += { "IOVSvc" };
+ApplicationMgr.Dlls += { "IOVSvc" };
ApplicationMgr.ExtSvc += { "IOVSvc" };
@@ -46,7 +46,7 @@ ApplicationMgr.ExtSvc += { "EvtPersistencySvc/EventPersistencySvc",
// Private Application Configuration options
//--------------------------------------------------------------
//load relevant libraries
-ApplicationMgr.DLLs += { "AthExSubAlg" };
+ApplicationMgr.Dlls += { "AthExSubAlg" };
//top algorithms to be run
ApplicationMgr.TopAlg = { "MainAlg" };
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolWriteOptions.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolWriteOptions.ref
index 6f6fd154b1fe0057b5a3cb5f8e71d96a25a16210..6e3be6c88bc7c6fdee6a469d7b8dc55ff6cb7b6e 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolWriteOptions.ref
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolWriteOptions.ref
@@ -467,7 +467,7 @@ ApplicationMgr INFO Successfully loaded modules: AthenaPoolTest
# load converter and append to event object ItemList
# For example, LArAthenaPool should include
#
-# ApplicationMgr.DLLs += { "LArAthenaPool" };
+# ApplicationMgr.Dlls += { "LArAthenaPool" };
# Stream1.ItemList += { "2701#*", "2731#*" };
theApp.Dlls += [ "PoolSvc", "AthenaPoolCnvSvc", "AthenaPoolCnvSvcPoolCnv" ]
theApp.ExtSvc += [ "PoolSvc", "AthenaPoolCnvSvc" ]
diff --git a/AtlasTest/TestTools/TestTools/CppUnit_SGtestdriver.cxx b/AtlasTest/TestTools/TestTools/CppUnit_SGtestdriver.cxx
index 18c5ab91a8304c71d1218e039040d6ccff717c8a..d20edf736771fdfb08502bc882455c7f0045bad9 100755
--- a/AtlasTest/TestTools/TestTools/CppUnit_SGtestdriver.cxx
+++ b/AtlasTest/TestTools/TestTools/CppUnit_SGtestdriver.cxx
@@ -82,8 +82,8 @@ bool setupStoreGate()
{ // Build a default list of options.
std::list<std::string> opts;
opts.push_back("#pragma print off");
- opts.push_back("ApplicationMgr.DLLs += { \"StoreGate\" };");
- //opts.push_back("ApplicationMgr.DLLs += { \"CLIDSvc\" };");
+ opts.push_back("ApplicationMgr.Dlls += { \"StoreGate\" };");
+ //opts.push_back("ApplicationMgr.Dlls += { \"CLIDSvc\" };");
opts.push_back("ApplicationMgr.ExtSvc += { \"ClassIDSvc\" };");
opts.push_back("ApplicationMgr.ExtSvc += { \"StoreGateSvc\", \"StoreGateSvc/DetectorStore\", \"StoreGateSvc/HistoryStore\" };");
opts.push_back("ApplicationMgr.ExtSvc += { \"ActiveStoreSvc\" };");
diff --git a/Calorimeter/CaloCnv/CaloTPCnv/share/CaloCompactCellTool_test.ref b/Calorimeter/CaloCnv/CaloTPCnv/share/CaloCompactCellTool_test.ref
index 0b02550e6802d890c378379a4057de7019482732..56d318502d7b70455840da51995001db18b2d5e0 100644
--- a/Calorimeter/CaloCnv/CaloTPCnv/share/CaloCompactCellTool_test.ref
+++ b/Calorimeter/CaloCnv/CaloTPCnv/share/CaloCompactCellTool_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/CaloCompactCellTool_test.txt
JobOptionsSvc INFO # =======> /home/sss/nobackup/atlas/build-dvtest/../tests/../share/CaloCompactCellTool_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps", "CaloTriggerTool"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps", "CaloTriggerTool"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from ../share/CaloCompactCellTool_test.txt
ApplicationMgr SUCCESS
diff --git a/Calorimeter/CaloCnv/CaloTPCnv/share/CaloCompactCellTool_test.txt b/Calorimeter/CaloCnv/CaloTPCnv/share/CaloCompactCellTool_test.txt
index 0dc9dec0ecec08f4dd40a8450ee42ed712681d19..b69004e2db2b87c42f4fbed1a352214452b8f3f3 100644
--- a/Calorimeter/CaloCnv/CaloTPCnv/share/CaloCompactCellTool_test.txt
+++ b/Calorimeter/CaloCnv/CaloTPCnv/share/CaloCompactCellTool_test.txt
@@ -1,2 +1,2 @@
-ApplicationMgr.DLLs += { "StoreGate", "CLIDComps", "CaloTriggerTool" };
+ApplicationMgr.Dlls += { "StoreGate", "CLIDComps", "CaloTriggerTool" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore" };
diff --git a/Calorimeter/CaloEvent/share/CaloCellContainer_test.ref b/Calorimeter/CaloEvent/share/CaloCellContainer_test.ref
index 422a971a768c85a1e76b678c333ff7082b247fa8..f495b64b896bc6ce19b987827bb32630fd9d6075 100644
--- a/Calorimeter/CaloEvent/share/CaloCellContainer_test.ref
+++ b/Calorimeter/CaloEvent/share/CaloCellContainer_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/CaloCellContainer_test.txt
JobOptionsSvc INFO # =======> /home/sss/atlas/dvtest/build/../tests/../share/CaloCellContainer_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from ../share/CaloCellContainer_test.txt
ApplicationMgr SUCCESS
diff --git a/Calorimeter/CaloEvent/share/CaloCellContainer_test.txt b/Calorimeter/CaloEvent/share/CaloCellContainer_test.txt
index dae64b09f4f22ed7c79f1886401d5f466bab00f8..7a62d9fe77da0cf0d0cbc0da69a7694363ba0940 100644
--- a/Calorimeter/CaloEvent/share/CaloCellContainer_test.txt
+++ b/Calorimeter/CaloEvent/share/CaloCellContainer_test.txt
@@ -1,2 +1,2 @@
-ApplicationMgr.DLLs += { "StoreGate", "CLIDComps" };
+ApplicationMgr.Dlls += { "StoreGate", "CLIDComps" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore" };
diff --git a/Calorimeter/CaloEvent/share/CaloCellPrefetchIterator_test.ref b/Calorimeter/CaloEvent/share/CaloCellPrefetchIterator_test.ref
index 5b95656245d2e17116c53e6f0bc3f90a622561ec..3967cb2cf5853856054fb1302fef0f8031d84e77 100644
--- a/Calorimeter/CaloEvent/share/CaloCellPrefetchIterator_test.ref
+++ b/Calorimeter/CaloEvent/share/CaloCellPrefetchIterator_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/CaloCellContainer_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3e/Calorimeter/CaloEvent/run/../share/CaloCellContainer_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from ../share/CaloCellContainer_test.txt
ApplicationMgr SUCCESS
diff --git a/Calorimeter/CaloEvent/share/CaloCellPrefetchIterator_test.txt b/Calorimeter/CaloEvent/share/CaloCellPrefetchIterator_test.txt
index dae64b09f4f22ed7c79f1886401d5f466bab00f8..7a62d9fe77da0cf0d0cbc0da69a7694363ba0940 100644
--- a/Calorimeter/CaloEvent/share/CaloCellPrefetchIterator_test.txt
+++ b/Calorimeter/CaloEvent/share/CaloCellPrefetchIterator_test.txt
@@ -1,2 +1,2 @@
-ApplicationMgr.DLLs += { "StoreGate", "CLIDComps" };
+ApplicationMgr.Dlls += { "StoreGate", "CLIDComps" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore" };
diff --git a/Calorimeter/CaloEvent/share/CaloConstCellContainer_test.ref b/Calorimeter/CaloEvent/share/CaloConstCellContainer_test.ref
index c748ac64b66be3f48987617167792945903d18b7..2752368b4d0a453fe9b76e685539cd29159e7d24 100644
--- a/Calorimeter/CaloEvent/share/CaloConstCellContainer_test.ref
+++ b/Calorimeter/CaloEvent/share/CaloConstCellContainer_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/CaloCellContainer_test.txt
JobOptionsSvc INFO # =======> /home/sss/atlas/dvtest/build/../tests/../share/CaloCellContainer_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from ../share/CaloCellContainer_test.txt
ApplicationMgr SUCCESS
diff --git a/Calorimeter/CaloEvent/share/CaloTopoTowerContainer_test.ref b/Calorimeter/CaloEvent/share/CaloTopoTowerContainer_test.ref
index 4318ac7ac6bf26a4f5a4a44d0dee3871fc1ffcc8..e623fd4982fedb2387f5ec529d1339bb7a96c103 100644
--- a/Calorimeter/CaloEvent/share/CaloTopoTowerContainer_test.ref
+++ b/Calorimeter/CaloEvent/share/CaloTopoTowerContainer_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/CaloTopoTowerContainer_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/Calorimeter/CaloEvent/run/../share/CaloTopoTowerContainer_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from ../share/CaloTopoTowerContainer_test.txt
ApplicationMgr SUCCESS
diff --git a/Calorimeter/CaloEvent/share/CaloTopoTowerContainer_test.txt b/Calorimeter/CaloEvent/share/CaloTopoTowerContainer_test.txt
index 7b6025a7cbdc4c4a933d9f56208cc72db38a7ca1..584034897969d1428e564ba6038b678203d11ab7 100644
--- a/Calorimeter/CaloEvent/share/CaloTopoTowerContainer_test.txt
+++ b/Calorimeter/CaloEvent/share/CaloTopoTowerContainer_test.txt
@@ -1,3 +1,3 @@
-ApplicationMgr.DLLs += { "StoreGate", "CLIDComps" };
+ApplicationMgr.Dlls += { "StoreGate", "CLIDComps" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore" };
#include "IOVSvc/IOVSvc.txt"
diff --git a/Calorimeter/CaloUtils/share/CaloLayerCalculator_test.ref b/Calorimeter/CaloUtils/share/CaloLayerCalculator_test.ref
index 6c8e3fcd74fa006a1fa3b58c1e0c2dba1a84bffe..aef00a56498f04b15b444c54bf4b25ea15acf9cb 100644
--- a/Calorimeter/CaloUtils/share/CaloLayerCalculator_test.ref
+++ b/Calorimeter/CaloUtils/share/CaloLayerCalculator_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/CaloLayerCalculator_test.txt
JobOptionsSvc INFO # =======> /home/sss/atlas/dvtest/build/../tests/../share/CaloLayerCalculator_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from ../share/CaloLayerCalculator_test.txt
ApplicationMgr SUCCESS
diff --git a/Calorimeter/CaloUtils/share/CaloLayerCalculator_test.txt b/Calorimeter/CaloUtils/share/CaloLayerCalculator_test.txt
index 7b6025a7cbdc4c4a933d9f56208cc72db38a7ca1..584034897969d1428e564ba6038b678203d11ab7 100644
--- a/Calorimeter/CaloUtils/share/CaloLayerCalculator_test.txt
+++ b/Calorimeter/CaloUtils/share/CaloLayerCalculator_test.txt
@@ -1,3 +1,3 @@
-ApplicationMgr.DLLs += { "StoreGate", "CLIDComps" };
+ApplicationMgr.Dlls += { "StoreGate", "CLIDComps" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore" };
#include "IOVSvc/IOVSvc.txt"
diff --git a/Calorimeter/CaloUtils/share/CaloVertexedCell_test.ref b/Calorimeter/CaloUtils/share/CaloVertexedCell_test.ref
index 962f35a63e69c960464c7a4a72b0a6039e8a1447..ca494e1a6ded84f817433932662791d7de49e601 100644
--- a/Calorimeter/CaloUtils/share/CaloVertexedCell_test.ref
+++ b/Calorimeter/CaloUtils/share/CaloVertexedCell_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/CaloLayerCalculator_test.txt
JobOptionsSvc INFO # =======> /home/sss/atlas/dvtest/build/../tests/../share/CaloLayerCalculator_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from ../share/CaloLayerCalculator_test.txt
ApplicationMgr SUCCESS
diff --git a/Calorimeter/CaloUtils/share/CaloVertexedCluster_test.ref b/Calorimeter/CaloUtils/share/CaloVertexedCluster_test.ref
index ed1674e8a53b6323848e7c3f422301bb9a86d31f..ebcb6f2680ad4657026373c8e7cac51664013bdf 100644
--- a/Calorimeter/CaloUtils/share/CaloVertexedCluster_test.ref
+++ b/Calorimeter/CaloUtils/share/CaloVertexedCluster_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/CaloLayerCalculator_test.txt
JobOptionsSvc INFO # =======> /home/sss/atlas/dvtest/build/../tests/../share/CaloLayerCalculator_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from ../share/CaloLayerCalculator_test.txt
ApplicationMgr SUCCESS
diff --git a/Commission/CommissionUtils/share/AnaCosmic.py b/Commission/CommissionUtils/share/AnaCosmic.py
index 642cc9f1fcceda10c7e5649c87987a24764e5daa..1170445faf288103a347894ec648a4aca274a0e1 100644
--- a/Commission/CommissionUtils/share/AnaCosmic.py
+++ b/Commission/CommissionUtils/share/AnaCosmic.py
@@ -24,13 +24,13 @@ include( "CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv_joboptions.py" )
-theApp.DLLs +=["LArAthenaPoolPoolCnv"]
-theApp.DLLs +=["TileEventAthenaPoolPoolCnv"]
-theApp.DLLs +=["GeneratorObjectsAthenaPoolPoolCnv"]
-theApp.DLLs +=["TruthExamples"]
+theApp.Dlls +=["LArAthenaPoolPoolCnv"]
+theApp.Dlls +=["TileEventAthenaPoolPoolCnv"]
+theApp.Dlls +=["GeneratorObjectsAthenaPoolPoolCnv"]
+theApp.Dlls +=["TruthExamples"]
# add user Dlls and TopAlg.
-# theApp.DLLs +=["XYZ"]
+# theApp.Dlls +=["XYZ"]
# theApp.TopAlg = ["UVW"]
# CBNT
diff --git a/Commission/CommissionUtils/share/CBNT_TTR_jobOptions.py b/Commission/CommissionUtils/share/CBNT_TTR_jobOptions.py
index b6a8b826d03692ec346177c0ba1083e3529e3318..8eabd64c330c962ef14ea4795e808b864a3fa6cb 100644
--- a/Commission/CommissionUtils/share/CBNT_TTR_jobOptions.py
+++ b/Commission/CommissionUtils/share/CBNT_TTR_jobOptions.py
@@ -1,4 +1,4 @@
-theApp.DLLs += ["CommissionUtils"]
+theApp.Dlls += ["CommissionUtils"]
# jamie boyd - 1/6/2012 removing all references to CBNT but not testing!
#CBNT_Athena.Members += [ "CBNT_TTR" ]
diff --git a/Commission/CommissionUtils/share/DigitCosmic.py b/Commission/CommissionUtils/share/DigitCosmic.py
index 86e5cbebeacdc5708bfbe94853a9b82f5850343f..b91dd1cc715fa0a5b16c70cc6c900a9ef40f0087 100644
--- a/Commission/CommissionUtils/share/DigitCosmic.py
+++ b/Commission/CommissionUtils/share/DigitCosmic.py
@@ -30,9 +30,9 @@ if not 'outputfile' in dir() :
EventSelector.InputCollections=[inputfile]
Stream1.OutputFile = outputfile
-theApp.DLLs += ["GeneratorObjectsAthenaPoolPoolCnv"]
-theApp.DLLs += ["G4SimAthenaPOOLPoolCnv"]
-theApp.DLLs += ["CommissionAthenaPoolPoolCnv"]
+theApp.Dlls += ["GeneratorObjectsAthenaPoolPoolCnv"]
+theApp.Dlls += ["G4SimAthenaPOOLPoolCnv"]
+theApp.Dlls += ["CommissionAthenaPoolPoolCnv"]
include ("CommissionEvent/CommissionEventDict_joboptions.py")
digitmaker1.SkipNoHit=True
@@ -45,7 +45,7 @@ TileHitVecToCnt.UseTriggerTime = True;
TileHitVecToCnt.TriggerTimeToolName = "CosmicTriggerTimeTool"
# insert ComTimeRec at the beginning of the TopAlgs.
-theApp.DLLs += ["CommissionRec"]
+theApp.Dlls += ["CommissionRec"]
topAlgs = theApp.TopAlg ;
theApp.TopAlg = ["ComTimeRec"]
@@ -70,7 +70,7 @@ theApp.EvtMax = 2000
IOVDbSvc.ManageConnections = TRUE
MessageSvc.infoLimit = 1000000
-theApp.DLLs += ["CommissionUtils"]
+theApp.Dlls += ["CommissionUtils"]
PileUpMergeSvc = Service("PileUpMergeSvc")
PileUpMergeSvc.TriggerTimeTool = "CosmicTriggerTimeTool"
diff --git a/Commission/CommissionUtils/share/RecoCosmic.py b/Commission/CommissionUtils/share/RecoCosmic.py
index 1ecc8c3e400521996c30706af63a1f225acc1031..7f24f6f9e25ee9739191cf0ed536520f0150bfb3 100644
--- a/Commission/CommissionUtils/share/RecoCosmic.py
+++ b/Commission/CommissionUtils/share/RecoCosmic.py
@@ -56,13 +56,13 @@ slimmer.ClusterContainerNames = ["EMTopoCluster","CaloTopoCluster"]
slimmer.CellContainerName = "ClusterOnly"
-theApp.DLLs +=["LArAthenaPoolPoolCnv"]
-theApp.DLLs +=["TileEventAthenaPoolPoolCnv"]
-theApp.DLLs +=["GeneratorObjectsAthenaPoolPoolCnv"]
-theApp.DLLs +=["G4SimAthenaPOOLPoolCnv"]
-theApp.DLLs +=["RecAthenaPoolPoolCnv"]
-theApp.DLLs +=["TruthExamples"]
-theApp.DLLs +=["LArRawUtils", "LArROD"]
+theApp.Dlls +=["LArAthenaPoolPoolCnv"]
+theApp.Dlls +=["TileEventAthenaPoolPoolCnv"]
+theApp.Dlls +=["GeneratorObjectsAthenaPoolPoolCnv"]
+theApp.Dlls +=["G4SimAthenaPOOLPoolCnv"]
+theApp.Dlls +=["RecAthenaPoolPoolCnv"]
+theApp.Dlls +=["TruthExamples"]
+theApp.Dlls +=["LArRawUtils", "LArROD"]
#theApp.TopAlg += ["DumpMC"]
#DumpMC = Algorithm("DumpMC")
diff --git a/Control/AthAllocators/share/DataPool_test.txt b/Control/AthAllocators/share/DataPool_test.txt
index a47946e04274cd48cc518a8b3809d41befe29384..5fbb5f9dcff9f1c0934bfc088c9d687dad0ff59a 100644
--- a/Control/AthAllocators/share/DataPool_test.txt
+++ b/Control/AthAllocators/share/DataPool_test.txt
@@ -2,7 +2,7 @@
// $Id: DataPool_test.txt,v 1.1 2003-04-02 19:35:10 calaf Exp $
-//ApplicationMgr.DLLs += { "StoreGate" };
+//ApplicationMgr.Dlls += { "StoreGate" };
MessageSvc.OutputLevel = 2;
ApplicationMgr.ExtSvc += {"IncidentSvc", "ChronoStatSvc", "AuditorSvc"};
diff --git a/Control/AthenaCommon/python/ConfigurationShelve.py b/Control/AthenaCommon/python/ConfigurationShelve.py
index 461bd058add0e3f00991a9cbbaf6631d55d3da8b..ffbb125095d7a62c28804c4a36a46971443e27ea 100644
--- a/Control/AthenaCommon/python/ConfigurationShelve.py
+++ b/Control/AthenaCommon/python/ConfigurationShelve.py
@@ -305,6 +305,9 @@ def loadJobOptionsCatalogue( cfg_fname ):
# restore job catalogue entries
import GaudiPython.Bindings as gaudi
for client in jocat:
+ if client == "ApplicationMgr":
+ # ApplicationMgr properties are already set
+ continue
for n,v in six.iteritems(jocat[ client ]):
# In Gaudi v28, the second argument of the ctor is passed by move,
# which pyroot doesn't handle correctly. Do this as a workaround.
diff --git a/Control/AthenaCommon/share/GenerateBootstrapTest.ref b/Control/AthenaCommon/share/GenerateBootstrapTest.ref
index f192f34d09382e00b8e561e48cd3151e65c84a56..1458f3c147c2978aad06b1d7c4fcc7aaa2e5a99d 100644
--- a/Control/AthenaCommon/share/GenerateBootstrapTest.ref
+++ b/Control/AthenaCommon/share/GenerateBootstrapTest.ref
@@ -4,13 +4,13 @@ copy bootstrap.pkl
... Read 2 items from python pickle file: bootstrap.pkl
... Read 2 items from python pickle file: bootstrap_test.pkl
Given list of size 0. Not looking for differences.
-Step 1: reference file #components: 27
-Step 2: file to check #components: 27
+Step 1: reference file #components: 28
+Step 2: file to check #components: 28
Willing to acquire file bootstrap_threaded.pkl from
/build/mnowak/work/sealsvc/build/x86_64-centos7-gcc8-opt/share/bootstrap_threaded.pkl
copy bootstrap_threaded.pkl
... Read 2 items from python pickle file: bootstrap_threaded.pkl
... Read 2 items from python pickle file: bootstrap_threaded_test.pkl
Given list of size 0. Not looking for differences.
-Step 1: reference file #components: 33
-Step 2: file to check #components: 33
+Step 1: reference file #components: 34
+Step 2: file to check #components: 34
diff --git a/Control/AthenaCommon/share/bootstrap.pkl b/Control/AthenaCommon/share/bootstrap.pkl
index 693d4fce1c1f243c19c772defff3334222c7fa1b..1f9067c79c008b22f79765672be3434d59fcda8a 100644
Binary files a/Control/AthenaCommon/share/bootstrap.pkl and b/Control/AthenaCommon/share/bootstrap.pkl differ
diff --git a/Control/AthenaCommon/share/bootstrap_threaded.pkl b/Control/AthenaCommon/share/bootstrap_threaded.pkl
index 0a97d6d7b29e0ca07ce3e49a6b7a526e6efa920c..3de8cc67c8703e88e3f3356f672f32686471e2af 100644
Binary files a/Control/AthenaCommon/share/bootstrap_threaded.pkl and b/Control/AthenaCommon/share/bootstrap_threaded.pkl differ
diff --git a/Control/AthenaExamples/AthExStoreGateExample/share/SGTutorial_jobOptions.txt b/Control/AthenaExamples/AthExStoreGateExample/share/SGTutorial_jobOptions.txt
index bf13e979386c1d0e376b9f3d2990d810030249a0..ec8adccb9885a6d86668dc8fdc0d9d9ec7fffa1a 100755
--- a/Control/AthenaExamples/AthExStoreGateExample/share/SGTutorial_jobOptions.txt
+++ b/Control/AthenaExamples/AthExStoreGateExample/share/SGTutorial_jobOptions.txt
@@ -12,7 +12,7 @@
//--------------------------------------------------------------
//load relevant libraries
-ApplicationMgr.DLLs += { "SGTutorial" };
+ApplicationMgr.Dlls += { "SGTutorial" };
//top algorithms to be run
ApplicationMgr.TopAlg = { "SGWrite", "SGRead" };
diff --git a/Control/AthenaExamples/AthExStoreGateExample/share/StoreGateExample_Gen_jobOptions.txt b/Control/AthenaExamples/AthExStoreGateExample/share/StoreGateExample_Gen_jobOptions.txt
index a1665c2d26cbc2d53c8572a70e0c0d61190209bf..e9cbfdee6d6bfc3c60b8acd7d1c5d3db9dda8d33 100755
--- a/Control/AthenaExamples/AthExStoreGateExample/share/StoreGateExample_Gen_jobOptions.txt
+++ b/Control/AthenaExamples/AthExStoreGateExample/share/StoreGateExample_Gen_jobOptions.txt
@@ -12,7 +12,7 @@
//--------------------------------------------------------------
//load relevant libraries
-ApplicationMgr.DLLs += { "AthExStoreGateExample" };
+ApplicationMgr.Dlls += { "AthExStoreGateExample" };
//top algorithms to be run
ApplicationMgr.TopAlg = { "WriteData", "ReadData" };
diff --git a/Control/AthenaMonitoringKernel/share/GenericMon.txt b/Control/AthenaMonitoringKernel/share/GenericMon.txt
index c0d05d2cec80818f46bf7f5c7599205c7a49713d..84e46740614e87d9af006749ba00b78a6c4f9cdd 100644
--- a/Control/AthenaMonitoringKernel/share/GenericMon.txt
+++ b/Control/AthenaMonitoringKernel/share/GenericMon.txt
@@ -1,7 +1,7 @@
// -*- C -*-
// startup script for GenericMonTool tests
-ApplicationMgr.DLLs += { "StoreGate", "AthenaMonitoringKernel" };
+ApplicationMgr.Dlls += { "StoreGate", "AthenaMonitoringKernel" };
ApplicationMgr.ExtSvc += { "ClassIDSvc" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore" };
ApplicationMgr.ExtSvc += { "ActiveStoreSvc" };
diff --git a/Control/AthenaMonitoringKernel/share/GenericMonPerf.txt b/Control/AthenaMonitoringKernel/share/GenericMonPerf.txt
index 9fe26a0cb394d670a057a0b21d69ce1b0fc2cd74..fbd796536063787b9676d029f172aaf29c832b9d 100644
--- a/Control/AthenaMonitoringKernel/share/GenericMonPerf.txt
+++ b/Control/AthenaMonitoringKernel/share/GenericMonPerf.txt
@@ -1,7 +1,7 @@
// -*- C -*-
// startup script for GenericMonTool tests
-ApplicationMgr.DLLs += { "StoreGate", "AthenaMonitoringKernel" };
+ApplicationMgr.Dlls += { "StoreGate", "AthenaMonitoringKernel" };
ApplicationMgr.ExtSvc += { "ClassIDSvc" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore" };
ApplicationMgr.ExtSvc += { "ActiveStoreSvc" };
diff --git a/Control/AthenaServices/share/AtDSFMT_test.txt b/Control/AthenaServices/share/AtDSFMT_test.txt
index 0ae90be83740d491849cd205500a3be8d71bb398..f7eba831962ffea473cf4ec07182e04e331841a6 100644
--- a/Control/AthenaServices/share/AtDSFMT_test.txt
+++ b/Control/AthenaServices/share/AtDSFMT_test.txt
@@ -2,7 +2,7 @@
// $Id: AtDSFMT_test.txt,v 1.2 2007-06-24 05:37:15 calaf Exp $
-ApplicationMgr.DLLs += { "AthenaServices" };
+ApplicationMgr.Dlls += { "AthenaServices" };
ApplicationMgr.ExtSvc += { "AtDSFMTGenSvc", "AtDSFMTGenSvc/AtDSFMTGenSvc2", "AtDSFMTGenSvc/AtDSFMTGenSvc3" };
ApplicationMgr.ExtSvcCreates = false;
diff --git a/Control/AthenaServices/share/AtRanlux_test.ref b/Control/AthenaServices/share/AtRanlux_test.ref
index dff59b8bf39f6bcf732c4624f4007455949dee68..0352f50b5560a5f8aa7d8f8b39012637b3bf0fd1 100644
--- a/Control/AthenaServices/share/AtRanlux_test.ref
+++ b/Control/AthenaServices/share/AtRanlux_test.ref
@@ -4,7 +4,7 @@ Initializing Gaudi ApplicationMgr using job opts ../share/AtRanlux_test.txt
JobOptionsSvc INFO
//GP:================================================================================
//GP: include "../share/AtRanlux_test.txt" (0,0)
-ApplicationMgr.DLLs += [ "AthenaServices" ] ; //GP: (1,1)
+ApplicationMgr.Dlls += [ "AthenaServices" ] ; //GP: (1,1)
ApplicationMgr.ExtSvc += [ "AtRanluxGenSvc" , "AtRanluxGenSvc/AtRanluxGenSvc2" , "AtRanluxGenSvc/AtRanluxGenSvc3" ] ;//GP: (1,1)
ApplicationMgr.ExtSvcCreates = 0; //GP: (1,1)
MessageSvc.OutputLevel = 2; //GP: (1,1)
diff --git a/Control/AthenaServices/share/AtRanlux_test.txt b/Control/AthenaServices/share/AtRanlux_test.txt
index 1bdb8a414f37b02f8051e355ba1452fbc164047f..bd3dcb31ba8dd343c5c8e3341088c81095a8b42e 100644
--- a/Control/AthenaServices/share/AtRanlux_test.txt
+++ b/Control/AthenaServices/share/AtRanlux_test.txt
@@ -2,7 +2,7 @@
// $Id: AtRanlux_test.txt,v 1.2 2007-06-24 05:37:15 calaf Exp $
-ApplicationMgr.DLLs += { "AthenaServices" };
+ApplicationMgr.Dlls += { "AthenaServices" };
ApplicationMgr.ExtSvc += { "AtRanluxGenSvc", "AtRanluxGenSvc/AtRanluxGenSvc2", "AtRanluxGenSvc/AtRanluxGenSvc3" };
ApplicationMgr.ExtSvcCreates = false;
diff --git a/Control/AthenaServices/share/AtRndmGen_test.ref b/Control/AthenaServices/share/AtRndmGen_test.ref
index c58c2e863b3fd9c2ce97c3ac55f79124a592c90d..8ed35afecb2dfee18548c1c34259420a9c48547e 100644
--- a/Control/AthenaServices/share/AtRndmGen_test.ref
+++ b/Control/AthenaServices/share/AtRndmGen_test.ref
@@ -4,7 +4,7 @@ Initializing Gaudi ApplicationMgr using job opts ../share/AtRndmGen_test.txt
JobOptionsSvc INFO
//GP:================================================================================
//GP: include "../share/AtRndmGen_test.txt" (0,0)
-ApplicationMgr.DLLs += [ "AthenaServices" ] ; //GP: (1,1)
+ApplicationMgr.Dlls += [ "AthenaServices" ] ; //GP: (1,1)
ApplicationMgr.ExtSvc += [ "AtRndmGenSvc" , "AtRndmGenSvc/AtRndmGenSvc2" , "AtRndmGenSvc/AtRndmGenSvc3" ] ;//GP: (1,1)
ApplicationMgr.ExtSvcCreates = 0; //GP: (1,1)
MessageSvc.OutputLevel = 2; //GP: (1,1)
diff --git a/Control/AthenaServices/share/AtRndmGen_test.txt b/Control/AthenaServices/share/AtRndmGen_test.txt
index d839d74c1ea418741914838169868c02a5b23315..3e81463c51fb33137e7a11709add7f0fc2f68c41 100644
--- a/Control/AthenaServices/share/AtRndmGen_test.txt
+++ b/Control/AthenaServices/share/AtRndmGen_test.txt
@@ -2,7 +2,7 @@
// $Id: AtRndmGen_test.txt,v 1.2 2002-11-27 23:29:41 calaf Exp $
-ApplicationMgr.DLLs += { "AthenaServices" };
+ApplicationMgr.Dlls += { "AthenaServices" };
ApplicationMgr.ExtSvc += { "AtRndmGenSvc", "AtRndmGenSvc/AtRndmGenSvc2", "AtRndmGenSvc/AtRndmGenSvc3" };
ApplicationMgr.ExtSvcCreates = false;
diff --git a/Control/AthenaServices/share/AthenaEventLoopMgr_test.ref b/Control/AthenaServices/share/AthenaEventLoopMgr_test.ref
index fd38e430c3ff5d6c4e3db107b3566193b76adfd0..c85d4bf1b8dfa8237cabcfd049dca171356dce32 100644
--- a/Control/AthenaServices/share/AthenaEventLoopMgr_test.ref
+++ b/Control/AthenaServices/share/AthenaEventLoopMgr_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/AthenaEventLoopMgr_test.txt
JobOptionsSvc INFO # =======> /home/sss/nobackup/atlas/build/../tests/../share/AthenaEventLoopMgr_test.txt
-JobOptionsSvc INFO # (5,1): ApplicationMgr.DLLs += ["AthenaServices"]
+JobOptionsSvc INFO # (5,1): ApplicationMgr.Dlls += ["AthenaServices"]
JobOptionsSvc INFO # (6,1): ApplicationMgr.ExtSvc += ["AthenaEventLoopMgr/AthenaEventLoopMgr1"]
JobOptionsSvc INFO # (7,1): ApplicationMgr.ExtSvc += ["AthenaEventLoopMgr/AthenaEventLoopMgr2"]
JobOptionsSvc INFO # (8,1): ApplicationMgr.ExtSvc += ["TestEvtSelector"]
diff --git a/Control/AthenaServices/share/AthenaEventLoopMgr_test.txt b/Control/AthenaServices/share/AthenaEventLoopMgr_test.txt
index 4dc0801890d895c38d78e130afc0606253ae7666..544faaaaf3d4cdd5466bfdd2f86513afe5c70369 100644
--- a/Control/AthenaServices/share/AthenaEventLoopMgr_test.txt
+++ b/Control/AthenaServices/share/AthenaEventLoopMgr_test.txt
@@ -2,7 +2,7 @@
// $Id$
-ApplicationMgr.DLLs += { "AthenaServices" };
+ApplicationMgr.Dlls += { "AthenaServices" };
ApplicationMgr.ExtSvc += { "AthenaEventLoopMgr/AthenaEventLoopMgr1" };
ApplicationMgr.ExtSvc += { "AthenaEventLoopMgr/AthenaEventLoopMgr2" };
ApplicationMgr.ExtSvc += { "TestEvtSelector" };
diff --git a/Control/AthenaServices/share/ConditionsCleanerSvc_test.ref b/Control/AthenaServices/share/ConditionsCleanerSvc_test.ref
index 44b11296bdca45151b065a84e61e26c4b3462af3..59906d837c8e012395e4d57667a54a3344f5e7a0 100644
--- a/Control/AthenaServices/share/ConditionsCleanerSvc_test.ref
+++ b/Control/AthenaServices/share/ConditionsCleanerSvc_test.ref
@@ -3,7 +3,7 @@ ConditionsCleanerSvc_test
Initializing Gaudi ApplicationMgr using job opts ../share/ConditionsCleanerSvc_test.txt
JobOptionsSvc INFO # =======> /home/sss/atlas/dvtest/build/../tests/../share/ConditionsCleanerSvc_test.txt
-JobOptionsSvc INFO # (5,1): ApplicationMgr.DLLs += ["AthenaServices"]
+JobOptionsSvc INFO # (5,1): ApplicationMgr.Dlls += ["AthenaServices"]
JobOptionsSvc INFO # (6,1): ApplicationMgr.ExtSvc += ["Athena::ConditionsCleanerSvc/ConditionsCleanerSvc1"]
JobOptionsSvc INFO # (7,1): ApplicationMgr.ExtSvc += ["Athena::ConditionsCleanerSvc/ConditionsCleanerSvc2"]
JobOptionsSvc INFO # (8,1): ConditionsCleanerSvc2.CleanerSvc = "ConditionsCleanerTest"
diff --git a/Control/AthenaServices/share/ConditionsCleanerSvc_test.txt b/Control/AthenaServices/share/ConditionsCleanerSvc_test.txt
index cd930ce9f695ceff7c91c19a9426d64aa3b4b79f..d6fe14618a0428e20e6bff71e59e2dbec645738a 100644
--- a/Control/AthenaServices/share/ConditionsCleanerSvc_test.txt
+++ b/Control/AthenaServices/share/ConditionsCleanerSvc_test.txt
@@ -2,7 +2,7 @@
// $Id$
-ApplicationMgr.DLLs += { "AthenaServices" };
+ApplicationMgr.Dlls += { "AthenaServices" };
ApplicationMgr.ExtSvc += { "Athena::ConditionsCleanerSvc/ConditionsCleanerSvc1" };
ApplicationMgr.ExtSvc += { "Athena::ConditionsCleanerSvc/ConditionsCleanerSvc2" };
ConditionsCleanerSvc2.CleanerSvc = "ConditionsCleanerTest";
diff --git a/Control/AthenaServices/share/FPEControlSvc_test.ref b/Control/AthenaServices/share/FPEControlSvc_test.ref
index 390c5f6f4b650520e6c5c567f4f61e5a2cec015f..f7b1bcefc261dd8e900c6c9a4067676ae11d7ef1 100644
--- a/Control/AthenaServices/share/FPEControlSvc_test.ref
+++ b/Control/AthenaServices/share/FPEControlSvc_test.ref
@@ -3,7 +3,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/FPEControlSvc_test.txt
/cvmfs/sft.cern.ch/lcg/contrib/gcc/4.9.3/x86_64-slc6/include/c++/4.9.3/bits/regex.h:1545:11: runtime error: load of value 16, which is not a valid value for type 'bool'
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3e/Control/AthenaServices/share/../share/FPEControlSvc_test.txt
-JobOptionsSvc INFO # (5,1): ApplicationMgr.DLLs += ["AthenaServices"]
+JobOptionsSvc INFO # (5,1): ApplicationMgr.Dlls += ["AthenaServices"]
JobOptionsSvc INFO # (6,1): ApplicationMgr.ExtSvc += ["FPEControlSvc"]
JobOptionsSvc INFO Job options successfully read in from ../share/FPEControlSvc_test.txt
ApplicationMgr SUCCESS
diff --git a/Control/AthenaServices/share/FPEControlSvc_test.txt b/Control/AthenaServices/share/FPEControlSvc_test.txt
index 852a3a8c8ade26d5c590138097937a31f2adb56e..ea960fbfb1867b77850ea206b75e46136867198d 100644
--- a/Control/AthenaServices/share/FPEControlSvc_test.txt
+++ b/Control/AthenaServices/share/FPEControlSvc_test.txt
@@ -2,5 +2,5 @@
// $Id: FPEControlSvc_test.txt,v 1.1 2007-11-09 05:05:09 ssnyder Exp $
-ApplicationMgr.DLLs += { "AthenaServices" };
+ApplicationMgr.Dlls += { "AthenaServices" };
ApplicationMgr.ExtSvc += { "FPEControlSvc" };
diff --git a/Control/AthenaServices/share/MixingEventSelector_test.txt b/Control/AthenaServices/share/MixingEventSelector_test.txt
index 978d15e924cb34dd7d3b2d7b63077e7ee757ba11..359e05b43fd2cc656d33f6f2cc5763fc43b2682a 100644
--- a/Control/AthenaServices/share/MixingEventSelector_test.txt
+++ b/Control/AthenaServices/share/MixingEventSelector_test.txt
@@ -6,13 +6,13 @@
#include "AthenaCommon/Atlas.UnixStandardJob.txt"
-ApplicationMgr.DLLs += { "PoolSvc",
+ApplicationMgr.Dlls += { "PoolSvc",
"AthenaPoolCnvSvc", "EventSelectorAthenaPool"
};
EventPersistencySvc.CnvServices += { "AthenaPoolCnvSvc" };
-ApplicationMgr.DLLs += { "McEventSelector" };
+ApplicationMgr.Dlls += { "McEventSelector" };
#include "AthenaSealSvc/AthenaSealSvc_joboptions.txt"
@@ -21,7 +21,7 @@ ApplicationMgr.DLLs += { "McEventSelector" };
#include "EventAthenaPool/EventAthenaPool_joboptions.txt"
#include "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.txt"
#include "InDetEventAthenaPool/InDetEventAthenaPool_joboptions.txt"
-ApplicationMgr.DLLs += { "AthenaPoolCnvSvcPoolCnv" };
+ApplicationMgr.Dlls += { "AthenaPoolCnvSvcPoolCnv" };
//--------------------------------------------------------------
// Event related parameters
//--------------------------------------------------------------
@@ -95,8 +95,8 @@ Stream1.OutputLevel = 2;
//
// write out a summary of the time spent
//
-ApplicationMgr.DLLs += { "GaudiAud" };
+ApplicationMgr.Dlls += { "GaudiAud" };
AuditorSvc.Auditors += { "ChronoAuditor"};
-ApplicationMgr.DLLs += { "TruthExamples" };
+ApplicationMgr.Dlls += { "TruthExamples" };
//ApplicationMgr.TopAlg += { "DumpMC" };
diff --git a/Control/AthenaServices/share/SimplePOSIXTimeKeeperOptions.txt b/Control/AthenaServices/share/SimplePOSIXTimeKeeperOptions.txt
index ff9f3d21d2e8437940beaa92284ddd6765fc97b5..966e911abfbba8e07994e6e5df27cc9fb643560c 100644
--- a/Control/AthenaServices/share/SimplePOSIXTimeKeeperOptions.txt
+++ b/Control/AthenaServices/share/SimplePOSIXTimeKeeperOptions.txt
@@ -2,5 +2,5 @@
// $Id: SimplePOSIXTimeKeeperOptions.txt,v 1.1 2004-01-08 02:21:03 calaf Exp $
-ApplicationMgr.DLLs += { "AthenaServices" };
+ApplicationMgr.Dlls += { "AthenaServices" };
ApplicationMgr.ExtSvc += { "SimplePOSIXTimeKeeperSvc" };
diff --git a/Control/IOVSvc/share/IOVSvcTool_test.ref b/Control/IOVSvc/share/IOVSvcTool_test.ref
index 88465c94287646eb2d6a3075e3e53bacc878854a..1c035c978afbfdba04ab25afa86fcd359f6e6d09 100644
--- a/Control/IOVSvc/share/IOVSvcTool_test.ref
+++ b/Control/IOVSvc/share/IOVSvcTool_test.ref
@@ -3,7 +3,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/IOVSvc/share/IOVSvcTool_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/IOVSvc/share/IOVSvcTool_test.txt
-JobOptionsSvc INFO # (2,1): ApplicationMgr.DLLs += ["StoreGate", "IOVSvc"]
+JobOptionsSvc INFO # (2,1): ApplicationMgr.Dlls += ["StoreGate", "IOVSvc"]
JobOptionsSvc INFO # (3,1): ApplicationMgr.CreateSvc += ["StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO # (5,1): MessageSvc.OutputLevel = 2
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/IOVSvc/share/IOVSvcTool_test.txt
diff --git a/Control/IOVSvc/share/IOVSvcTool_test.txt b/Control/IOVSvc/share/IOVSvcTool_test.txt
index cf43223ddaf08a1ab2d3d0b28f2ad41e328dcce3..21ed8f26a60baf2ab05c4251e70ec532a18f3852 100644
--- a/Control/IOVSvc/share/IOVSvcTool_test.txt
+++ b/Control/IOVSvc/share/IOVSvcTool_test.txt
@@ -1,5 +1,5 @@
//job opts for IOVSvcTool unit test
-ApplicationMgr.DLLs += { "StoreGate", "IOVSvc" };
+ApplicationMgr.Dlls += { "StoreGate", "IOVSvc" };
ApplicationMgr.CreateSvc += { "StoreGateSvc/DetectorStore" };
MessageSvc.OutputLevel = 2;
diff --git a/Control/Navigation/share/NavigableIterator_test.ref b/Control/Navigation/share/NavigableIterator_test.ref
index 4f9997010e17fe47e7c2edd6554af55f566035d4..32c0ec270d84d36713bede9f476af6d7bf74e056 100644
--- a/Control/Navigation/share/NavigableIterator_test.ref
+++ b/Control/Navigation/share/NavigableIterator_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/NavigableIterator_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/Navigation/run/../share/NavigableIterator_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from ../share/NavigableIterator_test.txt
ApplicationMgr SUCCESS
diff --git a/Control/Navigation/share/NavigableIterator_test.txt b/Control/Navigation/share/NavigableIterator_test.txt
index dae64b09f4f22ed7c79f1886401d5f466bab00f8..7a62d9fe77da0cf0d0cbc0da69a7694363ba0940 100644
--- a/Control/Navigation/share/NavigableIterator_test.txt
+++ b/Control/Navigation/share/NavigableIterator_test.txt
@@ -1,2 +1,2 @@
-ApplicationMgr.DLLs += { "StoreGate", "CLIDComps" };
+ApplicationMgr.Dlls += { "StoreGate", "CLIDComps" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore" };
diff --git a/Control/RngComps/share/AtDSFMT_test.txt b/Control/RngComps/share/AtDSFMT_test.txt
index 0ae90be83740d491849cd205500a3be8d71bb398..f7eba831962ffea473cf4ec07182e04e331841a6 100644
--- a/Control/RngComps/share/AtDSFMT_test.txt
+++ b/Control/RngComps/share/AtDSFMT_test.txt
@@ -2,7 +2,7 @@
// $Id: AtDSFMT_test.txt,v 1.2 2007-06-24 05:37:15 calaf Exp $
-ApplicationMgr.DLLs += { "AthenaServices" };
+ApplicationMgr.Dlls += { "AthenaServices" };
ApplicationMgr.ExtSvc += { "AtDSFMTGenSvc", "AtDSFMTGenSvc/AtDSFMTGenSvc2", "AtDSFMTGenSvc/AtDSFMTGenSvc3" };
ApplicationMgr.ExtSvcCreates = false;
diff --git a/Control/RngComps/share/AtRanlux_test.ref b/Control/RngComps/share/AtRanlux_test.ref
index 5a9ba67517b84f71665bde3ec9ef83707834e57a..dca3dda744612a134d636ed854bbb8d91d8b520d 100644
--- a/Control/RngComps/share/AtRanlux_test.ref
+++ b/Control/RngComps/share/AtRanlux_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/AtRanlux_test.txt
JobOptionsSvc INFO # =======> /home/leggett/work/v30r1.002/src/Control/RngComps/share/../share/AtRanlux_test.txt
-JobOptionsSvc INFO # (5,1): ApplicationMgr.DLLs += ["AthenaServices"]
+JobOptionsSvc INFO # (5,1): ApplicationMgr.Dlls += ["AthenaServices"]
JobOptionsSvc INFO # (6,1): ApplicationMgr.ExtSvc += ["AtRanluxGenSvc", "AtRanluxGenSvc/AtRanluxGenSvc2", "AtRanluxGenSvc/AtRanluxGenSvc3"]
JobOptionsSvc INFO # (7,1): ApplicationMgr.ExtSvcCreates = 0
JobOptionsSvc INFO # (9,1): MessageSvc.OutputLevel = 2
diff --git a/Control/RngComps/share/AtRanlux_test.txt b/Control/RngComps/share/AtRanlux_test.txt
index 1bdb8a414f37b02f8051e355ba1452fbc164047f..bd3dcb31ba8dd343c5c8e3341088c81095a8b42e 100644
--- a/Control/RngComps/share/AtRanlux_test.txt
+++ b/Control/RngComps/share/AtRanlux_test.txt
@@ -2,7 +2,7 @@
// $Id: AtRanlux_test.txt,v 1.2 2007-06-24 05:37:15 calaf Exp $
-ApplicationMgr.DLLs += { "AthenaServices" };
+ApplicationMgr.Dlls += { "AthenaServices" };
ApplicationMgr.ExtSvc += { "AtRanluxGenSvc", "AtRanluxGenSvc/AtRanluxGenSvc2", "AtRanluxGenSvc/AtRanluxGenSvc3" };
ApplicationMgr.ExtSvcCreates = false;
diff --git a/Control/RngComps/share/AtRndmGen_test.ref b/Control/RngComps/share/AtRndmGen_test.ref
index a8e1457403ff6fe2443a61f5d6caedc8b04e233c..dcb6f191c0d015c90221f2265abdb0f97c0e4c07 100644
--- a/Control/RngComps/share/AtRndmGen_test.ref
+++ b/Control/RngComps/share/AtRndmGen_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/AtRndmGen_test.txt
JobOptionsSvc INFO # =======> /home/leggett/work/v30r1.002/src/Control/RngComps/share/../share/AtRndmGen_test.txt
-JobOptionsSvc INFO # (5,1): ApplicationMgr.DLLs += ["AthenaServices"]
+JobOptionsSvc INFO # (5,1): ApplicationMgr.Dlls += ["AthenaServices"]
JobOptionsSvc INFO # (7,1): ApplicationMgr.ExtSvc += ["AtRndmGenSvc", "AtRndmGenSvc/AtRndmGenSvc2", "AtRndmGenSvc/AtRndmGenSvc3"]
JobOptionsSvc INFO # (8,1): ApplicationMgr.ExtSvcCreates = 0
JobOptionsSvc INFO # (10,1): MessageSvc.OutputLevel = 2
diff --git a/Control/RngComps/share/AtRndmGen_test.txt b/Control/RngComps/share/AtRndmGen_test.txt
index d839d74c1ea418741914838169868c02a5b23315..3e81463c51fb33137e7a11709add7f0fc2f68c41 100644
--- a/Control/RngComps/share/AtRndmGen_test.txt
+++ b/Control/RngComps/share/AtRndmGen_test.txt
@@ -2,7 +2,7 @@
// $Id: AtRndmGen_test.txt,v 1.2 2002-11-27 23:29:41 calaf Exp $
-ApplicationMgr.DLLs += { "AthenaServices" };
+ApplicationMgr.Dlls += { "AthenaServices" };
ApplicationMgr.ExtSvc += { "AtRndmGenSvc", "AtRndmGenSvc/AtRndmGenSvc2", "AtRndmGenSvc/AtRndmGenSvc3" };
ApplicationMgr.ExtSvcCreates = false;
diff --git a/Control/StoreGate/src/setupStoreGate.cxx b/Control/StoreGate/src/setupStoreGate.cxx
index 1fb6fbd3bd6013ba3c34a83dfb273c1e689d2e2f..913f2bd0f6d0a3d93c043929d2f2265724fb923a 100644
--- a/Control/StoreGate/src/setupStoreGate.cxx
+++ b/Control/StoreGate/src/setupStoreGate.cxx
@@ -44,8 +44,8 @@ bool setupStoreGate (std::string progname,
{
std::list<std::string> opts;
opts.push_back("#pragma print off");
- opts.push_back("ApplicationMgr.DLLs += { \"StoreGate\" };");
- //opts.push_back("ApplicationMgr.DLLs += { \"CLIDSvc\" };");
+ opts.push_back("ApplicationMgr.Dlls += { \"StoreGate\" };");
+ //opts.push_back("ApplicationMgr.Dlls += { \"CLIDSvc\" };");
opts.push_back("ApplicationMgr.ExtSvc += { \"ClassIDSvc\" };");
opts.push_back("ApplicationMgr.ExtSvc += { \"StoreGateSvc\", \"StoreGateSvc/DetectorStore\", \"StoreGateSvc/HistoryStore\" };");
opts.push_back("ApplicationMgr.ExtSvc += { \"ActiveStoreSvc\" };");
diff --git a/Control/StoreGate/test/VarHandleKeyProperty_test.cxx b/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
index e05f07c80d44984cf762cfc075fcfe822bb0f680..dd41003f2fae52167f596fa3a2eb1a937df2dcf0 100644
--- a/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
+++ b/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
@@ -187,12 +187,12 @@ public:
virtual StatusCode queryInterface(const InterfaceID &/*ti*/, void** /*pp*/) override
{ std::abort(); }
- virtual StatusCode setProperty( const Property& p ) override
- { return mgr.setProperty(p); }
virtual StatusCode setProperty( const std::string& s ) override
{ return mgr.setProperty(s); }
- virtual StatusCode setProperty( const std::string& n, const std::string& v ) override
- { return mgr.setProperty(n, v); }
+ virtual StatusCode setProperty( const std::string& n, const Gaudi::Details::PropertyBase& p ) override
+ { return mgr.setProperty(n, p); }
+ virtual StatusCode setPropertyRepr( const std::string& n, const std::string& r ) override
+ { return mgr.setPropertyRepr(n,r); }
virtual StatusCode getProperty( Property* p ) const override
{ return mgr.getProperty (p); }
virtual const Property& getProperty( const std::string& name) const override
diff --git a/Control/StoreGate/test/VarHandleProperty_test.cxx b/Control/StoreGate/test/VarHandleProperty_test.cxx
index 8443c28fee2ad017e1d7296c263b3b9cc7877394..9736dda12934f07ab2d665ff58496f0ae01caf2d 100644
--- a/Control/StoreGate/test/VarHandleProperty_test.cxx
+++ b/Control/StoreGate/test/VarHandleProperty_test.cxx
@@ -50,12 +50,12 @@ public:
virtual StatusCode queryInterface(const InterfaceID &/*ti*/, void** /*pp*/) override
{ std::abort(); }
- virtual StatusCode setProperty( const Property& p ) override
- { return mgr.setProperty(p); }
virtual StatusCode setProperty( const std::string& s ) override
{ return mgr.setProperty(s); }
- virtual StatusCode setProperty( const std::string& n, const std::string& v ) override
- { return mgr.setProperty(n, v); }
+ virtual StatusCode setProperty( const std::string& n, const Gaudi::Details::PropertyBase& p ) override
+ { return mgr.setProperty(n, p); }
+ virtual StatusCode setPropertyRepr( const std::string& n, const std::string& r ) override
+ { return mgr.setPropertyRepr(n,r); }
virtual StatusCode getProperty( Property* p ) const override
{ return mgr.getProperty (p); }
virtual const Property& getProperty( const std::string& name) const override
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/WriteAthenaPool.py b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/WriteAthenaPool.py
index e484ee2ef16cef9445a464475fc6e56ead4537ba..5c7ca61ae79795dcffe4d8ee7c0661cc33615ae2 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/WriteAthenaPool.py
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/WriteAthenaPool.py
@@ -10,7 +10,7 @@
# Each subsystem should provide additional jobOpt fragments to load converter and append
# to event object ItemList. For example, LArAthenaPool should include:
#
-# ApplicationMgr.DLLs += [ "LArAthenaPool" ];
+# ApplicationMgr.Dlls += [ "LArAthenaPool" ];
# Stream1.ItemList += [ "2701#*", "2731#*" ];
#
#==============================================================
diff --git a/Event/ByteStreamCnvSvc/doc/ByteStream.txt b/Event/ByteStreamCnvSvc/doc/ByteStream.txt
index 5c6ccec61398f45a6b6cafe5b4210d05f406e3a2..43e5bd17da84cf37fcf8fd3f46c5eaea893e8420 100644
--- a/Event/ByteStreamCnvSvc/doc/ByteStream.txt
+++ b/Event/ByteStreamCnvSvc/doc/ByteStream.txt
@@ -287,7 +287,7 @@ Here is the jobOptions from LArByteStream.
// define how the LArRawChannels are created.
// ... omitted.
-ApplicationMgr.DLLs += {"LArByteStream", "RMS_LArByteStream" } ;
+ApplicationMgr.Dlls += {"LArByteStream", "RMS_LArByteStream" } ;
// Select types to be written
StreamBS.Itemlist +={"2721#*"} ;
diff --git a/Event/EventCommonTPCnv/share/EventCommonTPCnv_test.txt b/Event/EventCommonTPCnv/share/EventCommonTPCnv_test.txt
index 52e74f3f3960da310f117cb262b0f82eafbfe2b6..ec4df14e6475f3329b47b6070761b55c56129784 100644
--- a/Event/EventCommonTPCnv/share/EventCommonTPCnv_test.txt
+++ b/Event/EventCommonTPCnv/share/EventCommonTPCnv_test.txt
@@ -1,2 +1,2 @@
-ApplicationMgr.DLLs += { "StoreGate", "CLIDComps" };
+ApplicationMgr.Dlls += { "StoreGate", "CLIDComps" };
ApplicationMgr.ExtSvc += { "StoreGateSvc" };
diff --git a/Event/EventCommonTPCnv/share/INav4MomAssocsCnv_p1_test.ref b/Event/EventCommonTPCnv/share/INav4MomAssocsCnv_p1_test.ref
index 4fea735023171b1b557046323b0908fe330ec394..c0d495514b55f8b1e3602a5da35482157fe5700d 100644
--- a/Event/EventCommonTPCnv/share/INav4MomAssocsCnv_p1_test.ref
+++ b/Event/EventCommonTPCnv/share/INav4MomAssocsCnv_p1_test.ref
@@ -3,7 +3,7 @@ INav4MomAssocsCnv_p1_test
Initializing Gaudi ApplicationMgr using job opts ../share/EventCommonTPCnv_test.txt
JobOptionsSvc INFO # =======> /home/sss/atlas/dvtest/build/../tests/../share/EventCommonTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc"]
JobOptionsSvc INFO Job options successfully read in from ../share/EventCommonTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/Generators/CosmicGenerator/share/jobOptions_CosmicGenerator.txt b/Generators/CosmicGenerator/share/jobOptions_CosmicGenerator.txt
index abceedc42f18325760e0c79e0c13970e5119feaf..287f66c1d16b25759977db9b08c4e767c12a4879 100644
--- a/Generators/CosmicGenerator/share/jobOptions_CosmicGenerator.txt
+++ b/Generators/CosmicGenerator/share/jobOptions_CosmicGenerator.txt
@@ -12,7 +12,7 @@
//--------------------------------------------------------------
//load relevant libraries
-ApplicationMgr.DLLs += { "CosmicGenerator","TruthExamples" };
+ApplicationMgr.Dlls += { "CosmicGenerator","TruthExamples" };
ApplicationMgr.TopAlg = { "CosmicGenerator","DumpMC" };
// The following is needed to load the Athena Random
diff --git a/Generators/CosmicGenerator/share/jobOptions_PixelEndCapCosmicGenerator.txt b/Generators/CosmicGenerator/share/jobOptions_PixelEndCapCosmicGenerator.txt
index 083a609511e029b303fccab49c02df0977103029..b42a8b58f68a7fa148d086112de04ba3fc9793fd 100644
--- a/Generators/CosmicGenerator/share/jobOptions_PixelEndCapCosmicGenerator.txt
+++ b/Generators/CosmicGenerator/share/jobOptions_PixelEndCapCosmicGenerator.txt
@@ -12,7 +12,7 @@
//--------------------------------------------------------------
//load relevant libraries
-ApplicationMgr.DLLs += { "CosmicGenerator","TruthExamples" };
+ApplicationMgr.Dlls += { "CosmicGenerator","TruthExamples" };
ApplicationMgr.TopAlg = { "CosmicGenerator","DumpMC" };
// The following is needed to load the Athena Random
diff --git a/Generators/EvtGen_i/share/ReadGen.py b/Generators/EvtGen_i/share/ReadGen.py
index b3a9b8633f0b2b61a0355e79afa3eb2d711c7a53..90b1b3b18466dd0b1c255fc2def80178f62ec565 100644
--- a/Generators/EvtGen_i/share/ReadGen.py
+++ b/Generators/EvtGen_i/share/ReadGen.py
@@ -270,7 +270,7 @@ if doBphysNtuple or doCBNT:
HistogramPersistencySvc.OutputFile = "histo.root"
theApp.Dlls += [ "RootHistCnv" ]
theApp.HistogramPersistency = "ROOT"
- #theApp.DLLs += [ "HbookCnv" ]
+ #theApp.Dlls += [ "HbookCnv" ]
#theApp.HistogramPersistency = "HBOOK"
#HbookHistSvc = Service( "HbookHistSvc")
#HbookHistSvc.NPAWC = 1500000
diff --git a/Generators/GeneratorFilters/doc/GeneratorFilters.tex b/Generators/GeneratorFilters/doc/GeneratorFilters.tex
index 18622cee3aa337c11a38779cfdb23124c234f705..dd1bbb6a06b558254de1165f58bdd755747b0853 100644
--- a/Generators/GeneratorFilters/doc/GeneratorFilters.tex
+++ b/Generators/GeneratorFilters/doc/GeneratorFilters.tex
@@ -139,11 +139,11 @@ PhotonFilter.Ptcut = 10000. \\4 GeV
The filters are used in an Athena seqence as in the following example
\begin{verbatim}
-theApp.DLLs += [ "Herwig_i" ]
-theApp.DLLs += [ "TruthExamples" ]
-theApp.DLLs += [ "HbookCnv" ]
-theApp.DLLs += [ "GeneratorFilters" ]
-theApp.DLLs += ["GaudiAlg"]
+theApp.Dlls += [ "Herwig_i" ]
+theApp.Dlls += [ "TruthExamples" ]
+theApp.Dlls += [ "HbookCnv" ]
+theApp.Dlls += [ "GeneratorFilters" ]
+theApp.Dlls += ["GaudiAlg"]
theApp.HistogramPersistency = "HBOOK"
theApp.TopAlg = ["Sequencer/Generator"]
Generator.Members = ["Herwig", "ElectronFilter", "HistSample"]
diff --git a/Generators/Hijing_i/doc/Hijing.tex b/Generators/Hijing_i/doc/Hijing.tex
index 0bd550c4d52b764dac155cbd42f23fb7091e0f8f..0b53e7b1ed8176ffad0ff92747fee66464ec6569 100644
--- a/Generators/Hijing_i/doc/Hijing.tex
+++ b/Generators/Hijing_i/doc/Hijing.tex
@@ -38,7 +38,7 @@ The default jobOptions.hijing.py file will have been copied to your TestRelease
area when you set up athena under CMT.
The following is needed if you wish to run Hijing
\begin{verbatim}
-theApp.DLLs += [ "Hijing\_i"]
+theApp.Dlls += [ "Hijing\_i"]
theApp.TopAlg = ["Hijing"]
\end{verbatim}
The initialization parameters can be changed via the following line in the jobOptions.py
diff --git a/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/run/MyJobOptions.py b/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/run/MyJobOptions.py
index fb73d13ae8350f6c44e161eea9f079548798cdae..55489f8e831f0853206be7e4e883e970252c8464 100755
--- a/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/run/MyJobOptions.py
+++ b/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/run/MyJobOptions.py
@@ -235,7 +235,7 @@ ToolSvc.InDetSurveyDBTool.DBRoot="/Indet/SiSurvey"
#ToolSvc.CondStream1.OutputFile="MisalignPixECModuleRand.root"
# Select the appropriate shared library
-theApp.DLLs += [ "RootHistCnv" ]
+theApp.Dlls += [ "RootHistCnv" ]
# Select HBOOK or ROOT persistency
theApp.HistogramPersistency = "ROOT"
HistogramPersistencySvc = Service( "HistogramPersistencySvc" )
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/InDetEventTPCnv_test.txt b/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/InDetEventTPCnv_test.txt
index 7b6025a7cbdc4c4a933d9f56208cc72db38a7ca1..584034897969d1428e564ba6038b678203d11ab7 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/InDetEventTPCnv_test.txt
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/InDetEventTPCnv_test.txt
@@ -1,3 +1,3 @@
-ApplicationMgr.DLLs += { "StoreGate", "CLIDComps" };
+ApplicationMgr.Dlls += { "StoreGate", "CLIDComps" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore" };
#include "IOVSvc/IOVSvc.txt"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/PixelClusterContainerCnv_p1_test.ref b/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/PixelClusterContainerCnv_p1_test.ref
index d10115b91fc610566aa1627744b65731d70acadc..466649f62ccfba18a0796bde376e575a12e321e3 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/PixelClusterContainerCnv_p1_test.ref
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/PixelClusterContainerCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/InDetEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3d/InnerDetector/InDetEventCnv/InDetEventTPCnv/run/../share/InDetEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from ../share/InDetEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/PixelClusterContainerCnv_p2_test.ref b/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/PixelClusterContainerCnv_p2_test.ref
index 34f8b645497baed227c4a7f9930ea0c9dc7c9f33..730219da83487a4fcd5a3f62bbf5112cba42a2e0 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/PixelClusterContainerCnv_p2_test.ref
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/PixelClusterContainerCnv_p2_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/InDetEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /home/sss/nobackup/atlas/build/../tests/../share/InDetEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from ../share/InDetEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/PixelClusterContainerCnv_p3_test.ref b/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/PixelClusterContainerCnv_p3_test.ref
index 55bcb330faed85b405ef95968bc86b1719e5896e..374edeeeb21e527526a251d364b460229a1410a2 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/PixelClusterContainerCnv_p3_test.ref
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/PixelClusterContainerCnv_p3_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/InDetEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /home/sss/nobackup/atlas/build/../tests/../share/InDetEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from ../share/InDetEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/PixelGangedClusterAmbiguitiesCnv_p1_test.ref b/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/PixelGangedClusterAmbiguitiesCnv_p1_test.ref
index 9d41e2b4bcb5242e933490212268f7d7fa40811a..e79e437d075daecdbcf8fb7cde78533ee4dd18d5 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/PixelGangedClusterAmbiguitiesCnv_p1_test.ref
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/PixelGangedClusterAmbiguitiesCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/InDetEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /home/sss/nobackup/atlas/build/../tests/../share/InDetEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from ../share/InDetEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/SCT_ClusterContainerCnv_p2_test.ref b/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/SCT_ClusterContainerCnv_p2_test.ref
index 8dd528eedd7f4862137b66086d1d2d876520383b..24cbc064b95a8c4caf9f0742f0fc29c277c23770 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/SCT_ClusterContainerCnv_p2_test.ref
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/SCT_ClusterContainerCnv_p2_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/InDetEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/InDetEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/InDetEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/SCT_ClusterContainerCnv_p3_test.ref b/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/SCT_ClusterContainerCnv_p3_test.ref
index 8dd528eedd7f4862137b66086d1d2d876520383b..24cbc064b95a8c4caf9f0742f0fc29c277c23770 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/SCT_ClusterContainerCnv_p3_test.ref
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/SCT_ClusterContainerCnv_p3_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/InDetEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/InDetEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/InDetEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/TRT_DriftCircleContainerCnv_p2_test.ref b/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/TRT_DriftCircleContainerCnv_p2_test.ref
index 9ea2c8d3be1c6b7d7e007dc57360daf6ca84b27a..93ba26f5c9e0a87faafae41e9495d3b96da54db0 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/TRT_DriftCircleContainerCnv_p2_test.ref
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/share/TRT_DriftCircleContainerCnv_p2_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/InDetEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /home/sss/nobackup/atlas/build/../tests/../share/InDetEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from ../share/InDetEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/run/CosmicMonitorOpts.py b/InnerDetector/InDetMonitoring/SCT_Monitoring/run/CosmicMonitorOpts.py
index f13fbb0d0e2a8ef1b8b71de974ae522ae21d5397..04a0129e53701da5b760c652bb42dd3970534e19 100755
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/run/CosmicMonitorOpts.py
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/run/CosmicMonitorOpts.py
@@ -182,7 +182,7 @@ if CosmicMonitorFlags.doMonitoring:
theApp.Dlls += [ "CBNT_Utils","CBNT_Athena" ]
if CosmicMonitorFlags.makeAlignNtp:
- theApp.DLLs += ["HbookCnv"]
+ theApp.Dlls += ["HbookCnv"]
theApp.HistogramPersistency = "HBOOK"
else:
theApp.Dlls += [ "RootHistCnv" ]
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/IDPVM_Test.txt b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/IDPVM_Test.txt
index f5103f439bb6f83c4739d72a8f37b51b0418debf..3abc771c6044abb487e93958f134c4dffc0c2579 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/IDPVM_Test.txt
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/IDPVM_Test.txt
@@ -1,5 +1,5 @@
ApplicationMgr.OutputLevel = 5;
-ApplicationMgr.DLLs += { "InDetPhysValMonitoring" };
+ApplicationMgr.Dlls += { "InDetPhysValMonitoring" };
ApplicationMgr.CreateSvc += { "HistogramDefinitionSvc/HistogramDefinitionSvc" };
HistogramDefinitionSvc.DefinitionFormat = "text/xml";
HistogramDefinitionSvc.DefinitionSource = "testHDef.xml";
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/XmlEntityInclusionOptions.txt b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/XmlEntityInclusionOptions.txt
index 4a5e2818152e2f7411382426517eded312f04968..ade4a1f065ef7e978404fdd649e2486cc749b816 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/XmlEntityInclusionOptions.txt
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/XmlEntityInclusionOptions.txt
@@ -1,5 +1,5 @@
ApplicationMgr.OutputLevel = 5;
-ApplicationMgr.DLLs += { "InDetPhysValMonitoring" };
+ApplicationMgr.Dlls += { "InDetPhysValMonitoring" };
ApplicationMgr.CreateSvc += { "HistogramDefinitionSvc/HistogramDefinitionSvc" };
HistogramDefinitionSvc.DefinitionFormat = "text/xml";
HistogramDefinitionSvc.DefinitionSource = "entityMaster.xml";
diff --git a/LArCalorimeter/LArCellRec/share/LArCellTest_jobOptions.py b/LArCalorimeter/LArCellRec/share/LArCellTest_jobOptions.py
index 3d8f6dc8b8bc6ce49160365021d4c132e168f04c..7c99f2a0789035df888a7cd31f1145ecee8d9cfe 100755
--- a/LArCalorimeter/LArCellRec/share/LArCellTest_jobOptions.py
+++ b/LArCalorimeter/LArCellRec/share/LArCellTest_jobOptions.py
@@ -1,5 +1,5 @@
# jobOptions file for testing LArCell
-# ApplicationMgr.DLLs += { "LArCellRec" };
+# ApplicationMgr.Dlls += { "LArCellRec" };
theApp.TopAlg += [
"LArCellTest/LArCellTestEM",
"LArCellTest/LArCellTestHEC",
diff --git a/LArCalorimeter/LArCnv/LArAthenaPool/share/LArRecAthenaPool_ReadTest_jobOptions.py b/LArCalorimeter/LArCnv/LArAthenaPool/share/LArRecAthenaPool_ReadTest_jobOptions.py
index 4ce6fcdb61353e4c25246a3545f9ee7443b90823..bede78eae1eab2c2f45ffcd295035e8593745e16 100755
--- a/LArCalorimeter/LArCnv/LArAthenaPool/share/LArRecAthenaPool_ReadTest_jobOptions.py
+++ b/LArCalorimeter/LArCnv/LArAthenaPool/share/LArRecAthenaPool_ReadTest_jobOptions.py
@@ -52,11 +52,11 @@ theApp.EvtMax = 200
#--------------------------------------------------------------
MessageSvc = Service( "MessageSvc" )
MessageSvc.OutputLevel = 2
-#ApplicationMgr.DLLs += { "LArClusterRec" };
-#ApplicationMgr.DLLs += { "LArCellRec" };
+#ApplicationMgr.Dlls += { "LArClusterRec" };
+#ApplicationMgr.Dlls += { "LArCellRec" };
-theApp.DLLs += [ "CaloTools" ]
-theApp.DLLs += [ "CaloRec" ]
+theApp.Dlls += [ "CaloTools" ]
+theApp.Dlls += [ "CaloRec" ]
from CaloIdentifier import SUBCALO
diff --git a/LArCalorimeter/LArCnv/LArAthenaPool/share/LArRecAthenaPool_WriteTest_jobOptions.py b/LArCalorimeter/LArCnv/LArAthenaPool/share/LArRecAthenaPool_WriteTest_jobOptions.py
index cf8b098ee167a8d7f93cb30af92fe30b4d9d9976..faca6bdcb1f7c1f054a28c18be0e370bcccc1893 100755
--- a/LArCalorimeter/LArCnv/LArAthenaPool/share/LArRecAthenaPool_WriteTest_jobOptions.py
+++ b/LArCalorimeter/LArCnv/LArAthenaPool/share/LArRecAthenaPool_WriteTest_jobOptions.py
@@ -72,7 +72,7 @@ include( "CaloRec/CaloCluster_jobOptions.py" )
from CaloIdentifier import SUBCALO
-theApp.DLLs += [ "CaloTools" ]
+theApp.Dlls += [ "CaloTools" ]
include( "CBNT_Athena/CBNT_Athena_jobOptions.py" )
theApp.TopAlg += [ "CBNT_Athena/CBNT_Calo" ]
diff --git a/LArCalorimeter/LArCnv/LArByteStream/doc/README.txt b/LArCalorimeter/LArCnv/LArByteStream/doc/README.txt
index 243d25d96057849eaa2c6807dcbff35b9e26d1e8..45b66bec012577a5cb6d777c242521eba9d9596a 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/doc/README.txt
+++ b/LArCalorimeter/LArCnv/LArByteStream/doc/README.txt
@@ -277,7 +277,7 @@ ReadLArRaw.HistogramID = 128 ;
ReadLArRaw.NtupleLocID = "/FILE1/LARG" ;
// specify the LAr Converter and LArROD type and key for output.
-ApplicationMgr.DLLs += { "LArByteStream" };
+ApplicationMgr.Dlls += { "LArByteStream" };
StreamBS.ItemList +={"2721#*"};
The first part should be replaced by jobOptions that can make your RDOs.
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_AutoCorr_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_AutoCorr_jobOptions.py
index e1c31851b6ce438a79b95f77a8aabe02c72ffc3b..07fa340675a802f640b4aa330a0f3e39be3c7790 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_AutoCorr_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_AutoCorr_jobOptions.py
@@ -41,7 +41,7 @@ theApp.HistogramPersistency="HBOOK"
NTupleSvc = Service( "NTupleSvc" )
NTupleSvc.Output = [ "FILE1 DATAFILE='autocorr.ntp' OPT='NEW'"]
# To output ROOT file
-#ApplicationMgr.DLLs += { "RootHistCnv" };
+#ApplicationMgr.Dlls += { "RootHistCnv" };
#HistogramPersistencySvc.OutputFile = "";
#ApplicationMgr.HistogramPersistency="ROOT";
#NTupleSvc.Output = { "FILE1 DATAFILE='autocorr.root' OPT='NEW'"};
diff --git a/LArCalorimeter/LArSim/share/LArSim_Fake_jobOptions.txt b/LArCalorimeter/LArSim/share/LArSim_Fake_jobOptions.txt
index c6feed0ab3fabe2ed26693d0fc881d07fa5b8d0b..a479eaa66b95b9889ef05b407ecb5fbffdd437c2 100755
--- a/LArCalorimeter/LArSim/share/LArSim_Fake_jobOptions.txt
+++ b/LArCalorimeter/LArSim/share/LArSim_Fake_jobOptions.txt
@@ -13,7 +13,7 @@
// Private Application Configuration options
//--------------------------------------------------------------
-ApplicationMgr.DLLs += {"LArSim"} ;
+ApplicationMgr.Dlls += {"LArSim"} ;
ApplicationMgr.TopAlg += {"LArHitMaker/hitmaker1"} ;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonEventAthenaPool_test.txt b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonEventAthenaPool_test.txt
index ece7c5043ba3bb73ae416e934755101eb8f8614b..19791156cd4e560725e099eb2423b94700d848af 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonEventAthenaPool_test.txt
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonEventAthenaPool_test.txt
@@ -1,4 +1,4 @@
-ApplicationMgr.DLLs += { "StoreGate", "CLIDComps" };
+ApplicationMgr.Dlls += { "StoreGate", "CLIDComps" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore" };
TGCcablingServerSvc.forcedUse = true;
#include "IOVSvc/IOVSvc.txt"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/RpcPadContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/RpcPadContainerCnv_p1_test.ref
index 3cc8a04ce49fbd5506e6e5dd1839523dec25e99d..4a294b1ab94c2abc84db380982653e6158dcc16f 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/RpcPadContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/RpcPadContainerCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/MuonEventAthenaPool_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/../share/MuonEventAthenaPool_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO # (3,1): TGCcablingServerSvc.forcedUse = 1
JobOptionsSvc INFO Job options successfully read in from ../share/MuonEventAthenaPool_test.txt
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/RpcPadContainerCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/RpcPadContainerCnv_p2_test.ref
index bfa4b2ddaafd1dc7fd1ace86d48f051ff578e78f..7b7f6c23c624511708b9042832633aa24a2d7919 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/RpcPadContainerCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/RpcPadContainerCnv_p2_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/MuonEventAthenaPool_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/../share/MuonEventAthenaPool_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO # (3,1): TGCcablingServerSvc.forcedUse = 1
JobOptionsSvc INFO Job options successfully read in from ../share/MuonEventAthenaPool_test.txt
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/TgcRdoCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/TgcRdoCnv_p1_test.ref
index 28eace07793b66b63a7af313eb8205404d609d26..ba1e5f3511c3314bb7f38fe35de1d900eaa1f0f2 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/TgcRdoCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/TgcRdoCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/MuonEventAthenaPool_test.txt
JobOptionsSvc INFO # =======> /home/sss/nobackup/atlas/build/../tests/../share/MuonEventAthenaPool_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO # (3,1): TGCcablingServerSvc.forcedUse = 1
JobOptionsSvc INFO Job options successfully read in from ../share/MuonEventAthenaPool_test.txt
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/TgcRdoCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/TgcRdoCnv_p2_test.ref
index 967d3b76e385249998ce65f1046460e615ddc4fd..77400977a10dddcde60cc0cf68f98157b1f24d81 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/TgcRdoCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/TgcRdoCnv_p2_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/MuonEventAthenaPool_test.txt
JobOptionsSvc INFO # =======> /home/sss/nobackup/atlas/build/../tests/../share/MuonEventAthenaPool_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO # (3,1): TGCcablingServerSvc.forcedUse = 1
JobOptionsSvc INFO Job options successfully read in from ../share/MuonEventAthenaPool_test.txt
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/TgcRdoCnv_p3_test.ref b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/TgcRdoCnv_p3_test.ref
index 94f40ab95502a380f0c25ebe2a428b669c9462b9..a7cc616457b78f77b6842b7c255780d225f08d6c 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/TgcRdoCnv_p3_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/TgcRdoCnv_p3_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/MuonEventAthenaPool_test.txt
JobOptionsSvc INFO # =======> /home/sss/nobackup/atlas/build/../tests/../share/MuonEventAthenaPool_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO # (3,1): TGCcablingServerSvc.forcedUse = 1
JobOptionsSvc INFO Job options successfully read in from ../share/MuonEventAthenaPool_test.txt
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CompetingMuonClustersOnTrackCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CompetingMuonClustersOnTrackCnv_p2_test.ref
index 8b95877006b9d9372314b02097e88ff1c5f54719..3c50c1642a444a9b155e398bc90631a7ec9f8ac4 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CompetingMuonClustersOnTrackCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CompetingMuonClustersOnTrackCnv_p2_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscClusterOnTrackCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscClusterOnTrackCnv_p2_test.ref
index eb7e46d2ac9f20d19b39592c79e840bfa51123f0..80f2a7c8a758f6e81459b471d52d091eef43094f 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscClusterOnTrackCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscClusterOnTrackCnv_p2_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscPrepDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscPrepDataContainerCnv_p1_test.ref
index e4e220ef8a62a3cfe73b75bdf269d8a4704c5cc8..a463acacecb056c45c29ee01141bcaa525926453 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscPrepDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscPrepDataContainerCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscPrepDataContainerCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscPrepDataContainerCnv_p2_test.ref
index 3baef6e3f4e865ab2623a6e4444232fe4705298c..cea147a8d8eac2fbf3bbcaf3a9bd2746ee2db16e 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscPrepDataContainerCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscPrepDataContainerCnv_p2_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscStripPrepDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscStripPrepDataContainerCnv_p1_test.ref
index 2370d71c91755e5e005e6ddbf1bcc38da1a237df..926b5347c3ad146a199427412130198f674fbb1a 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscStripPrepDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscStripPrepDataContainerCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MMPrepDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MMPrepDataContainerCnv_p1_test.ref
index 96b75544dbf6e64cd776eb60b5de668cc96a912d..93fd0cd6a5227e32171ebecb97e3cafee9fda221 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MMPrepDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MMPrepDataContainerCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_ClusterOnTrackCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_ClusterOnTrackCnv_p1_test.ref
index 38e08957f3a966f6c9d7e11c7b4f68d4b48278c2..e55934786df9e6ed4635fea8551f6872a8621ce5 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_ClusterOnTrackCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_ClusterOnTrackCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_DigitContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_DigitContainerCnv_p1_test.ref
index d22980deb84877856f6ea726d431df72db72476f..1f43aa615789d4c51545f3fabfaaae7611588677 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_DigitContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_DigitContainerCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_DigitContainerCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_DigitContainerCnv_p2_test.ref
index 4c32314c13f30a0aca3eb31b9c34a8b20d6bea78..944ac6415254d31fb4aa2ba7107a0c78ce7646f6 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_DigitContainerCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_DigitContainerCnv_p2_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtDriftCircleOnTrackCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtDriftCircleOnTrackCnv_p2_test.ref
index 987ce23fb6fbdbd91f357bf5d83339874973e052..f9cee4c88157c2a92437c793cc9902aad10460c3 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtDriftCircleOnTrackCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtDriftCircleOnTrackCnv_p2_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtPrepDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtPrepDataContainerCnv_p1_test.ref
index 981337c2b92dd683c462aea2156e57735a2a85a3..1584f712d129f7b79dd198d27c2ee89a29a1f87d 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtPrepDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtPrepDataContainerCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtPrepDataContainerCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtPrepDataContainerCnv_p2_test.ref
index 981337c2b92dd683c462aea2156e57735a2a85a3..1584f712d129f7b79dd198d27c2ee89a29a1f87d 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtPrepDataContainerCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtPrepDataContainerCnv_p2_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MuonEventTPCnv_test.txt b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MuonEventTPCnv_test.txt
index 8104e46f1dd933f98942a4b86c208bce91a80285..204aecf3452f8be96c105b346ffc2a60c035af33 100755
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MuonEventTPCnv_test.txt
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MuonEventTPCnv_test.txt
@@ -1,3 +1,3 @@
-ApplicationMgr.DLLs += { "StoreGate", "CLIDComps" };
+ApplicationMgr.Dlls += { "StoreGate", "CLIDComps" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc" };
#include "IOVSvc/IOVSvc.txt"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcClusterOnTrackCnv_p3_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcClusterOnTrackCnv_p3_test.ref
index 2e973c04a6c1b6ede5694335bdaaca8d759bbe42..6793b6c6c481338faf8a83c85f0b191c50a6e50b 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcClusterOnTrackCnv_p3_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcClusterOnTrackCnv_p3_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcCoinDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcCoinDataContainerCnv_p1_test.ref
index 4528d183142fc32e9223dff01bfbaebbed2aeda3..fbb360bf46942210cd4cb488c9bd391d819d5557 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcCoinDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcCoinDataContainerCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p1_test.ref
index 981337c2b92dd683c462aea2156e57735a2a85a3..1584f712d129f7b79dd198d27c2ee89a29a1f87d 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p2_test.ref
index 6619bca36ffc9728a8919f534f049854a9e38b39..42c3c15a2ba237665b5f72b09a3469a8faa2dc7d 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p2_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p3_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p3_test.ref
index 6619bca36ffc9728a8919f534f049854a9e38b39..42c3c15a2ba237665b5f72b09a3469a8faa2dc7d 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p3_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p3_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_ClusterOnTrackCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_ClusterOnTrackCnv_p1_test.ref
index 3c57dbdb485d696c272e7ae6d420cac314b88598..f3f1295795bd68d57d356996c3d3834ff004d0ec 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_ClusterOnTrackCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_ClusterOnTrackCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_DigitContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_DigitContainerCnv_p1_test.ref
index 35e2bd565aa4188a88c2af3c41ab61ae8efe1883..15caa6ea8b8584258de8d70ae032ea7c3fd61a37 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_DigitContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_DigitContainerCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_RawDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_RawDataContainerCnv_p1_test.ref
index b1241a74ca9cde51c40ff25983aca152e5e8566c..f33987f72618cb35b7110c42b796c8d41936dcc7 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_RawDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_RawDataContainerCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcClusterOnTrackCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcClusterOnTrackCnv_p2_test.ref
index 7a619941921fe10b2054f8e90044a25fec5b9901..afb0082ce2f5810854fa2710ae4136bf9e013fd6 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcClusterOnTrackCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcClusterOnTrackCnv_p2_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p1_test.ref
index 4f7c5a0c2e26e414c6d1bca13cf6ec3fb235daf2..1154f6d092517e4b8f48f442dbced038456c5d44 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p2_test.ref
index 67e8a017e9c2dc91847155ed2d38c4f1a73e551c..c3171a22bf8f7cd7afd63e2b10bd77335320ad7a 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p2_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p3_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p3_test.ref
index bbad59bb010d086ddc66174dd6166521fc95b130..e3a93452533b3c8f342692961f9ee50167f3338b 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p3_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p3_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p1_test.ref
index 1fc5a8a2ba448ae333e18bb198619e240a9f5ba2..4917471e954852e1d00b91d6f84ae1c02a3c0ca2 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p2_test.ref
index 812cc81fec09163e557309ca9dc7f4650144fda3..bd3c418438615fe102cf5d749d27beab70af0dd0 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p2_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p3_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p3_test.ref
index 812cc81fec09163e557309ca9dc7f4650144fda3..bd3c418438615fe102cf5d749d27beab70af0dd0 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p3_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p3_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/sTgcPrepDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/sTgcPrepDataContainerCnv_p1_test.ref
index 807907fa4bc9f22babeb3674d671632fabf39cdc..8878998c78af6485a700a6f4327bef16d17d4bac 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/sTgcPrepDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/sTgcPrepDataContainerCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-dbg/x86_64-centos7-gcc8-dbg/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-dbg/x86_64-centos7-gcc8-dbg/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore", "Athena::RCUSvc"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-dbg/x86_64-centos7-gcc8-dbg/jobOptions/MuonEventTPCnv/MuonEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/ReadCoolStrFiles.py b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/ReadCoolStrFiles.py
index 193f1de6433f1e1832ad0becd12c507c32ffdeaf..2c87a1c0649d5c3c12fa9497ad9d07e182e34903 100755
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/ReadCoolStrFiles.py
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/ReadCoolStrFiles.py
@@ -7,7 +7,7 @@
#
# define two instances of the ReadWriteCoolStrFile algorithm to read the data
-theApp.DLLs+=["DetDescrCondTools","DetDescrCondExample"]
+theApp.Dlls+=["DetDescrCondTools","DetDescrCondExample"]
theApp.TopAlg+=["ReadWriteCoolStrFile/RWInstA","ReadWriteCoolStrFile/RWInstB"]
# parameters for first instance - reads from channel 1 in folder /TEST/COOLSTR
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/allign.py b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/allign.py
index 6803ac223f8963a7458d2d7e5d32d338df3f17fb..fbf311dec8acfade9b7cf5c9fbd38f9de171d867 100755
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/allign.py
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/allign.py
@@ -16,8 +16,8 @@ theApp.EvtMax = 3
# define two instances of the ReadWriteCoolStrFile algorithm to manipulate
# the data files
#
-theApp.DLLs+=["MuonCondCool"]
-#theApp.DLLs+=["DetDescrCondTools","DetDescrCondExample"]
+theApp.Dlls+=["MuonCondCool"]
+#theApp.Dlls+=["DetDescrCondTools","DetDescrCondExample"]
theApp.TopAlg+=["MuonCalib::MdtReadWriteCoolStr/RWInstA"]
#"MuonCalib::MdtReadWriteCoolStr/RWInstA2","MuonCalib::MdtReadWriteCoolStr/RWInstA3","MuonCalib::MdtReadWriteCoolStr/RWInstA4","MuonCalib::MdtReadWriteCoolStr/RWInstA5","MuonCalib::MdtReadWriteCoolStr/RWInstA6"]
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/deadtube.py b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/deadtube.py
index 7ff383f2e0ab581f0a679d03f2deb8d8c448ee82..2cb256a16ca3a8f502dc43f47552e657ac2709af 100755
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/deadtube.py
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/deadtube.py
@@ -15,7 +15,7 @@ theApp.EvtMax = 10
# define two instances of the ReadWriteCoolStrFile algorithm to manipulate
# the data files
#
-theApp.DLLs+=["MuonCondCool"]
+theApp.Dlls+=["MuonCondCool"]
theApp.TopAlg+=["MuonCalib::MdtTubeCondCool/RWInstA"]
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/t0.py b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/t0.py
index 95017d2574bea1f354e42b4df5779bdd69d148bd..c452ec8cc3fc2303530231abce7a7077836d5043 100755
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/t0.py
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/t0.py
@@ -15,7 +15,7 @@ theApp.EvtMax = 5
# define two instances of the ReadWriteCoolStrFile algorithm to manipulate
# the data files
#
-theApp.DLLs+=["MuonCondCool"]
+theApp.Dlls+=["MuonCondCool"]
theApp.TopAlg+=["MuonCalib::MdtReadWriteCoolStr/RWInstA","MuonCalib::MdtReadWriteCoolStr/RWInstA2","MuonCalib::MdtReadWriteCoolStr/RWInstA3","MuonCalib::MdtReadWriteCoolStr/RWInstA4","MuonCalib::MdtReadWriteCoolStr/RWInstA5","MuonCalib::MdtReadWriteCoolStr/RWInstA6"]
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/share/MDT_DigitizationStandalone_jobOptions.py b/MuonSpectrometer/MuonDigitization/MDT_Digitization/share/MDT_DigitizationStandalone_jobOptions.py
index 36daaf11736bffc771e67a79fb787c33c7572d4a..921efd03079e256298db45fab32416c614636830 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/share/MDT_DigitizationStandalone_jobOptions.py
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/share/MDT_DigitizationStandalone_jobOptions.py
@@ -13,8 +13,8 @@ EventSelector = Service( "EventSelector" )
EventSelector.InputCollection = "NewPoolTry"
theApp.Dlls += [ "MDT_Digitization"]
theApp.Dlls += [ "GaudiAlg" ,"GaudiAud"]
-#ApplicationMgr.DLLs += { "EventHdrAthenaRoot", "MuonSimHitAthenaRoot"};
-#ApplicationMgr.DLLs += { "RootSvcModules" , "AthenaRootCnvSvc" };
+#ApplicationMgr.Dlls += { "EventHdrAthenaRoot", "MuonSimHitAthenaRoot"};
+#ApplicationMgr.Dlls += { "RootSvcModules" , "AthenaRootCnvSvc" };
#ApplicationMgr.ExtSvc += { "RootSvc" };
include( "MuonDetMgrDetDescrCnv/MuonDetMgrDetDescrCnv_joboptions.py" )
diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/share/RPC_Digitization_jobOptions.txt b/MuonSpectrometer/MuonDigitization/RPC_Digitization/share/RPC_Digitization_jobOptions.txt
index a29bff7460031eabe83abc924a85c69d6f8a0a7b..fc8ebaf02aef74c6ae0b0de52439bec037589246 100644
--- a/MuonSpectrometer/MuonDigitization/RPC_Digitization/share/RPC_Digitization_jobOptions.txt
+++ b/MuonSpectrometer/MuonDigitization/RPC_Digitization/share/RPC_Digitization_jobOptions.txt
@@ -1,7 +1,7 @@
// RPC Digitization.
-ApplicationMgr.DLLs += { "RPC_Digitization"};
+ApplicationMgr.Dlls += { "RPC_Digitization"};
ApplicationMgr.TopAlg += {"RPC_Digitizer"};
RPC_Digitizer.Parameters="G4RPC_Digitizer.txt";
diff --git a/MuonSpectrometer/MuonGeoModelTest/test/MuonGeoModelTestMaps.py b/MuonSpectrometer/MuonGeoModelTest/test/MuonGeoModelTestMaps.py
index eefaa27f36dd0167f9e69d45b9f27f65dccf2a47..617a991d96285023766a85606e24bf92af2bff64 100644
--- a/MuonSpectrometer/MuonGeoModelTest/test/MuonGeoModelTestMaps.py
+++ b/MuonSpectrometer/MuonGeoModelTest/test/MuonGeoModelTestMaps.py
@@ -15,7 +15,7 @@ include( "AtlasGeoModel/MuonGeoModel.py" )
theApp.EvtSel = "EventSelector";
theApp.EvtMax = 0;
-theApp.DLLs += [ "MuonGeoModelTest"]
+theApp.Dlls += [ "MuonGeoModelTest"]
#---- display top algorithm
theApp.TopAlg = [ "MuonGMCheck" ]
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEvent/share/TruthParticle_test.txt b/PhysicsAnalysis/TruthParticleID/McParticleEvent/share/TruthParticle_test.txt
index 834e51e5c614832b3a4b131afa9cc6aa0d818298..7283c88f96472c5d3d59d668693f31434865b908 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEvent/share/TruthParticle_test.txt
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEvent/share/TruthParticle_test.txt
@@ -1,7 +1,7 @@
// common job opts for SG unit tests
#pragma print off
-ApplicationMgr.DLLs += { "StoreGate" };
+ApplicationMgr.Dlls += { "StoreGate" };
ApplicationMgr.ExtSvc += { "StoreGateSvc",
"StoreGateSvc/DetectorStore",
"StoreGateSvc/HistoryStore" };
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx
index add3feeee5b1cccc7ce4b552d77d05962fd12e7c..77a2cbdb7380a8c9f010b000ceeb435243964433 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx
@@ -200,12 +200,10 @@ unsigned long RootTruthParticleCnvTool::refCount() const { abort(); }
// Implementation of the IProperty function(s)
//
-StatusCode RootTruthParticleCnvTool::setProperty( const Property& ) { abort(); }
StatusCode RootTruthParticleCnvTool::setProperty( const std::string& ) {
abort(); }
-StatusCode RootTruthParticleCnvTool::setProperty( const std::string&,
- const std::string& ) {
- abort(); }
+StatusCode RootTruthParticleCnvTool::setProperty( const std::string&, const Gaudi::Details::PropertyBase& ) { abort(); }
+StatusCode RootTruthParticleCnvTool::setPropertyRepr( const std::string&, const std::string& ){ abort(); }
StatusCode RootTruthParticleCnvTool::getProperty( Property* ) const { abort(); }
const Property&
RootTruthParticleCnvTool::getProperty( const std::string& ) const{ abort(); }
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.h b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.h
index 34c8595523ba1bdd23cbb824d3fa81943b177bc5..3573cbd1e416332bc5390b803940987431f87faf 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.h
@@ -8,6 +8,7 @@
#define MCPARTICLEEVENTTPCNV_ROOTTRUTHPARTICLECNVTOOL_H
#include "McParticleKernel/ITruthParticleCnvTool.h"
+#include "GaudiKernel/Property.h"
class RootTruthParticleCnvTool
: public ITruthParticleCnvTool
@@ -51,9 +52,10 @@ public:
/// @name Function(s) inherited from IProperty
/// @{
- virtual StatusCode setProperty( const Property& p );
virtual StatusCode setProperty( const std::string& s );
- virtual StatusCode setProperty( const std::string& n, const std::string& v );
+ virtual StatusCode setProperty( const std::string& name, const Gaudi::Details::PropertyBase& p );
+ virtual StatusCode setPropertyRepr( const std::string& n, const std::string& r );
+
virtual StatusCode getProperty( Property* p ) const;
virtual const Property& getProperty( const std::string& name ) const;
virtual StatusCode getProperty( const std::string& n, std::string& v ) const;
diff --git a/Projects/AthGeneration/externals.txt b/Projects/AthGeneration/externals.txt
index a5b437a06ac8cce117f517c0356979bccd667300..f132bae02e50268d4db8afa1413149e0dc472d1d 100644
--- a/Projects/AthGeneration/externals.txt
+++ b/Projects/AthGeneration/externals.txt
@@ -9,4 +9,4 @@
AthGenerationExternalsVersion = 2.0.72
# The version of atlas/Gaudi to use:
-GaudiVersion = v33r1.004
+GaudiVersion = v34r0.000
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index 234b5a04b14e4e91a90582cedfd7cd0c93b95516..242f63bc4786e4b81e54ecad45da140d717eba6e 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -9,4 +9,4 @@
AthSimulationExternalsVersion = 2.0.72
# The version of atlas/Gaudi to use:
-GaudiVersion = v33r1.004
+GaudiVersion = v34r0.000
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index be57a7a38e66d544df68766813821ff422cff006..eb81e7685bde6621a4c4f9c512a91330fbb87bd6 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -9,4 +9,4 @@
AthenaExternalsVersion = 2.0.72
# The version of atlas/Gaudi to use:
-GaudiVersion = v33r1.004
+GaudiVersion = v34r0.000
diff --git a/Simulation/FastShower/FastCaloSim/share/FastShower_CaloCellMaker_jobOptions.py b/Simulation/FastShower/FastCaloSim/share/FastShower_CaloCellMaker_jobOptions.py
index eb5ab6ac7fd039f08b182a20bc9e87caad15bbc0..4f075bb0fa744524db98bef27e9774b79fd95ed3 100755
--- a/Simulation/FastShower/FastCaloSim/share/FastShower_CaloCellMaker_jobOptions.py
+++ b/Simulation/FastShower/FastCaloSim/share/FastShower_CaloCellMaker_jobOptions.py
@@ -50,6 +50,6 @@ CaloCellMakerFS.CaloCellMakerToolNames += ["CaloCellContainerCheckerTool"]
# if necessary finalize and check the compactified/decompactified tool
if CaloCellMakerFlags.doCompactCellInAddition or CaloCellMakerFlags.doCompactCellInstead:
- theApp.DLLs+= ["CaloTools"]
+ theApp.Dlls+= ["CaloTools"]
CaloCellMakerFS.CaloCompactCellMakerToolNames += ["CaloCellContainerFinalizerTool"]
CaloCellMakerFS.CaloCompactCellMakerToolNames += ["CaloCellContainerCheckerTool"]
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/ISF_FatrasEventTPCnv_test.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/ISF_FatrasEventTPCnv_test.txt
index dae64b09f4f22ed7c79f1886401d5f466bab00f8..7a62d9fe77da0cf0d0cbc0da69a7694363ba0940 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/ISF_FatrasEventTPCnv_test.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/ISF_FatrasEventTPCnv_test.txt
@@ -1,2 +1,2 @@
-ApplicationMgr.DLLs += { "StoreGate", "CLIDComps" };
+ApplicationMgr.Dlls += { "StoreGate", "CLIDComps" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore" };
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/PlanarClusterCnv_p1_test.ref b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/PlanarClusterCnv_p1_test.ref
index f32abb737021b5335aae952c8319691cb15d47af..82917f2d8370fe3e702ac9de281822d26d445141 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/PlanarClusterCnv_p1_test.ref
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/PlanarClusterCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/ISF_FatrasEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/ISF_FatrasEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/ISF_FatrasEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/PlanarClusterCnv_p2_test.ref b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/PlanarClusterCnv_p2_test.ref
index 8220477e696c35d2ad0ced9a7f509cf8d19c4a6a..432cf47acd56cf7e3e9115b2347131fb5a48c448 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/PlanarClusterCnv_p2_test.ref
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/PlanarClusterCnv_p2_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/ISF_FatrasEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/ISF_FatrasEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/ISF_FatrasEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/PlanarClusterContainerCnv_p1_test.ref b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/PlanarClusterContainerCnv_p1_test.ref
index 7cb10a08bc6954ea971ff657a5394ddb8a6eb29a..b8c535f5255910051314db16ee684150116ed4d7 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/PlanarClusterContainerCnv_p1_test.ref
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/PlanarClusterContainerCnv_p1_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/ISF_FatrasEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/ISF_FatrasEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/ISF_FatrasEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/PlanarClusterContainerCnv_p2_test.ref b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/PlanarClusterContainerCnv_p2_test.ref
index 677d21c3b112e6d4b7851bd283f61a818e4e432f..13182b07cab14ffe0ce4078d5f6c75bf15c59117 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/PlanarClusterContainerCnv_p2_test.ref
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/PlanarClusterContainerCnv_p2_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/ISF_FatrasEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/ISF_FatrasEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/share/ISF_FatrasEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/TestBeam/TBMonitoring/share/TBMonExemple_jobOptions.txt b/TestBeam/TBMonitoring/share/TBMonExemple_jobOptions.txt
index 498e10bb4a3b35a7b43d4157f7516c21e887855c..34214bf34231e1fc77655a68a8a35255fbb4dfdc 100755
--- a/TestBeam/TBMonitoring/share/TBMonExemple_jobOptions.txt
+++ b/TestBeam/TBMonitoring/share/TBMonExemple_jobOptions.txt
@@ -10,7 +10,7 @@ DetDescrCnvSvc.DetectorManagers += { "CaloMgr" };
//
//---- EMTB-Files input --------------------
//
-ApplicationMgr.DLLs += {"LArTBCnv"};
+ApplicationMgr.Dlls += {"LArTBCnv"};
ApplicationMgr.ExtSvc += { "LArTBCnvSvc" , "LArTBEventSelector/EventSelector"};
ApplicationMgr.EvtSel = "EventSelector";
@@ -18,11 +18,11 @@ EventPersistencySvc.CnvServices += { "LArTBCnvSvc" };
EventSelector.InputFiles = {"/afs/cern.ch/user/r/rmcphers/w0/data/rd13_run220113.dat"};
//--- LArMonitoring ---------------------------
-ApplicationMgr.DLLs += { "AthenaMonitoring"};
+ApplicationMgr.Dlls += { "AthenaMonitoring"};
ApplicationMgr.TopAlg += { "AthenaMon/athenamon" };
-ApplicationMgr.DLLs += { "TBMonitoring" };
+ApplicationMgr.Dlls += { "TBMonitoring" };
athenamon.AthenaMonTools = {"BeamDetectorMonTool/beamdetmon"};
@@ -54,12 +54,12 @@ ToolSvc.beamdetmon.TDCMin = 0;
ToolSvc.beamdetmon.TriggFlags = {1,2,4,8,16,32};
// -- use root histos --
-ApplicationMgr.DLLs += { "RootHistCnv" };
+ApplicationMgr.Dlls += { "RootHistCnv" };
ApplicationMgr.HistogramPersistency = "ROOT";
HistogramPersistencySvc.OutputFile = "test.root";
// -- Use auditors --
-ApplicationMgr.DLLs += { "GaudiAud" };
+ApplicationMgr.Dlls += { "GaudiAud" };
// write out a summary of the time spent
//
diff --git a/TestBeam/TBMonitoring/share/jobOptions_MonTBInstruments.py b/TestBeam/TBMonitoring/share/jobOptions_MonTBInstruments.py
index 9f0eb105315386ca89444cfef14ed7c77f8c834d..6743982293ead94c4543a6a5988d07ca9918510b 100755
--- a/TestBeam/TBMonitoring/share/jobOptions_MonTBInstruments.py
+++ b/TestBeam/TBMonitoring/share/jobOptions_MonTBInstruments.py
@@ -8,7 +8,7 @@
include( "TBCnv/TBReadH8BS_jobOptions.py")
#---- Reconstruct Beam Instrumentation ------------------------
-theApp.DLLs+=["TBRec"]
+theApp.Dlls+=["TBRec"]
#--- BPCs
theApp.TopAlg += ["TBBPCRec/TBBPCRec"]
TBBPCRec = Algorithm("TBBPCRec")
diff --git a/TestBeam/TBRec/share/H8TimingNtuple.py b/TestBeam/TBRec/share/H8TimingNtuple.py
index a2d4af7fe50df31058592f7b3fbbce0d10d773c0..86e0840171cb7d354fcedd6afd131bfba6688507 100755
--- a/TestBeam/TBRec/share/H8TimingNtuple.py
+++ b/TestBeam/TBRec/share/H8TimingNtuple.py
@@ -32,7 +32,7 @@ ToolSvc.TBByteStreamCnvTool.Dump = False
#---- LAr BS Reading & Reconstruction
include("LArTBRec/LArTBRec_H8_Simple_jobOptions.py")
-theApp.DLLs+=["LArTools"]
+theApp.Dlls+=["LArTools"]
include( "LArDetMgrDetDescrCnv/LArDetMgrDetDescrCnv_H8_joboptions.py" )
LArRawChannelSimpleBuilder.RecoMode = "CUBIC"
diff --git a/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref b/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref
index b81a803596968e3390e9be275db841a369e130f0..ab3b5e78b5211495a454354bbc9a29a5845a4a60 100644
--- a/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref
@@ -255,7 +255,7 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCondAlg INFO ProxyOflLasFib is set up and can be used
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflCes) for folder: "/TILE/OFL02/CALIB/CES"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflEms) for folder: "/TILE/OFL02/CALIB/EMS"
-TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':Invalid
+TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':'Invalid'
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCis) for folder: "/TILE/OFL02/CALIB/CIS/FIT/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlLas) for folder: "/TILE/OFL02/CALIB/LAS/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCes) for folder: "/TILE/OFL02/CALIB/CES"
diff --git a/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref b/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref
index 014dd1b635eba014af02f56e0ba3d5688d1efe70..a0182699e46f05fc4ef546d655ee2bba1ca86242 100644
--- a/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref
@@ -255,7 +255,7 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCondAlg INFO ProxyOflLasFib is set up and can be used
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflCes) for folder: "/TILE/OFL02/CALIB/CES"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflEms) for folder: "/TILE/OFL02/CALIB/EMS"
-TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':Invalid
+TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':'Invalid'
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCis) for folder: "/TILE/OFL02/CALIB/CIS/FIT/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlLas) for folder: "/TILE/OFL02/CALIB/LAS/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCes) for folder: "/TILE/OFL02/CALIB/CES"
diff --git a/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref b/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref
index c396b721f546a699ade833d34e63b1c19dc3d047..e713cd572b009bb31a0d2d2fa8cdf6ed0d292f0b 100644
--- a/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref
@@ -293,7 +293,7 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCondAlg INFO ProxyOflLasFib is set up and can be used
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflCes) for folder: "/TILE/OFL02/CALIB/CES"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflEms) for folder: "/TILE/OFL02/CALIB/EMS"
-TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':Invalid
+TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':'Invalid'
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCis) for folder: "/TILE/OFL02/CALIB/CIS/FIT/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlLas) for folder: "/TILE/OFL02/CALIB/LAS/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCes) for folder: "/TILE/OFL02/CALIB/CES"
diff --git a/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref b/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref
index d9ad04bb640d648e7bd5683cd3e9f4d504541557..3cff56476197d7b23e4135c1e29bce5c7ff41dd3 100644
--- a/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref
@@ -293,7 +293,7 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCondAlg INFO ProxyOflLasFib is set up and can be used
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflCes) for folder: "/TILE/OFL02/CALIB/CES"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflEms) for folder: "/TILE/OFL02/CALIB/EMS"
-TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':Invalid
+TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':'Invalid'
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCis) for folder: "/TILE/OFL02/CALIB/CIS/FIT/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlLas) for folder: "/TILE/OFL02/CALIB/LAS/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCes) for folder: "/TILE/OFL02/CALIB/CES"
diff --git a/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref b/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref
index b0822cfd21ca12b36d860ed01114f85408aa7a96..34b32dcb9202e0b5012285117b93db41952d8ed2 100644
--- a/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref
@@ -293,7 +293,7 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCondAlg INFO ProxyOflLasFib is set up and can be used
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflCes) for folder: "/TILE/OFL02/CALIB/CES"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflEms) for folder: "/TILE/OFL02/CALIB/EMS"
-TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':Invalid
+TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':'Invalid'
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCis) for folder: "/TILE/OFL02/CALIB/CIS/FIT/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlLas) for folder: "/TILE/OFL02/CALIB/LAS/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCes) for folder: "/TILE/OFL02/CALIB/CES"
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref
index 9ed90acaf0bbd5e2728690cf5f837cbfb992c33c..1b2158d0663fea16e9aea28abddd7ea0e06e7d2d 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref
@@ -299,7 +299,7 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCondAlg INFO ProxyOflLasFib is set up and can be used
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflCes) for folder: "/TILE/OFL02/CALIB/CES"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflEms) for folder: "/TILE/OFL02/CALIB/EMS"
-TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':Invalid
+TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':'Invalid'
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCis) for folder: "/TILE/OFL02/CALIB/CIS/FIT/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlLas) for folder: "/TILE/OFL02/CALIB/LAS/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCes) for folder: "/TILE/OFL02/CALIB/CES"
@@ -951,7 +951,7 @@ TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyC
TileEMScaleCondAlg 0 INFO ProxyOflLasFib is set up and can be used
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflCes) for folder: "/TILE/OFL02/CALIB/CES"
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflEms) for folder: "/TILE/OFL02/CALIB/EMS"
-TileEMScaleCondAlg 0 INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':Invalid
+TileEMScaleCondAlg 0 INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':'Invalid'
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCis) for folder: "/TILE/OFL02/CALIB/CIS/FIT/LIN"
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlLas) for folder: "/TILE/OFL02/CALIB/LAS/LIN"
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCes) for folder: "/TILE/OFL02/CALIB/CES"
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref
index 6cf57f1ac97e3f4bc13d111d6d67938d8cb33c03..ecb06d7c0f87743552a8dfd93ae28740ccfcbf7a 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref
@@ -299,7 +299,7 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCondAlg INFO ProxyOflLasFib is set up and can be used
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflCes) for folder: "/TILE/OFL02/CALIB/CES"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflEms) for folder: "/TILE/OFL02/CALIB/EMS"
-TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':Invalid
+TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':'Invalid'
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCis) for folder: "/TILE/OFL02/CALIB/CIS/FIT/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlLas) for folder: "/TILE/OFL02/CALIB/LAS/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCes) for folder: "/TILE/OFL02/CALIB/CES"
@@ -953,7 +953,7 @@ TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyC
TileEMScaleCondAlg 0 INFO ProxyOflLasFib is set up and can be used
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflCes) for folder: "/TILE/OFL02/CALIB/CES"
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflEms) for folder: "/TILE/OFL02/CALIB/EMS"
-TileEMScaleCondAlg 0 INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':Invalid
+TileEMScaleCondAlg 0 INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':'Invalid'
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCis) for folder: "/TILE/OFL02/CALIB/CIS/FIT/LIN"
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlLas) for folder: "/TILE/OFL02/CALIB/LAS/LIN"
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCes) for folder: "/TILE/OFL02/CALIB/CES"
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref
index 9afe1fdd345d573c68cad9c2ef5ab097c90742ed..5ae104db67cc73afd02cc78b611d5cca9c701261 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref
@@ -299,7 +299,7 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCondAlg INFO ProxyOflLasFib is set up and can be used
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflCes) for folder: "/TILE/OFL02/CALIB/CES"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflEms) for folder: "/TILE/OFL02/CALIB/EMS"
-TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':Invalid
+TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':'Invalid'
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCis) for folder: "/TILE/OFL02/CALIB/CIS/FIT/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlLas) for folder: "/TILE/OFL02/CALIB/LAS/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCes) for folder: "/TILE/OFL02/CALIB/CES"
@@ -952,7 +952,7 @@ TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyC
TileEMScaleCondAlg 0 INFO ProxyOflLasFib is set up and can be used
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflCes) for folder: "/TILE/OFL02/CALIB/CES"
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflEms) for folder: "/TILE/OFL02/CALIB/EMS"
-TileEMScaleCondAlg 0 INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':Invalid
+TileEMScaleCondAlg 0 INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':'Invalid'
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCis) for folder: "/TILE/OFL02/CALIB/CIS/FIT/LIN"
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlLas) for folder: "/TILE/OFL02/CALIB/LAS/LIN"
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCes) for folder: "/TILE/OFL02/CALIB/CES"
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref
index 74564973e68ca36649ef1875b57f79db0a4dbafe..8df793adf8b9ce8bfe46f1a17bd7146a78e5f09e 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref
@@ -298,7 +298,7 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCondAlg INFO ProxyOflLasFib is set up and can be used
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflCes) for folder: "/TILE/OFL02/CALIB/CES"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflEms) for folder: "/TILE/OFL02/CALIB/EMS"
-TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':Invalid
+TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':'Invalid'
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCis) for folder: "/TILE/OFL02/CALIB/CIS/FIT/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlLas) for folder: "/TILE/OFL02/CALIB/LAS/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCes) for folder: "/TILE/OFL02/CALIB/CES"
@@ -949,7 +949,7 @@ TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyC
TileEMScaleCondAlg 0 INFO ProxyOflLasFib is set up and can be used
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflCes) for folder: "/TILE/OFL02/CALIB/CES"
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflEms) for folder: "/TILE/OFL02/CALIB/EMS"
-TileEMScaleCondAlg 0 INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':Invalid
+TileEMScaleCondAlg 0 INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':'Invalid'
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCis) for folder: "/TILE/OFL02/CALIB/CIS/FIT/LIN"
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlLas) for folder: "/TILE/OFL02/CALIB/LAS/LIN"
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCes) for folder: "/TILE/OFL02/CALIB/CES"
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref
index 6b3dceaa3d3543db89ed0fd92d11877583aa8f06..ed521ffec3ac1d9dbcc0ce8863446171b883e372 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref
@@ -299,7 +299,7 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCondAlg INFO ProxyOflLasFib is set up and can be used
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflCes) for folder: "/TILE/OFL02/CALIB/CES"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflEms) for folder: "/TILE/OFL02/CALIB/EMS"
-TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':Invalid
+TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':'Invalid'
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCis) for folder: "/TILE/OFL02/CALIB/CIS/FIT/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlLas) for folder: "/TILE/OFL02/CALIB/LAS/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCes) for folder: "/TILE/OFL02/CALIB/CES"
@@ -953,7 +953,7 @@ TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyC
TileEMScaleCondAlg 0 INFO ProxyOflLasFib is set up and can be used
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflCes) for folder: "/TILE/OFL02/CALIB/CES"
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflEms) for folder: "/TILE/OFL02/CALIB/EMS"
-TileEMScaleCondAlg 0 INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':Invalid
+TileEMScaleCondAlg 0 INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':'Invalid'
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCis) for folder: "/TILE/OFL02/CALIB/CIS/FIT/LIN"
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlLas) for folder: "/TILE/OFL02/CALIB/LAS/LIN"
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCes) for folder: "/TILE/OFL02/CALIB/CES"
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref
index 75d978955253a326c921ce97bfc40a2cf063f58c..7abb0196247ab421afa718f73265debbfd7f9a61 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref
@@ -299,7 +299,7 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCondAlg INFO ProxyOflLasFib is set up and can be used
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflCes) for folder: "/TILE/OFL02/CALIB/CES"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflEms) for folder: "/TILE/OFL02/CALIB/EMS"
-TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':Invalid
+TileEMScaleCondAlg INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':'Invalid'
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCis) for folder: "/TILE/OFL02/CALIB/CIS/FIT/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlLas) for folder: "/TILE/OFL02/CALIB/LAS/LIN"
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCes) for folder: "/TILE/OFL02/CALIB/CES"
@@ -953,7 +953,7 @@ TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyC
TileEMScaleCondAlg 0 INFO ProxyOflLasFib is set up and can be used
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflCes) for folder: "/TILE/OFL02/CALIB/CES"
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OflEms) for folder: "/TILE/OFL02/CALIB/EMS"
-TileEMScaleCondAlg 0 INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':Invalid
+TileEMScaleCondAlg 0 INFO Undoing online calibration is not requested, since OnlCacheUnit= 'OnlCacheUnit':'Invalid'
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCis) for folder: "/TILE/OFL02/CALIB/CIS/FIT/LIN"
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlLas) for folder: "/TILE/OFL02/CALIB/LAS/LIN"
TileEMScaleCondAlg.TileCondProxyCool_... 0 INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlCes) for folder: "/TILE/OFL02/CALIB/CES"
diff --git a/Tools/Scripts/share/check_joboptions b/Tools/Scripts/share/check_joboptions
index 926c2815c03b8befcb72d5ae40fc2afae6344603..cb443bdf83d08901ed36792628e48601962b37ad 100755
--- a/Tools/Scripts/share/check_joboptions
+++ b/Tools/Scripts/share/check_joboptions
@@ -84,8 +84,8 @@ function check ()
##echo file=${file}
- #echo "------ DLLs:"
- for f in `awk '/(DLLs).*{/,/}/ {print}' ${file} | sed -e 's#[^{]*{##' -e 's#}.*##' -e 's#[",]##g'`; do
+ #echo "------ Dlls:"
+ for f in `awk '/(Dlls).*{/,/}/ {print}' ${file} | sed -e 's#[^{]*{##' -e 's#}.*##' -e 's#[",]##g'`; do
#echo ${tabulation}${f}
s=`echo "${all_dlls}" | egrep -e "[ ]${f}[ ]"`
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.cxx
index 9668f665bdf2b239a4bdd0598cc0549aa4d517c4..58cbebc361e403ab0feb18ca273d1fc16580b826 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.cxx
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.cxx
@@ -16,7 +16,8 @@
TrigConf::JobOptionsSvc::JobOptionsSvc(const std::string& name, ISvcLocator* pSvcLocator) :
base_class(name, pSvcLocator),
- m_josvc("JobOptionsSvc/TrigConfWrapped_JobOptionsSvc", name)
+ m_josvc("JobOptionsSvc/TrigConfWrapped_JobOptionsSvc", name),
+ m_optsvc("JobOptionsSvc/TrigConfWrapped_JobOptionsSvc", name)
{}
StatusCode TrigConf::JobOptionsSvc::initialize()
@@ -28,6 +29,11 @@ StatusCode TrigConf::JobOptionsSvc::initialize()
SmartIF<IProperty> joprop = &*m_josvc;
ATH_CHECK(joprop->setProperty("TYPE", "NONE"));
+ // m_optsvc = serviceLocator()->getOptsSvc();
+ ATH_CHECK(m_optsvc.retrieve());
+ m_optsvc->set( this->name() + ".TYPE" , "NONE" );
+
+
if (m_sourceType == "FILE") {
ATH_MSG_INFO("Reading joboptions from " << m_sourcePath.value());
ATH_CHECK(readOptions(m_sourcePath));
@@ -94,6 +100,7 @@ StatusCode TrigConf::JobOptionsSvc::readOptions(const std::string& file, const s
for (const auto& [client, props] : json["properties"].items()) {
for (const auto& [name, value] : props.items()) {
ATH_CHECK(addPropertyToCatalogue(client, Gaudi::Property<std::string>(name, value.get<std::string>())));
+ // set(client + "." + name, value.get<std::string>());
}
}
@@ -114,6 +121,7 @@ StatusCode TrigConf::JobOptionsSvc::readOptionsDB(const std::string& db_server,
for( const auto & property : client.second ) {
nProps++;
ATH_CHECK(addPropertyToCatalogue(client.first, Gaudi::Property<std::string>(property.first, property.second.data())));
+ // set(client.first + "." + property.first, property.second.data());
}
}
ATH_MSG_INFO("Loaded job options from " << nClients << " clients with " << nProps << " in total");
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.h b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.h
index 7efa1688bdbd6fea573a4bc0a398dc8d03fb8ca0..573b5af122f3e8bee35a73c1b680884fb16645ec 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.h
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.h
@@ -9,6 +9,7 @@
#include <vector>
#include "GaudiKernel/IJobOptionsSvc.h"
+#include "Gaudi/Interfaces/IOptionsSvc.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaBaseComps/AthService.h"
@@ -30,7 +31,7 @@ namespace TrigConf {
* - `DB`: Read properties from DB, connection string in `PATH`, see \ref parseDBString
*
*/
- class JobOptionsSvc : public extends<AthService, TrigConf::IJobOptionsSvc, ::IJobOptionsSvc> {
+ class JobOptionsSvc : public extends<AthService, TrigConf::IJobOptionsSvc, ::IJobOptionsSvc, Gaudi::Interfaces::IOptionsSvc> {
using AthService::getProperties;
public:
@@ -39,6 +40,44 @@ namespace TrigConf {
virtual StatusCode initialize() override;
virtual StatusCode start() override;
+ /// @name IOptionsSvc interface
+ ///@{
+ virtual void set( const std::string& key, const std::string& value ) {
+ return m_optsvc->set(key,value);
+ }
+
+ virtual std::string get( const std::string& key, const std::string& default_ = {} ) const {
+ return m_optsvc->get(key,default_);
+ }
+
+ virtual std::string pop( const std::string& key, const std::string& default_ = {} ) {
+ return m_optsvc->pop(key,default_);
+ }
+
+ virtual bool has( const std::string& key ) const {
+ return m_optsvc->has(key);
+ }
+
+ virtual bool isSet( const std::string& key ) const {
+ return m_optsvc->isSet(key);
+ }
+
+ virtual std::vector<std::tuple<std::string, std::string>> items() const {
+ return m_optsvc->items();
+ }
+
+ virtual void bind( const std::string& prefix, Gaudi::Details::PropertyBase* property ) {
+ return m_optsvc->bind(prefix,property);
+ }
+
+ // using OnlyDefaults = Gaudi::tagged_bool<class OnlyDefaults_tag>;
+ using OnlyDefaults = Gaudi::Interfaces::IOptionsSvc::OnlyDefaults;
+ virtual void broadcast( const std::regex& filter, const std::string& value,
+ OnlyDefaults defaults = OnlyDefaults{true} ) {
+ return m_optsvc->broadcast(filter, value, defaults);
+ }
+ ///@}
+
/// @name IJobOptionsSvc interface
/// Most interfaces are just forwards to the "real" JobOptionsSvc.
///@{
@@ -102,6 +141,7 @@ namespace TrigConf {
/// handle to the "real" IJobOptionsSvc
ServiceHandle<::IJobOptionsSvc> m_josvc;
+ ServiceHandle<Gaudi::Interfaces::IOptionsSvc> m_optsvc;
};
} // namespace TrigConf
diff --git a/Trigger/TrigEvent/TrigInDetEventTPCnv/share/TrigInDetEventTPCnv_test.txt b/Trigger/TrigEvent/TrigInDetEventTPCnv/share/TrigInDetEventTPCnv_test.txt
index 7b6025a7cbdc4c4a933d9f56208cc72db38a7ca1..584034897969d1428e564ba6038b678203d11ab7 100644
--- a/Trigger/TrigEvent/TrigInDetEventTPCnv/share/TrigInDetEventTPCnv_test.txt
+++ b/Trigger/TrigEvent/TrigInDetEventTPCnv/share/TrigInDetEventTPCnv_test.txt
@@ -1,3 +1,3 @@
-ApplicationMgr.DLLs += { "StoreGate", "CLIDComps" };
+ApplicationMgr.Dlls += { "StoreGate", "CLIDComps" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore" };
#include "IOVSvc/IOVSvc.txt"
diff --git a/Trigger/TrigEvent/TrigInDetEventTPCnv/share/TrigInDetTrackCnv_p4_test.ref b/Trigger/TrigEvent/TrigInDetEventTPCnv/share/TrigInDetTrackCnv_p4_test.ref
index 5429700f587433b203db01f2ba16223850eb2976..c7673adce557606c139394f95cd4b6c6fd867f17 100644
--- a/Trigger/TrigEvent/TrigInDetEventTPCnv/share/TrigInDetTrackCnv_p4_test.ref
+++ b/Trigger/TrigEvent/TrigInDetEventTPCnv/share/TrigInDetTrackCnv_p4_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/TrigInDetEventTPCnv_test.txt
JobOptionsSvc INFO # =======> /home/sss/nobackup/atlas/build/../tests/../share/TrigInDetEventTPCnv_test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "CLIDComps"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "CLIDComps"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore"]
JobOptionsSvc INFO Job options successfully read in from ../share/TrigInDetEventTPCnv_test.txt
ApplicationMgr SUCCESS
diff --git a/Trigger/TrigEvent/TrigNavigation/share/HLTNavigation_test.ref b/Trigger/TrigEvent/TrigNavigation/share/HLTNavigation_test.ref
index bad65b3669dce893ce7cccb3c370eca7abb71c2a..7bbf00b0f23152138cfe6ddd7f24ae4501953ee0 100644
--- a/Trigger/TrigEvent/TrigNavigation/share/HLTNavigation_test.ref
+++ b/Trigger/TrigEvent/TrigNavigation/share/HLTNavigation_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/test.txt
JobOptionsSvc INFO # =======> /home/sss/atlas/dvtest/build/../tests/../share/test.txt
-JobOptionsSvc INFO # (2,1): ApplicationMgr.DLLs += ["StoreGate", "TrigNavigation", "TrigSerializeCnvSvc"]
+JobOptionsSvc INFO # (2,1): ApplicationMgr.Dlls += ["StoreGate", "TrigNavigation", "TrigSerializeCnvSvc"]
JobOptionsSvc INFO # (3,1): ApplicationMgr.ExtSvc += ["ClassIDSvc"]
JobOptionsSvc INFO # (4,1): ApplicationMgr.ExtSvc += ["TrigSerializeCnvSvc"]
JobOptionsSvc INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore"]
diff --git a/Trigger/TrigEvent/TrigNavigation/share/Holder_test.ref b/Trigger/TrigEvent/TrigNavigation/share/Holder_test.ref
index 6a23db15f20ae102c068aa217ffa4e5eaa0ff8a2..8d884ebc690ee175feb2cefe9520d68e86745855 100644
--- a/Trigger/TrigEvent/TrigNavigation/share/Holder_test.ref
+++ b/Trigger/TrigEvent/TrigNavigation/share/Holder_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/Trigger/TrigEvent/TrigNavigation/share/../share/test.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.DLLs += ["StoreGate", "TrigNavigation", "TrigSerializeCnvSvc"]
+JobOptionsSvc INFO # (1,1): ApplicationMgr.Dlls += ["StoreGate", "TrigNavigation", "TrigSerializeCnvSvc"]
JobOptionsSvc INFO # (2,1): ApplicationMgr.ExtSvc += ["ClassIDSvc"]
JobOptionsSvc INFO # (3,1): ApplicationMgr.ExtSvc += ["TrigSerializeCnvSvc"]
JobOptionsSvc INFO # (4,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore"]
diff --git a/Trigger/TrigEvent/TrigNavigation/share/Ownership_test.ref b/Trigger/TrigEvent/TrigNavigation/share/Ownership_test.ref
index f254588f4a98a2bb4874d4eb96328dc7e4139b70..982e4f5ac69bcdb2360513e331fabd38b2112562 100644
--- a/Trigger/TrigEvent/TrigNavigation/share/Ownership_test.ref
+++ b/Trigger/TrigEvent/TrigNavigation/share/Ownership_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/test.txt
JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/Trigger/TrigEvent/TrigNavigation/share/../share/test.txt
-JobOptionsSvc INFO # (2,1): ApplicationMgr.DLLs += ["StoreGate", "TrigNavigation", "TrigSerializeCnvSvc"]
+JobOptionsSvc INFO # (2,1): ApplicationMgr.Dlls += ["StoreGate", "TrigNavigation", "TrigSerializeCnvSvc"]
JobOptionsSvc INFO # (3,1): ApplicationMgr.ExtSvc += ["ClassIDSvc"]
JobOptionsSvc INFO # (4,1): ApplicationMgr.ExtSvc += ["TrigSerializeCnvSvc"]
JobOptionsSvc INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore"]
diff --git a/Trigger/TrigEvent/TrigNavigation/share/Registration_test.ref b/Trigger/TrigEvent/TrigNavigation/share/Registration_test.ref
index 7772b5171b3258801bd354f307a2f622c57faa1e..825c1e153e837b35fe76efda515705029ced50b1 100644
--- a/Trigger/TrigEvent/TrigNavigation/share/Registration_test.ref
+++ b/Trigger/TrigEvent/TrigNavigation/share/Registration_test.ref
@@ -2,7 +2,7 @@
Initializing Gaudi ApplicationMgr using job opts ../share/test.txt
JobOptionsSvc INFO # =======> /home/sss/atlas/dvtest/build/../tests/../share/test.txt
-JobOptionsSvc INFO # (2,1): ApplicationMgr.DLLs += ["StoreGate", "TrigNavigation", "TrigSerializeCnvSvc"]
+JobOptionsSvc INFO # (2,1): ApplicationMgr.Dlls += ["StoreGate", "TrigNavigation", "TrigSerializeCnvSvc"]
JobOptionsSvc INFO # (3,1): ApplicationMgr.ExtSvc += ["ClassIDSvc"]
JobOptionsSvc INFO # (4,1): ApplicationMgr.ExtSvc += ["TrigSerializeCnvSvc"]
JobOptionsSvc INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore"]
diff --git a/Trigger/TrigEvent/TrigNavigation/share/RoICache_test.ref b/Trigger/TrigEvent/TrigNavigation/share/RoICache_test.ref
index e00b55642409751f1806fa37a7622442232023f5..aaeb356cb88758934b192cc219ac653ae07f5b82 100644
--- a/Trigger/TrigEvent/TrigNavigation/share/RoICache_test.ref
+++ b/Trigger/TrigEvent/TrigNavigation/share/RoICache_test.ref
@@ -4,7 +4,7 @@ RoICache_test INFO LINE:82 Start of the test: RoIcaching test
Initializing Gaudi ApplicationMgr using job opts ../share/test2.txt
JobOptionsSvc INFO # =======> /home/sss/atlas/dvtest/build/../tests/../share/test2.txt
-JobOptionsSvc INFO # (2,1): ApplicationMgr.DLLs += ["StoreGate", "TrigNavigation", "TrigSerializeCnvSvc"]
+JobOptionsSvc INFO # (2,1): ApplicationMgr.Dlls += ["StoreGate", "TrigNavigation", "TrigSerializeCnvSvc"]
JobOptionsSvc INFO # (3,1): ApplicationMgr.ExtSvc += ["ClassIDSvc"]
JobOptionsSvc INFO # (4,1): ApplicationMgr.ExtSvc += ["TrigSerializeCnvSvc"]
JobOptionsSvc INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore"]
diff --git a/Trigger/TrigEvent/TrigNavigation/share/test.txt b/Trigger/TrigEvent/TrigNavigation/share/test.txt
index cca4873dc002b5b8d3cb93c05a004e5080d8584f..8116816c7ddd94b95b91a3065c22230f9c3042c6 100644
--- a/Trigger/TrigEvent/TrigNavigation/share/test.txt
+++ b/Trigger/TrigEvent/TrigNavigation/share/test.txt
@@ -1,4 +1,4 @@
-ApplicationMgr.DLLs += { "StoreGate", "TrigNavigation", "TrigSerializeCnvSvc" };
+ApplicationMgr.Dlls += { "StoreGate", "TrigNavigation", "TrigSerializeCnvSvc" };
ApplicationMgr.ExtSvc += { "ClassIDSvc" };
ApplicationMgr.ExtSvc += { "TrigSerializeCnvSvc" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore" };
@@ -14,7 +14,7 @@ MessageSvc.useColors = false;
//YourFolder.ItemList = {"8101", "8107#", "Baricco#*"};
//#include "IOVSvc/IOVSvc.txt"
-//ApplicationMgr.DLLs += { "IOVSvc" };
+//ApplicationMgr.Dlls += { "IOVSvc" };
//ApplicationMgr.ExtSvc += { "IOVSvc" };
@@ -22,7 +22,7 @@ MessageSvc.useColors = false;
//
//Navigation.ReferenceAllClasses = 1
-//ApplicationMgr.DLLs += { "TrigCaloEvent" };
+//ApplicationMgr.Dlls += { "TrigCaloEvent" };
ToolSvc.Navigation.ReferenceAllClasses = 1;
ToolSvc.Navigation.ClassesToPreregister = {"TestA#EverEmptyButPresent", "TestA#AgainPresentButEmpty", "TestA#","TrigNavTest::TestBContainer#BContainer1", "TrigNavTest::TestBContainer#BContainer2", "TestDContainer#DContainer1"};
//ToolSvc.Navigation.AuxClasses = {"TestAuxA#EverEmptyButPresent", "TrigNavTest::TestAuxB#BContainer2"};
diff --git a/Trigger/TrigEvent/TrigNavigation/share/test2.txt b/Trigger/TrigEvent/TrigNavigation/share/test2.txt
index 4133eb8d68376acf8f9b27d44b34097688095004..9ba1ed5d31b46b9910f3b530df12b2fe921eea52 100755
--- a/Trigger/TrigEvent/TrigNavigation/share/test2.txt
+++ b/Trigger/TrigEvent/TrigNavigation/share/test2.txt
@@ -1,4 +1,4 @@
-ApplicationMgr.DLLs += { "StoreGate", "TrigNavigation", "TrigSerializeCnvSvc" };
+ApplicationMgr.Dlls += { "StoreGate", "TrigNavigation", "TrigSerializeCnvSvc" };
ApplicationMgr.ExtSvc += { "ClassIDSvc" };
ApplicationMgr.ExtSvc += { "TrigSerializeCnvSvc" };
ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore" };
@@ -14,7 +14,7 @@ MessageSvc.useColors = false;
//YourFolder.ItemList = {"8101", "8107#", "Baricco#*"};
//#include "IOVSvc/IOVSvc.txt"
-//ApplicationMgr.DLLs += { "IOVSvc" };
+//ApplicationMgr.Dlls += { "IOVSvc" };
//ApplicationMgr.ExtSvc += { "IOVSvc" };
@@ -22,7 +22,7 @@ MessageSvc.useColors = false;
//
//Navigation.ReferenceAllClasses = 1
-//ApplicationMgr.DLLs += { "TrigCaloEvent" };
+//ApplicationMgr.Dlls += { "TrigCaloEvent" };
ToolSvc.Navigation.ReferenceAllClasses = 1;
//ToolSvc.Navigation.ClassesToPreregister =
//{"TestA#EverEmptyButPresent", "TestA#AgainPresentButEmpty",
diff --git a/Trigger/TrigT1/TrigT1RPClogic/README b/Trigger/TrigT1/TrigT1RPClogic/README
index 3bb0acdac985eeae892f9fcf7c34f6861c672b15..597e49d4cfaf1b280191660cbaae9085b5790f5d 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/README
+++ b/Trigger/TrigT1/TrigT1RPClogic/README
@@ -70,7 +70,7 @@ Use and configuration in ATHENA:
* Load and use the required DLL module with the following command lines:
- ApplicationMgr.DLLs += { "TrigT1RPClogic" };
+ ApplicationMgr.Dlls += { "TrigT1RPClogic" };
* The logic package needs the TrigT1RPChardware package to be built.
diff --git a/Trigger/TrigT1/TrigT1RPCsteering/README b/Trigger/TrigT1/TrigT1RPCsteering/README
index 28e03accfe4fd917f6a4ebc648919a1b68ff674a..5f055c69579231f6d35c5ddd6d84c8635105f1c7 100755
--- a/Trigger/TrigT1/TrigT1RPCsteering/README
+++ b/Trigger/TrigT1/TrigT1RPCsteering/README
@@ -15,7 +15,7 @@ Use and configuration in ATHENA:
* Load and use the required DLL module with the following command lines:
- ApplicationMgr.DLLs += { "TrigT1RPCsteering" };
+ ApplicationMgr.Dlls += { "TrigT1RPCsteering" };
ApplicationMgr.TopAlg = { "TrigT1RPC" };
* The steering needs all the other packages inside the branch TrigT1RPC.
diff --git a/Trigger/TrigT1/TrigT1RPCsteering/share/LVL1RpcRunJobOptions.py b/Trigger/TrigT1/TrigT1RPCsteering/share/LVL1RpcRunJobOptions.py
index e7e91f7ef7ae894a092a7a0f06f09ef9e33169ac..ec9a76b88e678d1d2b2f23c747bbf6c9a035a0a2 100755
--- a/Trigger/TrigT1/TrigT1RPCsteering/share/LVL1RpcRunJobOptions.py
+++ b/Trigger/TrigT1/TrigT1RPCsteering/share/LVL1RpcRunJobOptions.py
@@ -73,7 +73,7 @@ else:
# Configure the job to access G3 data
#-----------------------------------------------------------
include ("AthenaCommon/Atlas_ZebraTDR.UnixStandardJob.py")
- theApp.DLLs += [ "MuonZebraCnvTest", "MuonDigitZebraCnv" ]
+ theApp.Dlls += [ "MuonZebraCnvTest", "MuonDigitZebraCnv" ]
#-----------------------------------------------------------
@@ -92,7 +92,7 @@ else:
DetDescrCnvSvc.MuonIDFileName = "IdDictMuonSpectrometer_P.03.xml"
# Genzkine->HepMc converter
- theApp.DLLs += [ "GenzModule" ]
+ theApp.Dlls += [ "GenzModule" ]
theApp.TopAlg += [ "GenzModule" ]
@@ -103,9 +103,9 @@ include ("AmdcAth/AmdcAth_jobOptions.py")
# Configure the LVL1 RPC simulation
-theApp.DLLs += [ "RPCgeometry" ]
-theApp.DLLs += [ "RPCcabling" ]
-theApp.DLLs += [ "TrigT1RPCsteering" ]
+theApp.Dlls += [ "RPCgeometry" ]
+theApp.Dlls += [ "RPCcabling" ]
+theApp.Dlls += [ "TrigT1RPCsteering" ]
theApp.ExtSvc += [ "RPCgeometrySvc" ]
theApp.ExtSvc += [ "RPCcablingSvc" ]
diff --git a/Trigger/TrigTools/TrigTimeAlgs/share/test.txt b/Trigger/TrigTools/TrigTimeAlgs/share/test.txt
index bc44ffabc9cbaf06c4f081145d801f90cf84f137..4f319d2b552c2596e463ccf259873aeae006e8ef 100755
--- a/Trigger/TrigTools/TrigTimeAlgs/share/test.txt
+++ b/Trigger/TrigTools/TrigTimeAlgs/share/test.txt
@@ -1,4 +1,4 @@
-ApplicationMgr.DLLs += { "TrigTimeAlgs" };
+ApplicationMgr.Dlls += { "TrigTimeAlgs" };
//ApplicationMgr.ExtSvc += { "ClassIDSvc" };
//ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore" };
//ApplicationMgr.ExtSvc += { "ActiveStoreSvc" };