diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
index a6d2834afad826a442b88f6d1daab9db8071083d..c9aeb56175e0351aad55a168c9f64db4ab9a9e78 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
@@ -90,8 +90,8 @@ StatusCode AthenaPoolCnvSvc::initialize() {
last = m_maxFileSizes.value().end(); iter != last; iter++) {
if (iter->find('=') != std::string::npos) {
long long maxFileSize = atoll(iter->substr(iter->find('=') + 1).c_str());
- if (maxFileSize > 10000000000LL) {
- ATH_MSG_WARNING("Files larger than 10GB are disallowed by ATLAS policy.");
+ if (maxFileSize > 15000000000LL) {
+ ATH_MSG_WARNING("Files larger than 15GB are disallowed by ATLAS policy.");
ATH_MSG_WARNING("They should only be produced for private use or in special cases.");
}
std::string databaseName = iter->substr(0, iter->find_first_of(" ="));
@@ -99,8 +99,8 @@ StatusCode AthenaPoolCnvSvc::initialize() {
m_databaseMaxFileSize.insert(entry);
} else {
m_domainMaxFileSize = atoll(iter->c_str());
- if (m_domainMaxFileSize > 10000000000LL) {
- ATH_MSG_WARNING("Files larger than 10GB are disallowed by ATLAS policy.");
+ if (m_domainMaxFileSize > 15000000000LL) {
+ ATH_MSG_WARNING("Files larger than 15GB are disallowed by ATLAS policy.");
ATH_MSG_WARNING("They should only be produced for private use or in special cases.");
}
}
@@ -1132,7 +1132,7 @@ AthenaPoolCnvSvc::AthenaPoolCnvSvc(const std::string& name, ISvcLocator* pSvcLoc
m_containerPrefix(),
m_containerNameHint(),
m_branchNameHint(),
- m_domainMaxFileSize(10000000000LL),
+ m_domainMaxFileSize(15000000000LL),
m_doChronoStat(true) {
declareProperty("UseDetailChronoStat", m_useDetailChronoStat = false);
declareProperty("PoolContainerPrefix", m_containerPrefixProp = "ROOTTREE:CollectionTree");
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.combinedinput.py b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.combinedinput.py
index fd4bca4e8261883342d9ba544270e3c1f56f85ef..6d9d752f45bb1098637a1ad507af62b3da23120b 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.combinedinput.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.combinedinput.py
@@ -204,13 +204,6 @@ if jobproperties.Beam.beamType.get_Value() == 'cosmics':
else:
svcMgr.EventSelector.FirstEvent = 0
-
-## Increase max RDO output file size to 10 GB
-## NB. We use 10GB since Athena complains that 15GB files are not supported
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-svcMgr.AthenaPoolCnvSvc.MaxFileSizes = [ "10000000000" ]
-
-
## Post-include
if hasattr(runArgs, "postInclude"):
for fragment in runArgs.postInclude:
diff --git a/Reconstruction/RecExample/RecExCommon/share/RecoUtils.py b/Reconstruction/RecExample/RecExCommon/share/RecoUtils.py
index f431f191563902358f15c2c5fc436a3c9f8ed31f..2aa325ad5f5324faf8b131cf5873e0f239f65064 100644
--- a/Reconstruction/RecExample/RecExCommon/share/RecoUtils.py
+++ b/Reconstruction/RecExample/RecExCommon/share/RecoUtils.py
@@ -150,7 +150,7 @@ if rec.doTimeLimit():
# Output file options
# rather use default athenapool value
if rec.doPersistencyOptimization() and hasattr(svcMgr, 'AthenaPoolCnvSvc'):
- svcMgr.AthenaPoolCnvSvc.MaxFileSizes = [ "12000000000" ]
+ svcMgr.AthenaPoolCnvSvc.CommitInterval = 1000000000
svcMgr.AthenaPoolCnvSvc.PoolAttributes += [ "TREE_BRANCH_OFFSETTAB_LEN ='100'" ]
diff --git a/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_ISF.py b/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_ISF.py
index bb5445379fefa21a54638df304f71fba996d2465..c3c868aa95383f25addc8e434a994b16c4d85c1a 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_ISF.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_ISF.py
@@ -268,12 +268,6 @@ if jobproperties.Beam.beamType.get_Value() == 'cosmics':
else:
svcMgr.EventSelector.FirstEvent = 0
-## Increase max RDO output file size to 10 GB
-## NB. We use 10GB since Athena complains that 15GB files are not supported
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-svcMgr.AthenaPoolCnvSvc.MaxFileSizes = [ "10000000000" ]
-
-
## Post-include
if hasattr(runArgs, "postInclude"):
for fragment in runArgs.postInclude:
diff --git a/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_MC12.py b/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_MC12.py
index af14d358ac2e7c7e3c92f06730c6d257fd234519..5e87c34ed19203a566ade163641e118befc87222 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_MC12.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_MC12.py
@@ -253,12 +253,6 @@ if jobproperties.Beam.beamType.get_Value() == 'cosmics':
else:
svcMgr.EventSelector.FirstEvent = 0
-## Increase max RDO output file size to 10 GB
-## NB. We use 10GB since Athena complains that 15GB files are not supported
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-svcMgr.AthenaPoolCnvSvc.MaxFileSizes = [ "10000000000" ]
-
-
## Post-include
if hasattr(runArgs, "postInclude"):
for fragment in runArgs.postInclude:
diff --git a/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py b/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py
index 234d718e3cd46b4bff93c6a51b956ebe84350121..6ffb33f281b5b2a8448d3e64da3533dadccf6d37 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py
@@ -269,8 +269,6 @@ if not hasattr(ServiceMgr.IOVDbSvc, 'GlobalTag') or not ServiceMgr.IOVDbSvc.Glob
#Stream1.ExtendProvenanceRecord = False
-ServiceMgr.AthenaPoolCnvSvc.MaxFileSizes = [ "10000000000" ] #[ "15000000000" ]
-
#--------------------------------------------------------------
## Post-include
diff --git a/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py b/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py
index 99c927fbe18e85a82bfabab416bbcbd1680596c7..9587e1aa50e1862d5e854b34d81be8925d371391 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py
@@ -465,15 +465,10 @@ if hasattr(runArgs,"AMITag"):
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
svcMgr.TagInfoMgr.ExtraTagValuePairs += ["AMITag", runArgs.AMITag ]
-# Increase max RDO output file size to 10 GB
-
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr; import AthenaPoolCnvSvc.AthenaPool
-svcMgr.AthenaPoolCnvSvc.MaxFileSizes = [ "10000000000" ] #[ "15000000000" ] #Athena complains that 15GB files are not supported
-
-
#==========================================================
# Use LZIB for compression of temporary outputs of AthenaMP
#==========================================================
+from AthenaCommon.AppMgr import ServiceMgr as svcMgr; import AthenaPoolCnvSvc.AthenaPool
if hasattr(runArgs, "outputRDOFile") and '_000' in runArgs.outputRDOFile:
svcMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolRDOOutput()+ "'; COMPRESSION_ALGORITHM = '1'" ]
svcMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolRDOOutput()+ "'; COMPRESSION_LEVEL = '1'" ]
diff --git a/Simulation/SimuJobTransforms/share/skeleton.TestBeam.py b/Simulation/SimuJobTransforms/share/skeleton.TestBeam.py
index b31eb4228c51ddfdd4397b95c3daaa5bd3f577ab..f8b5416e4b6c30c7bfd4d2bf6a2a0f7298141633 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.TestBeam.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.TestBeam.py
@@ -233,13 +233,6 @@ if hasattr(runArgs, 'AMITag'):
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
svcMgr.TagInfoMgr.ExtraTagValuePairs += ["AMITag", runArgs.AMITag]
-
-## Increase max RDO output file size to 10 GB
-## NB. We use 10GB since Athena complains that 15GB files are not supported
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-svcMgr.AthenaPoolCnvSvc.MaxFileSizes = [ "10000000000" ]
-
-
## Post-include
if hasattr(runArgs, "postInclude"):
for fragment in runArgs.postInclude:
diff --git a/Tools/FullChainTransforms/share/FastChainSkeleton.EVGENtoRDO.py b/Tools/FullChainTransforms/share/FastChainSkeleton.EVGENtoRDO.py
index fde12ad917fc9652f1a5bcb27957abf75fc7d78e..2380b4b1faba3d339231e5cf02936290f1d0caf7 100644
--- a/Tools/FullChainTransforms/share/FastChainSkeleton.EVGENtoRDO.py
+++ b/Tools/FullChainTransforms/share/FastChainSkeleton.EVGENtoRDO.py
@@ -979,11 +979,6 @@ if hasattr(runArgs, 'AMITag'):
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
svcMgr.TagInfoMgr.ExtraTagValuePairs += ["AMITag", runArgs.AMITag]
-## Increase max RDO output file size to 10 GB
-## NB. We use 10GB since Athena complains that 15GB files are not supported
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-svcMgr.AthenaPoolCnvSvc.MaxFileSizes = [ "10000000000" ]
-
### Changing to post-sim include/exec
## Post-include
if hasattr(runArgs, "postSimInclude"):
@@ -1381,7 +1376,7 @@ ServiceMgr.EventSelector.SkipEvents = athenaCommonFlags.SkipEvents()
-
+from AthenaCommon.AppMgr import ServiceMgr as svcMgr
if hasattr(runArgs,"AMITag"):
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
svcMgr.TagInfoMgr.ExtraTagValuePairs += ["AMITag", runArgs.AMITag ]
diff --git a/Tools/FullChainTransforms/share/skeleton.EVGENtoRDO.py b/Tools/FullChainTransforms/share/skeleton.EVGENtoRDO.py
index 422b4986599d50f436e4e5c101c385071daaf692..4016b406fde580bddea9f60144efefbe2d239d49 100644
--- a/Tools/FullChainTransforms/share/skeleton.EVGENtoRDO.py
+++ b/Tools/FullChainTransforms/share/skeleton.EVGENtoRDO.py
@@ -226,11 +226,6 @@ if hasattr(runArgs, 'AMITag'):
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
svcMgr.TagInfoMgr.ExtraTagValuePairs += ["AMITag", runArgs.AMITag]
-## Increase max RDO output file size to 10 GB
-## NB. We use 10GB since Athena complains that 15GB files are not supported
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-svcMgr.AthenaPoolCnvSvc.MaxFileSizes = [ "10000000000" ]
-
### Changing to post-sim include/exec
## Post-include
if hasattr(runArgs, "postSimInclude"):
@@ -415,6 +410,7 @@ except:
include ("Digitization/Digitization.py")
+from AthenaCommon.AppMgr import ServiceMgr as svcMgr
if hasattr(runArgs,"AMITag"):
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
svcMgr.TagInfoMgr.ExtraTagValuePairs += ["AMITag", runArgs.AMITag ]