From 2bc7fded5863fa7ef09dbfd6f2a43bf36a6724a1 Mon Sep 17 00:00:00 2001
From: Tomasz Bold <tomasz.bold@gmail.com>
Date: Tue, 16 Oct 2018 12:04:20 +0200
Subject: [PATCH] Drops deprecated flags get/set functions, adds ESD output
related flags
Former-commit-id: eb399ad031eebe4953374cb5687bee48f218d6d4
---
.../python/AllConfigFlags.py | 45 +++++++------------
.../python/AthConfigFlags.py | 11 -----
2 files changed, 16 insertions(+), 40 deletions(-)
diff --git a/Control/AthenaConfiguration/python/AllConfigFlags.py b/Control/AthenaConfiguration/python/AllConfigFlags.py
index af3b04f5ceb..4c00c139cf0 100644
--- a/Control/AthenaConfiguration/python/AllConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AllConfigFlags.py
@@ -8,43 +8,30 @@ from AthenaConfiguration.AutoConfigFlags import GetFileMD
def _createCfgFlags():
acf=AthConfigFlags()
-#Global Flags:
-#They are becoming, please use the specific flags below.
- # acf.addFlag('global.InputFiles',["_ATHENA_GENERIC_INPUTFILE_NAME_",])
- # acf.addFlag('global.isOnline',False)
- # acf.addFlag('global.GeoLayout',"atlas")
- # acf.addFlag('global.ProjectName',lambda prevFlags : GetFileMD(prevFlags.get("global.InputFiles")).get("Project","data17_13TeV"))
- # acf.addFlag('global.isMC',lambda prevFlags : GetFileMD(prevFlags.get("global.InputFiles")).get("isMC",None))
- # acf.addFlag('global.BunchSpacing',25) # Bunch spacing in ns
- # acf.addFlag("global.NumberOfCollisions",0) #"Number of collisions per beam crossing. Should be 2.3*(L/10**33)*(bunchSpacing/25 ns)
- # acf.addFlag("global.BeamType",'collisions') # "Specify data taking type: 'collisions' (default), 'singlebeam','cosmics'")
- # acf.addFlag("global.BeamEnergy",lambda prevFlags : GetFileMD(prevFlags.get("global.InputFiles")).get("BeamEnergy",7*TeV))
- # acf.addFlag("global.estimatedLuminosity",lambda prevFlags : 1E33*(prevFlags.get("global.NumberOfCollisions")/2.3)* \
- # (25./prevFlags.get("global.BunchSpacing")))
- # acf.addFlag("global.RunNumber",lambda prevFlags : list(GetFileMD(prevFlags.get("global.InputFiles")).get("RunNumber",None)))
-
-# Replacement for global flags
-# people please comment here
- acf.addFlag('Input.Files', ["_ATHENA_GENERIC_INPUTFILE_NAME_",] )
- acf.addFlag('Input.isMC', lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("isMC",None))
- acf.addFlag('Input.RunNumber', lambda prevFlags : list(GetFileMD(prevFlags.Input.Files).get("RunNumber",None)))
- acf.addFlag('Input.ProjectName', lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("Project","data17_13TeV") )
+
+ acf.addFlag('Input.Files', ["_ATHENA_GENERIC_INPUTFILE_NAME_",] ) # fromer global.InputFiles
+ acf.addFlag('Input.isMC', lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("isMC",None)) # former global.isMC
+ acf.addFlag('Input.RunNumber', lambda prevFlags : list(GetFileMD(prevFlags.Input.Files).get("RunNumber",None))) # former global.RunNumber
+ acf.addFlag('Input.ProjectName', lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("Project","data17_13TeV") ) # former global.ProjectName
- acf.addFlag('Common.isOnline', False ) # Job runs in an online environment (access only to resources available at P1)
+ acf.addFlag('Common.isOnline', False ) # Job runs in an online environment (access only to resources available at P1) # former global.isOnline
# replace global.Beam*
- acf.addFlag('Beam.BunchSpacing', 25)
- acf.addFlag("Beam.NumberOfCollisions",0)
- acf.addFlag('Beam.Type', 'collisions')
- acf.addFlag('Beam.Energy', lambda prevFlags : GetFileMD(prevFlags.Input.Files).get('BeamEnergy',7*TeV))
+ acf.addFlag('Beam.BunchSpacing', 25) # former global.BunchSpacing
+ acf.addFlag("Beam.NumberOfCollisions",0) # former global.NumberOfCollisions
+ acf.addFlag('Beam.Type', 'collisions') # former global.BeamType
+ acf.addFlag('Beam.Energy', lambda prevFlags : GetFileMD(prevFlags.Input.Files).get('BeamEnergy',7*TeV)) # former global.BeamEnergy
acf.addFlag('Beam.estimatedLuminosity', lambda prevFlags : ( 1E33*(prevFlags.Beam.NumberOfCollisions)/2.3 ) *\
- (25./prevFlags.Beam.BunchSpacing))
-
+ (25./prevFlags.Beam.BunchSpacing)) # former flobal.estimatedLuminosity
+
+
+ acf.addFlag('Output.doESD', False) # produce ESD containers
+ acf.addFlag('Output.writeESD', False) # configure ESD output writing
#Geo Model Flags:
acf.addFlag('GeoModel.Layout', 'atlas') # replaces global.GeoLayout
- acf.addFlag("GeoModel.AtlasVersion", lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("Geometry","ATLAS-R2-2016-01-00-01"))
+ acf.addFlag("GeoModel.AtlasVersion", lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("Geometry","ATLAS-R2-2016-01-00-01")) #
#IOVDbSvc Flags:
diff --git a/Control/AthenaConfiguration/python/AthConfigFlags.py b/Control/AthenaConfiguration/python/AthConfigFlags.py
index a53d85e8259..ba42173268b 100644
--- a/Control/AthenaConfiguration/python/AthConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AthConfigFlags.py
@@ -93,11 +93,6 @@ class AthConfigFlags(object):
def hasFlag(self, name):
return name in self._flagdict
- def set(self,name,value):
- import warnings
- warnings.warn("The flags should be set with programatic syntax: flag."+name, stacklevel=2 )
- self._set(name,value)
-
def _set(self,name,value):
if (self._locked):
raise RuntimeError("Attempt to set a flag of an already-locked container")
@@ -110,12 +105,6 @@ class AthConfigFlags(object):
if len(closestMatch)>0:
errString+=". Did you mean \'%s\'?" % closestMatch[0]
raise KeyError(errString)
-
- def get(self,name):
- import warnings
- warnings.warn("The flags should be red with programatic syntax: flag."+name, stacklevel=2 )
- return self._get(name)
-
def _get(self,name):
try:
--
GitLab