From 03ed41b1af97301d0baecf252e4b8ebf6975395f Mon Sep 17 00:00:00 2001
From: Tamara Vazquez Schroeder <tamara.vazquez.schroeder@cern.ch>
Date: Fri, 15 Sep 2017 15:15:28 +0000
Subject: [PATCH] Merge branch 'CharginosGauginosSimFix_21.0' into '21.0'
CfgGetter syntax fixes for Charginos and Gauginos packages
See merge request !4675
---
.../G4Extensions/Charginos/python/CharginosConfig.py | 12 ++++++------
.../G4Extensions/Gauginos/python/GauginosConfig.py | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Simulation/G4Extensions/Charginos/python/CharginosConfig.py b/Simulation/G4Extensions/Charginos/python/CharginosConfig.py
index bc9f51fbcac..fd9fb0e31a9 100644
--- a/Simulation/G4Extensions/Charginos/python/CharginosConfig.py
+++ b/Simulation/G4Extensions/Charginos/python/CharginosConfig.py
@@ -55,7 +55,7 @@ def getCharginoPlusToPiPlusNeutralino(name="CharginoPlusToPiPlusNeutralino", **k
kwargs.setdefault("ParticleName","s_chi_plus_1")
kwargs.setdefault("BR",C1ToPiBR) #Branching Ratio
kwargs.setdefault("Daughters","s_chi_0_1,pi+")
- return CfgMgr.AddPhysicsDecayTool(name, kwargs)
+ return CfgMgr.AddPhysicsDecayTool(name, **kwargs)
def getCharginoMinusToPiMinusNeutralino(name="CharginoMinusToPiMinusNeutralino", **kwargs):
@@ -70,7 +70,7 @@ def getCharginoMinusToPiMinusNeutralino(name="CharginoMinusToPiMinusNeutralino",
kwargs.setdefault("ParticleName","s_chi_minus_1")
kwargs.setdefault("BR",C1ToPiBR) #Branching Ratio
kwargs.setdefault("Daughters","s_chi_0_1,pi-")
- return CfgMgr.AddPhysicsDecayTool(name, kwargs)
+ return CfgMgr.AddPhysicsDecayTool(name, **kwargs)
def getCharginoPlusToEPlusNeutralino(name="CharginoPlusToEPlusNeutralino", **kwargs):
@@ -82,7 +82,7 @@ def getCharginoPlusToEPlusNeutralino(name="CharginoPlusToEPlusNeutralino", **kwa
kwargs.setdefault("ParticleName","s_chi_plus_1")
kwargs.setdefault("BR",C1ToEBR) #Branching Ratio
kwargs.setdefault("Daughters","s_chi_0_1,nu_e,e+")
- return CfgMgr.AddPhysicsDecayTool(name, kwargs)
+ return CfgMgr.AddPhysicsDecayTool(name, **kwargs)
def getCharginoMinusToEMinusNeutralino(name="CharginoMinusToEMinusNeutralino", **kwargs):
@@ -94,7 +94,7 @@ def getCharginoMinusToEMinusNeutralino(name="CharginoMinusToEMinusNeutralino", *
kwargs.setdefault("ParticleName","s_chi_minus_1")
kwargs.setdefault("BR",C1ToEBR) #Branching Ratio
kwargs.setdefault("Daughters","s_chi_0_1,anti_nu_e,e-")
- return CfgMgr.AddPhysicsDecayTool(name, kwargs)
+ return CfgMgr.AddPhysicsDecayTool(name, **kwargs)
def getCharginoPlusToMuPlusNeutralino(name="CharginoPlusToMuPlusNeutralino", **kwargs):
@@ -106,7 +106,7 @@ def getCharginoPlusToMuPlusNeutralino(name="CharginoPlusToMuPlusNeutralino", **k
kwargs.setdefault("ParticleName","s_chi_plus_1")
kwargs.setdefault("BR",C1ToMuonBR) #Branching Ratio
kwargs.setdefault("Daughters","s_chi_0_1,nu_mu,mu+")
- return CfgMgr.AddPhysicsDecayTool(name, kwargs)
+ return CfgMgr.AddPhysicsDecayTool(name, **kwargs)
def getCharginoMinusToMuMinusNeutralino(name="CharginoMinusToMuMinusNeutralino", **kwargs):
@@ -118,4 +118,4 @@ def getCharginoMinusToMuMinusNeutralino(name="CharginoMinusToMuMinusNeutralino",
kwargs.setdefault("ParticleName","s_chi_minus_1")
kwargs.setdefault("BR",C1ToMuonBR) #Branching Ratio
kwargs.setdefault("Daughters","s_chi_0_1,anti_nu_mu,mu-")
- return CfgMgr.AddPhysicsDecayTool(name, kwargs)
+ return CfgMgr.AddPhysicsDecayTool(name, **kwargs)
diff --git a/Simulation/G4Extensions/Gauginos/python/GauginosConfig.py b/Simulation/G4Extensions/Gauginos/python/GauginosConfig.py
index c5a9d3b62f2..bc55e052566 100644
--- a/Simulation/G4Extensions/Gauginos/python/GauginosConfig.py
+++ b/Simulation/G4Extensions/Gauginos/python/GauginosConfig.py
@@ -30,4 +30,4 @@ def getNeutralinoToPhotonGravitino(name="NeutralinoToPhotonGravitino", **kwargs)
kwargs.setdefault("ParticleName","s_chi_0_1")
kwargs.setdefault("BR", 1.0) # Branching Ratio
kwargs.setdefault("Daughters","s_G,gamma")
- return CfgMgr.AddPhysicsDecayTool(name, kwargs)
+ return CfgMgr.AddPhysicsDecayTool(name, **kwargs)
--
GitLab