diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D1.py index fce98cc954afa1f99f518090a3b750f070342924..5a84b969850f06af493ee750f11d9c060bba6ec4 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D1.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D1.py @@ -12,12 +12,12 @@ from DerivationFrameworkJetEtMiss.METCommon import * from DerivationFrameworkEGamma.EGammaCommon import * from DerivationFrameworkMuons.MuonsCommon import * from DerivationFrameworkInDet.InDetCommon import * -from DerivationFrameworkCore.WeightMetadata import * +# from DerivationFrameworkCore.WeightMetadata import * from DerivationFrameworkHiggs.TruthCategories import * import AthenaCommon.SystemOfUnits as Units # Add sumOfWeights metadata for LHE3 multiweights ======= -from DerivationFrameworkCore.LHE3WeightMetadata import * +# from DerivationFrameworkCore.LHE3WeightMetadata import * #==================================================================== # SET UP STREAM diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D2.py index 53c648944f191f87686876396e5bdba73dffcf77..52cb4f9e1ab2044e852576c8485f0502b33f89de 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D2.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D2.py @@ -12,12 +12,12 @@ from DerivationFrameworkJetEtMiss.METCommon import * from DerivationFrameworkEGamma.EGammaCommon import * from DerivationFrameworkMuons.MuonsCommon import * from DerivationFrameworkInDet.InDetCommon import * -from DerivationFrameworkCore.WeightMetadata import * +# from DerivationFrameworkCore.WeightMetadata import * from DerivationFrameworkHiggs.TruthCategories import * import AthenaCommon.SystemOfUnits as Units # Add sumOfWeights metadata for LHE3 multiweights ======= -from DerivationFrameworkCore.LHE3WeightMetadata import * +# from DerivationFrameworkCore.LHE3WeightMetadata import * #==================================================================== # SET UP STREAM diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py index 369d00ffa33e37f8d280d1cb081aecc4678edbbd..2da812b65b9b7fc67cb23ac8cad6b7e4797c8261 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py @@ -13,7 +13,7 @@ from DerivationFrameworkFlavourTag.HbbCommon import * from DerivationFrameworkEGamma.EGammaCommon import * from DerivationFrameworkMuons.MuonsCommon import * from DerivationFrameworkInDet.InDetCommon import * -from DerivationFrameworkCore.WeightMetadata import * +# from DerivationFrameworkCore.WeightMetadata import * from DerivationFrameworkHiggs.TruthCategories import * import AthenaCommon.SystemOfUnits as Units @@ -21,7 +21,7 @@ if DerivationFrameworkIsMonteCarlo: from DerivationFrameworkTau.TauTruthCommon import * # Add sumOfWeights metadata for LHE3 multiweights ======= -from DerivationFrameworkCore.LHE3WeightMetadata import * +# from DerivationFrameworkCore.LHE3WeightMetadata import * #==================================================================== # SET UP STREAM diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D5.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D5.py index 9a579ff709972eb8b44dc0c8ab8e2f9a672b3dac..cf9b346df9f5b0620dad163fa95d8a680e0e1d4c 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D5.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D5.py @@ -12,11 +12,11 @@ from DerivationFrameworkJetEtMiss.METCommon import * from DerivationFrameworkEGamma.EGammaCommon import * from DerivationFrameworkMuons.MuonsCommon import * from DerivationFrameworkInDet.InDetCommon import * -from DerivationFrameworkCore.WeightMetadata import * +# from DerivationFrameworkCore.WeightMetadata import * import AthenaCommon.SystemOfUnits as Units # Add sumOfWeights metadata for LHE3 multiweights ======= -from DerivationFrameworkCore.LHE3WeightMetadata import * +# from DerivationFrameworkCore.LHE3WeightMetadata import * #==================================================================== # SET UP STREAM @@ -447,6 +447,10 @@ print "HIGG2D5.py SkipTriggerRequirement", SkipTriggerRequirement TriggerJPSI= [] TriggerPHI = [] TriggerRHO = [] +TriggerKSHORT = [] +TriggerKSTAR = [] +TriggerD0 = [] +TriggerWPIGAMMA = [] if not SkipTriggerRequirement: TriggerJPSI = ["HLT_mu24_imedium", "HLT_mu26_imedium", "HLT_mu50", "HLT_2mu10", "HLT_2mu14", "HLT_mu24_mu8noL1"] if jobproperties.Beam.energy()==4000000.0: