diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/share/NANO.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/share/NANO.py
index 7123ff66f7ebfad6b06547417f194990dafdf525..b98f994a68d0d4a4ac1491c79846c955cb43a9a9 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/share/NANO.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/share/NANO.py
@@ -232,20 +232,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation (before skimming!)
-#==============================================================================
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
-
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqNANO += CfgMgr.DerivationFramework__DerivationKernel("NANOKernelSigAug",
- AugmentationTools = DecorateSUSYProcess("NANO")
- )
-
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
-
-
#==============================================================================
# Jet building
#==============================================================================
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/MCTruthCommon.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/MCTruthCommon.py
index 1790be5d3cba879d8dadad18097fd057b1739f1d..a02f251d1950e6e673e26f5ccc5176ee50efe0ed 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/MCTruthCommon.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/MCTruthCommon.py
@@ -265,11 +265,17 @@ def schedulePostJetMCTruthAugmentations(kernel=None, decorationDressing=None):
if IsSUSYSignal():
from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
augmentationToolsList += DecorateSUSYProcess('MCTruthCommon')
+
from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramework__CommonAugmentation
kernel += CfgMgr.DerivationFramework__CommonAugmentation("MCTruthCommonPostJetKernel",
AugmentationTools = augmentationToolsList
)
+ # add SoW of individual SUSY final states, relies on augmentation from DecorateSUSYProcess()
+ if IsSUSYSignal():
+ from DerivationFrameworkSUSY.SUSYWeightMetadata import addSUSYWeights
+ addSUSYWeights(kernel)
+
# This adds the entirety of TRUTH3
def addStandardTruthContents(kernel=None,
decorationDressing='dressedPhoton',
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py
index be07492d20beeb26dbcfaab49e48d4c0d50427ae..8a11b76b38c8d93977885a65c3120de4f2fe6c18 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py
@@ -70,10 +70,6 @@ if DerivationFrameworkHasTruth:
addPVCollection(SeqPHYS)
# Set appropriate truth jet collection for tau truth matching
ToolSvc.DFCommonTauTruthMatchingTool.TruthJetContainerName = "AntiKt4TruthDressedWZJets"
- # SUSY signal
- from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
- if IsSUSYSignal():
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
# Add sumOfWeights metadata for LHE3 multiweights =======
from DerivationFrameworkCore.LHE3WeightMetadata import *
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS2.py
index 9b8bf153e43d44d7b6bc4d2dcbf875b67f0f9793..d3f71df458ecff9738f257fe8c89aa0ec6bd564a 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS2.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS2.py
@@ -71,10 +71,6 @@ if DerivationFrameworkHasTruth:
addPVCollection(SeqPHYS2)
# Set appropriate truth jet collection for tau truth matching
ToolSvc.DFCommonTauTruthMatchingTool.TruthJetContainerName = "AntiKt4TruthDressedWZJets"
- # SUSY signal
- from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
- if IsSUSYSignal():
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
# Add sumOfWeights metadata for LHE3 multiweights =======
from DerivationFrameworkCore.LHE3WeightMetadata import *
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py
index 99980e389465387d215853a8cb7eb4d897b264c7..d16466f3fd505c18ada8108210b140af94e03388 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py
@@ -54,9 +54,6 @@ if DerivationFrameworkHasTruth:
ToolSvc.DFCommonTauTruthMatchingTool.TruthJetContainerName = "AntiKt4TruthDressedWZJets"
# Add sumOfWeights metadata for LHE3 multiweights =======
from DerivationFrameworkCore.LHE3WeightMetadata import *
- from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
- if IsSUSYSignal():
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
#==============================================================================
# HEAVY FLAVOR DECORATION
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/python/SUSYWeightMetadata.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/python/SUSYWeightMetadata.py
index 1524de83d515260d1f42e2671368b9608c699c5d..7d37a1bfdd521d4681afb44bac3380d029098139 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/python/SUSYWeightMetadata.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/python/SUSYWeightMetadata.py
@@ -31,11 +31,3 @@ def addSUSYWeights(seq, pref = ""):
sumOfWeightsAlg.WeightTools = listTools
seq += sumOfWeightsAlg
-
-
-from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkJob
-
-# skip this in data
-from AthenaCommon.GlobalFlags import globalflags
-if globalflags.DataSource() == 'geant4':
- addSUSYWeights(DerivationFrameworkJob, "")
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY1.py
index 5a17f0ae5122aca6c838df96942ccb0e651f13f4..246836ee150e2ce73b2de53df70cd37aedb023ee 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY1.py
@@ -284,20 +284,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
# Add sumOfWeights metadata for LHE3 multiweights =======
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation (before skimming!)
-#==============================================================================
-
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
-
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY1 += CfgMgr.DerivationFramework__DerivationKernel("SUSY1KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY1")
- )
-
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
-
#==============================================================================
# SUSY skimming selection
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY10.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY10.py
index 551d7a2340b6ffa5b11c3cf596c4561cfc4c330e..ec2866f191afebaab612c50609a66debe5637bcf 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY10.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY10.py
@@ -174,19 +174,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
# Add sumOfWeights metadata for LHE3 multiweights =======
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation (before skimming!)
-#==============================================================================
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
-
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY10 += CfgMgr.DerivationFramework__DerivationKernel("SUSY10KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY10")
- )
-
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
-
#==============================================================================
# SUSY skimming selection
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY11.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY11.py
index 8c35045730fd73defc110485696818ec90c7aaf9..fa1e8ffa0c4c943cbc17c4530ebf144f608cab5a 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY11.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY11.py
@@ -125,19 +125,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
# Add sumOfWeights metadata for LHE3 multiweights =======
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation (before skimming!)
-#==============================================================================
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
-
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY11 += CfgMgr.DerivationFramework__DerivationKernel("SUSY11KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY11")
- )
-
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
-
#==============================================================================
# SUSY skimming selection
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY12.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY12.py
index ec79787e9f5b333a5333542cde53a2ea2cd0a2d6..05abd81f97e89637da1e051098f30b11f7cfc27e 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY12.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY12.py
@@ -233,19 +233,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
# Add sumOfWeights metadata for LHE3 multiweights =======
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation (before skimming!)
-#==============================================================================
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
-
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY12 += CfgMgr.DerivationFramework__DerivationKernel("SUSY12KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY12")
- )
-
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
-
#==============================================================================
# SUSY skimming selection
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY13.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY13.py
index d1a752079265b1a88bb3265f590cced6e71a8fcd..e6fb846debb17ab9ee47cd995f2ea1bfc5dc649d 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY13.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY13.py
@@ -161,19 +161,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
# Add sumOfWeights metadata for LHE3 multiweights =======
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation (before skimming!)
-#==============================================================================
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
-
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY13 += CfgMgr.DerivationFramework__DerivationKernel("SUSY13KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY13")
- )
-
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
-
#==============================================================================
# SUSY skimming selection
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY14.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY14.py
index 661eb0261d068baf50fc6a4b356a5c5a2f825349..b73ac7b6f92d8e04bceae3138b0ad6c1dd50f55b 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY14.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY14.py
@@ -161,19 +161,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
# Add sumOfWeights metadata for LHE3 multiweights =======
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation (before skimming!)
-#==============================================================================
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
-
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY14 += CfgMgr.DerivationFramework__DerivationKernel("SUSY14KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY14")
- )
-
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
-
#==============================================================================
# SUSY skimming selection
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY15.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY15.py
index 67c02746314f636fe2390d8cd634e066d34fe327..4cc7e8b4658008f385530131ad8c0f8ebed7685a 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY15.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY15.py
@@ -336,20 +336,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation (before skimming!)
-#==============================================================================
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
-
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY15 += CfgMgr.DerivationFramework__DerivationKernel("SUSY15KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY15")
- )
-
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
-
-
#==============================================================================
# SUSY skimming selection
#==============================================================================
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY16.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY16.py
index aa5f5258848a7f9b292e7e9690c14fafb5d627e8..505f0bf6c507a2c6e435082d0189a2a46bdb9668 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY16.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY16.py
@@ -382,19 +382,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation (before skimming!)
-#==============================================================================
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
-
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY16 += CfgMgr.DerivationFramework__DerivationKernel("SUSY16KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY16")
- )
-
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
-
#==============================================================================
# SUSY skimming selection
#==============================================================================
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY17.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY17.py
index da2303b0a328f151885238be544d0d48a6177f33..2bb721409612f784cd97365f73dd62b549356d87 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY17.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY17.py
@@ -190,19 +190,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
# Add sumOfWeights metadata for LHE3 multiweights =======
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation
-#==============================================================================
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
-
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY17 += CfgMgr.DerivationFramework__DerivationKernel("SUSY17KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY17")
- )
-
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
-
#==============================================================================
# SUSY skimming selection
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY18.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY18.py
index 398ce031f945f2e2eda10a7ae2d6f431a1b2ddba..ad4ff203672aef6c2d4f1f7aef41c48f80cfde28 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY18.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY18.py
@@ -258,20 +258,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
# Add sumOfWeights metadata for LHE3 multiweights
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation (before skimming!)
-#==============================================================================
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
-
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY18 += CfgMgr.DerivationFramework__DerivationKernel("SUSY18KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY18")
- )
-
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
-
-
#==============================================================================
# SUSY skimming selection
#==============================================================================
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY19.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY19.py
index c96cab9f9095d43be9b9716178f3acf637d766f8..3d931912b30c4971af6ff150e6979682b7e44901 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY19.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY19.py
@@ -317,19 +317,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
# Add sumOfWeights metadata for LHE3 multiweights =======
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation (before skimming!)
-#==============================================================================
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
-
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY19 += CfgMgr.DerivationFramework__DerivationKernel("SUSY19KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY19")
- )
-
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
-
#==============================================================================
# SUSY skimming selection
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY2.py
index 7b6a60d6d717a861b73e408c74df0c77a9868180..a79587a6dd9b2a2abac73840b36d69cb3d84fc05 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY2.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY2.py
@@ -251,19 +251,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
# Add sumOfWeights metadata for LHE3 multiweights =======
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation (before skimming!)
-#==============================================================================
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
-
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY2 += CfgMgr.DerivationFramework__DerivationKernel("SUSY2KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY2")
- )
-
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
-
#==============================================================================
# SUSY skimming selection
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY3.py
index 7bcd85c01d4d6482bcf4187b7c4275301706e275..92fe1421550d84c79654ffd72454acecbaaf4620 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY3.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY3.py
@@ -179,20 +179,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation (before skimming!)
-#==============================================================================
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
-
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY3 += CfgMgr.DerivationFramework__DerivationKernel("SUSY3KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY3")
- )
-
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
-
-
#==============================================================================
# SUSY skimming selection
#==============================================================================
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY4.py
index 5c9ee749aa2f722fe67ae92bbd8483afd8dce62d..618ccdfee882b05af0bc1b9d0eb50ab7a96d892e 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY4.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY4.py
@@ -212,18 +212,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
# Add sumOfWeights metadata for LHE3 multiweights =======
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation (before skimming!)
-#==============================================================================
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
-
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY4 += CfgMgr.DerivationFramework__DerivationKernel("SUSY4KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY4")
- )
-
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
#==============================================================================
# SUSY skimming selection
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY5.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY5.py
index 999eba3cbcf853ecc8a253b025174fa0ebf5f819..bb70303fa552ecab912b1f6ccc8d7ef8302fc2d2 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY5.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY5.py
@@ -176,19 +176,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
# Add sumOfWeights metadata for LHE3 multiweights =======
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation
-#==============================================================================
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
-
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY5 += CfgMgr.DerivationFramework__DerivationKernel("SUSY5KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY5")
- )
-
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
-
#==============================================================================
# SUSY skimming selection
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY6.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY6.py
index e7ddfa8d08e87a09c358a3c92be3d49ac8c10d78..168f3ccc5a2e525b546c9601ba0fdbfabd68a2f3 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY6.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY6.py
@@ -453,16 +453,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
# Add sumOfWeights metadata for LHE3 multiweights =======
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation (before skimming!)
-#==============================================================================
-
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY6 += CfgMgr.DerivationFramework__DerivationKernel("SUSY6KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY6"))
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
#==============================================================================
# SUSY skimming selection
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY7.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY7.py
index 8c1d52d0b507c158b02f6517e921c7fbaefb67e9..ef96ae4ea43320b435fbeae0f32d508effe4c00b 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY7.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY7.py
@@ -337,19 +337,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation (before skimming!)
-#==============================================================================
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
-
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY7 += CfgMgr.DerivationFramework__DerivationKernel("SUSY7KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY7")
- )
-
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
-
#==============================================================================
# Jet building
#==============================================================================
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY8.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY8.py
index 922a38373b89ae3b4d834c7a83ac389470111a3a..56ffe72b5367e083ab994585601e84acce6edcd3 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY8.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY8.py
@@ -166,17 +166,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
# Add sumOfWeights metadata for LHE3 multiweights =======
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation (before skimming!)
-#==============================================================================
-
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY8 += CfgMgr.DerivationFramework__DerivationKernel("SUSY8KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY8"))
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
-
#==============================================================================
# SUSY skimming selection
#==============================================================================
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY9.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY9.py
index cfa4a34cd57c4fff61cc7a4fddeba351f2a9c9c0..cb1bbb7392f09ba5a270e53a8aeffc8482f81798 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY9.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY9.py
@@ -239,19 +239,6 @@ from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramew
from DerivationFrameworkCore.LHE3WeightMetadata import *
-#==============================================================================
-# SUSY signal augmentation (before skimming!)
-#==============================================================================
-from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
-if IsSUSYSignal():
-
- from DerivationFrameworkSUSY.DecorateSUSYProcess import DecorateSUSYProcess
- SeqSUSY9 += CfgMgr.DerivationFramework__DerivationKernel("SUSY9KernelSigAug",
- AugmentationTools = DecorateSUSYProcess("SUSY9")
- )
-
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
-
#====================================================================
# Prompt Lepton Tagger
#====================================================================