From 374adfe9d075839bae25014e3d8fe715701dba66 Mon Sep 17 00:00:00 2001
From: Niels Van Eldik <niels.van.eldik@cern.ch>
Date: Fri, 19 Dec 2014 09:08:33 +0100
Subject: [PATCH] add doTrackParticleCellAssociation (RecExConfig-00-03-47)
* add doTrackParticleCellAssociation
* turn off MuonSpShower
* tag RecExConfig-00-03-47
2014-12-04 Jovan Mitrevski <Jovan.Mitrevski@cern.ch>
* change doContainerRemapping flag default to true
* tag RecExConfig-00-03-46
2014-11-26 Jovan Mitrevski <Jovan.Mitrevski@cern.ch>
* change doContainerRemapping flag default to false (temporarily)
* tag RecExConfig-00-03-45
2014-11-25 Karsten Koeneke
* python/RecoFunctions.py: prepare for cutflow bundle
* tag RecExConfig-00-03-44
2014-11-24 Jovan Mitrevski <Jovan.Mitrevski@cern.ch>
* add doContainerRemapping flag, default true (for now)
* tag RecExConfig-00-03-43
...
(Long ChangeLog diff - truncated)
---
.../RecExConfig/python/RecAlgsFlags.py | 10 +++++--
.../RecExample/RecExConfig/python/RecFlags.py | 9 +++++-
.../RecExConfig/python/RecoFunctions.py | 30 ++++++-------------
3 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/Reconstruction/RecExample/RecExConfig/python/RecAlgsFlags.py b/Reconstruction/RecExample/RecExConfig/python/RecAlgsFlags.py
index 825bb556781..720352aba5d 100755
--- a/Reconstruction/RecExample/RecExConfig/python/RecAlgsFlags.py
+++ b/Reconstruction/RecExample/RecExConfig/python/RecAlgsFlags.py
@@ -64,7 +64,7 @@ class doMuonSpShower(JobProperty):
""" Switch for MuonSpShower (muon identification in jets)"""
statusOn=True
allowedTypes=['bool']
- StoredValue=True
+ StoredValue=False
class doCaloTrkMuId(JobProperty):
""" Switch for CaloTrkMuid (muon identification in calorimeter with tracks)"""
statusOn=True
@@ -117,6 +117,12 @@ class doMonteCarloReact(JobProperty):
allowedTypes=['bool']
StoredValue=False
+class doTrackParticleCellAssociation(JobProperty):
+ """ Switch for TrackParticle cell association """
+ statusOn=True
+ allowedTypes=['bool']
+ StoredValue=True
+
# Defines a sub-container for the algorithm switches
class RecAlgs(JobPropertyContainer):
""" Algorithm switches. """
@@ -133,7 +139,7 @@ _list_Rec=[doTrackRecordFilter,\
doTrigger,\
doMuonIDStandAlone,doMuonIDCombined,doMuidLowPt,doMuGirl,\
doStaco,doMuTag,doTileMuID,doMuonSpShower,doCaloTrkMuId,
- doAtlfast,doMonteCarloReact ]
+ doAtlfast,doMonteCarloReact,doTrackParticleCellAssociation ]
for j in _list_Rec:
recAlgs.add_JobProperty(j)
del _list_Rec
diff --git a/Reconstruction/RecExample/RecExConfig/python/RecFlags.py b/Reconstruction/RecExample/RecExConfig/python/RecFlags.py
index 5a52e5d5378..ae1a700f8c8 100755
--- a/Reconstruction/RecExample/RecExConfig/python/RecFlags.py
+++ b/Reconstruction/RecExample/RecExConfig/python/RecFlags.py
@@ -924,6 +924,13 @@ class doWriteCalibHits(JobProperty):
"""
statusOn=True
allowedTypes=['bool']
+ StoredValue=False
+
+class doContainerRemapping(JobProperty):
+ """ Enable container name remapping
+ """
+ statusOn=True
+ allowedTypes=['bool']
StoredValue=True
@@ -957,7 +964,7 @@ doWriteAOD, doWritexAOD, doWriteESD, doWriteBS, doWriteRDO, doWriteTAG, doWriteT
readESD, doDetStatus, AMITag, AutoConfiguration, RunNumber, triggerStream, projectName, \
doInDet,doLArg,doTile,doCalo,doMuon,doForwardDet,doLucid,doZdc,doAlfa,doAFP,doFwdRegion,doJetMissingETTag,doEgamma,doMuonCombined,doTau,doTrigger,doBTagging, Production, doPhysValMonHists, \
doHeavyIon, doHIP, doLowPt, doMinimalRec, noESDTrigger,doFileMetaData,ScopingLevel, Commissioning, oldRecExCommissionConfig, mergingStreamName, LCGCMTVersion, \
-AtlasReleaseVersion, inputFileFromAthenaVersion, doApplyAODFix, doAODSelect, doRDOTrigger, doFastPhysMonitoring, RootFastPhysMonOutput,doWriteCalibHits, doTriggerFilter, triggerFilterList ]
+AtlasReleaseVersion, inputFileFromAthenaVersion, doApplyAODFix, doAODSelect, doRDOTrigger, doFastPhysMonitoring, RootFastPhysMonOutput,doWriteCalibHits, doTriggerFilter, triggerFilterList, doContainerRemapping ]
for j in _list_Rec:
jobproperties.Rec.add_JobProperty(j)
del _list_Rec
diff --git a/Reconstruction/RecExample/RecExConfig/python/RecoFunctions.py b/Reconstruction/RecExample/RecExConfig/python/RecoFunctions.py
index de433f8ca3c..162029a5bec 100644
--- a/Reconstruction/RecExample/RecExConfig/python/RecoFunctions.py
+++ b/Reconstruction/RecExample/RecExConfig/python/RecoFunctions.py
@@ -25,7 +25,7 @@ def RunInnerDetectorOnly():
def ListOfTupleToDic(lst):
if lst is None:
return {}
-
+
import collections as _c
dic= _c.defaultdict(list)
@@ -41,13 +41,13 @@ def InputFileNames():
return athenaCommonFlags.FilesInput()
from RecExConfig.RecFlags import rec
inFiles=None
-
+
## FIXME
## if (not athenaCommonFlags.PoolTAGInput.isDefault() or rec.readTAG() ):
## inFiles=athenaCommonFlags.PoolTAGInput()
## elif (not athenaCommonFlags.PoolAODInput.isDefault() or rec.readAOD() ):
## inFiles=athenaCommonFlags.PoolAODInput()
-## elif (not athenaCommonFlags.PoolESDInput.isDefault() or rec.readESD() ):
+## elif (not athenaCommonFlags.PoolESDInput.isDefault() or rec.readESD() ):
## inFiles=athenaCommonFlags.PoolESDInput()
## elif not athenaCommonFlags.BSRDOInput.isDefault():
## inFiles=athenaCommonFlags.BSRDOInput()
@@ -69,7 +69,7 @@ def InputFileNames():
inFiles=athenaCommonFlags.PoolRDOInput()
else:
raise RuntimeError("Unable to determine input file")
-
+
return inFiles
@@ -85,17 +85,17 @@ def OutputFileName(suffix=""):
OutFileName="rdo"
elif rec.readESD():
OutFileName="esd"
- elif rec.readAOD():
+ elif rec.readAOD():
OutFileName="aod"
else:
OutFileName="in"
-
+
OutFileName=OutFileName+"to"
if rec.doWriteBS():
OutFileName=OutFileName+"bs"
elif rec.doWriteRDO():
OutFileName=OutFileName+"rdo"
-
+
if rec.doESD():
OutFileName=OutFileName+"esd"
if rec.doAOD():
@@ -104,7 +104,7 @@ def OutputFileName(suffix=""):
OutFileName=OutFileName+"dpd"
if rec.doWriteTAG():
OutFileName=OutFileName+"tag"
-
+
if suffix!="":
OutFileName=OutFileName+"_"+suffix
print "Generated OutFileName",OutFileName
@@ -151,7 +151,7 @@ def AddValidItemToList(item,aList):
aList += [item]
else:
raise TypeError("RecoFunctions.AddValidItemToList() does not support item of type %s"%type(item))
- return
+ return
def RemoveValidItemFromList(item,aList):
#Recursive loop if item is a list
@@ -175,15 +175,3 @@ def ItemInListStartsWith(item_starts, aList):
if item.startswith(item_starts):
found = True
return found
-
-##--------------------
-def GetSkimCycle( inputFileSummary ):
- cycle=-1
- try:
- metaDataItemList=inputFileSummary['metadata_itemsList']
- for item in metaDataItemList:
- if item.startswith("EventBookkeeperCollection#cycle"):
- cycle=int(item.lstrip("EventBookkeeperCollection#cycle"))
- except:
- print "WARNING Unable to determine skim cycle from metadata_itemList."
- return cycle
--
GitLab