diff --git a/docs/found-issues.md b/docs/found-issues.md index 59627874..77952078 100644 --- a/docs/found-issues.md +++ b/docs/found-issues.md @@ -22,3 +22,7 @@ The generators are listed in alphabetical order. ### Sherpa - [x] [Issue](https://gitlab.com/sherpa-team/sherpa/-/issues/655): Inconsistent cross-section from Sherpa. Our automated test discovered that Sherpa was underestimating the total cross-section. The bug was found and fixed in a subsequent [merge request](https://gitlab.com/sherpa-team/sherpa/-/merge_requests/1086). + +### Whizard + +- [ ] [Issue](https://github.com/key4hep/k4GeneratorsConfig/issues/86): Whizard slows down to a stop for more than 2M events. diff --git a/examples/FermionProduction.yaml b/examples/ChargedLeptonProduction.yaml similarity index 87% rename from examples/FermionProduction.yaml rename to examples/ChargedLeptonProduction.yaml index c285ea01..b8935325 100644 --- a/examples/FermionProduction.yaml +++ b/examples/ChargedLeptonProduction.yaml @@ -4,6 +4,7 @@ Generators: - Madgraph - KKMC - Pythia + - Herwig OutputFormat: edm4hep OutDir: Run-Cards @@ -18,10 +19,6 @@ Processes: Muon91.2: Final: [13, -13] - MuonNeutrino91.2: - Final: [14, -14] - ISRMode: 1 - Tau91.2: Final: [15, -15] ISRMode: 1 @@ -31,10 +28,6 @@ Processes: SqrtS: 350 ISRMode: 1 - MuonNeutrino350: - Final: [14, -14] - SqrtS: 350 - Tau350: Final: [15, -15] SqrtS: 350 diff --git a/examples/NeutrinoProduction.yaml b/examples/NeutrinoProduction.yaml new file mode 100644 index 00000000..0cf0a81d --- /dev/null +++ b/examples/NeutrinoProduction.yaml @@ -0,0 +1,58 @@ +Generators: + - Sherpa + - Whizard + - Madgraph + - KKMC + - Pythia + +OutputFormat: edm4hep +OutDir: Run-Cards +Events: 10000 +EventMode: unweighted + +SqrtS: 91.2 +Model: SM +ISRMode: 0 + +Processes: + + MuonNeutrino91.2: + Final: [14, -14] + ISRMode: 1 + + MuonNeutrino350: + Final: [14, -14] + SqrtS: 350 + +Selectors: + Process: + Tau350: + PT: + Max: 175 + Min: 20 + Flavour: [-15,15] + Muon350: + PT: + Max: 175 + Min: 20 + Flavour: [-13,13] + Muon91.2: + PT: + Max: 45.6 + Min: 20 + Flavour: [-13,13] + + +Sherpa: + Run: + EW_SCHEME: 3 + + +ParticleData: + 23: + mass: 91.1876 + width: 2.4952 + +Analysis: + Tools: [key4HEP] + diff --git a/examples/ZHProduction.yaml b/examples/ZHProduction.yaml index a0f34984..e9d80537 100644 --- a/examples/ZHProduction.yaml +++ b/examples/ZHProduction.yaml @@ -1,4 +1,5 @@ Generators: + - Herwig - Sherpa - Whizard - Madgraph diff --git a/k4GeneratorsConfig/src/eventGenerationCollections2Root.cxx b/k4GeneratorsConfig/src/eventGenerationCollections2Root.cxx index 695dc9f6..05be6c48 100644 --- a/k4GeneratorsConfig/src/eventGenerationCollections2Root.cxx +++ b/k4GeneratorsConfig/src/eventGenerationCollections2Root.cxx @@ -28,7 +28,7 @@ void k4GeneratorsConfig::eventGenerationCollections2Root::Init() { TGaxis::SetExponentOffset(-0.08, -0.12, "y"); // define the generator colors (as offset) - std::vector genNames = {"Madgraph", "Sherpa", "Whizard", "KKMC", "Pythia", "Babayaga"}; + std::vector genNames = {"Madgraph", "Sherpa", "Whizard", "KKMC", "Pythia", "Babayaga", "Herwig"}; for (unsigned int i = 0; i < genNames.size(); i++) { m_generatorColorOffset[genNames[i]] = i; } @@ -464,7 +464,7 @@ void k4GeneratorsConfig::eventGenerationCollections2Root::writeCrossSectionFigur mgRMS->GetYaxis()->SetLabelSize(0.1); // generate a name and write a png - label << m_dirname << "/" << m_processesList[iProc] << "wRMS.png"; + label << m_dirname << "/" << m_processesList[iProc] << "wRMS.pdf"; c1->Print(label.str().c_str()); label.clear(); label.str(""); @@ -503,7 +503,7 @@ void k4GeneratorsConfig::eventGenerationCollections2Root::writeCrossSectionFigur mgDelta->GetYaxis()->SetLabelSize(0.1); // generate a name and write a png - label << m_dirname << "/" << m_processesList[iProc] << "wDelta.png"; + label << m_dirname << "/" << m_processesList[iProc] << "wDelta.pdf"; c1->Print(label.str().c_str()); label.clear(); label.str(""); @@ -571,7 +571,7 @@ void k4GeneratorsConfig::eventGenerationCollections2Root::writeAnalysisHistosFig // now build the legend: TLegend* topLegend = new TLegend(0.1, 0.0, 0.4, 0.4); std::ostringstream title; - title << m_procSqrtsList[proc].first << " #sqrt{s} =" << m_procSqrtsList[proc].second << "GeV"; + title << m_procSqrtsList[proc].first << " #sqrt{s} =" << m_procSqrtsList[proc].second << " GeV"; topLegend->SetHeader(title.str().c_str(), "C"); // we need to get the histo from the top TList* topPadPrimitives = topPad->GetListOfPrimitives(); @@ -626,7 +626,7 @@ void k4GeneratorsConfig::eventGenerationCollections2Root::writeAnalysisHistosFig // done, save the canvas label << m_dirname << "/" << m_procSqrtsList[proc].first << (unsigned int)(m_procSqrtsList[proc].second * m_EnergyUnitCnv) << m_cnvAnalysisHistosNames[proc][ihisto] - << ".png"; + << ".pdf"; m_cnvAnalysisHistos[proc][ihisto]->Print(label.str().c_str()); label.clear(); label.str(""); diff --git a/python/Generators/Babayaga.py b/python/Generators/Babayaga.py index 0cf94dfa..9dc08108 100644 --- a/python/Generators/Babayaga.py +++ b/python/Generators/Babayaga.py @@ -139,6 +139,10 @@ def getParticleOperator(self, pdg, prop): # not used by Babayaga pass + def getParticlePropertyUnit(self): + # not used + pass + def getParticleProperty(self, attr): # not used by Babayaga pass diff --git a/python/Generators/GeneratorBase.py b/python/Generators/GeneratorBase.py index c05504ab..a78383da 100644 --- a/python/Generators/GeneratorBase.py +++ b/python/Generators/GeneratorBase.py @@ -323,7 +323,7 @@ def resetGeneratorDatacard(self): def getGeneratorCommand(self,key,value): pass - def addOption2GeneratorDatacard(self,key,value,replace=True): + def addOption2GeneratorDatacard(self,key,value,unit="",replace=True): # check if the key is already defined in the datacard, then we take the last one (TBC): if replace is True: if key in self.__datacardContent: @@ -440,14 +440,19 @@ def prepareParticles(self,add2Datacard=True, writeParticleHeader=False): for attr in particle: value = particle[attr] prop = self.getParticleProperty(attr) + unit = self.getParticlePropertyUnit() # writing out if prop is not None: command = self.getParticleOperator(pdg,prop) if add2Datacard is True: - self.addOption2GeneratorDatacard(command, value,replace=False) + self.addOption2GeneratorDatacard(command, value, unit, replace=False) else: self.replaceOptionInGeneratorDatacard(command,value) + @abstractmethod + def getParticlePropertyUnit(self): + pass + @abstractmethod def getParticleProperty(self, attr): pass @@ -552,11 +557,14 @@ def prepareAnalysisContent(self): # write the RIVET analysis if (outformat == "edm4hep" or outformat == "hepmc3") and self.procinfo.settings.rivetON(): + # first we add the RIVET_ANALYSIS_PATH setting + analysis += f"export RIVET_ANALYSIS_PATH={self.procinfo.settings.rivetpath}\n" + # now the actual rivet command yodaout = self.procinfo.settings.yodaoutput + f"/{self.procinfo.get('procname')}.yoda" analysis += f"rivet" for ana in self.procinfo.settings.analysisname: analysis += f" -a {ana}" - analysis+=f" -o {yodaout} {self.procinfo.get('procname')}.{self.procinfo.get_output_format()}\n" + analysis+=f" -o {yodaout} {self.procinfo.get('procname')}.hepmc\n" # add to the text to the data member self.add2Analysis(analysis) diff --git a/python/Generators/Herwig.py b/python/Generators/Herwig.py new file mode 100644 index 00000000..f24e108a --- /dev/null +++ b/python/Generators/Herwig.py @@ -0,0 +1,273 @@ +from .GeneratorBase import GeneratorBase + +class Herwig(GeneratorBase): + """Herwig class""" + + def __init__(self, procinfo): + super().__init__(procinfo, "Herwig", "in") + + self.version = "x.y.z" + + self.executable = "Herwig" + + def setModelParameters(self): + # no alphaS and MZ, these are default + self.addModelParameter('GFermi') + self.addModelParameter('alphaEM') + self.addModelParameter('sin2theta') + self.addModelParticleProperty(pdg_code=23, property_type='mass') + self.addModelParticleProperty(pdg_code=23, property_type='width') + self.addModelParticleProperty(pdg_code=24, property_type='width') + + def execute(self): + # prepare the datacard + self.fill_datacard() + # prepare the key4hep script + self.fill_key4hepScript() + + def fill_datacard(self): + # prepare the datacard + self.fill_run() + # as a last step we need to add the writing out of the EventGenerator + self.add2GeneratorDatacard(f"saverun {self.GeneratorDatacardBase} EventGenerator\n") + + def fill_run(self): + + initialState = [self.procinfo.get_beam_flavour(1), self.procinfo.get_beam_flavour(2)] + if initialState[0]*initialState[1] == -121: + self.add2GeneratorDatacard("read snippets/EECollider.in\n") + + beamA = self.pdg_to_herwig(initialState[0]) + beamB = self.pdg_to_herwig(initialState[1]) + + self.add2GeneratorDatacard("cd /Herwig/Generators\n") + self.addOption2GeneratorDatacard("set EventGenerator:EventHandler:BeamA", f"/Herwig/Particles/{beamA}") + self.addOption2GeneratorDatacard("set EventGenerator:EventHandler:BeamB", f"/Herwig/Particles/{beamB}") + self.addOption2GeneratorDatacard("set /Herwig/EventHandlers/Luminosity:Energy",str(self.procinfo.get("sqrts"))+"*GeV") + self.addOption2GeneratorDatacard("set EventGenerator:NumberOfEvents", self.procinfo.settings.get_nevents()) + + self.addOption2GeneratorDatacard("set EventGenerator:RandomNumberGenerator:Seed", self.procinfo.get_rndmSeed()) + + # ISR + if self.procinfo.get("isrmode"): + print("ISR NOT Implemented") + #self.addOption2GeneratorDatacard(f"set /Herwig/Particles/{beamA}:PDF", "/Herwig/Partons/DefaultPDF") + #self.addOption2GeneratorDatacard(f"set /Herwig/Particles/{beamB}:PDF", "/Herwig/Partons/DefaultPDF") + else: + self.addOption2GeneratorDatacard(f"set /Herwig/Particles/{beamA}:PDF", "/Herwig/Partons/NoPDF") + self.addOption2GeneratorDatacard(f"set /Herwig/Particles/{beamB}:PDF", "/Herwig/Partons/NoPDF") + + # FSR + if self.procinfo.get("fsrmode"): + print("FSR on to be implemented for Herwig") + #self.addOption2GeneratorDatacard("set /Herwig/Shower/SplittingGenerator:FSR", "Yes") + else: + print("FSR on to be implemented for Herwig") + #self.addOption2GeneratorDatacard("set /Herwig/Shower/SplittingGenerator:FSR", "No") + + # now add the model parameters + self.prepareParameters() + + # now add the particles checking for overlap with ProcDB + self.prepareParticles() + + # add the procDB settings + self.add2GeneratorDatacard("cd /Herwig/MatrixElements\n") + for key in self.procDB.getDict(): + value = self.procDB.getDict()[key] + self.addOption2GeneratorDatacard(key,value) + + # the generator settings from yaml are set last as they superseed all previous settings + if self.gen_settings is not None: + for key, value in self.gen_settings.items(): + self.addOption2GeneratorDatacard(key, value) + + # activate writing out the HepMC file + self.add2GeneratorDatacard("cd /Herwig/Generators\n") + self.add2GeneratorDatacard("insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile\n") + self.add2GeneratorDatacard(f"set /Herwig/Analysis/HepMCFile:PrintEvent {self.procinfo.settings.get_nevents()}\n") + self.add2GeneratorDatacard("set /Herwig/Analysis/HepMCFile:Format GenEvent\n") + self.add2GeneratorDatacard("set /Herwig/Analysis/HepMCFile:Units GeV_mm\n") + self.add2GeneratorDatacard(f"set /Herwig/Analysis/HepMCFile:Filename {self.GeneratorDatacardBase}.hepmc\n") + + + def fill_decay(self): + #if self.procinfo.get("decay"): + #self.add_decay() + return + + def fill_key4hepScript(self): + key4hepRun = "" + key4hepRun += self.executable + " read " + self.GeneratorDatacardName + "\n" + key4hepRun += self.executable + " run " + self.GeneratorDatacardBase + ".run\n" + + if self.procinfo.get_output_format() == "edm4hep": + key4hepRun += f"convertHepMC2EDM4HEP -i hepmc2 -o edm4hep {self.GeneratorDatacardBase}.hepmc {self.GeneratorDatacardBase}.edm4hep\n" + + self.add2Key4hepScript(key4hepRun) + + def getGeneratorCommand(self,key,value): + return f"{key} {value}" + + def getParameterLabel(self, param): + parameterDict = { 'GFermi' : '/Herwig/Model:EW/FermiConstant', + 'alphaEM' : '/Herwig/Model:EW/AlphaEM', + 'sin2theta' : '/Herwig/Model:EW/Sin2ThetaW', + 'alphaSMZ' : '/Herwig/Model:QCD/AlphaS'} + # alphas could be SigmaProcess:alphaSvalue + if param not in parameterDict.keys(): + print(f"Warning::Herwig: parameter {param} has no translation in Herwig Parameter Dictionary") + return "" + return parameterDict[param] + + def setSelectorsDict(self): + # set up the correspondance between the yamlInput and the Sherpa convention + self.selectorsDict['eta'] = "Eta" + self.selectorsDict['pt'] = "pt" + self.selectorsDict['et'] = "pt" + #self.selectorsDict['rapidity'] = "Rapidity" + #self.selectorsDict['theta'] = "Eta" + + self.selectorsDict['mass'] = "Mass" + #self.selectorsDict['angle'] = "Angle" + self.selectorsDict['deltaeta'] = "DeltaR" + self.selectorsDict['deltarapidity'] = "DeltaY" + #self.selectorsDict['deltaphi'] = "DeltaPhi" + #self.selectorsDict['deltar'] = "DeltaR" + + + def add1ParticleSelector2Card(self, sel, name): + # if the unit is deg or rad, we need to change it: + unit = "" + if sel.get_unit() == "rad" or sel.get_unit() == "deg": + unit = "eta" + Min, Max = sel.get_MinMax(unit) + f1 = sel.get_Flavours() + for f in f1: + particle = self.pdg_to_herwig4cuts(f) + sname = f"insert Cuts:OneCuts 0 {particle}Cut" + if sname not in self.getGeneratorDatacard(): + self.add2GeneratorDatacard(f"{sname}\n") + sname = f"set /Herwig/Cuts/{particle}Cut:{name}Min {Min}" + if f"set /Herwig/Cuts/{particle}Cut:{name}Min" not in self.getGeneratorDatacard(): + self.add2GeneratorDatacard(f"{sname}\n") + sname = f"set /Herwig/Cuts/{particle}Cut:{name}Max {Max}" + if f"set /Herwig/Cuts/{particle}Cut:{name}Cut" not in self.getGeneratorDatacard(): + self.add2GeneratorDatacard(f"{sname}\n") + + def add2ParticleSelector2Card(self, sel, name): + Min, Max = sel.get_MinMax() + flavs = sel.get_Flavours() + if len(flavs) == 2: + f1 = flavs[0] + f2 = flavs[1] + if ( + str(f1) not in self.procinfo.get_finalstate_pdgString() + or str(f2) not in self.procinfo.get_finalstate_pdgString() + ): + return + particle = self.pdg_to_herwig4cuts(f1) + sname = f"insert Cuts:MultiCuts 0 /Herwig/Cuts/{particle}{name}Cut" + if sname not in self.getGeneratorDatacard(): + self.add2GeneratorDatacard(f"{sname}\n") + sname = f"set /Herwig/Cuts/{particle}{name}Cut:{name}Min {Min}" + if f"set /Herwig/Cuts/{particle}{name}Cut:{name}Min" not in self.getGeneratorDatacard(): + self.add2GeneratorDatacard(f"{sname}\n") + sname = f"set /Herwig/Cuts/{particle}{name}Cut:{name}Max {Max}" + if f"set /Herwig/Cuts/{particle}{name}Cut:{name}Max" not in self.getGeneratorDatacard(): + self.add2GeneratorDatacard(f"{sname}\n") + else: + for fl in flavs: + f1 = fl[0] + f2 = fl[1] + if ( + str(f1) not in self.procinfo.get_finalstate_pdgString() + or str(f2) not in self.procinfo.get_finalstate_pdgString() + ): + continue + particle = self.pdg_to_herwig4cuts(f1) + sname = f"insert Cuts:MultiCuts 0 /Herwig/Cuts/{particle}{name}Cut" + if sname not in self.getGeneratorDatacard(): + self.add2GeneratorDatacard(f"{sname}\n") + sname = f"set /Herwig/Cuts/{particle}{name}Cut:{name}Min {Min}" + if f"set /Herwig/Cuts/{particle}{name}Cut:{name}Min" not in self.getGeneratorDatacard(): + self.add2GeneratorDatacard(f"{sname}\n") + sname = f"set /Herwig/Cuts/{particle}{name}Cut:{name}Max {Max}" + if f"set /Herwig/Cuts/{particle}{name}Cut:{name}Max" not in self.getGeneratorDatacard(): + self.add2GeneratorDatacard(f"{sname}\n") + + + def getParameterOperator(self, name): + return f"set {name}" + + def getParticlePropertyUnit(self): + return "*GeV" + + def getParticleProperty(self, d): + name = None + if d == "mass": + name = "NominalMass" + if d == "width": + name = "Width" + return name + + def getParticleOperator(self, pdg, prop): + pdgString = self.pdg_to_herwig(abs(int(pdg))) + return f"set /Herwig/Particles/{pdgString}:{prop}" + + def getModelName(self): + # not needed for Herwig + pass + + def pdg_to_herwig(self, pdg, signed=True): + apdg = abs(pdg) + if type(pdg) is int: + particle_mapping = {1: "d", 52: "u", 3: "s", 4: "c", 5: "b", 6: "t", + 11: "e", 13: "mu", 15: "tau", + 12: "nu_e", 14: "nu_mu", 16: "nu_tau", + 21: "g", + 22: "gamma", 23: "Z0", 24: "W", + 25: "h0"} + particle = particle_mapping.get(apdg,"ERROR") + if not signed: + return particle + # continue if we need more + if particle != "ERROR": + if apdg <= 6: + if pdg > 0: + return f"{particle}" + else: + return f"{particle}bar" + elif apdg == 11 or apdg == 13 or apdg == 15: + if pdg > 0: + return f"{particle}-" + else: + return f"{particle}+" + elif apdg == 12 or apdg == 14 or apdg == 16: + if pdg > 0: + return f"{particle}" + else: + return f"{particle}bar" + elif apdg == 22 or apdg == 23 or apdg == 25: + return f"{particle}" + elif apdg == 24: + if pdg > 0: + return f"{particle}+" + else: + return f"{particle}-" + else: + return f"Cant find Herwig id for pdg {pdg}" + + def pdg_to_herwig4cuts(self, pdg): + apdg = abs(pdg) + if type(pdg) is int: + particle_mapping = {5: "BottomQuark", 6: "TopQuark", + 11: "ChargedLepton", 13: "ChargedLepton", 15: "ChargedLepton", + 12: "Lepton", 14: "Lepton", 16: "Lepton", + 22: "Photon", 23: "ZBoson", 24: "WBoson", + 25: "HiggsBoson"} + particle = particle_mapping.get(apdg,"ERROR") + if particle != "ERROR": + return particle + else: + return f"Cant find Herwig cuts id for pdg {pdg}" diff --git a/python/Generators/HerwigProcDB.py b/python/Generators/HerwigProcDB.py new file mode 100644 index 00000000..c765aeb7 --- /dev/null +++ b/python/Generators/HerwigProcDB.py @@ -0,0 +1,72 @@ +import copy +from .ProcDBBase import ProcDBBase + +class HerwigProcDB(ProcDBBase): + """HerwigProcDB class""" + + def __init__(self, process): + super().__init__(process) + self.process = process + + def execute(self): + # general stuff + # choose as function of DBTag + tag = copy.deepcopy(self.process.get_DBTag()) + # allow for e+e- and mu+mu- initial state + if tag[0] == [-11.11] or tag[0] == [-13,13]: + tag[0] = [-11,11] + # tag prepared compare + if tag == [[-11,11],[-1,1]]: + self.write_Difermion(1) + elif tag == [[-11,11],[-2,2]]: + self.write_Difermion(2) + elif tag == [[-11,11],[-3,3]]: + self.write_Difermion(3) + elif tag == [[-11,11],[-4,4]]: + self.write_Difermion(4) + elif tag == [[-11,11],[-5,5]]: + self.write_Difermion(5) + elif tag == [[-11,11],[-6,6]]: + self.write_Difermion(6) + elif tag == [[-11,11],[-13,13]]: + self.write_Difermion(13) + elif tag == [[-11,11],[-15,15]]: + self.write_Difermion(15) + elif tag == [[-11,11],[23,23]]: + self.write_WeakBosonPair(23) + elif tag == [[-11,11],[24,24]]: + self.write_WeakBosonPair(24) + elif tag == [[-11,11],[23,25]]: + self.write_run_ZH() + elif tag == [[-11,11],[-12,12,25]]: + self.write_run_Hnunu() + else: + print(f"WARNING: Process {tag} not implemented in HerwigProcDB") + + def write_Difermion(self, pdg): + MatrixElement = None + if pdg < 7: + MatrixElement = "MEee2gZ2qq" + elif pdg > 10 and pdg < 17: + MatrixElement = "MEee2gZ2ll" + + # set the matrix element etc: + if MatrixElement is not None: + self.procdict['insert SubProcess:MatrixElements 0'] = MatrixElement + if pdg < 7: + self.procdict[f"set {MatrixElement}:MinimumFlavour"] = f"{pdg}" + self.procdict[f"set {MatrixElement}:MaximumFlavour"] = f"{pdg}" + else: + print("FermionPair selection for leptons not implemented") + + def write_WeakBosonPair(self, pdg): + MatrixElement = "MEee2VV" + self.procdict['insert SubProcess:MatrixElements 0'] = MatrixElement + self.procdict[f"set {MatrixElement}:MinimumFlavour"] = f"{pdg}" + self.procdict[f"set {MatrixElement}:MaximumFlavour"] = f"{pdg}" + + def write_run_ZH(self): + self.procdict['insert SubProcess:MatrixElements 0'] = "MEee2ZH" + + def write_run_Hnunu(self): + self.procdict['insert SubProcess:MatrixElements 0'] = "MEee2HiggsVBF" diff --git a/python/Generators/KKMC.py b/python/Generators/KKMC.py index 0ede74e9..f777482a 100644 --- a/python/Generators/KKMC.py +++ b/python/Generators/KKMC.py @@ -85,14 +85,14 @@ def add_decay(self): def fill_key4hepScript(self): key4hepRun = "" - key4hepRun += "KKMCee -c {0} --nevts {2} -o {1}.hepmc3\n".format( + key4hepRun += "KKMCee -c {0} --nevts {2} -o {1}.hepmc\n".format( self.GeneratorDatacardName, self.GeneratorDatacardBase, self.procinfo.settings.get_nevents(), ) outformat = self.procinfo.get_output_format() if outformat == "edm4hep": - key4hepRun += f"convertHepMC2EDM4HEP -i hepmc3 -o edm4hep {self.GeneratorDatacardBase}.hepmc3 {self.GeneratorDatacardBase}.edm4hep\n" + key4hepRun += f"convertHepMC2EDM4HEP -i hepmc3 -o edm4hep {self.GeneratorDatacardBase}.hepmc {self.GeneratorDatacardBase}.edm4hep\n" elif outformat == "lhe": print("KKMC cannot provide LHE files, hepmc3 files will be produced") @@ -106,6 +106,10 @@ def getParameterLabel(self, param): return "" return parameterDict[param] + def getParticlePropertyUnit(self): + # not used + pass + def getParticleProperty(self, d): name = None if d == "mass": diff --git a/python/Generators/Madgraph.py b/python/Generators/Madgraph.py index d4db8136..dcf64107 100644 --- a/python/Generators/Madgraph.py +++ b/python/Generators/Madgraph.py @@ -1,3 +1,4 @@ +import math from .GeneratorBase import GeneratorBase from Particles import Particle as part @@ -13,6 +14,9 @@ def __init__(self, procinfo): self.add_header() self.executable = "mg5_aMC" + self.NbEventsSurplusFactor = 1.002 + self.maxEventsPerRun = 1000000 + self.setOptionalFileNameAndExtension(f"pythia{self.GeneratorDatacardBase}","cmnd") self.fill_PythiaCMND() @@ -63,7 +67,15 @@ def fill_datacard(self): self.addOption2GeneratorDatacard("generate", self.proc) # self.addOption2GeneratorDatacard("output", self.outdir+f"/{self.procinfo.get('procname')}") self.addOption2GeneratorDatacard("output", "Output") - self.addOption2GeneratorDatacard("launch", None) + # multi run for > 1M events + nevents = int(self.procinfo.settings.get_nevents()*self.NbEventsSurplusFactor) + if nevents <= self.maxEventsPerRun: + self.addOption2GeneratorDatacard("launch", None) + else: + nruns = math.ceil(nevents/self.maxEventsPerRun) + self.addOption2GeneratorDatacard("launch", "-i") + self.addOption2GeneratorDatacard("multi_run",nruns) + # the run_card parameters self.addOption2GeneratorDatacard("set iseed", self.procinfo.get_rndmSeed()) self.addOption2GeneratorDatacard("set EBEAM", self.procinfo.get("sqrts") / 2.0) @@ -73,7 +85,7 @@ def fill_datacard(self): # now add the particles checking for overlap with ProcDB self.prepareParticles() # temporary fix: increase LHE event size - self.addOption2GeneratorDatacard("set nevents", int(self.procinfo.settings.get_nevents()*1.002)) + self.addOption2GeneratorDatacard("set nevents", nevents) if self.procinfo.get("isrmode"): if self.procinfo.get("beamstrahlung") is not None: # if self.gen_settings is None: @@ -270,6 +282,10 @@ def getParameterOperator(self, name): def getGeneratorCommand(self,key,value): return f"{key} {value}" + def getParticlePropertyUnit(self): + # not used + pass + def getParticleProperty(self, d): if d == "mass": return "M" diff --git a/python/Generators/Pythia.py b/python/Generators/Pythia.py index e8353c65..bfcf84c4 100644 --- a/python/Generators/Pythia.py +++ b/python/Generators/Pythia.py @@ -86,9 +86,7 @@ def fill_run(self): outformat = self.procinfo.get_output_format() if outformat == "hepmc3" or outformat == "edm4hep": self.addOption2GeneratorDatacard("Main:WriteHepMC", "on") - outputFile = "{0}.hepmc3".format( - self.GeneratorDatacardBase - ) + outputFile = f"{self.GeneratorDatacardBase}.hepmc" self.addOption2GeneratorDatacard("Main:HepMCFile", outputFile) # add the procDB settings @@ -190,7 +188,7 @@ def fill_key4hepScript(self): key4hepRun += self.executable + " " + self.GeneratorDatacardName + "\n" if self.procinfo.get_output_format() == "edm4hep": - key4hepRun += f"convertHepMC2EDM4HEP -i hepmc3 -o edm4hep {self.GeneratorDatacardBase}.hepmc3 {self.GeneratorDatacardBase}.edm4hep\n" + key4hepRun += f"convertHepMC2EDM4HEP -i hepmc3 -o edm4hep {self.GeneratorDatacardBase}.hepmc {self.GeneratorDatacardBase}.edm4hep\n" self.add2Key4hepScript(key4hepRun) @@ -214,6 +212,10 @@ def getParameterOperator(self, name): return f"ParticleData:{name}" # return f"SigmaProcess:{name}" + def getParticlePropertyUnit(self): + # not used + pass + def getParticleProperty(self, d): name = None if d == "mass": diff --git a/python/Generators/Sherpa.py b/python/Generators/Sherpa.py index bb206d4d..c6364c4d 100644 --- a/python/Generators/Sherpa.py +++ b/python/Generators/Sherpa.py @@ -68,7 +68,7 @@ def write_run(self): self.prepareParameters() # output to hepmc3 - eoutname = f"HepMC3_GenEvent[{self.GeneratorDatacardBase}.hepmc3]" + eoutname = f"HepMC3_GenEvent[{self.GeneratorDatacardBase}.hepmc]" self.addOption2GeneratorDatacard("EVENT_OUTPUT", eoutname) # run settings @@ -181,7 +181,7 @@ def fill_key4hepScript(self): key4hepRun += self.executable + " " + self.GeneratorDatacardName + "\n" if self.procinfo.get_output_format() == "edm4hep": - key4hepRun += f"convertHepMC2EDM4HEP -i hepmc3 -o edm4hep {self.GeneratorDatacardBase}.hepmc3 {self.GeneratorDatacardBase}.edm4hep\n" + key4hepRun += f"convertHepMC2EDM4HEP -i hepmc3 -o edm4hep {self.GeneratorDatacardBase}.hepmc {self.GeneratorDatacardBase}.edm4hep\n" elif self.procinfo.get_output_format() == "lhe": print("Sherpa is not configured for LHE, using hepmc3") @@ -209,6 +209,10 @@ def getParameterOperator(self, name): def getGeneratorCommand(self,key,value): return f"{key}: {value}" + def getParticlePropertyUnit(self): + # not used + pass + def getParticleProperty(self, d): name = None d = d.lower() diff --git a/python/Generators/Whizard.py b/python/Generators/Whizard.py index d241af66..6ef213fb 100644 --- a/python/Generators/Whizard.py +++ b/python/Generators/Whizard.py @@ -182,8 +182,9 @@ def fill_key4hepScript(self): key4hepRun += f"wget https://whizard.hepforge.org/circe_files/{accel}/{self.procinfo.get_BeamstrahlungFile()}\n" # back to normal key4hepRun += self.executable + " " + self.GeneratorDatacardName + "\n" + key4hepRun += f"mv proc.hepmc {self.GeneratorDatacardBase}.hepmc\n" if self.procinfo.get_output_format() == "edm4hep": - key4hepRun += f"convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc {self.GeneratorDatacardBase}.edm4hep\n" + key4hepRun += f"convertHepMC2EDM4HEP -i hepmc3 -o edm4hep {self.GeneratorDatacardBase}.hepmc {self.GeneratorDatacardBase}.edm4hep\n" self.add2Key4hepScript(key4hepRun) @@ -210,6 +211,10 @@ def getParameterOperator(self, name): def getGeneratorCommand(self,key,value): return f"{key} = {value}" + def getParticlePropertyUnit(self): + # not used + pass + def getParticleProperty(self, d): name = None if d == "mass": diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index fc69d5cf..175af1a9 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,4 +1,4 @@ -# generl settings: +# general settings: set(TEST_ENVIRONMENT "PATH=${PROJECT_BINARY_DIR}/bin:$ENV{PATH}") set(TEST_TIMEOUT 3500) diff --git a/test/ref-results/Herwig/Muon350/Muon350_ISR.in b/test/ref-results/Herwig/Muon350/Muon350_ISR.in new file mode 100644 index 00000000..9a741080 --- /dev/null +++ b/test/ref-results/Herwig/Muon350/Muon350_ISR.in @@ -0,0 +1,27 @@ +read snippets/EECollider.in +cd /Herwig/Generators +set EventGenerator:EventHandler:BeamA /Herwig/Particles/e- +set EventGenerator:EventHandler:BeamB /Herwig/Particles/e+ +set /Herwig/EventHandlers/Luminosity:Energy 350*GeV +set EventGenerator:NumberOfEvents 10000 +set EventGenerator:RandomNumberGenerator:Seed 4713 +set /Herwig/Model:QCD/AlphaS 0.1184 +set /Herwig/Model:EW/FermiConstant 1.16637e-05 +set /Herwig/Model:EW/AlphaEM 0.007297352566354976 +set /Herwig/Model:EW/Sin2ThetaW 0.23155 +set /Herwig/Particles/Z0:NominalMass 91.1876 +set /Herwig/Particles/Z0:Width 2.4952 +set /Herwig/Particles/t:NominalMass 172 +set /Herwig/Particles/t:Width 1.50833649 +set /Herwig/Particles/h0:NominalMass 125 +set /Herwig/Particles/h0:Width 0.00407 +set /Herwig/Particles/W+:Width 2.085 +cd /Herwig/MatrixElements +insert SubProcess:MatrixElements 0 MEee2gZ2ll +cd /Herwig/Generators +insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile +set /Herwig/Analysis/HepMCFile:PrintEvent 10000 +set /Herwig/Analysis/HepMCFile:Format GenEvent +set /Herwig/Analysis/HepMCFile:Units GeV_mm +set /Herwig/Analysis/HepMCFile:Filename Muon350_ISR.hepmc +saverun Muon350_ISR EventGenerator diff --git a/test/ref-results/Herwig/Muon350/Run_Muon350_ISR.sh b/test/ref-results/Herwig/Muon350/Run_Muon350_ISR.sh new file mode 100755 index 00000000..4f96c676 --- /dev/null +++ b/test/ref-results/Herwig/Muon350/Run_Muon350_ISR.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +if [ -z "${KEY4HEP_STACK}" ]; then + source /cvmfs/sw.hsf.org/key4hep/setup.sh +fi + +Herwig read Muon350_ISR.in +Herwig run Muon350_ISR.run +convertHepMC2EDM4HEP -i hepmc2 -o edm4hep Muon350_ISR.hepmc Muon350_ISR.edm4hep + +key4HEPAnalysis -i Muon350_ISR.edm4hep -o Muon350_ISR.root -p 13,-13 diff --git a/test/ref-results/Herwig/Muon91.2/Muon91.2.in b/test/ref-results/Herwig/Muon91.2/Muon91.2.in new file mode 100644 index 00000000..24eecd0a --- /dev/null +++ b/test/ref-results/Herwig/Muon91.2/Muon91.2.in @@ -0,0 +1,29 @@ +read snippets/EECollider.in +cd /Herwig/Generators +set EventGenerator:EventHandler:BeamA /Herwig/Particles/e- +set EventGenerator:EventHandler:BeamB /Herwig/Particles/e+ +set /Herwig/EventHandlers/Luminosity:Energy 91.2*GeV +set EventGenerator:NumberOfEvents 10000 +set EventGenerator:RandomNumberGenerator:Seed 4711 +set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF +set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF +set /Herwig/Model:QCD/AlphaS 0.1184 +set /Herwig/Model:EW/FermiConstant 1.16637e-05 +set /Herwig/Model:EW/AlphaEM 0.007297352566354976 +set /Herwig/Model:EW/Sin2ThetaW 0.23155 +set /Herwig/Particles/Z0:NominalMass 91.1876 +set /Herwig/Particles/Z0:Width 2.4952 +set /Herwig/Particles/t:NominalMass 172 +set /Herwig/Particles/t:Width 1.50833649 +set /Herwig/Particles/h0:NominalMass 125 +set /Herwig/Particles/h0:Width 0.00407 +set /Herwig/Particles/W+:Width 2.085 +cd /Herwig/MatrixElements +insert SubProcess:MatrixElements 0 MEee2gZ2ll +cd /Herwig/Generators +insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile +set /Herwig/Analysis/HepMCFile:PrintEvent 10000 +set /Herwig/Analysis/HepMCFile:Format GenEvent +set /Herwig/Analysis/HepMCFile:Units GeV_mm +set /Herwig/Analysis/HepMCFile:Filename Muon91.2.hepmc +saverun Muon91.2 EventGenerator diff --git a/test/ref-results/Herwig/Muon91.2/Run_Muon91.2.sh b/test/ref-results/Herwig/Muon91.2/Run_Muon91.2.sh new file mode 100755 index 00000000..054c26aa --- /dev/null +++ b/test/ref-results/Herwig/Muon91.2/Run_Muon91.2.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +if [ -z "${KEY4HEP_STACK}" ]; then + source /cvmfs/sw.hsf.org/key4hep/setup.sh +fi + +Herwig read Muon91.2.in +Herwig run Muon91.2.run +convertHepMC2EDM4HEP -i hepmc2 -o edm4hep Muon91.2.hepmc Muon91.2.edm4hep + +key4HEPAnalysis -i Muon91.2.edm4hep -o Muon91.2.root -p 13,-13 diff --git a/test/ref-results/Herwig/Tau350/Run_Tau350.sh b/test/ref-results/Herwig/Tau350/Run_Tau350.sh new file mode 100755 index 00000000..059e2ec0 --- /dev/null +++ b/test/ref-results/Herwig/Tau350/Run_Tau350.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +if [ -z "${KEY4HEP_STACK}" ]; then + source /cvmfs/sw.hsf.org/key4hep/setup.sh +fi + +Herwig read Tau350.in +Herwig run Tau350.run +convertHepMC2EDM4HEP -i hepmc2 -o edm4hep Tau350.hepmc Tau350.edm4hep + +key4HEPAnalysis -i Tau350.edm4hep -o Tau350.root -p 15,-15 diff --git a/test/ref-results/Herwig/Tau350/Tau350.in b/test/ref-results/Herwig/Tau350/Tau350.in new file mode 100644 index 00000000..cf6d2698 --- /dev/null +++ b/test/ref-results/Herwig/Tau350/Tau350.in @@ -0,0 +1,29 @@ +read snippets/EECollider.in +cd /Herwig/Generators +set EventGenerator:EventHandler:BeamA /Herwig/Particles/e- +set EventGenerator:EventHandler:BeamB /Herwig/Particles/e+ +set /Herwig/EventHandlers/Luminosity:Energy 350*GeV +set EventGenerator:NumberOfEvents 10000 +set EventGenerator:RandomNumberGenerator:Seed 4714 +set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF +set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF +set /Herwig/Model:QCD/AlphaS 0.1184 +set /Herwig/Model:EW/FermiConstant 1.16637e-05 +set /Herwig/Model:EW/AlphaEM 0.007297352566354976 +set /Herwig/Model:EW/Sin2ThetaW 0.23155 +set /Herwig/Particles/Z0:NominalMass 91.1876 +set /Herwig/Particles/Z0:Width 2.4952 +set /Herwig/Particles/t:NominalMass 172 +set /Herwig/Particles/t:Width 1.50833649 +set /Herwig/Particles/h0:NominalMass 125 +set /Herwig/Particles/h0:Width 0.00407 +set /Herwig/Particles/W+:Width 2.085 +cd /Herwig/MatrixElements +insert SubProcess:MatrixElements 0 MEee2gZ2ll +cd /Herwig/Generators +insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile +set /Herwig/Analysis/HepMCFile:PrintEvent 10000 +set /Herwig/Analysis/HepMCFile:Format GenEvent +set /Herwig/Analysis/HepMCFile:Units GeV_mm +set /Herwig/Analysis/HepMCFile:Filename Tau350.hepmc +saverun Tau350 EventGenerator diff --git a/test/ref-results/Herwig/Tau91.2/Run_Tau91.2_ISR.sh b/test/ref-results/Herwig/Tau91.2/Run_Tau91.2_ISR.sh new file mode 100755 index 00000000..cfb1268c --- /dev/null +++ b/test/ref-results/Herwig/Tau91.2/Run_Tau91.2_ISR.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +if [ -z "${KEY4HEP_STACK}" ]; then + source /cvmfs/sw.hsf.org/key4hep/setup.sh +fi + +Herwig read Tau91.2_ISR.in +Herwig run Tau91.2_ISR.run +convertHepMC2EDM4HEP -i hepmc2 -o edm4hep Tau91.2_ISR.hepmc Tau91.2_ISR.edm4hep + +key4HEPAnalysis -i Tau91.2_ISR.edm4hep -o Tau91.2_ISR.root -p 15,-15 diff --git a/test/ref-results/Herwig/Tau91.2/Tau91.2_ISR.in b/test/ref-results/Herwig/Tau91.2/Tau91.2_ISR.in new file mode 100644 index 00000000..39b74562 --- /dev/null +++ b/test/ref-results/Herwig/Tau91.2/Tau91.2_ISR.in @@ -0,0 +1,27 @@ +read snippets/EECollider.in +cd /Herwig/Generators +set EventGenerator:EventHandler:BeamA /Herwig/Particles/e- +set EventGenerator:EventHandler:BeamB /Herwig/Particles/e+ +set /Herwig/EventHandlers/Luminosity:Energy 91.2*GeV +set EventGenerator:NumberOfEvents 10000 +set EventGenerator:RandomNumberGenerator:Seed 4712 +set /Herwig/Model:QCD/AlphaS 0.1184 +set /Herwig/Model:EW/FermiConstant 1.16637e-05 +set /Herwig/Model:EW/AlphaEM 0.007297352566354976 +set /Herwig/Model:EW/Sin2ThetaW 0.23155 +set /Herwig/Particles/Z0:NominalMass 91.1876 +set /Herwig/Particles/Z0:Width 2.4952 +set /Herwig/Particles/t:NominalMass 172 +set /Herwig/Particles/t:Width 1.50833649 +set /Herwig/Particles/h0:NominalMass 125 +set /Herwig/Particles/h0:Width 0.00407 +set /Herwig/Particles/W+:Width 2.085 +cd /Herwig/MatrixElements +insert SubProcess:MatrixElements 0 MEee2gZ2ll +cd /Herwig/Generators +insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile +set /Herwig/Analysis/HepMCFile:PrintEvent 10000 +set /Herwig/Analysis/HepMCFile:Format GenEvent +set /Herwig/Analysis/HepMCFile:Units GeV_mm +set /Herwig/Analysis/HepMCFile:Filename Tau91.2_ISR.hepmc +saverun Tau91.2_ISR EventGenerator diff --git a/test/ref-results/Herwig/ZH250/Run_ZH250_ISR.sh b/test/ref-results/Herwig/ZH250/Run_ZH250_ISR.sh new file mode 100755 index 00000000..9e719d0f --- /dev/null +++ b/test/ref-results/Herwig/ZH250/Run_ZH250_ISR.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +if [ -z "${KEY4HEP_STACK}" ]; then + source /cvmfs/sw.hsf.org/key4hep/setup.sh +fi + +Herwig read ZH250_ISR.in +Herwig run ZH250_ISR.run +convertHepMC2EDM4HEP -i hepmc2 -o edm4hep ZH250_ISR.hepmc ZH250_ISR.edm4hep + +key4HEPAnalysis -i ZH250_ISR.edm4hep -o ZH250_ISR.root -p 23,25 diff --git a/test/ref-results/Herwig/ZH250/ZH250_ISR.in b/test/ref-results/Herwig/ZH250/ZH250_ISR.in new file mode 100644 index 00000000..98a536d0 --- /dev/null +++ b/test/ref-results/Herwig/ZH250/ZH250_ISR.in @@ -0,0 +1,28 @@ +read snippets/EECollider.in +cd /Herwig/Generators +set EventGenerator:EventHandler:BeamA /Herwig/Particles/e- +set EventGenerator:EventHandler:BeamB /Herwig/Particles/e+ +set /Herwig/EventHandlers/Luminosity:Energy 250.0*GeV +set EventGenerator:NumberOfEvents 10000 +set EventGenerator:RandomNumberGenerator:Seed 4711 +set /Herwig/Model:QCD/AlphaS 0.1184 +set /Herwig/Model:EW/FermiConstant 1.16637e-05 +set /Herwig/Model:EW/AlphaEM 0.007297352566354976 +set /Herwig/Model:EW/Sin2ThetaW 0.23155 +set /Herwig/Particles/Z0:NominalMass 91.1876 +set /Herwig/Particles/Z0:Width 2.4952 +set /Herwig/Particles/t:NominalMass 172 +set /Herwig/Particles/t:Width 1.50833649 +set /Herwig/Particles/h0:NominalMass 125 +set /Herwig/Particles/h0:Width 0.00407 +set /Herwig/Particles/W+:Width 2.085 +set /Herwig/Particles/W+:NominalMass 80.379 +cd /Herwig/MatrixElements +insert SubProcess:MatrixElements 0 MEee2ZH +cd /Herwig/Generators +insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile +set /Herwig/Analysis/HepMCFile:PrintEvent 10000 +set /Herwig/Analysis/HepMCFile:Format GenEvent +set /Herwig/Analysis/HepMCFile:Units GeV_mm +set /Herwig/Analysis/HepMCFile:Filename ZH250_ISR.hepmc +saverun ZH250_ISR EventGenerator diff --git a/test/ref-results/Herwig/ZH350/Run_ZH350_ISR.sh b/test/ref-results/Herwig/ZH350/Run_ZH350_ISR.sh new file mode 100755 index 00000000..f84306cb --- /dev/null +++ b/test/ref-results/Herwig/ZH350/Run_ZH350_ISR.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +if [ -z "${KEY4HEP_STACK}" ]; then + source /cvmfs/sw.hsf.org/key4hep/setup.sh +fi + +Herwig read ZH350_ISR.in +Herwig run ZH350_ISR.run +convertHepMC2EDM4HEP -i hepmc2 -o edm4hep ZH350_ISR.hepmc ZH350_ISR.edm4hep + +key4HEPAnalysis -i ZH350_ISR.edm4hep -o ZH350_ISR.root -p 23,25 diff --git a/test/ref-results/Herwig/ZH350/ZH350_ISR.in b/test/ref-results/Herwig/ZH350/ZH350_ISR.in new file mode 100644 index 00000000..871a28e5 --- /dev/null +++ b/test/ref-results/Herwig/ZH350/ZH350_ISR.in @@ -0,0 +1,28 @@ +read snippets/EECollider.in +cd /Herwig/Generators +set EventGenerator:EventHandler:BeamA /Herwig/Particles/e- +set EventGenerator:EventHandler:BeamB /Herwig/Particles/e+ +set /Herwig/EventHandlers/Luminosity:Energy 350*GeV +set EventGenerator:NumberOfEvents 10000 +set EventGenerator:RandomNumberGenerator:Seed 42 +set /Herwig/Model:QCD/AlphaS 0.1184 +set /Herwig/Model:EW/FermiConstant 1.16637e-05 +set /Herwig/Model:EW/AlphaEM 0.007297352566354976 +set /Herwig/Model:EW/Sin2ThetaW 0.23155 +set /Herwig/Particles/Z0:NominalMass 91.1876 +set /Herwig/Particles/Z0:Width 2.4952 +set /Herwig/Particles/t:NominalMass 172 +set /Herwig/Particles/t:Width 1.50833649 +set /Herwig/Particles/h0:NominalMass 125 +set /Herwig/Particles/h0:Width 0.00407 +set /Herwig/Particles/W+:Width 2.085 +set /Herwig/Particles/W+:NominalMass 80.379 +cd /Herwig/MatrixElements +insert SubProcess:MatrixElements 0 MEee2ZH +cd /Herwig/Generators +insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile +set /Herwig/Analysis/HepMCFile:PrintEvent 10000 +set /Herwig/Analysis/HepMCFile:Format GenEvent +set /Herwig/Analysis/HepMCFile:Units GeV_mm +set /Herwig/Analysis/HepMCFile:Filename ZH350_ISR.hepmc +saverun ZH350_ISR EventGenerator diff --git a/test/ref-results/KKMC/Muon350/Muon350_ISR.dat b/test/ref-results/KKMC/Muon350/Muon350_ISR.dat index 1ccf10af..58516fe8 100644 --- a/test/ref-results/KKMC/Muon350/Muon350_ISR.dat +++ b/test/ref-results/KKMC/Muon350/Muon350_ISR.dat @@ -405,7 +405,7 @@ BeginX ******************************************************************************** ******************************************************************************** * FOAM GENERATION PARAMETERS - 3020 4714 Ranmar initial random number seed (KKMC and FOAM) + 3020 4713 Ranmar initial random number seed (KKMC and FOAM) *indx_____data______ccccccccc0cccc__________General_____ccc0ccccccccc0ccccccccc0 3021 20000 FOAM Maximum number of cells (5000 default, 2000 for map) 3022 0 FOAM Vopt: set to 0 to save vertices, 1 to NOT save them diff --git a/test/ref-results/KKMC/Muon350/Run_Muon350_ISR.sh b/test/ref-results/KKMC/Muon350/Run_Muon350_ISR.sh index 6846d511..2a062a3a 100755 --- a/test/ref-results/KKMC/Muon350/Run_Muon350_ISR.sh +++ b/test/ref-results/KKMC/Muon350/Run_Muon350_ISR.sh @@ -3,7 +3,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then source /cvmfs/sw.hsf.org/key4hep/setup.sh fi -KKMCee -c Muon350_ISR.dat --nevts 10000 -o Muon350_ISR.hepmc3 -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Muon350_ISR.hepmc3 Muon350_ISR.edm4hep +KKMCee -c Muon350_ISR.dat --nevts 10000 -o Muon350_ISR.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Muon350_ISR.hepmc Muon350_ISR.edm4hep key4HEPAnalysis -i Muon350_ISR.edm4hep -o Muon350_ISR.root -p 13,-13 diff --git a/test/ref-results/KKMC/Muon91.2/Run_Muon91.2.sh b/test/ref-results/KKMC/Muon91.2/Run_Muon91.2.sh index 52100728..9540f054 100755 --- a/test/ref-results/KKMC/Muon91.2/Run_Muon91.2.sh +++ b/test/ref-results/KKMC/Muon91.2/Run_Muon91.2.sh @@ -3,7 +3,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then source /cvmfs/sw.hsf.org/key4hep/setup.sh fi -KKMCee -c Muon91.2.dat --nevts 10000 -o Muon91.2.hepmc3 -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Muon91.2.hepmc3 Muon91.2.edm4hep +KKMCee -c Muon91.2.dat --nevts 10000 -o Muon91.2.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Muon91.2.hepmc Muon91.2.edm4hep key4HEPAnalysis -i Muon91.2.edm4hep -o Muon91.2.root -p 13,-13 diff --git a/test/ref-results/KKMC/MuonNeutrino350/MuonNeutrino350.dat b/test/ref-results/KKMC/MuonNeutrino350/MuonNeutrino350.dat index 3567886c..95257a3f 100644 --- a/test/ref-results/KKMC/MuonNeutrino350/MuonNeutrino350.dat +++ b/test/ref-results/KKMC/MuonNeutrino350/MuonNeutrino350.dat @@ -405,7 +405,7 @@ BeginX ******************************************************************************** ******************************************************************************** * FOAM GENERATION PARAMETERS - 3020 4715 Ranmar initial random number seed (KKMC and FOAM) + 3020 4712 Ranmar initial random number seed (KKMC and FOAM) *indx_____data______ccccccccc0cccc__________General_____ccc0ccccccccc0ccccccccc0 3021 20000 FOAM Maximum number of cells (5000 default, 2000 for map) 3022 0 FOAM Vopt: set to 0 to save vertices, 1 to NOT save them diff --git a/test/ref-results/KKMC/MuonNeutrino350/Run_MuonNeutrino350.sh b/test/ref-results/KKMC/MuonNeutrino350/Run_MuonNeutrino350.sh index 3335a81f..ba4127f3 100755 --- a/test/ref-results/KKMC/MuonNeutrino350/Run_MuonNeutrino350.sh +++ b/test/ref-results/KKMC/MuonNeutrino350/Run_MuonNeutrino350.sh @@ -3,7 +3,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then source /cvmfs/sw.hsf.org/key4hep/setup.sh fi -KKMCee -c MuonNeutrino350.dat --nevts 10000 -o MuonNeutrino350.hepmc3 -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonNeutrino350.hepmc3 MuonNeutrino350.edm4hep +KKMCee -c MuonNeutrino350.dat --nevts 10000 -o MuonNeutrino350.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonNeutrino350.hepmc MuonNeutrino350.edm4hep key4HEPAnalysis -i MuonNeutrino350.edm4hep -o MuonNeutrino350.root -p 14,-14 diff --git a/test/ref-results/KKMC/MuonNeutrino91.2/MuonNeutrino91.2_ISR.dat b/test/ref-results/KKMC/MuonNeutrino91.2/MuonNeutrino91.2_ISR.dat index 346bc7b8..c87d0142 100644 --- a/test/ref-results/KKMC/MuonNeutrino91.2/MuonNeutrino91.2_ISR.dat +++ b/test/ref-results/KKMC/MuonNeutrino91.2/MuonNeutrino91.2_ISR.dat @@ -405,7 +405,7 @@ BeginX ******************************************************************************** ******************************************************************************** * FOAM GENERATION PARAMETERS - 3020 4712 Ranmar initial random number seed (KKMC and FOAM) + 3020 4711 Ranmar initial random number seed (KKMC and FOAM) *indx_____data______ccccccccc0cccc__________General_____ccc0ccccccccc0ccccccccc0 3021 20000 FOAM Maximum number of cells (5000 default, 2000 for map) 3022 0 FOAM Vopt: set to 0 to save vertices, 1 to NOT save them diff --git a/test/ref-results/KKMC/MuonNeutrino91.2/Run_MuonNeutrino91.2_ISR.sh b/test/ref-results/KKMC/MuonNeutrino91.2/Run_MuonNeutrino91.2_ISR.sh index a3d253ce..6221f7f9 100755 --- a/test/ref-results/KKMC/MuonNeutrino91.2/Run_MuonNeutrino91.2_ISR.sh +++ b/test/ref-results/KKMC/MuonNeutrino91.2/Run_MuonNeutrino91.2_ISR.sh @@ -3,7 +3,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then source /cvmfs/sw.hsf.org/key4hep/setup.sh fi -KKMCee -c MuonNeutrino91.2_ISR.dat --nevts 10000 -o MuonNeutrino91.2_ISR.hepmc3 -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonNeutrino91.2_ISR.hepmc3 MuonNeutrino91.2_ISR.edm4hep +KKMCee -c MuonNeutrino91.2_ISR.dat --nevts 10000 -o MuonNeutrino91.2_ISR.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonNeutrino91.2_ISR.hepmc MuonNeutrino91.2_ISR.edm4hep key4HEPAnalysis -i MuonNeutrino91.2_ISR.edm4hep -o MuonNeutrino91.2_ISR.root -p 14,-14 diff --git a/test/ref-results/KKMC/Tau350/Run_Tau350.sh b/test/ref-results/KKMC/Tau350/Run_Tau350.sh index 6c5a2323..78493180 100755 --- a/test/ref-results/KKMC/Tau350/Run_Tau350.sh +++ b/test/ref-results/KKMC/Tau350/Run_Tau350.sh @@ -3,7 +3,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then source /cvmfs/sw.hsf.org/key4hep/setup.sh fi -KKMCee -c Tau350.dat --nevts 10000 -o Tau350.hepmc3 -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Tau350.hepmc3 Tau350.edm4hep +KKMCee -c Tau350.dat --nevts 10000 -o Tau350.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Tau350.hepmc Tau350.edm4hep key4HEPAnalysis -i Tau350.edm4hep -o Tau350.root -p 15,-15 diff --git a/test/ref-results/KKMC/Tau350/Tau350.dat b/test/ref-results/KKMC/Tau350/Tau350.dat index 56bfa456..b73a6add 100644 --- a/test/ref-results/KKMC/Tau350/Tau350.dat +++ b/test/ref-results/KKMC/Tau350/Tau350.dat @@ -405,7 +405,7 @@ BeginX ******************************************************************************** ******************************************************************************** * FOAM GENERATION PARAMETERS - 3020 4716 Ranmar initial random number seed (KKMC and FOAM) + 3020 4714 Ranmar initial random number seed (KKMC and FOAM) *indx_____data______ccccccccc0cccc__________General_____ccc0ccccccccc0ccccccccc0 3021 20000 FOAM Maximum number of cells (5000 default, 2000 for map) 3022 0 FOAM Vopt: set to 0 to save vertices, 1 to NOT save them diff --git a/test/ref-results/KKMC/Tau91.2/Run_Tau91.2_ISR.sh b/test/ref-results/KKMC/Tau91.2/Run_Tau91.2_ISR.sh index c437f1e9..eb8d63af 100755 --- a/test/ref-results/KKMC/Tau91.2/Run_Tau91.2_ISR.sh +++ b/test/ref-results/KKMC/Tau91.2/Run_Tau91.2_ISR.sh @@ -3,7 +3,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then source /cvmfs/sw.hsf.org/key4hep/setup.sh fi -KKMCee -c Tau91.2_ISR.dat --nevts 10000 -o Tau91.2_ISR.hepmc3 -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Tau91.2_ISR.hepmc3 Tau91.2_ISR.edm4hep +KKMCee -c Tau91.2_ISR.dat --nevts 10000 -o Tau91.2_ISR.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Tau91.2_ISR.hepmc Tau91.2_ISR.edm4hep key4HEPAnalysis -i Tau91.2_ISR.edm4hep -o Tau91.2_ISR.root -p 15,-15 diff --git a/test/ref-results/KKMC/Tau91.2/Tau91.2_ISR.dat b/test/ref-results/KKMC/Tau91.2/Tau91.2_ISR.dat index 3df0cbab..cb953b7c 100644 --- a/test/ref-results/KKMC/Tau91.2/Tau91.2_ISR.dat +++ b/test/ref-results/KKMC/Tau91.2/Tau91.2_ISR.dat @@ -405,7 +405,7 @@ BeginX ******************************************************************************** ******************************************************************************** * FOAM GENERATION PARAMETERS - 3020 4713 Ranmar initial random number seed (KKMC and FOAM) + 3020 4712 Ranmar initial random number seed (KKMC and FOAM) *indx_____data______ccccccccc0cccc__________General_____ccc0ccccccccc0ccccccccc0 3021 20000 FOAM Maximum number of cells (5000 default, 2000 for map) 3022 0 FOAM Vopt: set to 0 to save vertices, 1 to NOT save them diff --git a/test/ref-results/KKMC/bottom91.2/Run_bottom91.2.sh b/test/ref-results/KKMC/bottom91.2/Run_bottom91.2.sh index ac5a7015..ad2abfb6 100755 --- a/test/ref-results/KKMC/bottom91.2/Run_bottom91.2.sh +++ b/test/ref-results/KKMC/bottom91.2/Run_bottom91.2.sh @@ -3,7 +3,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then source /cvmfs/sw-nightlies.hsf.org/key4hep/setup.sh fi -KKMCee -c bottom91.2.dat -o bottom91.2.hepmc3 -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep bottom91.2.hepmc3 bottom91.2.edm4hep +KKMCee -c bottom91.2.dat -o bottom91.2.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep bottom91.2.hepmc bottom91.2.edm4hep key4HEPAnalysis -i bottom91.2.edm4hep -o bottom91.2.root -p 2,-2 diff --git a/test/ref-results/KKMC/charm91.2/Run_charm91.2.sh b/test/ref-results/KKMC/charm91.2/Run_charm91.2.sh index 10e53efc..d997ebd6 100755 --- a/test/ref-results/KKMC/charm91.2/Run_charm91.2.sh +++ b/test/ref-results/KKMC/charm91.2/Run_charm91.2.sh @@ -3,7 +3,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then source /cvmfs/sw-nightlies.hsf.org/key4hep/setup.sh fi -KKMCee -c charm91.2.dat -o charm91.2.hepmc3 -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep charm91.2.hepmc3 charm91.2.edm4hep +KKMCee -c charm91.2.dat -o charm91.2.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep charm91.2.hepmc charm91.2.edm4hep key4HEPAnalysis -i charm91.2.edm4hep -o charm91.2.root -p 4,-4 diff --git a/test/ref-results/KKMC/down91.2/Run_down91.2.sh b/test/ref-results/KKMC/down91.2/Run_down91.2.sh index 5096da33..33da8d8c 100755 --- a/test/ref-results/KKMC/down91.2/Run_down91.2.sh +++ b/test/ref-results/KKMC/down91.2/Run_down91.2.sh @@ -3,7 +3,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then source /cvmfs/sw-nightlies.hsf.org/key4hep/setup.sh fi -KKMCee -c down91.2.dat -o down91.2.hepmc3 -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep down91.2.hepmc3 down91.2.edm4hep +KKMCee -c down91.2.dat -o down91.2.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep down91.2.hepmc down91.2.edm4hep key4HEPAnalysis -i down91.2.edm4hep -o down91.2.root -p 1,-1 diff --git a/test/ref-results/KKMC/strang91.2/Run_strang91.2.sh b/test/ref-results/KKMC/strang91.2/Run_strang91.2.sh index baff01c6..e7c76847 100755 --- a/test/ref-results/KKMC/strang91.2/Run_strang91.2.sh +++ b/test/ref-results/KKMC/strang91.2/Run_strang91.2.sh @@ -3,7 +3,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then source /cvmfs/sw-nightlies.hsf.org/key4hep/setup.sh fi -KKMCee -c strang91.2.dat -o strang91.2.hepmc3 -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep strang91.2.hepmc3 strang91.2.edm4hep +KKMCee -c strang91.2.dat -o strang91.2.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep strang91.2.hepmc strang91.2.edm4hep key4HEPAnalysis -i strang91.2.edm4hep -o strang91.2.root -p 3,-3 diff --git a/test/ref-results/KKMC/up91.2/Run_up91.2.sh b/test/ref-results/KKMC/up91.2/Run_up91.2.sh index b6f210d2..7247dee6 100755 --- a/test/ref-results/KKMC/up91.2/Run_up91.2.sh +++ b/test/ref-results/KKMC/up91.2/Run_up91.2.sh @@ -3,7 +3,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then source /cvmfs/sw-nightlies.hsf.org/key4hep/setup.sh fi -KKMCee -c up91.2.dat -o up91.2.hepmc3 -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep up91.2.hepmc3 up91.2.edm4hep +KKMCee -c up91.2.dat -o up91.2.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep up91.2.hepmc up91.2.edm4hep key4HEPAnalysis -i up91.2.edm4hep -o up91.2.root -p 2,-2 diff --git a/test/ref-results/Madgraph/Muon350/Muon350_ISR.dat b/test/ref-results/Madgraph/Muon350/Muon350_ISR.dat index e1242f30..8557a4a3 100644 --- a/test/ref-results/Madgraph/Muon350/Muon350_ISR.dat +++ b/test/ref-results/Madgraph/Muon350/Muon350_ISR.dat @@ -22,7 +22,7 @@ import model loop_qcd_qed_sm_Gmu-full generate e- e+ > mu- mu+ output Output launch -set iseed 4714 +set iseed 4713 set EBEAM 175.0 set aS 0.1184 set GF 1.16637e-05 diff --git a/test/ref-results/Madgraph/MuonNeutrino350/MuonNeutrino350.dat b/test/ref-results/Madgraph/MuonNeutrino350/MuonNeutrino350.dat index fece1040..46638c4f 100644 --- a/test/ref-results/Madgraph/MuonNeutrino350/MuonNeutrino350.dat +++ b/test/ref-results/Madgraph/MuonNeutrino350/MuonNeutrino350.dat @@ -22,7 +22,7 @@ import model loop_qcd_qed_sm_Gmu-full generate e- e+ > vm vm~ output Output launch -set iseed 4715 +set iseed 4712 set EBEAM 175.0 set aS 0.1184 set GF 1.16637e-05 diff --git a/test/ref-results/Madgraph/MuonNeutrino91.2/MuonNeutrino91.2_ISR.dat b/test/ref-results/Madgraph/MuonNeutrino91.2/MuonNeutrino91.2_ISR.dat index de084ce3..87b1e18d 100644 --- a/test/ref-results/Madgraph/MuonNeutrino91.2/MuonNeutrino91.2_ISR.dat +++ b/test/ref-results/Madgraph/MuonNeutrino91.2/MuonNeutrino91.2_ISR.dat @@ -22,7 +22,7 @@ import model loop_qcd_qed_sm_Gmu-full generate e- e+ > vm vm~ output Output launch -set iseed 4712 +set iseed 4711 set EBEAM 45.6 set aS 0.1184 set GF 1.16637e-05 diff --git a/test/ref-results/Madgraph/Tau350/Tau350.dat b/test/ref-results/Madgraph/Tau350/Tau350.dat index a333b19e..f7a1cf4e 100644 --- a/test/ref-results/Madgraph/Tau350/Tau350.dat +++ b/test/ref-results/Madgraph/Tau350/Tau350.dat @@ -22,7 +22,7 @@ import model loop_qcd_qed_sm_Gmu-full generate e- e+ > ta- ta+ output Output launch -set iseed 4716 +set iseed 4714 set EBEAM 175.0 set aS 0.1184 set GF 1.16637e-05 diff --git a/test/ref-results/Madgraph/Tau91.2/Tau91.2_ISR.dat b/test/ref-results/Madgraph/Tau91.2/Tau91.2_ISR.dat index c07bcfd5..86212099 100644 --- a/test/ref-results/Madgraph/Tau91.2/Tau91.2_ISR.dat +++ b/test/ref-results/Madgraph/Tau91.2/Tau91.2_ISR.dat @@ -22,7 +22,7 @@ import model loop_qcd_qed_sm_Gmu-full generate e- e+ > ta- ta+ output Output launch -set iseed 4713 +set iseed 4712 set EBEAM 45.6 set aS 0.1184 set GF 1.16637e-05 diff --git a/test/ref-results/Pythia/Muon350/Muon350_ISR.dat b/test/ref-results/Pythia/Muon350/Muon350_ISR.dat index d125ca61..1ded3754 100644 --- a/test/ref-results/Pythia/Muon350/Muon350_ISR.dat +++ b/test/ref-results/Pythia/Muon350/Muon350_ISR.dat @@ -1,5 +1,5 @@ Random:setSeed = on -Random:seed = 4714 +Random:seed = 4713 Beams:eCM = 350 Beams:idA = 11 Beams:idB = -11 @@ -22,7 +22,7 @@ StandardModel:sin2thetaWbar = 0.23155 24:mWidth = 2.085 Main:SelectorsFile = Muon350_ISR.selectors Main:WriteHepMC = on -Main:HepMCFile = Muon350_ISR.hepmc3 +Main:HepMCFile = Muon350_ISR.hepmc Main:timesAllowErrors = 5 Init:showChangedSettings = on Init:showChangedParticleData = on diff --git a/test/ref-results/Pythia/Muon350/Run_Muon350_ISR.sh b/test/ref-results/Pythia/Muon350/Run_Muon350_ISR.sh index 6f72350b..77691ae6 100755 --- a/test/ref-results/Pythia/Muon350/Run_Muon350_ISR.sh +++ b/test/ref-results/Pythia/Muon350/Run_Muon350_ISR.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f Muon350_ISR.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Muon350_ISR.hepmc3 Muon350_ISR.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Muon350_ISR.hepmc Muon350_ISR.edm4hep key4HEPAnalysis -i Muon350_ISR.edm4hep -o Muon350_ISR.root -p 13,-13 diff --git a/test/ref-results/Pythia/Muon91.2/Muon91.2.dat b/test/ref-results/Pythia/Muon91.2/Muon91.2.dat index 75991155..74b269a3 100644 --- a/test/ref-results/Pythia/Muon91.2/Muon91.2.dat +++ b/test/ref-results/Pythia/Muon91.2/Muon91.2.dat @@ -22,7 +22,7 @@ StandardModel:sin2thetaWbar = 0.23155 24:mWidth = 2.085 Main:SelectorsFile = Muon91.2.selectors Main:WriteHepMC = on -Main:HepMCFile = Muon91.2.hepmc3 +Main:HepMCFile = Muon91.2.hepmc Main:timesAllowErrors = 5 Init:showChangedSettings = on Init:showChangedParticleData = on diff --git a/test/ref-results/Pythia/Muon91.2/Run_Muon91.2.sh b/test/ref-results/Pythia/Muon91.2/Run_Muon91.2.sh index ea744ddd..d9c953bc 100755 --- a/test/ref-results/Pythia/Muon91.2/Run_Muon91.2.sh +++ b/test/ref-results/Pythia/Muon91.2/Run_Muon91.2.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f Muon91.2.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Muon91.2.hepmc3 Muon91.2.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Muon91.2.hepmc Muon91.2.edm4hep key4HEPAnalysis -i Muon91.2.edm4hep -o Muon91.2.root -p 13,-13 diff --git a/test/ref-results/Pythia/MuonColliderZH/MuonColliderZH.dat b/test/ref-results/Pythia/MuonColliderZH/MuonColliderZH.dat index cef515c5..c984d5d8 100644 --- a/test/ref-results/Pythia/MuonColliderZH/MuonColliderZH.dat +++ b/test/ref-results/Pythia/MuonColliderZH/MuonColliderZH.dat @@ -23,7 +23,7 @@ StandardModel:sin2thetaWbar = 0.23155 24:m0 = 80.379 Main:SelectorsFile = MuonColliderZH.selectors Main:WriteHepMC = on -Main:HepMCFile = MuonColliderZH.hepmc3 +Main:HepMCFile = MuonColliderZH.hepmc Main:timesAllowErrors = 5 Init:showChangedSettings = on Init:showChangedParticleData = on diff --git a/test/ref-results/Pythia/MuonColliderZH/Run_MuonColliderZH.sh b/test/ref-results/Pythia/MuonColliderZH/Run_MuonColliderZH.sh index dc268b03..41ad713d 100755 --- a/test/ref-results/Pythia/MuonColliderZH/Run_MuonColliderZH.sh +++ b/test/ref-results/Pythia/MuonColliderZH/Run_MuonColliderZH.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f MuonColliderZH.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonColliderZH.hepmc3 MuonColliderZH.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonColliderZH.hepmc MuonColliderZH.edm4hep key4HEPAnalysis -i MuonColliderZH.edm4hep -o MuonColliderZH.root -p 23,25 diff --git a/test/ref-results/Pythia/MuonNeutrino350/MuonNeutrino350.dat b/test/ref-results/Pythia/MuonNeutrino350/MuonNeutrino350.dat index 5bfeb311..383292f5 100644 --- a/test/ref-results/Pythia/MuonNeutrino350/MuonNeutrino350.dat +++ b/test/ref-results/Pythia/MuonNeutrino350/MuonNeutrino350.dat @@ -1,5 +1,5 @@ Random:setSeed = on -Random:seed = 4715 +Random:seed = 4712 Beams:eCM = 350 Beams:idA = 11 Beams:idB = -11 @@ -22,7 +22,7 @@ StandardModel:sin2thetaWbar = 0.23155 24:mWidth = 2.085 Main:SelectorsFile = MuonNeutrino350.selectors Main:WriteHepMC = on -Main:HepMCFile = MuonNeutrino350.hepmc3 +Main:HepMCFile = MuonNeutrino350.hepmc Main:timesAllowErrors = 5 Init:showChangedSettings = on Init:showChangedParticleData = on diff --git a/test/ref-results/Pythia/MuonNeutrino350/Run_MuonNeutrino350.sh b/test/ref-results/Pythia/MuonNeutrino350/Run_MuonNeutrino350.sh index 43d9c4bd..68d1766c 100755 --- a/test/ref-results/Pythia/MuonNeutrino350/Run_MuonNeutrino350.sh +++ b/test/ref-results/Pythia/MuonNeutrino350/Run_MuonNeutrino350.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f MuonNeutrino350.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonNeutrino350.hepmc3 MuonNeutrino350.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonNeutrino350.hepmc MuonNeutrino350.edm4hep key4HEPAnalysis -i MuonNeutrino350.edm4hep -o MuonNeutrino350.root -p 14,-14 diff --git a/test/ref-results/Pythia/MuonNeutrino91.2/MuonNeutrino91.2_ISR.dat b/test/ref-results/Pythia/MuonNeutrino91.2/MuonNeutrino91.2_ISR.dat index 2412b7e1..e29d5d6f 100644 --- a/test/ref-results/Pythia/MuonNeutrino91.2/MuonNeutrino91.2_ISR.dat +++ b/test/ref-results/Pythia/MuonNeutrino91.2/MuonNeutrino91.2_ISR.dat @@ -1,5 +1,5 @@ Random:setSeed = on -Random:seed = 4712 +Random:seed = 4711 Beams:eCM = 91.2 Beams:idA = 11 Beams:idB = -11 @@ -22,7 +22,7 @@ StandardModel:sin2thetaWbar = 0.23155 24:mWidth = 2.085 Main:SelectorsFile = MuonNeutrino91.2_ISR.selectors Main:WriteHepMC = on -Main:HepMCFile = MuonNeutrino91.2_ISR.hepmc3 +Main:HepMCFile = MuonNeutrino91.2_ISR.hepmc Main:timesAllowErrors = 5 Init:showChangedSettings = on Init:showChangedParticleData = on diff --git a/test/ref-results/Pythia/MuonNeutrino91.2/Run_MuonNeutrino91.2_ISR.sh b/test/ref-results/Pythia/MuonNeutrino91.2/Run_MuonNeutrino91.2_ISR.sh index 15f0a51a..b680e2e6 100755 --- a/test/ref-results/Pythia/MuonNeutrino91.2/Run_MuonNeutrino91.2_ISR.sh +++ b/test/ref-results/Pythia/MuonNeutrino91.2/Run_MuonNeutrino91.2_ISR.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f MuonNeutrino91.2_ISR.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonNeutrino91.2_ISR.hepmc3 MuonNeutrino91.2_ISR.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonNeutrino91.2_ISR.hepmc MuonNeutrino91.2_ISR.edm4hep key4HEPAnalysis -i MuonNeutrino91.2_ISR.edm4hep -o MuonNeutrino91.2_ISR.root -p 14,-14 diff --git a/test/ref-results/Pythia/Photon91.0/Photon91.0.dat b/test/ref-results/Pythia/Photon91.0/Photon91.0.dat index 87f20ccf..e5f77586 100644 --- a/test/ref-results/Pythia/Photon91.0/Photon91.0.dat +++ b/test/ref-results/Pythia/Photon91.0/Photon91.0.dat @@ -22,7 +22,7 @@ StandardModel:sin2thetaWbar = 0.23155 24:mWidth = 2.085 Main:SelectorsFile = Photon91.0.selectors Main:WriteHepMC = on -Main:HepMCFile = Photon91.0.hepmc3 +Main:HepMCFile = Photon91.0.hepmc Main:timesAllowErrors = 5 Init:showChangedSettings = on Init:showChangedParticleData = on diff --git a/test/ref-results/Pythia/Photon91.0/Run_Photon91.0.sh b/test/ref-results/Pythia/Photon91.0/Run_Photon91.0.sh index c89f64fe..36c38733 100755 --- a/test/ref-results/Pythia/Photon91.0/Run_Photon91.0.sh +++ b/test/ref-results/Pythia/Photon91.0/Run_Photon91.0.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f Photon91.0.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Photon91.0.hepmc3 Photon91.0.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Photon91.0.hepmc Photon91.0.edm4hep key4HEPAnalysis -i Photon91.0.edm4hep -o Photon91.0.root -p 22,22 diff --git a/test/ref-results/Pythia/Tau350/Run_Tau350.sh b/test/ref-results/Pythia/Tau350/Run_Tau350.sh index 34ec6dea..6cf25023 100755 --- a/test/ref-results/Pythia/Tau350/Run_Tau350.sh +++ b/test/ref-results/Pythia/Tau350/Run_Tau350.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f Tau350.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Tau350.hepmc3 Tau350.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Tau350.hepmc Tau350.edm4hep key4HEPAnalysis -i Tau350.edm4hep -o Tau350.root -p 15,-15 diff --git a/test/ref-results/Pythia/Tau350/Tau350.dat b/test/ref-results/Pythia/Tau350/Tau350.dat index fc2b25aa..e75f0a04 100644 --- a/test/ref-results/Pythia/Tau350/Tau350.dat +++ b/test/ref-results/Pythia/Tau350/Tau350.dat @@ -1,5 +1,5 @@ Random:setSeed = on -Random:seed = 4716 +Random:seed = 4714 Beams:eCM = 350 Beams:idA = 11 Beams:idB = -11 @@ -22,7 +22,7 @@ StandardModel:sin2thetaWbar = 0.23155 24:mWidth = 2.085 Main:SelectorsFile = Tau350.selectors Main:WriteHepMC = on -Main:HepMCFile = Tau350.hepmc3 +Main:HepMCFile = Tau350.hepmc Main:timesAllowErrors = 5 Init:showChangedSettings = on Init:showChangedParticleData = on diff --git a/test/ref-results/Pythia/Tau91.2/Run_Tau91.2_ISR.sh b/test/ref-results/Pythia/Tau91.2/Run_Tau91.2_ISR.sh index fa808ebb..8dccbb0f 100755 --- a/test/ref-results/Pythia/Tau91.2/Run_Tau91.2_ISR.sh +++ b/test/ref-results/Pythia/Tau91.2/Run_Tau91.2_ISR.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f Tau91.2_ISR.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Tau91.2_ISR.hepmc3 Tau91.2_ISR.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Tau91.2_ISR.hepmc Tau91.2_ISR.edm4hep key4HEPAnalysis -i Tau91.2_ISR.edm4hep -o Tau91.2_ISR.root -p 15,-15 diff --git a/test/ref-results/Pythia/Tau91.2/Tau91.2_ISR.dat b/test/ref-results/Pythia/Tau91.2/Tau91.2_ISR.dat index c47791e2..c220d5b2 100644 --- a/test/ref-results/Pythia/Tau91.2/Tau91.2_ISR.dat +++ b/test/ref-results/Pythia/Tau91.2/Tau91.2_ISR.dat @@ -1,5 +1,5 @@ Random:setSeed = on -Random:seed = 4713 +Random:seed = 4712 Beams:eCM = 91.2 Beams:idA = 11 Beams:idB = -11 @@ -22,7 +22,7 @@ StandardModel:sin2thetaWbar = 0.23155 24:mWidth = 2.085 Main:SelectorsFile = Tau91.2_ISR.selectors Main:WriteHepMC = on -Main:HepMCFile = Tau91.2_ISR.hepmc3 +Main:HepMCFile = Tau91.2_ISR.hepmc Main:timesAllowErrors = 5 Init:showChangedSettings = on Init:showChangedParticleData = on diff --git a/test/ref-results/Pythia/Top1000/Run_Top1000_ISR.sh b/test/ref-results/Pythia/Top1000/Run_Top1000_ISR.sh index ef5f9d38..83e2d408 100755 --- a/test/ref-results/Pythia/Top1000/Run_Top1000_ISR.sh +++ b/test/ref-results/Pythia/Top1000/Run_Top1000_ISR.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f Top1000_ISR.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Top1000_ISR.hepmc3 Top1000_ISR.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Top1000_ISR.hepmc Top1000_ISR.edm4hep key4HEPAnalysis -i Top1000_ISR.edm4hep -o Top1000_ISR.root -p 6,-6 diff --git a/test/ref-results/Pythia/Top1000/Top1000_ISR.dat b/test/ref-results/Pythia/Top1000/Top1000_ISR.dat index 58df2d16..a6cff7f4 100644 --- a/test/ref-results/Pythia/Top1000/Top1000_ISR.dat +++ b/test/ref-results/Pythia/Top1000/Top1000_ISR.dat @@ -22,7 +22,7 @@ StandardModel:sin2thetaWbar = 0.23155 24:mWidth = 2.085 Main:SelectorsFile = Top1000_ISR.selectors Main:WriteHepMC = on -Main:HepMCFile = Top1000_ISR.hepmc3 +Main:HepMCFile = Top1000_ISR.hepmc Main:timesAllowErrors = 5 Init:showChangedSettings = on Init:showChangedParticleData = on diff --git a/test/ref-results/Pythia/Top350/Run_Top350_ISR.sh b/test/ref-results/Pythia/Top350/Run_Top350_ISR.sh index dc759107..f1b64a6f 100755 --- a/test/ref-results/Pythia/Top350/Run_Top350_ISR.sh +++ b/test/ref-results/Pythia/Top350/Run_Top350_ISR.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f Top350_ISR.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Top350_ISR.hepmc3 Top350_ISR.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Top350_ISR.hepmc Top350_ISR.edm4hep key4HEPAnalysis -i Top350_ISR.edm4hep -o Top350_ISR.root -p 6,-6 diff --git a/test/ref-results/Pythia/Top350/Top350_ISR.dat b/test/ref-results/Pythia/Top350/Top350_ISR.dat index 18445138..465bdefd 100644 --- a/test/ref-results/Pythia/Top350/Top350_ISR.dat +++ b/test/ref-results/Pythia/Top350/Top350_ISR.dat @@ -22,7 +22,7 @@ StandardModel:sin2thetaWbar = 0.23155 24:mWidth = 2.085 Main:SelectorsFile = Top350_ISR.selectors Main:WriteHepMC = on -Main:HepMCFile = Top350_ISR.hepmc3 +Main:HepMCFile = Top350_ISR.hepmc Main:timesAllowErrors = 5 Init:showChangedSettings = on Init:showChangedParticleData = on diff --git a/test/ref-results/Pythia/ZH250/Run_ZH250_ISR.sh b/test/ref-results/Pythia/ZH250/Run_ZH250_ISR.sh index 0f3daab6..222d0ba0 100755 --- a/test/ref-results/Pythia/ZH250/Run_ZH250_ISR.sh +++ b/test/ref-results/Pythia/ZH250/Run_ZH250_ISR.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f ZH250_ISR.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZH250_ISR.hepmc3 ZH250_ISR.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZH250_ISR.hepmc ZH250_ISR.edm4hep key4HEPAnalysis -i ZH250_ISR.edm4hep -o ZH250_ISR.root -p 23,25 diff --git a/test/ref-results/Pythia/ZH250/ZH250_ISR.dat b/test/ref-results/Pythia/ZH250/ZH250_ISR.dat index 1385edec..3d3dda86 100644 --- a/test/ref-results/Pythia/ZH250/ZH250_ISR.dat +++ b/test/ref-results/Pythia/ZH250/ZH250_ISR.dat @@ -23,7 +23,7 @@ StandardModel:sin2thetaWbar = 0.23155 24:m0 = 80.379 Main:SelectorsFile = ZH250_ISR.selectors Main:WriteHepMC = on -Main:HepMCFile = ZH250_ISR.hepmc3 +Main:HepMCFile = ZH250_ISR.hepmc Main:timesAllowErrors = 5 Init:showChangedSettings = on Init:showChangedParticleData = on diff --git a/test/ref-results/Pythia/ZH350/Run_ZH350_ISR.sh b/test/ref-results/Pythia/ZH350/Run_ZH350_ISR.sh index e2941ff0..47afa993 100755 --- a/test/ref-results/Pythia/ZH350/Run_ZH350_ISR.sh +++ b/test/ref-results/Pythia/ZH350/Run_ZH350_ISR.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f ZH350_ISR.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZH350_ISR.hepmc3 ZH350_ISR.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZH350_ISR.hepmc ZH350_ISR.edm4hep key4HEPAnalysis -i ZH350_ISR.edm4hep -o ZH350_ISR.root -p 23,25 diff --git a/test/ref-results/Pythia/ZH350/ZH350_ISR.dat b/test/ref-results/Pythia/ZH350/ZH350_ISR.dat index 71ca35f5..2d98df84 100644 --- a/test/ref-results/Pythia/ZH350/ZH350_ISR.dat +++ b/test/ref-results/Pythia/ZH350/ZH350_ISR.dat @@ -23,7 +23,7 @@ StandardModel:sin2thetaWbar = 0.23155 24:m0 = 80.379 Main:SelectorsFile = ZH350_ISR.selectors Main:WriteHepMC = on -Main:HepMCFile = ZH350_ISR.hepmc3 +Main:HepMCFile = ZH350_ISR.hepmc Main:timesAllowErrors = 5 Init:showChangedSettings = on Init:showChangedParticleData = on diff --git a/test/ref-results/Pythia/ZHDecay250/Run_ZHDecay250.sh b/test/ref-results/Pythia/ZHDecay250/Run_ZHDecay250.sh index e5f92cc1..a039c3c2 100755 --- a/test/ref-results/Pythia/ZHDecay250/Run_ZHDecay250.sh +++ b/test/ref-results/Pythia/ZHDecay250/Run_ZHDecay250.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f ZHDecay250.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZHDecay250.hepmc3 ZHDecay250.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZHDecay250.hepmc ZHDecay250.edm4hep key4HEPAnalysis -i ZHDecay250.edm4hep -o ZHDecay250.root -p 23,25 diff --git a/test/ref-results/Pythia/ZHDecay250/ZHDecay250.dat b/test/ref-results/Pythia/ZHDecay250/ZHDecay250.dat index 7e3771ce..ac646b10 100644 --- a/test/ref-results/Pythia/ZHDecay250/ZHDecay250.dat +++ b/test/ref-results/Pythia/ZHDecay250/ZHDecay250.dat @@ -23,7 +23,7 @@ StandardModel:sin2thetaWbar = 0.23155 24:m0 = 80.379 Main:SelectorsFile = ZHDecay250.selectors Main:WriteHepMC = on -Main:HepMCFile = ZHDecay250.hepmc3 +Main:HepMCFile = ZHDecay250.hepmc Main:timesAllowErrors = 5 Init:showChangedSettings = on Init:showChangedParticleData = on diff --git a/test/ref-results/Pythia/ZHDecay350/Run_ZHDecay350.sh b/test/ref-results/Pythia/ZHDecay350/Run_ZHDecay350.sh index 69adcd31..6d317051 100755 --- a/test/ref-results/Pythia/ZHDecay350/Run_ZHDecay350.sh +++ b/test/ref-results/Pythia/ZHDecay350/Run_ZHDecay350.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f ZHDecay350.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZHDecay350.hepmc3 ZHDecay350.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZHDecay350.hepmc ZHDecay350.edm4hep key4HEPAnalysis -i ZHDecay350.edm4hep -o ZHDecay350.root -p 23,25 diff --git a/test/ref-results/Pythia/ZHDecay350/ZHDecay350.dat b/test/ref-results/Pythia/ZHDecay350/ZHDecay350.dat index df5abc11..ab3da99a 100644 --- a/test/ref-results/Pythia/ZHDecay350/ZHDecay350.dat +++ b/test/ref-results/Pythia/ZHDecay350/ZHDecay350.dat @@ -23,7 +23,7 @@ StandardModel:sin2thetaWbar = 0.23155 24:m0 = 80.379 Main:SelectorsFile = ZHDecay350.selectors Main:WriteHepMC = on -Main:HepMCFile = ZHDecay350.hepmc3 +Main:HepMCFile = ZHDecay350.hepmc Main:timesAllowErrors = 5 Init:showChangedSettings = on Init:showChangedParticleData = on diff --git a/test/ref-results/Pythia/bottom91.2/Run_bottom91.2.sh b/test/ref-results/Pythia/bottom91.2/Run_bottom91.2.sh index b7365161..cc540e55 100755 --- a/test/ref-results/Pythia/bottom91.2/Run_bottom91.2.sh +++ b/test/ref-results/Pythia/bottom91.2/Run_bottom91.2.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f bottom91.2.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep bottom91.2.hepmc3 bottom91.2.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep bottom91.2.hepmc bottom91.2.edm4hep key4HEPAnalysis -i bottom91.2.edm4hep -o bottom91.2.root -p 2,-2 diff --git a/test/ref-results/Pythia/bottom91.2/bottom91.2.dat b/test/ref-results/Pythia/bottom91.2/bottom91.2.dat index 17e0ea22..4174a7a4 100644 --- a/test/ref-results/Pythia/bottom91.2/bottom91.2.dat +++ b/test/ref-results/Pythia/bottom91.2/bottom91.2.dat @@ -11,7 +11,7 @@ Main:numberOfEvents = 100000 23:mWidth = 2.4952 Main:SelectorsFile = bottom91.2.selectors Main:WriteHepMC = on -Main:HepMCFile = bottom91.2.hepmc3 +Main:HepMCFile = bottom91.2.hepmc Main:timesAllowErrors = 5 ! allow a few failures before quitting Init:showChangedSettings = on ! list changed settings Init:showChangedParticleData = on ! list changed particle data diff --git a/test/ref-results/Pythia/charm91.2/Run_charm91.2.sh b/test/ref-results/Pythia/charm91.2/Run_charm91.2.sh index 8dc96b41..b5cd1a31 100755 --- a/test/ref-results/Pythia/charm91.2/Run_charm91.2.sh +++ b/test/ref-results/Pythia/charm91.2/Run_charm91.2.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f charm91.2.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep charm91.2.hepmc3 charm91.2.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep charm91.2.hepmc charm91.2.edm4hep key4HEPAnalysis -i charm91.2.edm4hep -o charm91.2.root -p 4,-4 diff --git a/test/ref-results/Pythia/charm91.2/charm91.2.dat b/test/ref-results/Pythia/charm91.2/charm91.2.dat index 315db7af..897163e1 100644 --- a/test/ref-results/Pythia/charm91.2/charm91.2.dat +++ b/test/ref-results/Pythia/charm91.2/charm91.2.dat @@ -11,7 +11,7 @@ Main:numberOfEvents = 100000 23:mWidth = 2.4952 Main:SelectorsFile = charm91.2.selectors Main:WriteHepMC = on -Main:HepMCFile = charm91.2.hepmc3 +Main:HepMCFile = charm91.2.hepmc Main:timesAllowErrors = 5 ! allow a few failures before quitting Init:showChangedSettings = on ! list changed settings Init:showChangedParticleData = on ! list changed particle data diff --git a/test/ref-results/Pythia/down91.2/Run_down91.2.sh b/test/ref-results/Pythia/down91.2/Run_down91.2.sh index 714c220e..0a853e81 100755 --- a/test/ref-results/Pythia/down91.2/Run_down91.2.sh +++ b/test/ref-results/Pythia/down91.2/Run_down91.2.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f down91.2.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep down91.2.hepmc3 down91.2.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep down91.2.hepmc down91.2.edm4hep key4HEPAnalysis -i down91.2.edm4hep -o down91.2.root -p 1,-1 diff --git a/test/ref-results/Pythia/down91.2/down91.2.dat b/test/ref-results/Pythia/down91.2/down91.2.dat index 22bc0704..0c3ae603 100644 --- a/test/ref-results/Pythia/down91.2/down91.2.dat +++ b/test/ref-results/Pythia/down91.2/down91.2.dat @@ -11,7 +11,7 @@ Main:numberOfEvents = 100000 23:mWidth = 2.4952 Main:SelectorsFile = down91.2.selectors Main:WriteHepMC = on -Main:HepMCFile = down91.2.hepmc3 +Main:HepMCFile = down91.2.hepmc Main:timesAllowErrors = 5 ! allow a few failures before quitting Init:showChangedSettings = on ! list changed settings Init:showChangedParticleData = on ! list changed particle data diff --git a/test/ref-results/Pythia/strang91.2/Run_strang91.2.sh b/test/ref-results/Pythia/strang91.2/Run_strang91.2.sh index 9957ee7b..bd3b282a 100755 --- a/test/ref-results/Pythia/strang91.2/Run_strang91.2.sh +++ b/test/ref-results/Pythia/strang91.2/Run_strang91.2.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f strang91.2.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep strang91.2.hepmc3 strang91.2.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep strang91.2.hepmc strang91.2.edm4hep key4HEPAnalysis -i strang91.2.edm4hep -o strang91.2.root -p 3,-3 diff --git a/test/ref-results/Pythia/strang91.2/strang91.2.dat b/test/ref-results/Pythia/strang91.2/strang91.2.dat index de51d04c..5da815b6 100644 --- a/test/ref-results/Pythia/strang91.2/strang91.2.dat +++ b/test/ref-results/Pythia/strang91.2/strang91.2.dat @@ -11,7 +11,7 @@ Main:numberOfEvents = 100000 23:mWidth = 2.4952 Main:SelectorsFile = strang91.2.selectors Main:WriteHepMC = on -Main:HepMCFile = strang91.2.hepmc3 +Main:HepMCFile = strang91.2.hepmc Main:timesAllowErrors = 5 ! allow a few failures before quitting Init:showChangedSettings = on ! list changed settings Init:showChangedParticleData = on ! list changed particle data diff --git a/test/ref-results/Pythia/up91.2/Run_up91.2.sh b/test/ref-results/Pythia/up91.2/Run_up91.2.sh index bc4e245d..b627581d 100755 --- a/test/ref-results/Pythia/up91.2/Run_up91.2.sh +++ b/test/ref-results/Pythia/up91.2/Run_up91.2.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi pythiaRunner -f up91.2.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep up91.2.hepmc3 up91.2.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep up91.2.hepmc up91.2.edm4hep key4HEPAnalysis -i up91.2.edm4hep -o up91.2.root -p 2,-2 diff --git a/test/ref-results/Pythia/up91.2/up91.2.dat b/test/ref-results/Pythia/up91.2/up91.2.dat index 43e331a3..64944d42 100644 --- a/test/ref-results/Pythia/up91.2/up91.2.dat +++ b/test/ref-results/Pythia/up91.2/up91.2.dat @@ -11,7 +11,7 @@ Main:numberOfEvents = 100000 23:mWidth = 2.4952 Main:SelectorsFile = up91.2.selectors Main:WriteHepMC = on -Main:HepMCFile = up91.2.hepmc3 +Main:HepMCFile = up91.2.hepmc Main:timesAllowErrors = 5 ! allow a few failures before quitting Init:showChangedSettings = on ! list changed settings Init:showChangedParticleData = on ! list changed particle data diff --git a/test/ref-results/Sherpa/Difermion_Polarized/Difermion_Polarized.dat b/test/ref-results/Sherpa/Difermion_Polarized/Difermion_Polarized.dat index 4d1e4f53..48949325 100644 --- a/test/ref-results/Sherpa/Difermion_Polarized/Difermion_Polarized.dat +++ b/test/ref-results/Sherpa/Difermion_Polarized/Difermion_Polarized.dat @@ -12,7 +12,7 @@ EVENTS: 10000 ALPHAS(MZ): 0.1184 GF: 1.16637e-05 -EVENT_OUTPUT: HepMC3_GenEvent[Difermion_Polarized.hepmc3] +EVENT_OUTPUT: HepMC3_GenEvent[Difermion_Polarized.hepmc] EW_SCHEME: 3 EVENT_GENERATION_MODE: unweighted diff --git a/test/ref-results/Sherpa/Difermion_Polarized/Run_Difermion_Polarized.sh b/test/ref-results/Sherpa/Difermion_Polarized/Run_Difermion_Polarized.sh index e3c9d5f6..3f325179 100755 --- a/test/ref-results/Sherpa/Difermion_Polarized/Run_Difermion_Polarized.sh +++ b/test/ref-results/Sherpa/Difermion_Polarized/Run_Difermion_Polarized.sh @@ -6,6 +6,6 @@ fi Sherpa -f Difermion_Polarized.dat ./makelibs Sherpa -f Difermion_Polarized.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Difermion_Polarized.hepmc3 Difermion_Polarized.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Difermion_Polarized.hepmc Difermion_Polarized.edm4hep key4HEPAnalysis -i Difermion_Polarized.edm4hep -o Difermion_Polarized.root -p 13,-13 diff --git a/test/ref-results/Sherpa/Muon350/Muon350_ISR.dat b/test/ref-results/Sherpa/Muon350/Muon350_ISR.dat index 7448b063..e957054a 100644 --- a/test/ref-results/Sherpa/Muon350/Muon350_ISR.dat +++ b/test/ref-results/Sherpa/Muon350/Muon350_ISR.dat @@ -1,4 +1,4 @@ -RANDOM_SEED: 4714 +RANDOM_SEED: 4713 BEAMS: [11, -11] BEAM_ENERGIES: 175.0 MODEL: SM @@ -8,7 +8,7 @@ EVENTS: 10000 ALPHAS(MZ): 0.1184 GF: 1.16637e-05 -EVENT_OUTPUT: HepMC3_GenEvent[Muon350_ISR.hepmc3] +EVENT_OUTPUT: HepMC3_GenEvent[Muon350_ISR.hepmc] EVENT_GENERATION_MODE: unweighted EW_SCHEME: 3 diff --git a/test/ref-results/Sherpa/Muon350/Run_Muon350_ISR.sh b/test/ref-results/Sherpa/Muon350/Run_Muon350_ISR.sh index ba7b5d99..440a4808 100755 --- a/test/ref-results/Sherpa/Muon350/Run_Muon350_ISR.sh +++ b/test/ref-results/Sherpa/Muon350/Run_Muon350_ISR.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f Muon350_ISR.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Muon350_ISR.hepmc3 Muon350_ISR.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Muon350_ISR.hepmc Muon350_ISR.edm4hep key4HEPAnalysis -i Muon350_ISR.edm4hep -o Muon350_ISR.root -p 13,-13 diff --git a/test/ref-results/Sherpa/Muon91.2/Muon91.2.dat b/test/ref-results/Sherpa/Muon91.2/Muon91.2.dat index ad938598..9bfb56a4 100644 --- a/test/ref-results/Sherpa/Muon91.2/Muon91.2.dat +++ b/test/ref-results/Sherpa/Muon91.2/Muon91.2.dat @@ -8,7 +8,7 @@ EVENTS: 10000 ALPHAS(MZ): 0.1184 GF: 1.16637e-05 -EVENT_OUTPUT: HepMC3_GenEvent[Muon91.2.hepmc3] +EVENT_OUTPUT: HepMC3_GenEvent[Muon91.2.hepmc] EVENT_GENERATION_MODE: unweighted EW_SCHEME: 3 diff --git a/test/ref-results/Sherpa/Muon91.2/Run_Muon91.2.sh b/test/ref-results/Sherpa/Muon91.2/Run_Muon91.2.sh index 203ade45..c63319a4 100755 --- a/test/ref-results/Sherpa/Muon91.2/Run_Muon91.2.sh +++ b/test/ref-results/Sherpa/Muon91.2/Run_Muon91.2.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f Muon91.2.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Muon91.2.hepmc3 Muon91.2.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Muon91.2.hepmc Muon91.2.edm4hep key4HEPAnalysis -i Muon91.2.edm4hep -o Muon91.2.root -p 13,-13 diff --git a/test/ref-results/Sherpa/MuonColliderZH/MuonColliderZH.dat b/test/ref-results/Sherpa/MuonColliderZH/MuonColliderZH.dat index 2e6fedaa..eb4f2a99 100644 --- a/test/ref-results/Sherpa/MuonColliderZH/MuonColliderZH.dat +++ b/test/ref-results/Sherpa/MuonColliderZH/MuonColliderZH.dat @@ -8,7 +8,7 @@ EVENTS: 10000 ALPHAS(MZ): 0.1184 GF: 1.16637e-05 -EVENT_OUTPUT: HepMC3_GenEvent[MuonColliderZH.hepmc3] +EVENT_OUTPUT: HepMC3_GenEvent[MuonColliderZH.hepmc] EW_SCHEME: 3 EVENT_GENERATION_MODE: unweighted diff --git a/test/ref-results/Sherpa/MuonColliderZH/Run_MuonColliderZH.sh b/test/ref-results/Sherpa/MuonColliderZH/Run_MuonColliderZH.sh index 225e3422..d97eccab 100755 --- a/test/ref-results/Sherpa/MuonColliderZH/Run_MuonColliderZH.sh +++ b/test/ref-results/Sherpa/MuonColliderZH/Run_MuonColliderZH.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f MuonColliderZH.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonColliderZH.hepmc3 MuonColliderZH.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonColliderZH.hepmc MuonColliderZH.edm4hep key4HEPAnalysis -i MuonColliderZH.edm4hep -o MuonColliderZH.root -p 23,25 diff --git a/test/ref-results/Sherpa/MuonNeutrino350/MuonNeutrino350.dat b/test/ref-results/Sherpa/MuonNeutrino350/MuonNeutrino350.dat index c89cdcd5..96edba1d 100644 --- a/test/ref-results/Sherpa/MuonNeutrino350/MuonNeutrino350.dat +++ b/test/ref-results/Sherpa/MuonNeutrino350/MuonNeutrino350.dat @@ -1,4 +1,4 @@ -RANDOM_SEED: 4715 +RANDOM_SEED: 4712 BEAMS: [11, -11] BEAM_ENERGIES: 175.0 MODEL: SM @@ -8,7 +8,7 @@ EVENTS: 10000 ALPHAS(MZ): 0.1184 GF: 1.16637e-05 -EVENT_OUTPUT: HepMC3_GenEvent[MuonNeutrino350.hepmc3] +EVENT_OUTPUT: HepMC3_GenEvent[MuonNeutrino350.hepmc] EVENT_GENERATION_MODE: unweighted EW_SCHEME: 3 diff --git a/test/ref-results/Sherpa/MuonNeutrino350/Run_MuonNeutrino350.sh b/test/ref-results/Sherpa/MuonNeutrino350/Run_MuonNeutrino350.sh index bc98cc5f..5d73dc46 100755 --- a/test/ref-results/Sherpa/MuonNeutrino350/Run_MuonNeutrino350.sh +++ b/test/ref-results/Sherpa/MuonNeutrino350/Run_MuonNeutrino350.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f MuonNeutrino350.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonNeutrino350.hepmc3 MuonNeutrino350.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonNeutrino350.hepmc MuonNeutrino350.edm4hep key4HEPAnalysis -i MuonNeutrino350.edm4hep -o MuonNeutrino350.root -p 14,-14 diff --git a/test/ref-results/Sherpa/MuonNeutrino91.2/MuonNeutrino91.2_ISR.dat b/test/ref-results/Sherpa/MuonNeutrino91.2/MuonNeutrino91.2_ISR.dat index dbbc67cf..d837d642 100644 --- a/test/ref-results/Sherpa/MuonNeutrino91.2/MuonNeutrino91.2_ISR.dat +++ b/test/ref-results/Sherpa/MuonNeutrino91.2/MuonNeutrino91.2_ISR.dat @@ -1,4 +1,4 @@ -RANDOM_SEED: 4712 +RANDOM_SEED: 4711 BEAMS: [11, -11] BEAM_ENERGIES: 45.6 MODEL: SM @@ -8,7 +8,7 @@ EVENTS: 10000 ALPHAS(MZ): 0.1184 GF: 1.16637e-05 -EVENT_OUTPUT: HepMC3_GenEvent[MuonNeutrino91.2_ISR.hepmc3] +EVENT_OUTPUT: HepMC3_GenEvent[MuonNeutrino91.2_ISR.hepmc] EVENT_GENERATION_MODE: unweighted EW_SCHEME: 3 diff --git a/test/ref-results/Sherpa/MuonNeutrino91.2/Run_MuonNeutrino91.2_ISR.sh b/test/ref-results/Sherpa/MuonNeutrino91.2/Run_MuonNeutrino91.2_ISR.sh index a030e7a8..d39f509e 100755 --- a/test/ref-results/Sherpa/MuonNeutrino91.2/Run_MuonNeutrino91.2_ISR.sh +++ b/test/ref-results/Sherpa/MuonNeutrino91.2/Run_MuonNeutrino91.2_ISR.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f MuonNeutrino91.2_ISR.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonNeutrino91.2_ISR.hepmc3 MuonNeutrino91.2_ISR.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonNeutrino91.2_ISR.hepmc MuonNeutrino91.2_ISR.edm4hep key4HEPAnalysis -i MuonNeutrino91.2_ISR.edm4hep -o MuonNeutrino91.2_ISR.root -p 14,-14 diff --git a/test/ref-results/Sherpa/Photon91.0/Photon91.0.dat b/test/ref-results/Sherpa/Photon91.0/Photon91.0.dat index 7322de6c..f1aab98e 100644 --- a/test/ref-results/Sherpa/Photon91.0/Photon91.0.dat +++ b/test/ref-results/Sherpa/Photon91.0/Photon91.0.dat @@ -8,7 +8,7 @@ EVENTS: 10000 ALPHAS(MZ): 0.1184 GF: 1.16637e-05 -EVENT_OUTPUT: HepMC3_GenEvent[Photon91.0.hepmc3] +EVENT_OUTPUT: HepMC3_GenEvent[Photon91.0.hepmc] EVENT_GENERATION_MODE: weighted EW_SCHEME: 3 diff --git a/test/ref-results/Sherpa/Photon91.0/Run_Photon91.0.sh b/test/ref-results/Sherpa/Photon91.0/Run_Photon91.0.sh index 97c96745..91ce5bb8 100755 --- a/test/ref-results/Sherpa/Photon91.0/Run_Photon91.0.sh +++ b/test/ref-results/Sherpa/Photon91.0/Run_Photon91.0.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f Photon91.0.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Photon91.0.hepmc3 Photon91.0.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Photon91.0.hepmc Photon91.0.edm4hep key4HEPAnalysis -i Photon91.0.edm4hep -o Photon91.0.root -p 22,22 diff --git a/test/ref-results/Sherpa/Tau350/Run_Tau350.sh b/test/ref-results/Sherpa/Tau350/Run_Tau350.sh index 0bdb2ae3..4fcd363a 100755 --- a/test/ref-results/Sherpa/Tau350/Run_Tau350.sh +++ b/test/ref-results/Sherpa/Tau350/Run_Tau350.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f Tau350.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Tau350.hepmc3 Tau350.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Tau350.hepmc Tau350.edm4hep key4HEPAnalysis -i Tau350.edm4hep -o Tau350.root -p 15,-15 diff --git a/test/ref-results/Sherpa/Tau350/Tau350.dat b/test/ref-results/Sherpa/Tau350/Tau350.dat index 8222d310..260142ce 100644 --- a/test/ref-results/Sherpa/Tau350/Tau350.dat +++ b/test/ref-results/Sherpa/Tau350/Tau350.dat @@ -1,4 +1,4 @@ -RANDOM_SEED: 4716 +RANDOM_SEED: 4714 BEAMS: [11, -11] BEAM_ENERGIES: 175.0 MODEL: SM @@ -8,7 +8,7 @@ EVENTS: 10000 ALPHAS(MZ): 0.1184 GF: 1.16637e-05 -EVENT_OUTPUT: HepMC3_GenEvent[Tau350.hepmc3] +EVENT_OUTPUT: HepMC3_GenEvent[Tau350.hepmc] EVENT_GENERATION_MODE: unweighted EW_SCHEME: 3 diff --git a/test/ref-results/Sherpa/Tau91.2/Run_Tau91.2_ISR.sh b/test/ref-results/Sherpa/Tau91.2/Run_Tau91.2_ISR.sh index 5fb63688..c07fd3f7 100755 --- a/test/ref-results/Sherpa/Tau91.2/Run_Tau91.2_ISR.sh +++ b/test/ref-results/Sherpa/Tau91.2/Run_Tau91.2_ISR.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f Tau91.2_ISR.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Tau91.2_ISR.hepmc3 Tau91.2_ISR.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Tau91.2_ISR.hepmc Tau91.2_ISR.edm4hep key4HEPAnalysis -i Tau91.2_ISR.edm4hep -o Tau91.2_ISR.root -p 15,-15 diff --git a/test/ref-results/Sherpa/Tau91.2/Tau91.2_ISR.dat b/test/ref-results/Sherpa/Tau91.2/Tau91.2_ISR.dat index c01c5050..9647c9e0 100644 --- a/test/ref-results/Sherpa/Tau91.2/Tau91.2_ISR.dat +++ b/test/ref-results/Sherpa/Tau91.2/Tau91.2_ISR.dat @@ -1,4 +1,4 @@ -RANDOM_SEED: 4713 +RANDOM_SEED: 4712 BEAMS: [11, -11] BEAM_ENERGIES: 45.6 MODEL: SM @@ -8,7 +8,7 @@ EVENTS: 10000 ALPHAS(MZ): 0.1184 GF: 1.16637e-05 -EVENT_OUTPUT: HepMC3_GenEvent[Tau91.2_ISR.hepmc3] +EVENT_OUTPUT: HepMC3_GenEvent[Tau91.2_ISR.hepmc] EVENT_GENERATION_MODE: unweighted EW_SCHEME: 3 diff --git a/test/ref-results/Sherpa/Top1000/Run_Top1000_ISR.sh b/test/ref-results/Sherpa/Top1000/Run_Top1000_ISR.sh index 0eb335e9..be19124c 100755 --- a/test/ref-results/Sherpa/Top1000/Run_Top1000_ISR.sh +++ b/test/ref-results/Sherpa/Top1000/Run_Top1000_ISR.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f Top1000_ISR.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Top1000_ISR.hepmc3 Top1000_ISR.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Top1000_ISR.hepmc Top1000_ISR.edm4hep key4HEPAnalysis -i Top1000_ISR.edm4hep -o Top1000_ISR.root -p 6,-6 diff --git a/test/ref-results/Sherpa/Top1000/Top1000_ISR.dat b/test/ref-results/Sherpa/Top1000/Top1000_ISR.dat index 7c7a6c2e..4a63aa70 100644 --- a/test/ref-results/Sherpa/Top1000/Top1000_ISR.dat +++ b/test/ref-results/Sherpa/Top1000/Top1000_ISR.dat @@ -8,7 +8,7 @@ EVENTS: 10000 ALPHAS(MZ): 0.1184 GF: 1.16637e-05 -EVENT_OUTPUT: HepMC3_GenEvent[Top1000_ISR.hepmc3] +EVENT_OUTPUT: HepMC3_GenEvent[Top1000_ISR.hepmc] EVENT_GENERATION_MODE: unweighted EW_SCHEME: 3 FRAGMENTATION: None diff --git a/test/ref-results/Sherpa/Top350/Run_Top350_ISR.sh b/test/ref-results/Sherpa/Top350/Run_Top350_ISR.sh index d7499f71..c321e5a7 100755 --- a/test/ref-results/Sherpa/Top350/Run_Top350_ISR.sh +++ b/test/ref-results/Sherpa/Top350/Run_Top350_ISR.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f Top350_ISR.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Top350_ISR.hepmc3 Top350_ISR.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Top350_ISR.hepmc Top350_ISR.edm4hep key4HEPAnalysis -i Top350_ISR.edm4hep -o Top350_ISR.root -p 6,-6 diff --git a/test/ref-results/Sherpa/Top350/Top350_ISR.dat b/test/ref-results/Sherpa/Top350/Top350_ISR.dat index a7f40d98..727c8243 100644 --- a/test/ref-results/Sherpa/Top350/Top350_ISR.dat +++ b/test/ref-results/Sherpa/Top350/Top350_ISR.dat @@ -8,7 +8,7 @@ EVENTS: 10000 ALPHAS(MZ): 0.1184 GF: 1.16637e-05 -EVENT_OUTPUT: HepMC3_GenEvent[Top350_ISR.hepmc3] +EVENT_OUTPUT: HepMC3_GenEvent[Top350_ISR.hepmc] EVENT_GENERATION_MODE: unweighted EW_SCHEME: 3 FRAGMENTATION: None diff --git a/test/ref-results/Sherpa/ZH250/Run_ZH250_ISR.sh b/test/ref-results/Sherpa/ZH250/Run_ZH250_ISR.sh index 8a4c2c67..8d02dd28 100755 --- a/test/ref-results/Sherpa/ZH250/Run_ZH250_ISR.sh +++ b/test/ref-results/Sherpa/ZH250/Run_ZH250_ISR.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f ZH250_ISR.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZH250_ISR.hepmc3 ZH250_ISR.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZH250_ISR.hepmc ZH250_ISR.edm4hep key4HEPAnalysis -i ZH250_ISR.edm4hep -o ZH250_ISR.root -p 23,25 diff --git a/test/ref-results/Sherpa/ZH250/ZH250_ISR.dat b/test/ref-results/Sherpa/ZH250/ZH250_ISR.dat index 856d3d46..c8e371de 100644 --- a/test/ref-results/Sherpa/ZH250/ZH250_ISR.dat +++ b/test/ref-results/Sherpa/ZH250/ZH250_ISR.dat @@ -8,7 +8,7 @@ EVENTS: 10000 ALPHAS(MZ): 0.1184 GF: 1.16637e-05 -EVENT_OUTPUT: HepMC3_GenEvent[ZH250_ISR.hepmc3] +EVENT_OUTPUT: HepMC3_GenEvent[ZH250_ISR.hepmc] EW_SCHEME: 3 EVENT_GENERATION_MODE: unweighted diff --git a/test/ref-results/Sherpa/ZH350/Run_ZH350_ISR.sh b/test/ref-results/Sherpa/ZH350/Run_ZH350_ISR.sh index ddd5c9e8..0efadb7c 100755 --- a/test/ref-results/Sherpa/ZH350/Run_ZH350_ISR.sh +++ b/test/ref-results/Sherpa/ZH350/Run_ZH350_ISR.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f ZH350_ISR.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZH350_ISR.hepmc3 ZH350_ISR.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZH350_ISR.hepmc ZH350_ISR.edm4hep key4HEPAnalysis -i ZH350_ISR.edm4hep -o ZH350_ISR.root -p 23,25 diff --git a/test/ref-results/Sherpa/ZH350/ZH350_ISR.dat b/test/ref-results/Sherpa/ZH350/ZH350_ISR.dat index dc92e761..2954eb56 100644 --- a/test/ref-results/Sherpa/ZH350/ZH350_ISR.dat +++ b/test/ref-results/Sherpa/ZH350/ZH350_ISR.dat @@ -8,7 +8,7 @@ EVENTS: 10000 ALPHAS(MZ): 0.1184 GF: 1.16637e-05 -EVENT_OUTPUT: HepMC3_GenEvent[ZH350_ISR.hepmc3] +EVENT_OUTPUT: HepMC3_GenEvent[ZH350_ISR.hepmc] EW_SCHEME: 3 EVENT_GENERATION_MODE: unweighted diff --git a/test/ref-results/Sherpa/ZHDecay250/Run_ZHDecay250.sh b/test/ref-results/Sherpa/ZHDecay250/Run_ZHDecay250.sh index da18dd01..667e2d91 100755 --- a/test/ref-results/Sherpa/ZHDecay250/Run_ZHDecay250.sh +++ b/test/ref-results/Sherpa/ZHDecay250/Run_ZHDecay250.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f ZHDecay250.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZHDecay250.hepmc3 ZHDecay250.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZHDecay250.hepmc ZHDecay250.edm4hep key4HEPAnalysis -i ZHDecay250.edm4hep -o ZHDecay250.root -p 23,25 diff --git a/test/ref-results/Sherpa/ZHDecay250/ZHDecay250.dat b/test/ref-results/Sherpa/ZHDecay250/ZHDecay250.dat index 86ceb63d..df62ae18 100644 --- a/test/ref-results/Sherpa/ZHDecay250/ZHDecay250.dat +++ b/test/ref-results/Sherpa/ZHDecay250/ZHDecay250.dat @@ -8,7 +8,7 @@ EVENTS: 10000 ALPHAS(MZ): 0.1184 GF: 1.16637e-05 -EVENT_OUTPUT: HepMC3_GenEvent[ZHDecay250.hepmc3] +EVENT_OUTPUT: HepMC3_GenEvent[ZHDecay250.hepmc] EW_SCHEME: 3 EVENT_GENERATION_MODE: unweighted diff --git a/test/ref-results/Sherpa/ZHDecay350/Run_ZHDecay350.sh b/test/ref-results/Sherpa/ZHDecay350/Run_ZHDecay350.sh index cef9ab01..cab9dc83 100755 --- a/test/ref-results/Sherpa/ZHDecay350/Run_ZHDecay350.sh +++ b/test/ref-results/Sherpa/ZHDecay350/Run_ZHDecay350.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f ZHDecay350.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZHDecay350.hepmc3 ZHDecay350.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZHDecay350.hepmc ZHDecay350.edm4hep key4HEPAnalysis -i ZHDecay350.edm4hep -o ZHDecay350.root -p 23,25 diff --git a/test/ref-results/Sherpa/ZHDecay350/ZHDecay350.dat b/test/ref-results/Sherpa/ZHDecay350/ZHDecay350.dat index a8536af2..f9e15ed3 100644 --- a/test/ref-results/Sherpa/ZHDecay350/ZHDecay350.dat +++ b/test/ref-results/Sherpa/ZHDecay350/ZHDecay350.dat @@ -8,7 +8,7 @@ EVENTS: 10000 ALPHAS(MZ): 0.1184 GF: 1.16637e-05 -EVENT_OUTPUT: HepMC3_GenEvent[ZHDecay350.hepmc3] +EVENT_OUTPUT: HepMC3_GenEvent[ZHDecay350.hepmc] EW_SCHEME: 3 EVENT_GENERATION_MODE: unweighted diff --git a/test/ref-results/Sherpa/bottom91.2/Run_bottom91.2.sh b/test/ref-results/Sherpa/bottom91.2/Run_bottom91.2.sh index 9ef21b1a..93991ea8 100755 --- a/test/ref-results/Sherpa/bottom91.2/Run_bottom91.2.sh +++ b/test/ref-results/Sherpa/bottom91.2/Run_bottom91.2.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f bottom91.2.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep bottom91.2.hepmc3g bottom91.2.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep bottom91.2.hepmcg bottom91.2.edm4hep key4HEPAnalysis -i bottom91.2.edm4hep -o bottom91.2.root -p 2,-2 diff --git a/test/ref-results/Sherpa/bottom91.2/bottom91.2.dat b/test/ref-results/Sherpa/bottom91.2/bottom91.2.dat index 4f399baa..3b1cf739 100644 --- a/test/ref-results/Sherpa/bottom91.2/bottom91.2.dat +++ b/test/ref-results/Sherpa/bottom91.2/bottom91.2.dat @@ -11,7 +11,7 @@ MASS[23] 91.1876; WIDTH[23] 2.4952; - EVENT_OUTPUT HepMC3_GenEvent[bottom91.2.hepmc3g]; + EVENT_OUTPUT HepMC3_GenEvent[bottom91.2.hepmcg]; EVENT_GENERATION_MODE unweighted; EW_SCHEME 3; }(run) diff --git a/test/ref-results/Sherpa/charm91.2/Run_charm91.2.sh b/test/ref-results/Sherpa/charm91.2/Run_charm91.2.sh index 7156af13..c86ad274 100755 --- a/test/ref-results/Sherpa/charm91.2/Run_charm91.2.sh +++ b/test/ref-results/Sherpa/charm91.2/Run_charm91.2.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f charm91.2.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep charm91.2.hepmc3g charm91.2.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep charm91.2.hepmcg charm91.2.edm4hep key4HEPAnalysis -i charm91.2.edm4hep -o charm91.2.root -p 4,-4 diff --git a/test/ref-results/Sherpa/charm91.2/charm91.2.dat b/test/ref-results/Sherpa/charm91.2/charm91.2.dat index 19d81452..052e745e 100644 --- a/test/ref-results/Sherpa/charm91.2/charm91.2.dat +++ b/test/ref-results/Sherpa/charm91.2/charm91.2.dat @@ -11,7 +11,7 @@ MASS[23] 91.1876; WIDTH[23] 2.4952; - EVENT_OUTPUT HepMC3_GenEvent[charm91.2.hepmc3g]; + EVENT_OUTPUT HepMC3_GenEvent[charm91.2.hepmcg]; EVENT_GENERATION_MODE unweighted; EW_SCHEME 3; }(run) diff --git a/test/ref-results/Sherpa/down91.2/Run_down91.2.sh b/test/ref-results/Sherpa/down91.2/Run_down91.2.sh index c7ffc71b..9a9aff83 100755 --- a/test/ref-results/Sherpa/down91.2/Run_down91.2.sh +++ b/test/ref-results/Sherpa/down91.2/Run_down91.2.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f down91.2.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep down91.2.hepmc3g down91.2.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep down91.2.hepmcg down91.2.edm4hep key4HEPAnalysis -i down91.2.edm4hep -o down91.2.root -p 1,-1 diff --git a/test/ref-results/Sherpa/down91.2/down91.2.dat b/test/ref-results/Sherpa/down91.2/down91.2.dat index b2c433f8..87f60f00 100644 --- a/test/ref-results/Sherpa/down91.2/down91.2.dat +++ b/test/ref-results/Sherpa/down91.2/down91.2.dat @@ -11,7 +11,7 @@ MASS[23] 91.1876; WIDTH[23] 2.4952; - EVENT_OUTPUT HepMC3_GenEvent[down91.2.hepmc3g]; + EVENT_OUTPUT HepMC3_GenEvent[down91.2.hepmcg]; EVENT_GENERATION_MODE unweighted; EW_SCHEME 3; }(run) diff --git a/test/ref-results/Sherpa/strang91.2/Run_strang91.2.sh b/test/ref-results/Sherpa/strang91.2/Run_strang91.2.sh index c15922aa..0fdce2a5 100755 --- a/test/ref-results/Sherpa/strang91.2/Run_strang91.2.sh +++ b/test/ref-results/Sherpa/strang91.2/Run_strang91.2.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f strang91.2.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep strang91.2.hepmc3g strang91.2.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep strang91.2.hepmcg strang91.2.edm4hep key4HEPAnalysis -i strang91.2.edm4hep -o strang91.2.root -p 3,-3 diff --git a/test/ref-results/Sherpa/strang91.2/strang91.2.dat b/test/ref-results/Sherpa/strang91.2/strang91.2.dat index c42810eb..83032dce 100644 --- a/test/ref-results/Sherpa/strang91.2/strang91.2.dat +++ b/test/ref-results/Sherpa/strang91.2/strang91.2.dat @@ -11,7 +11,7 @@ MASS[23] 91.1876; WIDTH[23] 2.4952; - EVENT_OUTPUT HepMC3_GenEvent[strang91.2.hepmc3g]; + EVENT_OUTPUT HepMC3_GenEvent[strang91.2.hepmcg]; EVENT_GENERATION_MODE unweighted; EW_SCHEME 3; }(run) diff --git a/test/ref-results/Sherpa/up91.2/Run_up91.2.sh b/test/ref-results/Sherpa/up91.2/Run_up91.2.sh index b77e745c..2d83b470 100755 --- a/test/ref-results/Sherpa/up91.2/Run_up91.2.sh +++ b/test/ref-results/Sherpa/up91.2/Run_up91.2.sh @@ -4,6 +4,6 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi Sherpa -f up91.2.dat -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep up91.2.hepmc3g up91.2.edm4hep +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep up91.2.hepmcg up91.2.edm4hep key4HEPAnalysis -i up91.2.edm4hep -o up91.2.root -p 2,-2 diff --git a/test/ref-results/Sherpa/up91.2/up91.2.dat b/test/ref-results/Sherpa/up91.2/up91.2.dat index 6b3a691b..bf330a56 100644 --- a/test/ref-results/Sherpa/up91.2/up91.2.dat +++ b/test/ref-results/Sherpa/up91.2/up91.2.dat @@ -11,7 +11,7 @@ MASS[23] 91.1876; WIDTH[23] 2.4952; - EVENT_OUTPUT HepMC3_GenEvent[up91.2.hepmc3g]; + EVENT_OUTPUT HepMC3_GenEvent[up91.2.hepmcg]; EVENT_GENERATION_MODE unweighted; EW_SCHEME 3; }(run) diff --git a/test/ref-results/Whizard/Difermion_Polarized/Run_Difermion_Polarized.sh b/test/ref-results/Whizard/Difermion_Polarized/Run_Difermion_Polarized.sh index 9d1f8b8e..b5638c59 100755 --- a/test/ref-results/Whizard/Difermion_Polarized/Run_Difermion_Polarized.sh +++ b/test/ref-results/Whizard/Difermion_Polarized/Run_Difermion_Polarized.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard Difermion_Polarized.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc Difermion_Polarized.edm4hep +mv proc.hepmc Difermion_Polarized.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Difermion_Polarized.hepmc Difermion_Polarized.edm4hep key4HEPAnalysis -i Difermion_Polarized.edm4hep -o Difermion_Polarized.root -p 13,-13 diff --git a/test/ref-results/Whizard/Muon250/Run_Muon250_ISR_BSTilc.sh b/test/ref-results/Whizard/Muon250/Run_Muon250_ISR_BSTilc.sh index 0ed7f632..cde7ebed 100755 --- a/test/ref-results/Whizard/Muon250/Run_Muon250_ISR_BSTilc.sh +++ b/test/ref-results/Whizard/Muon250/Run_Muon250_ISR_BSTilc.sh @@ -5,6 +5,7 @@ fi wget https://whizard.hepforge.org/circe_files/ILC/250_SetA_ee024.circe whizard Muon250_ISR_BSTilc.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc Muon250_ISR_BSTilc.edm4hep +mv proc.hepmc Muon250_ISR_BSTilc.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Muon250_ISR_BSTilc.hepmc Muon250_ISR_BSTilc.edm4hep key4HEPAnalysis -i Muon250_ISR_BSTilc.edm4hep -o Muon250_ISR_BSTilc.root -p 13,-13 diff --git a/test/ref-results/Whizard/Muon350/Muon350_ISR.sin b/test/ref-results/Whizard/Muon350/Muon350_ISR.sin index c13364b1..0436f0ed 100644 --- a/test/ref-results/Whizard/Muon350/Muon350_ISR.sin +++ b/test/ref-results/Whizard/Muon350/Muon350_ISR.sin @@ -1,5 +1,5 @@ model = SM_CKM -seed = 4714 +seed = 4713 ?isr_handler = true beams = e1, E1 => isr,isr isr_mass = 0.000511 diff --git a/test/ref-results/Whizard/Muon350/Run_Muon350_ISR.sh b/test/ref-results/Whizard/Muon350/Run_Muon350_ISR.sh index 3ee72711..b948edde 100755 --- a/test/ref-results/Whizard/Muon350/Run_Muon350_ISR.sh +++ b/test/ref-results/Whizard/Muon350/Run_Muon350_ISR.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard Muon350_ISR.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc Muon350_ISR.edm4hep +mv proc.hepmc Muon350_ISR.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Muon350_ISR.hepmc Muon350_ISR.edm4hep key4HEPAnalysis -i Muon350_ISR.edm4hep -o Muon350_ISR.root -p 13,-13 diff --git a/test/ref-results/Whizard/Muon91.2/Run_Muon91.2.sh b/test/ref-results/Whizard/Muon91.2/Run_Muon91.2.sh index 7920ea32..63b525d2 100755 --- a/test/ref-results/Whizard/Muon91.2/Run_Muon91.2.sh +++ b/test/ref-results/Whizard/Muon91.2/Run_Muon91.2.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard Muon91.2.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc Muon91.2.edm4hep +mv proc.hepmc Muon91.2.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Muon91.2.hepmc Muon91.2.edm4hep key4HEPAnalysis -i Muon91.2.edm4hep -o Muon91.2.root -p 13,-13 diff --git a/test/ref-results/Whizard/MuonColliderZH/Run_MuonColliderZH.sh b/test/ref-results/Whizard/MuonColliderZH/Run_MuonColliderZH.sh index 2bf3ae2d..606308b7 100755 --- a/test/ref-results/Whizard/MuonColliderZH/Run_MuonColliderZH.sh +++ b/test/ref-results/Whizard/MuonColliderZH/Run_MuonColliderZH.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard MuonColliderZH.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc MuonColliderZH.edm4hep +mv proc.hepmc MuonColliderZH.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonColliderZH.hepmc MuonColliderZH.edm4hep key4HEPAnalysis -i MuonColliderZH.edm4hep -o MuonColliderZH.root -p 23,25 diff --git a/test/ref-results/Whizard/MuonNeutrino350/MuonNeutrino350.sin b/test/ref-results/Whizard/MuonNeutrino350/MuonNeutrino350.sin index f16ab6a2..ac645360 100644 --- a/test/ref-results/Whizard/MuonNeutrino350/MuonNeutrino350.sin +++ b/test/ref-results/Whizard/MuonNeutrino350/MuonNeutrino350.sin @@ -1,5 +1,5 @@ model = SM_CKM -seed = 4715 +seed = 4712 ?isr_handler = false process proc = e1, E1 => n2, N2 n_events = 10000 diff --git a/test/ref-results/Whizard/MuonNeutrino350/Run_MuonNeutrino350.sh b/test/ref-results/Whizard/MuonNeutrino350/Run_MuonNeutrino350.sh index 4cf7e45e..0c179fad 100755 --- a/test/ref-results/Whizard/MuonNeutrino350/Run_MuonNeutrino350.sh +++ b/test/ref-results/Whizard/MuonNeutrino350/Run_MuonNeutrino350.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard MuonNeutrino350.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc MuonNeutrino350.edm4hep +mv proc.hepmc MuonNeutrino350.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonNeutrino350.hepmc MuonNeutrino350.edm4hep key4HEPAnalysis -i MuonNeutrino350.edm4hep -o MuonNeutrino350.root -p 14,-14 diff --git a/test/ref-results/Whizard/MuonNeutrino91.2/MuonNeutrino91.2_ISR.sin b/test/ref-results/Whizard/MuonNeutrino91.2/MuonNeutrino91.2_ISR.sin index ed77ff25..4c33b858 100644 --- a/test/ref-results/Whizard/MuonNeutrino91.2/MuonNeutrino91.2_ISR.sin +++ b/test/ref-results/Whizard/MuonNeutrino91.2/MuonNeutrino91.2_ISR.sin @@ -1,5 +1,5 @@ model = SM_CKM -seed = 4712 +seed = 4711 ?isr_handler = true beams = e1, E1 => isr,isr isr_mass = 0.000511 diff --git a/test/ref-results/Whizard/MuonNeutrino91.2/Run_MuonNeutrino91.2_ISR.sh b/test/ref-results/Whizard/MuonNeutrino91.2/Run_MuonNeutrino91.2_ISR.sh index 1df396fd..be0e65ad 100755 --- a/test/ref-results/Whizard/MuonNeutrino91.2/Run_MuonNeutrino91.2_ISR.sh +++ b/test/ref-results/Whizard/MuonNeutrino91.2/Run_MuonNeutrino91.2_ISR.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard MuonNeutrino91.2_ISR.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc MuonNeutrino91.2_ISR.edm4hep +mv proc.hepmc MuonNeutrino91.2_ISR.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep MuonNeutrino91.2_ISR.hepmc MuonNeutrino91.2_ISR.edm4hep key4HEPAnalysis -i MuonNeutrino91.2_ISR.edm4hep -o MuonNeutrino91.2_ISR.root -p 14,-14 diff --git a/test/ref-results/Whizard/Photon91.0/Run_Photon91.0.sh b/test/ref-results/Whizard/Photon91.0/Run_Photon91.0.sh index 84b44d66..8722d782 100755 --- a/test/ref-results/Whizard/Photon91.0/Run_Photon91.0.sh +++ b/test/ref-results/Whizard/Photon91.0/Run_Photon91.0.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard Photon91.0.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc Photon91.0.edm4hep +mv proc.hepmc Photon91.0.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Photon91.0.hepmc Photon91.0.edm4hep key4HEPAnalysis -i Photon91.0.edm4hep -o Photon91.0.root -p 22,22 diff --git a/test/ref-results/Whizard/Tau350/Run_Tau350.sh b/test/ref-results/Whizard/Tau350/Run_Tau350.sh index ebec1657..1bc05f7c 100755 --- a/test/ref-results/Whizard/Tau350/Run_Tau350.sh +++ b/test/ref-results/Whizard/Tau350/Run_Tau350.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard Tau350.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc Tau350.edm4hep +mv proc.hepmc Tau350.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Tau350.hepmc Tau350.edm4hep key4HEPAnalysis -i Tau350.edm4hep -o Tau350.root -p 15,-15 diff --git a/test/ref-results/Whizard/Tau350/Tau350.sin b/test/ref-results/Whizard/Tau350/Tau350.sin index 93a9dc32..c3ff1cb7 100644 --- a/test/ref-results/Whizard/Tau350/Tau350.sin +++ b/test/ref-results/Whizard/Tau350/Tau350.sin @@ -1,5 +1,5 @@ model = SM_CKM -seed = 4716 +seed = 4714 ?isr_handler = false process proc = e1, E1 => e3, E3 n_events = 10000 diff --git a/test/ref-results/Whizard/Tau91.2/Run_Tau91.2_ISR.sh b/test/ref-results/Whizard/Tau91.2/Run_Tau91.2_ISR.sh index 0d17d72d..69d62e85 100755 --- a/test/ref-results/Whizard/Tau91.2/Run_Tau91.2_ISR.sh +++ b/test/ref-results/Whizard/Tau91.2/Run_Tau91.2_ISR.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard Tau91.2_ISR.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc Tau91.2_ISR.edm4hep +mv proc.hepmc Tau91.2_ISR.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Tau91.2_ISR.hepmc Tau91.2_ISR.edm4hep key4HEPAnalysis -i Tau91.2_ISR.edm4hep -o Tau91.2_ISR.root -p 15,-15 diff --git a/test/ref-results/Whizard/Tau91.2/Tau91.2_ISR.sin b/test/ref-results/Whizard/Tau91.2/Tau91.2_ISR.sin index ad840134..c24d00c4 100644 --- a/test/ref-results/Whizard/Tau91.2/Tau91.2_ISR.sin +++ b/test/ref-results/Whizard/Tau91.2/Tau91.2_ISR.sin @@ -1,5 +1,5 @@ model = SM_CKM -seed = 4713 +seed = 4712 ?isr_handler = true beams = e1, E1 => isr,isr isr_mass = 0.000511 diff --git a/test/ref-results/Whizard/Top1000/Run_Top1000_ISR.sh b/test/ref-results/Whizard/Top1000/Run_Top1000_ISR.sh index 0d37147d..7e7c8f58 100755 --- a/test/ref-results/Whizard/Top1000/Run_Top1000_ISR.sh +++ b/test/ref-results/Whizard/Top1000/Run_Top1000_ISR.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard Top1000_ISR.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc Top1000_ISR.edm4hep +mv proc.hepmc Top1000_ISR.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Top1000_ISR.hepmc Top1000_ISR.edm4hep key4HEPAnalysis -i Top1000_ISR.edm4hep -o Top1000_ISR.root -p 6,-6 diff --git a/test/ref-results/Whizard/Top350/Run_Top350_ISR.sh b/test/ref-results/Whizard/Top350/Run_Top350_ISR.sh index 2273bfb6..6ce2f1b9 100755 --- a/test/ref-results/Whizard/Top350/Run_Top350_ISR.sh +++ b/test/ref-results/Whizard/Top350/Run_Top350_ISR.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard Top350_ISR.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc Top350_ISR.edm4hep +mv proc.hepmc Top350_ISR.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep Top350_ISR.hepmc Top350_ISR.edm4hep key4HEPAnalysis -i Top350_ISR.edm4hep -o Top350_ISR.root -p 6,-6 diff --git a/test/ref-results/Whizard/ZH250/Run_ZH250_ISR.sh b/test/ref-results/Whizard/ZH250/Run_ZH250_ISR.sh index 17f37d11..130a052d 100755 --- a/test/ref-results/Whizard/ZH250/Run_ZH250_ISR.sh +++ b/test/ref-results/Whizard/ZH250/Run_ZH250_ISR.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard ZH250_ISR.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc ZH250_ISR.edm4hep +mv proc.hepmc ZH250_ISR.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZH250_ISR.hepmc ZH250_ISR.edm4hep key4HEPAnalysis -i ZH250_ISR.edm4hep -o ZH250_ISR.root -p 23,25 diff --git a/test/ref-results/Whizard/ZH350/Run_ZH350_ISR.sh b/test/ref-results/Whizard/ZH350/Run_ZH350_ISR.sh index 99526774..ecfcf433 100755 --- a/test/ref-results/Whizard/ZH350/Run_ZH350_ISR.sh +++ b/test/ref-results/Whizard/ZH350/Run_ZH350_ISR.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard ZH350_ISR.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc ZH350_ISR.edm4hep +mv proc.hepmc ZH350_ISR.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZH350_ISR.hepmc ZH350_ISR.edm4hep key4HEPAnalysis -i ZH350_ISR.edm4hep -o ZH350_ISR.root -p 23,25 diff --git a/test/ref-results/Whizard/ZHDecay250/Run_ZHDecay250.sh b/test/ref-results/Whizard/ZHDecay250/Run_ZHDecay250.sh index 4b07e60b..1c7ed9c6 100755 --- a/test/ref-results/Whizard/ZHDecay250/Run_ZHDecay250.sh +++ b/test/ref-results/Whizard/ZHDecay250/Run_ZHDecay250.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard ZHDecay250.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc ZHDecay250.edm4hep +mv proc.hepmc ZHDecay250.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZHDecay250.hepmc ZHDecay250.edm4hep key4HEPAnalysis -i ZHDecay250.edm4hep -o ZHDecay250.root -p 23,25 diff --git a/test/ref-results/Whizard/ZHDecay350/Run_ZHDecay350.sh b/test/ref-results/Whizard/ZHDecay350/Run_ZHDecay350.sh index 1f10bc38..f05856bb 100755 --- a/test/ref-results/Whizard/ZHDecay350/Run_ZHDecay350.sh +++ b/test/ref-results/Whizard/ZHDecay350/Run_ZHDecay350.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard ZHDecay350.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc ZHDecay350.edm4hep +mv proc.hepmc ZHDecay350.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep ZHDecay350.hepmc ZHDecay350.edm4hep key4HEPAnalysis -i ZHDecay350.edm4hep -o ZHDecay350.root -p 23,25 diff --git a/test/ref-results/Whizard/bottom91.2/Run_bottom91.2.sh b/test/ref-results/Whizard/bottom91.2/Run_bottom91.2.sh index 00783b9c..69a12c60 100755 --- a/test/ref-results/Whizard/bottom91.2/Run_bottom91.2.sh +++ b/test/ref-results/Whizard/bottom91.2/Run_bottom91.2.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard bottom91.2.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc bottom91.2.edm4hep +mv proc.hepmc bottom91.2.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep bottom91.2.hepmc bottom91.2.edm4hep key4HEPAnalysis -i bottom91.2.edm4hep -o bottom91.2.root -p 2,-2 diff --git a/test/ref-results/Whizard/charm91.2/Run_charm91.2.sh b/test/ref-results/Whizard/charm91.2/Run_charm91.2.sh index 5a008423..e34cdaca 100755 --- a/test/ref-results/Whizard/charm91.2/Run_charm91.2.sh +++ b/test/ref-results/Whizard/charm91.2/Run_charm91.2.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard charm91.2.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc charm91.2.edm4hep +mv proc.hepmc charm91.2.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep charm91.2.hepmc charm91.2.edm4hep key4HEPAnalysis -i charm91.2.edm4hep -o charm91.2.root -p 4,-4 diff --git a/test/ref-results/Whizard/down91.2/Run_down91.2.sh b/test/ref-results/Whizard/down91.2/Run_down91.2.sh index 4c382fc1..e5047c59 100755 --- a/test/ref-results/Whizard/down91.2/Run_down91.2.sh +++ b/test/ref-results/Whizard/down91.2/Run_down91.2.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard down91.2.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc down91.2.edm4hep +mv proc.hepmc down91.2.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep down91.2.hepmc down91.2.edm4hep key4HEPAnalysis -i down91.2.edm4hep -o down91.2.root -p 1,-1 diff --git a/test/ref-results/Whizard/strang91.2/Run_strang91.2.sh b/test/ref-results/Whizard/strang91.2/Run_strang91.2.sh index f1a338e4..483913be 100755 --- a/test/ref-results/Whizard/strang91.2/Run_strang91.2.sh +++ b/test/ref-results/Whizard/strang91.2/Run_strang91.2.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard strang91.2.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc strang91.2.edm4hep +whizard proc.hepmc strang91.2.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep strang91.2.hepmc strang91.2.edm4hep key4HEPAnalysis -i strang91.2.edm4hep -o strang91.2.root -p 3,-3 diff --git a/test/ref-results/Whizard/up91.2/Run_up91.2.sh b/test/ref-results/Whizard/up91.2/Run_up91.2.sh index dd18b056..f71f82d3 100755 --- a/test/ref-results/Whizard/up91.2/Run_up91.2.sh +++ b/test/ref-results/Whizard/up91.2/Run_up91.2.sh @@ -4,6 +4,7 @@ if [ -z "${KEY4HEP_STACK}" ]; then fi whizard up91.2.sin -convertHepMC2EDM4HEP -i hepmc3 -o edm4hep proc.hepmc up91.2.edm4hep +mv proc.hepmc up91.2.hepmc +convertHepMC2EDM4HEP -i hepmc3 -o edm4hep up91.2.hepmc up91.2.edm4hep key4HEPAnalysis -i up91.2.edm4hep -o up91.2.root -p 2,-2