Commit 22cb7ce2 authored by James Catmore's avatar James Catmore Committed by Graeme Stewart
Browse files

Removing ELReset from DFMaster (DerivationFrameworkCore-00-03-56-01)

	* BRANCHING AT DerivationFrameworkCore-00-03-56
	* Providing a branch free of ELReset, for 20.20
	* Tagged as DerivationFrameworkCore-00-03-56-01

2016-09-21 James Catmore <james.catmore@cern.ch>

	* Adding EXOT20
	* Tagged as DerivationFrameworkCore-00-03-56

2016-09-15 Jake Searcy <jsearcy@umich.edu>
	* Add Extra MissingET Trigger Container
	* Tagged as DerivationFrameworkCore-00-03-55

2016-09-13 James Catmore <james.catmore@cern.ch>

	* Adding EXOT19
	* Tagged as DerivationFrameworkCore-00-03-54

2016-09-07 Jake Searcy <jsearcy@umich.edu>
...
(Long ChangeLog diff - truncated)
parent f61b71ae
......@@ -5,7 +5,7 @@ CompulsoryContent = [
"xAOD::EventAuxInfo#*",
"xAOD::TrigDecision#*",
"xAOD::TrigDecisionAuxInfo#*",
"xAOD::TrigConfKeys#*",
"xAOD::EventShape#*",
"xAOD::EventShapeAuxInfo#*"
"xAOD::TrigConfKeys#*"
#"xAOD::EventShape#*",
#"xAOD::EventShapeAuxInfo#*"
]
......@@ -55,7 +55,7 @@ class ContentHandler:
mainOutput.append(mainItem)
if len(components)>1:
# Deal with Aux containers
if (mainItem.split('#')[0]!='xAOD::JetAuxContainer'):
if ((mainItem.split('#')[0]!='xAOD::JetAuxContainer') and (mainItem.split('#')[0]!='xAOD::ShallowAuxContainer') and (mainItem.split('#')[0]!='xAOD::MissingETAuxAssociationMap') ):
# expand to dynamic, not needed for jets as dynamic already
self.expandAuxStore(components[0])
if (components[0]+"." in wholeContentList):
......
......@@ -9,10 +9,6 @@
from AthenaCommon.AppMgr import ToolSvc
from AthenaCommon.AppMgr import theApp
# Output file name handling
from D2PDMaker.D2PDFlags import D2PDFlags
from D2PDMaker.D2PDHelpers import buildFileName
from PrimaryDPDMaker.PrimaryDPDFlags import primDPD
# Derivation names and locations of job options
from DerivationFrameworkCore.DerivationFrameworkProdFlags import derivationFlags
# Multiple stream manager
......@@ -24,9 +20,16 @@ from AthenaCommon.AlgSequence import AlgSequence
from JetRec.JetRecFlags import jetFlags
from AthenaCommon.GlobalFlags import globalflags
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
# AODFix object, for checking whether it ran or not
import os
if "AthAnalysisBase" not in os.environ.get("CMTEXTRATAGS",""):
from AODFix.AODFix import *
# Trap for ROOT6 errors
theApp.CreateSvc += ["AthROOTErrorHandlerSvc"]
# Trigger navigation slimming
#from TrigNavTools.TrigNavToolsConf import HLT__TrigNavigationSlimmingTool, TrigNavigationThinningTool, HLT__StreamTrigNavSlimming
#from TrigNavTools.TrigNavToolsConfig import navigationSlimming
......@@ -40,18 +43,12 @@ DerivationFrameworkJob += AuxStoreWrapperSequence
# Special sequence run after the algsequence
# Being used here to reset ElementLinks
athOutSeq = CfgMgr.AthSequencer("AthOutSeq")
athOutSeq += CfgMgr.xAODMaker__ElementLinkResetAlg( "ELReset" )
###ON HOLD FOR NOW
##use pileupreweighting provider to generate a df.metadata.root prw config file
##only to run if the input file is post-digitization (i.e. dont run this on EVNT)
#from RecExConfig.InputFilePeeker import inputFileSummary
#if 'metadata' in inputFileSummary and '/Digitization/Parameters' in inputFileSummary['metadata']:
# DerivationFrameworkJob += CfgMgr.CP__PileupReweightingProvider(ConfigOutputStream="DFMETADATA")
# if not hasattr(svcMgr,'THistSvc'):
# svcMgr += CfgMgr.THistSvc()
# svcMgr.THistSvc.Output += ["DFMETADATA DATAFILE='df.metadata.root' OPT='RECREATE'"]
# Commenting out for branch at 00-03-56
#if AODFix_willDoAODFix():
#if True: # Temporary replacment for above line, while this function makes it into release 20.7
# athOutSeq = CfgMgr.AthSequencer("AthOutSeq")
# athOutSeq += CfgMgr.xAODMaker__ElementLinkResetAlg( "ELReset" )
from RecExConfig.InputFilePeeker import inputFileSummary
if inputFileSummary is not None:
......@@ -70,11 +67,13 @@ if not hasattr(svcMgr, 'DecisionSvc'):
svcMgr.DecisionSvc.CalcStats = True
# Trigger decision tool
from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
cfg = TriggerConfigGetter('ReadPool')
from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
tdt = Trig__TrigDecisionTool("TrigDecisionTool")
ToolSvc += tdt
# SUPERFLUOUS
#if rec.doTrigger() or TriggerFlags.doTriggerConfigOnly():
# from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
# cfg = TriggerConfigGetter('ReadPool')
# from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
# tdt = Trig__TrigDecisionTool("TrigDecisionTool")
# ToolSvc += tdt
# Centrally setting flags
jetFlags.useTracks = True
......@@ -89,4 +88,6 @@ if globalflags.DataSource()=='geant4':
DerivationFrameworkSimBarcodeOffset = int(inputFileSummary['metadata']['/Simulation/Parameters']['SimBarcodeOffset'])
except:
print 'Could not retrieve SimBarcodeOffset from /Simulation/Parameters, leaving at 200k'
def buildFileName(derivationStream):
return derivationStream.FileName
......@@ -683,6 +683,19 @@ class WriteDAOD_STDM8Stream (JobProperty):
jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_STDM8Stream)
listAODtoDPD.append(WriteDAOD_STDM8Stream.StreamName)
class WriteDAOD_STDM9Stream (JobProperty):
"""STDM Heavy ION Derivation"""
statusOn = True
allowedTypes = ['bool']
StoredValue = False
StreamName = 'StreamDAOD_STDM9'
FileName = ''
isVirtual = False
DPDMakerScript = "DerivationFrameworkSM/STDM9.py"
pass
jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_STDM9Stream)
listAODtoDPD.append(WriteDAOD_STDM9Stream.StreamName)
#################################
......@@ -1180,6 +1193,31 @@ class WriteDAOD_EXOT18Stream(JobProperty):
jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_EXOT18Stream)
listAODtoDPD.append(WriteDAOD_EXOT18Stream.StreamName)
class WriteDAOD_EXOT19Stream(JobProperty):
"""EXOT19 derivation"""
statusOn = True
allowedTypes = ['bool']
StoredValue = False
StreamName = 'StreamDAOD_EXOT19'
FileName = ''
isVirtual = False
DPDMakerScript = "DerivationFrameworkExotics/EXOT19.py"
pass
jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_EXOT19Stream)
listAODtoDPD.append(WriteDAOD_EXOT19Stream.StreamName)
class WriteDAOD_EXOT20Stream(JobProperty):
"""EXOT20 derivation"""
statusOn = True
allowedTypes = ['bool']
StoredValue = False
StreamName = 'StreamDAOD_EXOT20'
FileName = ''
isVirtual = False
DPDMakerScript = "DerivationFrameworkExotics/EXOT20.py"
pass
jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_EXOT20Stream)
listAODtoDPD.append(WriteDAOD_EXOT20Stream.StreamName)
#################################
# Defined by the Jet/MET group
......
......@@ -2,7 +2,9 @@
EtMissTriggerContent = [
"HLT_xAOD__TrigMissingETContainer_TrigEFMissingET",
"HLT_xAOD__TrigMissingETContainer_TrigEFMissingETAux.ex.ey.ez.sumE.sumEt"
"HLT_xAOD__TrigMissingETContainer_TrigEFMissingETAux.ex.ey.ez.sumE.sumEt",
"HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_mht",
"HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_mhtAux.ex.ey.ez.sumE.sumEt"
#"LVL1EnergySumRoI",
#"LVL1EnergySumRoIAux.roiWord0.roiWord1.roiWord2.thrNames.energyX.energyY.energyT"
#"LVL1EnergySumRoI",
......
......@@ -228,8 +228,14 @@ class SlimmingHelper:
if item in theDictionary.keys():
if (theDictionary[item]=='xAOD::JetAuxContainer'):
entry = "xAOD::JetAuxContainer#"+item+"."
elif (theDictionary[item]=='xAOD::ShallowAuxContainer'):
entry = "xAOD::ShallowAuxContainer#"+item+"."
elif ("AuxInfo" in theDictionary[item]):
entry = "xAOD::AuxInfoBase#"+item+"."
elif (theDictionary[item]=='xAOD::MissingETAuxAssociationMap'):
entry = "xAOD::MissingETAuxAssociationMap#"+item+"."
else:
entry = "xAOD::AuxContainerBase#"+item+"."
entry = "xAOD::AuxContainerBase#"+item+"."
for element in auxEntries[item]:
length = len(auxEntries[item])
if (element==(auxEntries[item])[length-1]):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment