From 46b895b2476a3845781854d00328bb38211fbc1f Mon Sep 17 00:00:00 2001 From: Dirk Zerwas Date: Fri, 22 Mar 2024 10:17:38 +0100 Subject: [PATCH] #6 output command of madgraph should be a relative path, simplified to common name Output --- python/Generators/Madgraph.py | 3 ++- .../Madgraph/Difermion_Polarized/Run_Difermion_Polarized.dat | 2 +- test/ref-results/Madgraph/Muon/Run_Muon.dat | 2 +- test/ref-results/Madgraph/MuonNeutrino/Run_MuonNeutrino.dat | 2 +- test/ref-results/Madgraph/TauNeutrino/Run_TauNeutrino.dat | 2 +- test/ref-results/Madgraph/ZH/Run_ZH.dat | 2 +- test/ref-results/Madgraph/ZHDecay/Run_ZHDecay.dat | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/python/Generators/Madgraph.py b/python/Generators/Madgraph.py index 7f36474..958843f 100644 --- a/python/Generators/Madgraph.py +++ b/python/Generators/Madgraph.py @@ -40,7 +40,8 @@ def write_run(self): if self.procinfo.get("decay"): self.add_decay() self.add_run_option("generate", self.proc) - self.add_run_option("output", self.outdir+f"/{self.procinfo.get('procname')}") + #self.add_run_option("output", self.outdir+f"/{self.procinfo.get('procname')}") + self.add_run_option("output", "Output") self.add_run_option("launch", None) self.add_run_option("set iseed", self.procinfo.get_rndmSeed()) self.add_run_option("set EBEAM", self.procinfo.get("sqrts")/2.) diff --git a/test/ref-results/Madgraph/Difermion_Polarized/Run_Difermion_Polarized.dat b/test/ref-results/Madgraph/Difermion_Polarized/Run_Difermion_Polarized.dat index ccdb183..8ae6014 100644 --- a/test/ref-results/Madgraph/Difermion_Polarized/Run_Difermion_Polarized.dat +++ b/test/ref-results/Madgraph/Difermion_Polarized/Run_Difermion_Polarized.dat @@ -20,7 +20,7 @@ #************************************************************" import model sm generate e- e+ > vm vm~ -output Run-Cards/Madgraph/Difermion_Polarized/Difermion_Polarized +output Output launch set iseed 4711 set EBEAM 120.0 diff --git a/test/ref-results/Madgraph/Muon/Run_Muon.dat b/test/ref-results/Madgraph/Muon/Run_Muon.dat index 6343b42..b2c9364 100644 --- a/test/ref-results/Madgraph/Muon/Run_Muon.dat +++ b/test/ref-results/Madgraph/Muon/Run_Muon.dat @@ -20,7 +20,7 @@ #************************************************************" import model sm generate e- e+ > mu- mu+ -output Run-Cards/Madgraph/Muon/Muon +output Output launch set iseed 42 set EBEAM 45.6 diff --git a/test/ref-results/Madgraph/MuonNeutrino/Run_MuonNeutrino.dat b/test/ref-results/Madgraph/MuonNeutrino/Run_MuonNeutrino.dat index a3eacda..5e81b73 100644 --- a/test/ref-results/Madgraph/MuonNeutrino/Run_MuonNeutrino.dat +++ b/test/ref-results/Madgraph/MuonNeutrino/Run_MuonNeutrino.dat @@ -20,7 +20,7 @@ #************************************************************" import model sm generate e- e+ > vm vm~ -output Run-Cards/Madgraph/MuonNeutrino/MuonNeutrino +output Output launch set iseed 4712 set EBEAM 45.6 diff --git a/test/ref-results/Madgraph/TauNeutrino/Run_TauNeutrino.dat b/test/ref-results/Madgraph/TauNeutrino/Run_TauNeutrino.dat index 9867188..0a11da3 100644 --- a/test/ref-results/Madgraph/TauNeutrino/Run_TauNeutrino.dat +++ b/test/ref-results/Madgraph/TauNeutrino/Run_TauNeutrino.dat @@ -20,7 +20,7 @@ #************************************************************" import model sm generate e- e+ > vt vt~ -output Run-Cards/Madgraph/TauNeutrino/TauNeutrino +output Output launch set iseed 4714 set EBEAM 45.6 diff --git a/test/ref-results/Madgraph/ZH/Run_ZH.dat b/test/ref-results/Madgraph/ZH/Run_ZH.dat index cee2339..8798b3c 100644 --- a/test/ref-results/Madgraph/ZH/Run_ZH.dat +++ b/test/ref-results/Madgraph/ZH/Run_ZH.dat @@ -20,7 +20,7 @@ #************************************************************" import model sm generate e- e+ > Z H -output Run-Cards/Madgraph/ZH/ZH +output Output launch set iseed 42 set EBEAM 125.0 diff --git a/test/ref-results/Madgraph/ZHDecay/Run_ZHDecay.dat b/test/ref-results/Madgraph/ZHDecay/Run_ZHDecay.dat index 1b29a59..35b10b7 100644 --- a/test/ref-results/Madgraph/ZHDecay/Run_ZHDecay.dat +++ b/test/ref-results/Madgraph/ZHDecay/Run_ZHDecay.dat @@ -20,7 +20,7 @@ #************************************************************" import model sm-lepton_masses generate e- e+ > Z H , Z > ta- ta+ , H > mu- mu+ -output Run-Cards/Madgraph/ZHDecay/ZHDecay +output Output launch set iseed 42 set EBEAM 125.0