diff --git a/Reconstruction/RecJobTransforms/share/skeleton.ESDtoAOD_tf.py b/Reconstruction/RecJobTransforms/share/skeleton.ESDtoAOD_tf.py index b31ce24acd7b3ccd7142d9b9061cf437ae8df1ea..b44a0dc10e79868bc3b959225fd3ef4e3b61dac5 100644 --- a/Reconstruction/RecJobTransforms/share/skeleton.ESDtoAOD_tf.py +++ b/Reconstruction/RecJobTransforms/share/skeleton.ESDtoAOD_tf.py @@ -154,9 +154,9 @@ if hasattr(runArgs,"outputDESDM_BEAMSPOTFile"): include("InDetBeamSpotFinder/DESDM_BEAMSPOTFragment.py") #========================================================== -# Use LZIB for compression of temporary outputs of AthenaMP +# Use ZLIB for compression of all temporary outputs #========================================================== -if hasattr(runArgs, "outputAODFile") and '_000' in runArgs.outputAODFile: +if hasattr(runArgs, "outputAODFile") and ('_000' in runArgs.outputAODFile or 'tmp.' in runArgs.outputAODFile): ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolAODOutput()+ "'; COMPRESSION_ALGORITHM = '1'" ] ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolAODOutput()+ "'; COMPRESSION_LEVEL = '1'" ] diff --git a/Reconstruction/RecJobTransforms/share/skeleton.RAWtoALL_tf.py b/Reconstruction/RecJobTransforms/share/skeleton.RAWtoALL_tf.py index 2cf64f9b22e42ad4ad70678bb72a7d4d5982521b..ccf0cbd7d94adf16801b90dafefa34c60aae0d2c 100644 --- a/Reconstruction/RecJobTransforms/share/skeleton.RAWtoALL_tf.py +++ b/Reconstruction/RecJobTransforms/share/skeleton.RAWtoALL_tf.py @@ -146,13 +146,13 @@ if hasattr(runArgs,"inputRDO_TRIGFile") and rec.doFileMetaData(): svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.TriggerMenuMetaDataTool ] #========================================================== -# Use LZIB for compression of temporary outputs of AthenaMP +# Use ZLIB for compression of all temporary outputs #========================================================== -if hasattr(runArgs, "outputESDFile") and '_000' in runArgs.outputESDFile: +if hasattr(runArgs, "outputESDFile") and ('_000' in runArgs.outputESDFile or 'tmp.' in runArgs.outputESDFile): ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolESDOutput()+ "'; COMPRESSION_ALGORITHM = '1'" ] ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolESDOutput()+ "'; COMPRESSION_LEVEL = '1'" ] -if hasattr(runArgs, "outputAODFile") and '_000' in runArgs.outputAODFile: +if hasattr(runArgs, "outputAODFile") and ('_000' in runArgs.outputAODFile or 'tmp.' in runArgs.outputAODFile): ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolAODOutput()+ "'; COMPRESSION_ALGORITHM = '1'" ] ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolAODOutput()+ "'; COMPRESSION_LEVEL = '1'" ] diff --git a/Reconstruction/RecJobTransforms/share/skeleton.RAWtoESD_tf.py b/Reconstruction/RecJobTransforms/share/skeleton.RAWtoESD_tf.py index 5353261f7e73613e93e3a5cdb2b38f7ee399d416..62236d0468778075c2ef45b5ab401bf3a2f71e31 100644 --- a/Reconstruction/RecJobTransforms/share/skeleton.RAWtoESD_tf.py +++ b/Reconstruction/RecJobTransforms/share/skeleton.RAWtoESD_tf.py @@ -207,9 +207,9 @@ if hasattr(runArgs,"inputRDO_TRIGFile") and rec.doFileMetaData(): svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.TriggerMenuMetaDataTool ] #========================================================== -# Use LZIB for compression of temporary outputs of AthenaMP +# Use ZLIB for compression of all temporary outputs #========================================================== -if hasattr(runArgs, "outputESDFile") and '_000' in runArgs.outputESDFile: +if hasattr(runArgs, "outputESDFile") and ('_000' in runArgs.outputESDFile or 'tmp.' in runArgs.outputESDFile): ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolESDOutput()+ "'; COMPRESSION_ALGORITHM = '1'" ] ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolESDOutput()+ "'; COMPRESSION_LEVEL = '1'" ] diff --git a/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py b/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py index 1bf94188e53084c4a4143b2fb4c8766546e102c8..5fd42e4bc53bcff86931840b1dab4a65551a7dc1 100644 --- a/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py +++ b/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py @@ -421,10 +421,10 @@ if hasattr(runArgs,"AMITag"): svcMgr.TagInfoMgr.ExtraTagValuePairs.update({"AMITag": runArgs.AMITag}) #========================================================== -# Use LZIB for compression of temporary outputs of AthenaMP +# Use ZLIB for compression of all temporary outputs #========================================================== from AthenaCommon.AppMgr import ServiceMgr as svcMgr; import AthenaPoolCnvSvc.AthenaPool -if hasattr(runArgs, "outputRDOFile") and '_000' in runArgs.outputRDOFile: +if hasattr(runArgs, "outputRDOFile") and ('_000' in runArgs.outputRDOFile or 'tmp.' in runArgs.outputRDOFile): svcMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolRDOOutput()+ "'; COMPRESSION_ALGORITHM = '1'" ] svcMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolRDOOutput()+ "'; COMPRESSION_LEVEL = '1'" ]