diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODJobProperties.py b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODJobProperties.py
index 75ad92e83fa0affcaaf369192b94046e6c3cc607..09322c86b7e3f1f0497c48e30afa7988149819a3 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODJobProperties.py
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODJobProperties.py
@@ -152,5 +152,12 @@ class TrtJpsiSelection(JobProperty):
StoredValue = False
jobproperties.InDetDxAODJobPropertyContainer.add_JobProperty(TrtJpsiSelection)
+class DRAWZSelection(JobProperty):
+ """Z event selection based on DRAW ZMUMU"""
+ statusOn = True
+ allowedTypes = ["bool"]
+ StoredValue = False
+jobproperties.InDetDxAODJobPropertyContainer.add_JobProperty(DRAWZSelection)
+
InDetDxAODFlags = jobproperties.InDetDxAODJobPropertyContainer
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
index acf2fc04c0f77a2ffe31db0fd239bef6cf81412c..eb33f7899ed2d16af246764a25a16a12c884ae4b 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
@@ -16,6 +16,8 @@ dumpTrtInfo = InDetDxAODFlags.DumpTrtInfo()
TrtZSel = InDetDxAODFlags.TrtZSelection()
TrtJSel = InDetDxAODFlags.TrtJpsiSelection()
+DRAWZSel = InDetDxAODFlags.DRAWZSelection()
+
# Thin hits to store only the ones on-track
thinHitsOnTrack= InDetDxAODFlags.ThinHitsOnTrack()
@@ -67,6 +69,9 @@ if TrtZSel or TrtJSel:
dumpTrtInfo=True
dumpTriggerInfo=True
+if DRAWZSel:
+ dumpTriggerInfo=True
+
## Other settings
# Prefix for decoration, if any
prefixName = ""
@@ -310,6 +315,27 @@ if TrtZSel or TrtJSel:
+DRAW_ZMUMU_SkimmingTool=None
+if DRAWZSel:
+ sel_muon1 = 'Muons.pt > 25*GeV && Muons.ptcone40/Muons.pt < 0.3 && Muons.passesIDCuts && (Muons.quality <= 2)'
+ sel_muon2 = 'Muons.pt > 20*GeV && Muons.ptcone40/Muons.pt < 0.3 && Muons.passesIDCuts && (Muons.quality <= 2)'
+ draw_zmumu = '( count ( DRZmumuMass > 70*GeV && DRZmumuMass < 110*GeV ) >= 1 )'
+ from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__InvariantMassTool
+ DRZmumuMassTool = DerivationFramework__InvariantMassTool(name = "DRZmumuMassTool",
+ ContainerName = "Muons",
+ ObjectRequirements = sel_muon1,
+ SecondObjectRequirements = sel_muon2,
+ MassHypothesis = 105.66,
+ SecondMassHypothesis = 105.66,
+ StoreGateEntryName = "DRZmumuMass")
+ ToolSvc += DRZmumuMassTool
+ from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__xAODStringSkimmingTool
+ DRAW_ZMUMU_SkimmingTool = DerivationFramework__xAODStringSkimmingTool(name = "DRAW_ZMUMU_SkimmingTool",
+ expression = draw_zmumu)
+ ToolSvc += DRAW_ZMUMU_SkimmingTool
+ print DRAW_ZMUMU_SkimmingTool
+
+
#################
### Setup decorators tools
#################
@@ -399,6 +425,10 @@ if TrtZSel:
if TrtJSel:
augmentationTools.append(JPSIeeMassTool, JPSImmMassTool)
+if DRAWZSel:
+ augmentationTools.append(DRZmumuMassTool)
+
+
from AthenaCommon import CfgMgr
# Set up stream auditor
@@ -522,6 +552,10 @@ if TrtZSel:
if TrtJSel:
skimmingTools.append(JPSI_SkimmingTool)
+if DRAWZSel:
+ skimmingTools.append(DRAW_ZMUMU_SkimmingTool)
+
+
#minimumbiasTrig = '(L1_RD0_FILLED)'
#
#if not IsMonteCarlo:
@@ -633,6 +667,53 @@ IDTRKVALIDStream.AddItem("xAOD::ElectronAuxContainer#ElectronsAux.")
IDTRKVALIDStream.AddItem("xAOD::TrackParticleContainer#GSFTrackParticles")
IDTRKVALIDStream.AddItem("xAOD::TrackParticleAuxContainer#GSFTrackParticlesAux."+excludedAuxData)
+if DRAWZSel:
+ IDTRKVALIDStream.AddItem("xAOD::TauJetContainer#TauJets")
+ IDTRKVALIDStream.AddItem("xAOD::TauJetAuxContainer#TauJetsAux.")
+ IDTRKVALIDStream.AddItem("xAOD::JetContainer#AntiKt4EMTopoJets")
+ IDTRKVALIDStream.AddItem("xAOD::JetAuxContainer#AntiKt4EMTopoJetsAux.")
+ IDTRKVALIDStream.AddItem("xAOD::JetContainer#AntiKt4LCTopoJets")
+ IDTRKVALIDStream.AddItem("xAOD::JetAuxContainer#AntiKt4LCTopoJetsAux.")
+ IDTRKVALIDStream.AddItem("xAOD::JetContainer#AntiKt2PV0TrackJets")
+ IDTRKVALIDStream.AddItem("xAOD::JetAuxContainer#AntiKt2PV0TrackJetsAux.")
+ IDTRKVALIDStream.AddItem("xAOD::JetContainer#AntiKt3PV0TrackJets")
+ IDTRKVALIDStream.AddItem("xAOD::JetAuxContainer#AntiKt3PV0TrackJetsAux.")
+ IDTRKVALIDStream.AddItem("xAOD::BTaggingContainer#BTagging_AntiKt4EMTopo")
+ IDTRKVALIDStream.AddItem("xAOD::BTaggingAuxContainer#BTagging_AntiKt4EMTopoAux.")
+ IDTRKVALIDStream.AddItem("xAOD::BTaggingContainer#BTagging_AntiKt4LCTopo")
+ IDTRKVALIDStream.AddItem("xAOD::BTaggingAuxContainer#BTagging_AntiKt4LCTopoAux.")
+ IDTRKVALIDStream.AddItem("xAOD::BTaggingContainer#BTagging_AntiKt2Track")
+ IDTRKVALIDStream.AddItem("xAOD::BTaggingAuxContainer#BTagging_AntiKt2TrackAux.")
+ IDTRKVALIDStream.AddItem("xAOD::BTaggingContainer#BTagging_AntiKt3Track")
+ IDTRKVALIDStream.AddItem("xAOD::BTaggingAuxContainer#BTagging_AntiKt3TrackAux.")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETContainer#MET_Calo")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETAuxContainer#MET_CaloAux.")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETContainer#MET_EMTopo")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETContainer#MET_EMTopoRegions")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETContainer#MET_Core_AntiKt4EMTopo")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETContainer#MET_Reference_AntiKt4EMTopo")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETAuxContainer#MET_EMTopoAux.")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETAuxContainer#MET_EMTopoRegionsAux.")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETAuxContainer#MET_Core_AntiKt4EMTopoAux.")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETAuxContainer#MET_Reference_AntiKt4EMTopoAux.")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETAuxContainer#MET_Core_AntiKt4EMTopoAuxDyn.softConstituents")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETContainer#MET_Track")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETAuxContainer#MET_TrackAux.")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETContainer#MET_LocHadTopo")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETContainer#MET_LocHadTopoRegions")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETAuxContainer#MET_LocHadTopoAux.")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETAuxContainer#MET_LocHadTopoRegionsAux.")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETContainer#MET_Core_AntiKt4LCTopo")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETContainer#MET_Reference_AntiKt4LCTopo")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETAuxContainer#MET_Core_AntiKt4LCTopoAux.")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETAuxContainer#MET_Reference_AntiKt4LCTopoAux.")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETAuxContainer#MET_Core_AntiKt4LCTopoAuxDyn.softConstituents")
+ if dumpTruthInfo:
+ IDTRKVALIDStream.AddItem("xAOD::MissingETContainer#MET_Truth")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETContainer#MET_TruthRegions")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETAuxContainer#MET_TruthAux.")
+ IDTRKVALIDStream.AddItem("xAOD::MissingETAuxContainer#MET_TruthRegionsAux.")
+
# Add truth-related information
if dumpTruthInfo:
IDTRKVALIDStream.AddItem("xAOD::TruthParticleContainer#*")
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/TrackStateOnSurfaceDecorator.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/TrackStateOnSurfaceDecorator.cxx
index 079caacee18ce479122111ddd2d02d46d5b2a627..5d9f6abe3548439d3921b29a28248f2cc6be19f9 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/TrackStateOnSurfaceDecorator.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/TrackStateOnSurfaceDecorator.cxx
@@ -306,6 +306,76 @@ namespace DerivationFramework {
decoratorTRTusedHits_noHT_divByL (*track) = m_TRTdEdxTool->usedHits( trkTrack, true, false);
}
+ // Track extrapolation
+ std::unique_ptr<const Trk::TrackParameters> perigee( m_extrapolator->extrapolate(*trkTrack,(trkTrack->perigeeParameters())->associatedSurface(),Trk::oppositeMomentum,true, Trk::pion, Trk::addNoise));
+
+ Trk::CylinderSurface cylSurfIBL(29.5,3000.0);
+ Trk::CylinderSurface cylSurfBL(50.5,3000.0);
+ Trk::CylinderSurface cylSurfL1(88.5,3000.0);
+ Trk::CylinderSurface cylSurfL2(122.5,3000.0);
+ std::unique_ptr<const Trk::TrackParameters> outputParamsIBL(m_extrapolator->extrapolate(*perigee,cylSurfIBL,Trk::alongMomentum,true,Trk::pion,Trk::removeNoise));
+ std::unique_ptr<const Trk::TrackParameters> outputParamsBL(m_extrapolator->extrapolate(*perigee,cylSurfBL,Trk::alongMomentum,true,Trk::pion,Trk::removeNoise));
+ std::unique_ptr<const Trk::TrackParameters> outputParamsL1(m_extrapolator->extrapolate(*perigee,cylSurfL1,Trk::alongMomentum,true,Trk::pion,Trk::removeNoise));
+ std::unique_ptr<const Trk::TrackParameters> outputParamsL2(m_extrapolator->extrapolate(*perigee,cylSurfL2,Trk::alongMomentum,true,Trk::pion,Trk::removeNoise));
+
+ SG::AuxElement::Decorator<float> decoratorTrkIBLX("TrkIBLX");
+ SG::AuxElement::Decorator<float> decoratorTrkIBLY("TrkIBLY");
+ SG::AuxElement::Decorator<float> decoratorTrkIBLZ("TrkIBLZ");
+ if (outputParamsIBL.get()) {
+ decoratorTrkIBLX(*track) = outputParamsIBL->position().x();
+ decoratorTrkIBLY(*track) = outputParamsIBL->position().y();
+ decoratorTrkIBLZ(*track) = outputParamsIBL->position().z();
+ }
+ else {
+ decoratorTrkIBLX(*track) = 0.0;
+ decoratorTrkIBLY(*track) = 0.0;
+ decoratorTrkIBLZ(*track) = 0.0;
+ }
+
+ SG::AuxElement::Decorator<float> decoratorTrkBLX("TrkBLX");
+ SG::AuxElement::Decorator<float> decoratorTrkBLY("TrkBLY");
+ SG::AuxElement::Decorator<float> decoratorTrkBLZ("TrkBLZ");
+ if (outputParamsBL.get()) {
+ decoratorTrkBLX(*track) = outputParamsBL->position().x();
+ decoratorTrkBLY(*track) = outputParamsBL->position().y();
+ decoratorTrkBLZ(*track) = outputParamsBL->position().z();
+ }
+ else {
+ decoratorTrkBLX(*track) = 0.0;
+ decoratorTrkBLY(*track) = 0.0;
+ decoratorTrkBLZ(*track) = 0.0;
+ }
+
+ SG::AuxElement::Decorator<float> decoratorTrkL1X("TrkL1X");
+ SG::AuxElement::Decorator<float> decoratorTrkL1Y("TrkL1Y");
+ SG::AuxElement::Decorator<float> decoratorTrkL1Z("TrkL1Z");
+ if (outputParamsL1.get()) {
+ decoratorTrkL1X(*track) = outputParamsL1->position().x();
+ decoratorTrkL1Y(*track) = outputParamsL1->position().y();
+ decoratorTrkL1Z(*track) = outputParamsL1->position().z();
+ }
+ else {
+ decoratorTrkL1X(*track) = 0.0;
+ decoratorTrkL1Y(*track) = 0.0;
+ decoratorTrkL1Z(*track) = 0.0;
+ }
+
+ SG::AuxElement::Decorator<float> decoratorTrkL2X("TrkL2X");
+ SG::AuxElement::Decorator<float> decoratorTrkL2Y("TrkL2Y");
+ SG::AuxElement::Decorator<float> decoratorTrkL2Z("TrkL2Z");
+ if (outputParamsL2.get()) {
+ decoratorTrkL2X(*track) = outputParamsL2->position().x();
+ decoratorTrkL2Y(*track) = outputParamsL2->position().y();
+ decoratorTrkL2Z(*track) = outputParamsL2->position().z();
+ }
+ else {
+ decoratorTrkL2X(*track) = 0.0;
+ decoratorTrkL2Y(*track) = 0.0;
+ decoratorTrkL2Z(*track) = 0.0;
+ }
+
+
+
// -- Add Track states to the current track, filtering on their type
std::vector<const Trk::TrackStateOnSurface*> tsoss;