Add protection for clashes between smart slimming and Compulsory content...

Add protection for clashes between smart slimming and Compulsory content (DerivationFrameworkCore-00-03-37)

	* Adding Protection against clashes in smart slimming lists and compulsory content
	* Tagged as DerivationFrameworkCore-00-03-37

2016-06-16 Jake Searcy <jsearcy@umich.edu>
	* Adding MET_Reference_AntiKt4EMPFlowCPContent list
	* Tagged as DerivationFrameworkCore-00-03-36

2016-06-15 Jake Searcu <jsearcy@umich.edu>
	* Giving control of Jet/Etmiss smart slimming lists back to Jet/Etmiss cp group
	* Tagged as DerivationFrameworkCore-00-03-35

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

	* Modifications to SlimmingHelper and DerivationFrameworkMaster to
	support RAWtoAll
	* Tagged as DerivationFrameworkCore-00-03-34

2016-06-02 James Catmore <james.catmore@cern.ch>

	* Fixing path in TRIG1 definition
...
(Long ChangeLog diff - truncated)


Former-commit-id: a946413feb5838ec4a507693ab8a914a1f73df4e

PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/AntiKt10LCTopoTrimmedPtFrac5SmallR20JetsCPContent.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-AntiKt10LCTopoTrimmedPtFrac5SmallR20JetsCPContent = [
-"AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets",
-"AntiKt10LCTopoTrimmedPtFrac5SmallR20JetsAux.pt.eta.phi.m.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.NTrimSubjets.Parent.GhostAntiKt2TrackJet",
-"AntiKt10LCTopoJets",
-"AntiKt10LCTopoJetsAux.GhostAntiKt2TrackJet",
-"AntiKt10TruthTrimmedPtFrac5SmallR20Jets.pt.eta.phi.m.ECF1.ECF2.ECF3.Tau2_wta.Tau3_wta"
-]

PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/AntiKt4EMPFlowJetsCPContent.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-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.",
-"PrimaryVertices",
-"PrimaryVerticesAux.trackParticleLinks.neutralParticleLinks" 
-]

PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/AntiKt4EMTopoJetsCPContent.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-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.",
-"PrimaryVertices",
-"PrimaryVerticesAux.trackParticleLinks.neutralParticleLinks"
-]

PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/AntiKt4LCTopoJetsCPContent.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-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.",
-"PrimaryVertices",
-"PrimaryVerticesAux.trackParticleLinks.neutralParticleLinks"
-]

PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/DerivationFrameworkMaster.py

@@ -46,13 +46,15 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 #  svcMgr.THistSvc.Output += ["DFMETADATA DATAFILE='df.metadata.root' OPT='RECREATE'"]
 
 from RecExConfig.InputFilePeeker import inputFileSummary
-if (inputFileSummary['evt_type'][0] == 'IS_SIMULATION') and (inputFileSummary['stream_names'][0] != 'StreamEVGEN'):
-	svcMgr.IOVDbSvc.Folders += ['/Simulation/Parameters']
+if inputFileSummary is not None:
+	if (inputFileSummary['evt_type'][0] == 'IS_SIMULATION') and (inputFileSummary['stream_names'][0] != 'StreamEVGEN'):
+		svcMgr.IOVDbSvc.Folders += ['/Simulation/Parameters']
 	
 # Set up the metadata tool:
-ToolSvc += CfgMgr.xAODMaker__FileMetaDataCreatorTool( "FileMetaDataCreatorTool",
-						      OutputLevel = 2 )
-svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.FileMetaDataCreatorTool ]
+if not globalflags.InputFormat=="bytestream":
+	ToolSvc += CfgMgr.xAODMaker__FileMetaDataCreatorTool( "FileMetaDataCreatorTool",
+							      OutputLevel = 2 )
+	svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.FileMetaDataCreatorTool ]
 
 # Set up stream auditor
 if not hasattr(svcMgr, 'DecisionSvc'):

PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/DerivationFrameworkProdFlags.py

@@ -1975,5 +1975,23 @@ class WriteDAOD_HION9Stream (JobProperty):
 jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_HION9Stream)
 listAODtoDPD.append(WriteDAOD_HION9Stream.StreamName)
 
+################################
+# Defined by the trigger group
+################################
+
+class WriteDAOD_TRIG1Stream (JobProperty):
+     """TRIG1 derivation"""
+     statusOn = True
+     allowedTypes = ['bool']
+     StoredValue = False
+     StreamName = 'StreamDAOD_TRIG1'
+     FileName = ''
+     isVirtual = False
+     DPDMakerScript = "DerivationFrameworkTrigger/TRIG1.py"
+     pass
+jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_TRIG1Stream)
+listAODtoDPD.append(WriteDAOD_TRIG1Stream.StreamName)
+
+
 from RecExConfig.RecoFunctions import AddValidItemToList
 AddValidItemToList(listAODtoDPD,listAllKnownDPD)

PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/MET_Reference_AntiKt4EMTopoCPContent.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-MET_Reference_AntiKt4EMTopoCPContent  = [
-"AntiKt4EMTopoJets",
-"AntiKt4EMTopoJetsAux.originalObjectLink.pt.eta.phi.m.constituentLinks.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.btaggingLink.ConeExclBHadronsFinal.ConeExclCHadronsFinal.ConeExclTausFinal.GhostBHadronsFinal.GhostBHadronsInitial.GhostBQuarksFinal.GhostCHadronsFinal.GhostCHadronsInitial.GhostCQuarksFinal.GhostHBosons.GhostPartons.GhostTQuarksFinal.GhostTausFinal.GhostWBosons.GhostZBosons.GhostTruth.OriginVertex.GhostAntiKt3TrackJet.GhostAntiKt4TrackJet.GhostMuonSegment.GhostTrack.GhostTruthAssociationLink.HighestJVFLooseVtx.HighestJVFVtxGhost.AntiKt2TrackJet.GhostAntiKt2TrackJet.HighestJVFVtx.JetLCScaleMomentum_pt.JetLCScaleMomentum_eta.JetLCScaleMomentum_phi.JetLCScaleMomentum_m",
-"Electrons",
-"METAssoc_AntiKt4EMTopo",
-"METAssoc_AntiKt4EMTopoAux.jetLink.objectLinks.calkey.calpx.calpy.calpz.cale.calsumpt.trkkey.trkpx.trkpy.trkpz.trke.trksumpt.jettrkpx.jettrkpy.jettrkpz.jettrke.jettrksumpt.overlapIndices.overlapTypes.isMisc",
-"MET_Core_AntiKt4EMTopo",
-"MET_Core_AntiKt4EMTopoAux.name.mpx.mpy.sumet.source",
-"MET_Reference_AntiKt4EMTopo",
-"MET_Reference_AntiKt4EMTopoAux.name.mpx.mpy.sumet.source",
-"MET_Truth",
-"MET_TruthAux.name.mpx.mpy.sumet.source",
-"Muons",
-"MuonsAux.energyLossType.EnergyLoss.ParamEnergyLoss.MeasEnergyLoss.EnergyLossSigma.MeasEnergyLossSigma.ParamEnergyLossSigmaPlus.ParamEnergyLossSigmaMinus",
-"Photons",
-"TauJets",
-"PrimaryVertices",
-"PrimaryVerticesAux.vertexType"
-]

PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/MET_Reference_AntiKt4LCTopoCPContent.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-MET_Reference_AntiKt4LCTopoCPContent  = [
-"AntiKt4LCTopoJets",
-"AntiKt4LCTopoJetsAux.originalObjectLink.pt.eta.phi.m.constituentLinks.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.btaggingLink.ConeExclBHadronsFinal.ConeExclCHadronsFinal.ConeExclTausFinal.GhostBHadronsFinal.GhostBHadronsInitial.GhostBQuarksFinal.GhostCHadronsFinal.GhostCHadronsInitial.GhostCQuarksFinal.GhostHBosons.GhostPartons.GhostTQuarksFinal.GhostTausFinal.GhostWBosons.GhostZBosons.GhostTruth.OriginVertex.GhostAntiKt3TrackJet.GhostAntiKt4TrackJet.GhostMuonSegment.GhostTrack.GhostTruthAssociationLink.HighestJVFLooseVtx.HighestJVFVtxGhost.AntiKt2TrackJet.GhostAntiKt2TrackJet.HighestJVFVtx.JetLCScaleMomentum_pt.JetLCScaleMomentum_eta.JetLCScaleMomentum_phi.JetLCScaleMomentum_m",
-"Electrons",
-"METAssoc_AntiKt4LCTopo",
-"METAssoc_AntiKt4LCTopoAux.jetLink.objectLinks.calkey.calpx.calpy.calpz.cale.calsumpt.trkkey.trkpx.trkpy.trkpz.trke.trksumpt.jettrkpx.jettrkpy.jettrkpz.jettrke.jettrksumpt.overlapIndices.overlapTypes.isMisc",
-"MET_Core_AntiKt4LCTopo",
-"MET_Core_AntiKt4LCTopoAux.name.mpx.mpy.sumet.source",
-"MET_Reference_AntiKt4LCTopo",
-"MET_Reference_AntiKt4LCTopoAux.name.mpx.mpy.sumet.source",
-"MET_Truth",
-"MET_TruthAux.name.mpx.mpy.sumet.source",
-"Muons",
-"MuonsAux.energyLossType.EnergyLoss.ParamEnergyLoss.MeasEnergyLoss.EnergyLossSigma.MeasEnergyLossSigma.ParamEnergyLossSigmaPlus.ParamEnergyLossSigmaMinus",
-"Photons",
-"TauJets",
-"PrimaryVertices",
-"PrimaryVerticesAux.vertexType"
-]