Skip to content
Snippets Groups Projects
Commit 3b841c39 authored by James Catmore's avatar James Catmore Committed by Graeme Stewart
Browse files

Changing TEST0 to PASSTHR (DerivationFrameworkCore-00-03-31) 

	* Changing TEST0 to PASSTHR
	* Tagged as DerivationFrameworkCore-00-03-31

2016-05-23 James Catmore <james.catmore@cern.ch>

	* Adding format TEST0
	* Tagged as DerivationFrameworkCore-00-03-30

2016-05-18 Jake Searcy <jsearcy@umich.edu>
	* Adding MVATESTauJet smart slimming list
	* Tagged as DerivationFrameworkCore-00-03-29

2016-05-18 Jake Searcy <jsearcy@umich.edu>
	* Adding Susy13 Susy14
	* Tagged as DerivationFrameworkCore-00-03-28

2016-05-16 Jake Searcy <jsearcy@umich.edu>
	* Adding FTag5
	* Tagged as DerivationFrameworkCore-00-03-27
...
(Long ChangeLog diff - truncated)


Former-commit-id: 6195be40ea78627f6a20d2eec341e2e523dcc155
parent 2873f5d3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 131 additions and 78 deletions
PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/CMakeLists.txt 0 → 100644
+ 33
− 0
View file @ 3b841c39
################################################################################
# Package: DerivationFrameworkCore
################################################################################
# Declare the package name:
atlas_subdir( DerivationFrameworkCore )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
GaudiKernel
PhysicsAnalysis/DerivationFramework/DerivationFrameworkInterfaces
PRIVATE
Control/AthenaKernel
Control/DataModel
Control/SGTools
Control/StoreGate )
# Component(s) in the package:
atlas_add_library( DerivationFrameworkCoreLib
src/*.cxx
PUBLIC_HEADERS DerivationFrameworkCore
LINK_LIBRARIES AthenaBaseComps GaudiKernel StoreGateLib SGtests
PRIVATE_LINK_LIBRARIES AthenaKernel DataModel SGTools )
atlas_add_component( DerivationFrameworkCore
src/components/*.cxx
LINK_LIBRARIES AthenaBaseComps GaudiKernel AthenaKernel DataModel SGTools StoreGateLib SGtests DerivationFrameworkCoreLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/AntiKt4EMPFlowJetsCPContent.py
+ 1
− 1
View file @ 3b841c39
......@@ -4,7 +4,7 @@ AntiKt4EMPFlowJetsCPContent = [
"AntiKt4EMPFlowJets",
"AntiKt4EMPFlowJetsAux.pt.eta.phi.m.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.ActiveArea4vec_eta.ActiveArea4vec_m.ActiveArea4vec_phi.ActiveArea4vec_pt.GhostMuonSegment.GhostMuonSegmentCount.EnergyPerSampling.SumPtChargedPFOPt500.NumTrkPt500.TrackWidthPt500.NumTrkPt1000.TrackWidthPt1000.constituentLinks.btaggingLink.GhostTruthAssociationLink",
"MuonSegments",
"MuonSegmentsAux.-",
"MuonSegmentsAux.",
"PrimaryVertices",
"PrimaryVerticesAux.trackParticleLinks.neutralParticleLinks"
]
PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/AntiKt4EMTopoJetsCPContent.py
+ 1
− 1
View file @ 3b841c39
......@@ -4,7 +4,7 @@ AntiKt4EMTopoJetsCPContent = [
"AntiKt4EMTopoJets",
"AntiKt4EMTopoJetsAux.pt.eta.phi.m.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.HECFrac.HECQuality.JVF.LArQuality.NegativeE.NumTrkPt1000.NumTrkPt500.SumPtTrkPt500.Timing.TrackWidthPt1000.Width.ActiveArea4vec_eta.ActiveArea4vec_m.ActiveArea4vec_phi.ActiveArea4vec_pt.AverageLArQF.EMFrac.EnergyPerSampling.FracSamplingMax.GhostMuonSegment.GhostMuonSegmentCount.OriginCorrected.PileupCorrected.DetectorEta.JetOriginConstitScaleMomentum_pt.JetPileupScaleMomentum_pt.JetPileupScaleMomentum_eta.JetPileupScaleMomentum_phi.JetPileupScaleMomentum_m.JetEtaJESScaleMomentum_pt.JetEtaJESScaleMomentum_eta.JetEtaJESScaleMomentum_phi.JetEtaJESScaleMomentum_m.JetGSCScaleMomentum_pt.JetGSCScaleMomentum_eta.JetGSCScaleMomentum_phi.JetGSCScaleMomentum_m.JetInsituScaleMomentum_pt.JetInsituScaleMomentum_eta.JetInsituScaleMomentum_phi.JetInsituScaleMomentum_m.constituentLinks.btaggingLink.GhostBHadronsFinal.GhostBHadronsInitial.GhostBQuarksFinal.GhostCHadronsFinal.GhostCHadronsInitial.GhostCQuarksFinal.GhostHBosons.GhostPartons.GhostTQuarksFinal.GhostTausFinal.GhostWBosons.GhostZBosons.GhostTruth.OriginVertex.GhostAntiKt3TrackJet.GhostAntiKt4TrackJet.GhostTrack.GhostTruthAssociationLink.HighestJVFVtx.JetOriginConstitScaleMomentum_eta.JetOriginConstitScaleMomentum_m.JetOriginConstitScaleMomentum_phi.JvtJvfcorr.JvtRpt.Jvt.FracSamplingMaxIndex.LeadingClusterPt.ECPSFraction.N90Constituents.LeadingClusterSecondLambda.LeadingClusterCenterLambda.LeadingClusterSecondR.CentroidR.OotFracClusters5.OotFracClusters10.ConeTruthLabelID.PartonTruthLabelID",
"MuonSegments",
"MuonSegmentsAux.-",
"MuonSegmentsAux.",
"PrimaryVertices",
"PrimaryVerticesAux.trackParticleLinks.neutralParticleLinks"
]
PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/AntiKt4LCTopoJetsCPContent.py
+ 1
− 1
View file @ 3b841c39
......@@ -4,7 +4,7 @@ AntiKt4LCTopoJetsCPContent = [
"AntiKt4LCTopoJets",
"AntiKt4LCTopoJetsAux.pt.eta.phi.m.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.HECFrac.HECQuality.JVF.LArQuality.NegativeE.NumTrkPt1000.NumTrkPt500.SumPtTrkPt500.Timing.TrackWidthPt1000.Width.ActiveArea4vec_eta.ActiveArea4vec_m.ActiveArea4vec_phi.ActiveArea4vec_pt.AverageLArQF.EMFrac.EnergyPerSampling.FracSamplingMax.GhostMuonSegment.GhostMuonSegmentCount.OriginCorrected.PileupCorrected.DetectorEta.JetPileupScaleMomentum_pt.JetPileupScaleMomentum_eta.JetPileupScaleMomentum_phi.JetPileupScaleMomentum_m.JetOriginConstitScaleMomentum_pt.JetEtaJESScaleMomentum_pt.JetEtaJESScaleMomentum_eta.JetEtaJESScaleMomentum_phi.JetEtaJESScaleMomentum_m.JetGSCScaleMomentum_pt.JetGSCScaleMomentum_eta.JetGSCScaleMomentum_phi.JetGSCScaleMomentum_m.JetInsituScaleMomentum_pt.JetInsituScaleMomentum_eta.JetInsituScaleMomentum_phi.JetInsituScaleMomentum_m.constituentLinks.btaggingLink.GhostBHadronsFinal.GhostBHadronsInitial.GhostBQuarksFinal.GhostCHadronsFinal.GhostCHadronsInitial.GhostCQuarksFinal.GhostHBosons.GhostPartons.GhostTQuarksFinal.GhostTausFinal.GhostWBosons.GhostZBosons.GhostTruth.OriginVertex.GhostAntiKt3TrackJet.GhostAntiKt4TrackJet.GhostTrack.GhostTruthAssociationLink.HighestJVFVtx.JetOriginConstitScaleMomentum_eta.JetOriginConstitScaleMomentum_m.JetOriginConstitScaleMomentum_phi.JvtJvfcorr.JvtRpt.Jvt.FracSamplingMaxIndex.LeadingClusterPt.ECPSFraction.N90Constituents.LeadingClusterSecondLambda.LeadingClusterCenterLambda.LeadingClusterSecondR.CentroidR.OotFracClusters5.OotFracClusters10.ConeTruthLabelID.PartonTruthLabelID",
"MuonSegments",
"MuonSegmentsAux.-",
"MuonSegmentsAux.",
"PrimaryVertices",
"PrimaryVerticesAux.trackParticleLinks.neutralParticleLinks"
]
PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/BPhysTriggerContent.py
+ 2
− 2
View file @ 3b841c39
......@@ -12,9 +12,9 @@ BPhysTriggerContent = [
"HLT_xAOD__TrigBphysContainer_L2BMuMuFex",
"HLT_xAOD__TrigBphysContainer_L2BMuMuFexAux.",
"HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_EFID",
"HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_EFIDAux.pt.eta.phi.d0.z0",
"HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_EFIDAux.phi.d0.z0.theta.qOverP",
"HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_IDTrig",
"HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_IDTrigAux.pt.eta.phi.d0.z0"
"HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_IDTrigAux.phi.d0.z0.theta.qOverP"
#"HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_IDTrig",
#"HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_IDTrigAux.pt.eta.phi.d0.z0"
]
PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/DerivationFrameworkProdFlags.py
+ 62
− 10
View file @ 3b841c39
......@@ -15,8 +15,21 @@ listAllKnownDPD=[]
# Defined by ASG for tests/examples
####################################
class WriteDAOD_PASSTHRStream(JobProperty):
""" Produce the DPD for DAOD_PASSTHR - pass through """
statusOn = True
allowedTypes = ['bool']
StoredValue = False
StreamName = "StreamDAOD_PASSTHR"
FileName = ""
isVirtual = False
DPDMakerScript = "DerivationFrameworkExamples/PassThroughExample.py"
pass
jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_PASSTHRStream)
listAODtoDPD.append(WriteDAOD_PASSTHRStream.StreamName)
class WriteDAOD_TEST1Stream(JobProperty):
""" Produce the DPD for DAOD_TEST1 - derivation framework test """
""" Produce the DPD for DAOD_TEST1 - skimming example """
statusOn = True
allowedTypes = ['bool']
StoredValue = False
......@@ -29,7 +42,7 @@ jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_TEST1Stream
listAODtoDPD.append(WriteDAOD_TEST1Stream.StreamName)
class WriteDAOD_TEST2Stream(JobProperty):
""" Produce the DPD for DAOD_TEST2 - derivation framework test """
""" Produce the DPD for DAOD_TEST2 - skimming example using ExpressionEvaluation """
statusOn = True
allowedTypes = ['bool']
StoredValue = False
......@@ -42,7 +55,7 @@ jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_TEST2Stream
listAODtoDPD.append(WriteDAOD_TEST2Stream.StreamName)
class WriteDAOD_TEST3Stream(JobProperty):
""" Produce the DPD for DAOD_TEST3 - derivation framework test """
""" Produce the DPD for DAOD_TEST3 - skimming example using augmentations """
statusOn = True
allowedTypes = ['bool']
StoredValue = False
......@@ -55,7 +68,7 @@ jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_TEST3Stream
listAODtoDPD.append(WriteDAOD_TEST3Stream.StreamName)
class WriteDAOD_TEST4Stream(JobProperty):
""" Produce the DPD for DAOD_TEST4 - derivation framework test """
""" Produce the DPD for DAOD_TEST4 - slimming example """
statusOn = True
allowedTypes = ['bool']
StoredValue = False
......@@ -68,7 +81,7 @@ jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_TEST4Stream
listAODtoDPD.append(WriteDAOD_TEST4Stream.StreamName)
class WriteDAOD_TEST5Stream(JobProperty):
""" Produce the DPD for DAOD_TEST5 - derivation framework test """
""" Produce the DPD for DAOD_TEST5 - CP tools example """
statusOn = True
allowedTypes = ['bool']
StoredValue = False
......@@ -81,7 +94,7 @@ jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_TEST5Stream
listAODtoDPD.append(WriteDAOD_TEST5Stream.StreamName)
class WriteDAOD_TEST6Stream(JobProperty):
""" Produce the DPD for DAOD_TEST6 - derivation framework test """
""" Produce the DPD for DAOD_TEST6 - private sequencer example """
statusOn = True
allowedTypes = ['bool']
StoredValue = False
......@@ -94,7 +107,7 @@ jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_TEST6Stream
listAODtoDPD.append(WriteDAOD_TEST6Stream.StreamName)
class WriteDAOD_TEST7Stream(JobProperty):
""" Produce the DPD for DAOD_TEST7 - derivation framework test """
""" Produce the DPD for DAOD_TEST7 - augmentation example """
statusOn = True
allowedTypes = ['bool']
StoredValue = False
......@@ -107,7 +120,7 @@ jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_TEST7Stream
listAODtoDPD.append(WriteDAOD_TEST7Stream.StreamName)
class WriteDAOD_TEST8Stream(JobProperty):
""" Produce the DPD for DAOD_TEST8 - derivation framework test """
""" Produce the DPD for DAOD_TEST8 - thinning example """
statusOn = True
allowedTypes = ['bool']
StoredValue = False
......@@ -120,7 +133,7 @@ jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_TEST8Stream
listAODtoDPD.append(WriteDAOD_TEST8Stream.StreamName)
class WriteDAOD_TEST9Stream(JobProperty):
""" Produce the DPD for DAOD_TEST9 - derivation framework test """
""" Produce the DPD for DAOD_TEST9 - example of adding reconstruction tools """
statusOn = True
allowedTypes = ['bool']
StoredValue = False
......@@ -133,7 +146,7 @@ jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_TEST9Stream
listAODtoDPD.append(WriteDAOD_TEST9Stream.StreamName)
class WriteDAOD_TEST10Stream(JobProperty):
""" Produce the DPD for DAOD_TEST10 - derivation framework test """
""" Produce the DPD for DAOD_TEST10 - example of trigger content management """
statusOn = True
allowedTypes = ['bool']
StoredValue = False
......@@ -876,6 +889,32 @@ class WriteDAOD_SUSY12Stream(JobProperty):
jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_SUSY12Stream)
listAODtoDPD.append(WriteDAOD_SUSY12Stream.StreamName)
class WriteDAOD_SUSY13Stream(JobProperty):
"""SUSY13 derivation"""
statusOn = True
allowedTypes = ['bool']
StoredValue = False
StreamName = 'StreamDAOD_SUSY13'
FileName = ''
isVirtual = False
DPDMakerScript = "DerivationFrameworkSUSY/SUSY13.py"
pass
jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_SUSY13Stream)
listAODtoDPD.append(WriteDAOD_SUSY13Stream.StreamName)
class WriteDAOD_SUSY14Stream(JobProperty):
"""SUSY14 derivation"""
statusOn = True
allowedTypes = ['bool']
StoredValue = False
StreamName = 'StreamDAOD_SUSY14'
FileName = ''
isVirtual = False
DPDMakerScript = "DerivationFrameworkSUSY/SUSY14.py"
pass
jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_SUSY14Stream)
listAODtoDPD.append(WriteDAOD_SUSY14Stream.StreamName)
#################################
# Defined by the Exotics group
......@@ -1473,6 +1512,19 @@ class WriteDAOD_FTAG4Stream (JobProperty):
jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_FTAG4Stream)
listAODtoDPD.append(WriteDAOD_FTAG4Stream.StreamName)
class WriteDAOD_FTAG5Stream (JobProperty):
"""FTAG5 derivation"""
statusOn = True
allowedTypes = ['bool']
StoredValue = False
StreamName = 'StreamDAOD_FTAG5'
FileName = ''
isVirtual = False
DPDMakerScript = "DerivationFrameworkFlavourTag/FTAG5.py"
pass
jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_FTAG5Stream)
listAODtoDPD.append(WriteDAOD_FTAG5Stream.StreamName)
######################################
# Defined by the B-physics group
######################################
......
PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ElectronsCPContent.py
+ 4
− 2
View file @ 3b841c39
......@@ -2,9 +2,11 @@
ElectronsCPContent = [
"Electrons",
"ElectronsAux.trackParticleLinks.pt.eta.phi.m.truthParticleLink.truthOrigin.truthType.caloClusterLinks.author.OQ.ethad1.ethad.f1.f3.f3core.e233.e237.e277.weta1.weta2.e2tsts1.fracs1.wtots1.emins1.emaxs1.etcone20.ptcone30.deltaEta1.deltaPhi2.deltaPhiRescaled2.Loose.Medium.Tight.DFCommonElectronsLHLoose.DFCommonElectronsLHMedium.DFCommonElectronsLHTight.DFCommonElectronsML.ptcone20.ptcone30.ptcone40.ptvarcone20.ptvarcone30.ptvarcone40.topoetcone20.topoetcone30.topoetcone40.charge.Reta.Rphi.Eratio.Rhad.Rhad1.DeltaE.DFCommonElectronsIsEMLoose.DFCommonElectronsIsEMMedium.DFCommonElectronsIsEMTight.topoetcone20ptCorrection.topoetcone30ptCorrection.topoetcone40ptCorrection.etcone20ptCorrection.etcone30ptCorrection.etcone40ptCorrection",
"ElectronsAux.trackParticleLinks.pt.eta.phi.m.truthParticleLink.truthOrigin.truthType.caloClusterLinks.author.OQ.ethad1.ethad.f1.f3.f3core.e233.e237.e277.weta1.weta2.e2tsts1.fracs1.wtots1.emins1.emaxs1.etcone20.ptcone30.deltaEta1.deltaPhi2.deltaPhiRescaled2.Loose.Medium.Tight.DFCommonElectronsLHLoose.DFCommonElectronsLHMedium.DFCommonElectronsLHTight.DFCommonElectronsML.ptcone20.ptcone30.ptcone40.ptvarcone20.ptvarcone30.ptvarcone40.topoetcone20.topoetcone30.topoetcone40.charge.Reta.Rphi.Eratio.Rhad.Rhad1.DeltaE.DFCommonElectronsIsEMLoose.DFCommonElectronsIsEMMedium.DFCommonElectronsIsEMTight.topoetcone20ptCorrection.topoetcone30ptCorrection.topoetcone40ptCorrection.etcone20ptCorrection.etcone30ptCorrection.etcone40ptCorrection.LHLoose",
"GSFTrackParticles",
"GSFTrackParticlesAux.phi.d0.theta.qOverP.definingParametersCovMatrix.parameterX.parameterPX.parameterPY.parameterPZ.parameterPosition.numberOfBLayerHits.numberOfBLayerOutliers.expectBLayerHit.numberOfPixelHits.numberOfPixelOutliers.numberOfPixelDeadSensors.numberOfSCTHits.numberOfSCTOutliers.numberOfSCTDeadSensors.numberOfTRTHits.numberOfTRTOutliers.numberOfTRTHighThresholdHits.numberOfTRTHighThresholdOutliers.numberOfTRTXenonHits.z0.vz.vertexLink.numberOfInnermostPixelLayerHits.numberOfInnermostPixelLayerOutliers.numberOfNextToInnermostPixelLayerOutliers.expectInnermostPixelLayerHit.eProbabilityComb.truthParticleLink.originalTrackParticle.eProbabilityHT",
"GSFTrackParticlesAux.phi.d0.theta.qOverP.definingParametersCovMatrix.parameterX.parameterPX.parameterPY.parameterPZ.parameterPosition.numberOfBLayerHits.numberOfBLayerOutliers.expectBLayerHit.numberOfPixelHits.numberOfPixelOutliers.numberOfPixelDeadSensors.numberOfSCTHits.numberOfSCTOutliers.numberOfSCTDeadSensors.numberOfTRTHits.numberOfTRTOutliers.numberOfTRTHighThresholdHits.numberOfTRTHighThresholdOutliers.numberOfTRTXenonHits.z0.vz.vertexLink.numberOfInnermostPixelLayerHits.numberOfInnermostPixelLayerOutliers.numberOfNextToInnermostPixelLayerOutliers.expectInnermostPixelLayerHit.eProbabilityComb.truthParticleLink.originalTrackParticle.eProbabilityHT.numberOfNextToInnermostPixelLayerHits.expectNextToInnermostPixelLayerHit",
"GSFConversionVertices",
"GSFConversionVerticesAux.px.py.pz",
"PrimaryVertices",
"PrimaryVerticesAux.trackParticleLinks.vertexType.neutralParticleLinks",
"egammaClusters",
......
PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/MuonsCPContent.py deleted 100644 → 0
+ 0
− 27
View file @ 2873f5d3
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
MuonsCPContent = [
"CombinedMuonTrackParticles",
"CombinedMuonTrackParticlesAux.phi.theta.qOverP.numberOfPixelHits.numberOfPixelHoles.numberOfPixelDeadSensors.numberOfSCTHits.numberOfSCTHoles.numberOfSCTDeadSensors.numberOfTRTHits.numberOfTRTOutliers.numberOfPrecisionLayers.numberOfPrecisionHoleLayers.d0.z0.vz.definingParametersCovMatrix.vertexLink.truthParticleLink.chiSquared.numberDoF.numberOfPhiLayers.numberOfPhiHoleLayers",
"ExtrapolatedMuonTrackParticles",
"GSFTrackParticles",
"InDetTrackParticles",
"Muons",
"Photons",
"egammaClusters",
"Electrons",
"ElectronsAux.trackParticleLinks.pt.eta.phi.m.f1.topoetcone40.truthParticleLink.caloClusterLinks",
"ExtrapolatedMuonTrackParticlesAux.phi.theta.qOverP.numberOfPixelHits.numberOfPixelDeadSensors.numberOfPrecisionLayers.d0.z0.vz.definingParametersCovMatrix.vertexLink.truthParticleLink.chiSquared.numberDoF.numberOfPhiLayers.numberOfPhiHoleLayers",
"GSFTrackParticlesAux.phi.theta.d0.z0.vz.definingParametersCovMatrix.vertexLink.truthParticleLink.originalTrackParticle.qOverP",
"InDetTrackParticlesAux.phi.theta.qOverP.numberOfPixelHits.numberOfPixelHoles.numberOfPixelDeadSensors.numberOfSCTHits.numberOfSCTHoles.numberOfSCTDeadSensors.numberOfTRTHits.numberOfTRTOutliers.numberOfPrecisionLayers.d0.z0.vz.definingParametersCovMatrix.vertexLink.truthParticleLink.chiSquared.numberDoF.numberOfPhiLayers.numberOfPhiHoleLayers.numberOfPrecisionHoleLayers",
"MuonSpectrometerTrackParticles",
"MuonSpectrometerTrackParticlesAux.phi.d0.z0.vz.definingParametersCovMatrix.vertexLink.theta.qOverP.truthParticleLink",
"MuonsAux.pt.eta.phi.truthType.truthOrigin.author.muonType.quality.inDetTrackParticleLink.muonSpectrometerTrackParticleLink.combinedTrackParticleLink.InnerDetectorPt.MuonSpectrometerPt.DFCommonGoodMuon.momentumBalanceSignificance.clusterLink.ptcone20.ptcone30.ptcone40.ptvarcone20.ptvarcone30.ptvarcone40.topoetcone20.topoetcone30.topoetcone40.innerSmallHits.truthParticleLink.charge.CaloLRLikelihood.CaloMuonIDTag.extrapolatedMuonSpectrometerTrackParticleLink.numberOfPrecisionLayers.numberOfPrecisionHoleLayers.innerLargeHits.muonSegmentLinks.numberOfGoodPrecisionLayers.innerSmallHoles.innerLargeHoles.middleSmallHoles.middleLargeHoles.outerSmallHoles.outerLargeHoles.extendedSmallHoles.extendedLargeHoles.innerClosePrecisionHits.middleClosePrecisionHits.outerClosePrecisionHits.extendedClosePrecisionHits.innerOutBoundsPrecisionHits.middleOutBoundsPrecisionHits.outerOutBoundsPrecisionHits.extendedOutBoundsPrecisionHits.combinedTrackOutBoundsPrecisionHits.isEndcapGoodLayers.isSmallGoodSectors.middleLargeHits.middleSmallHits.outerLargeHits.outerSmallHits",
"PhotonsAux.pt.eta.phi.m.caloClusterLinks.author.f1.topoetcone40.Tight.truthParticleLink.vertexLinks",
"egammaClustersAux.calEta.calPhi.calE.calM",
"egammaTopoSeededClusters",
"egammaTopoSeededClustersAux.calEta.calPhi",
"InDetForwardTrackParticles",
"InDetForwardTrackParticlesAux.theta.phi.qOverP.numberOfPrecisionLayers.numberOfPrecisionHoleLayers.numberOfPixelHits.numberOfPixelDeadSensors.numberOfSCTHits.numberOfSCTDeadSensors.d0.z0.vz.definingParametersCovMatrix",
"ExtrapolatedMuonTrackParticlesAux.numberOfPrecisionHoleLayers.numberOfPixelHoles.numberOfSCTHits.numberOfSCTHoles.numberOfSCTDeadSensors.numberOfTRTHits.numberOfTRTOutliers"
]
PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py
+ 6
− 4
View file @ 3b841c39
......@@ -280,13 +280,15 @@ class SlimmingHelper:
from DerivationFrameworkCore.PhotonsCPContent import PhotonsCPContent
items.extend(PhotonsCPContent)
elif collectionName=="Muons":
#from DerivationFrameworkMuons.MuonsCPContent import MuonsCPContent
from DerivationFrameworkCore.MuonsCPContent import MuonsCPContent
from DerivationFrameworkMuons.MuonsCPContent import MuonsCPContent
# from DerivationFrameworkCore.MuonsCPContent import MuonsCPContent
items.extend(MuonsCPContent)
elif collectionName=="TauJets":
#from DerivationFrameworkTau.TauJetsCPContent import TauJetsCPContent
from DerivationFrameworkCore.TauJetsCPContent import TauJetsCPContent
from DerivationFrameworkTau.TauJetsCPContent import TauJetsCPContent
items.extend(TauJetsCPContent)
elif collectionName=="TauMVATESJets":
from DerivationFrameworkTau.TauMVATESContent import TauMVATESContent
items.extend(TauMVATESContent)
elif collectionName=="MET_Reference_AntiKt4LCTopo":
#from DerivationFrameworkJetEtMiss.MET_Reference_AntiKt4LCTopoCPContent import MET_Reference_AntiKt4LCTopoCPContent
from DerivationFrameworkCore.MET_Reference_AntiKt4LCTopoCPContent import MET_Reference_AntiKt4LCTopoCPContent
......
PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/TauJetsCPContent.py deleted 100644 → 0
+ 0
− 9
View file @ 2873f5d3
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
TauJetsCPContent = [
"AntiKt4LCTopoJets",
"InDetTrackParticles",
"InDetTrackParticlesAux.phi.vertexLink.theta.qOverP.truthParticleLink.truthMatchProbability",
"TauJets",
"TauJetsAux.pt.eta.phi.m.trackLinks.wideTrackLinks.otherTrackLinks.jetLink.vertexLink.secondaryVertexLink.hadronicPFOLinks.shotPFOLinks.chargedPFOLinks.neutralPFOLinks.pi0PFOLinks.protoChargedPFOLinks.protoNeutralPFOLinks.protoPi0PFOLinks.charge.isTauFlags.BDTJetScore.BDTEleScore.conversionTrackLinks.charged_PFOLinks.neutral_PFOLinks.pi0_PFOLinks.cellBased_Charged_PFOLinks.cellBased_Neutral_PFOLinks.cellBased_Pi0_PFOLinks.eflowRec_Charged_PFOLinks.eflowRec_Neutral_PFOLinks.eflowRec_Pi0_PFOLinks.shot_PFOLinks"
]
PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/WeightMetadata.py
+ 21
− 21
View file @ 3b841c39
......@@ -100,30 +100,30 @@ def addWeightsHist(stream, seq, svcMgr, CfgMgr, ToolSvc, derivName, fileName, pd
from DerivationFrameworkCore.DerivationFrameworkMaster import *
#addWeights(DerivationFrameworkJob, {'CT10nlo':52, 'MSTW2008nlo68cl': 40, 'NNPDF23_lo_as_0130_qed': 100, 'NNPDF30_nlo_as_0118': 100}, "")
listPDF = {}
listPDF["CT14nlo"] = 56
listPDF["CT14nlo_NF4"] = 0
listPDF["NNPDF30_nlo_as_0118"] = 100
listPDF["NNPDF30_nlo_as_0118_nf_4"] = 100
#listPDF["CT14nlo"] = 56
#listPDF["CT14nlo_NF4"] = 0
#listPDF["NNPDF30_nlo_as_0118"] = 100
#listPDF["NNPDF30_nlo_as_0118_nf_4"] = 100
listPDF["MMHT2014nlo68cl"] = 50
listPDF["MMHT2014nlo68cl_nf4"] = 50
listPDF["PDF4LHC15_nlo_100"] = 100
#listPDF["MMHT2014nlo68cl_nf4"] = 50
#listPDF["PDF4LHC15_nlo_100"] = 100
listPDF["PDF4LHC15_nlo_30"] = 30
listPDF["PDF4LHC15_nlo_mc"] = 100
listPDF["PDF4LHC15_nlo_asvar"] = 1
listPDF["NNPDF23_lo_as_0119_qed"] = 100
listPDF["NNPDF23_nlo_as_0118_qed"] = 100
listPDF["NNPDF30_nnlo_as_0118"] = 100
listPDF["NNPDF30_lo_as_0130"] = 100
#listPDF["PDF4LHC15_nlo_mc"] = 100
#listPDF["PDF4LHC15_nlo_asvar"] = 1
#listPDF["NNPDF23_lo_as_0119_qed"] = 100
#listPDF["NNPDF23_nlo_as_0118_qed"] = 100
#listPDF["NNPDF30_nnlo_as_0118"] = 100
listPDF["NNPDF30_nlo_as_0118"] = 100
listPDF["CT10"] = 52
listPDF["cteq66"] = 44
listPDF["MSTW2008nlo68cl"] = 40
listPDF["cteq6l1"] = 0
listPDF["abm12lhc_5_nnlo"] = 28
listPDF["HERAPDF20_NLO_EIG"] = 28
listPDF["HERAPDF20_NLO_VAR"] = 13
listPDF["ATLAS-epWZ12-EIG"] = 30
listPDF["ATLAS-epWZ12-VAR"] = 11
listPDF["abm12lhc_4_nnlo"] = 28
#listPDF["cteq66"] = 44
#listPDF["MSTW2008nlo68cl"] = 40
#listPDF["cteq6l1"] = 0
#listPDF["abm12lhc_5_nnlo"] = 28
#listPDF["HERAPDF20_NLO_EIG"] = 28
#listPDF["HERAPDF20_NLO_VAR"] = 13
#listPDF["ATLAS-epWZ12-EIG"] = 30
#listPDF["ATLAS-epWZ12-VAR"] = 11
#listPDF["abm12lhc_4_nnlo"] = 28
# skip this in data
from AthenaCommon.GlobalFlags import globalflags
......
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