diff --git a/GeneratorInterface/Herwig7Interface/interface/HepMC3Traits.h b/GeneratorInterface/Herwig7Interface/interface/HepMC3Traits.h index 2574df07cc0a..70d08abaf2d5 100644 --- a/GeneratorInterface/Herwig7Interface/interface/HepMC3Traits.h +++ b/GeneratorInterface/Herwig7Interface/interface/HepMC3Traits.h @@ -65,7 +65,7 @@ namespace ThePEG { typedef HepMCVertexPtrT VertexPtrT; /** Create an event object with number \a evno and \a weight. */ - static EventT* newEvent(long evno, double weight, const map& optionalWeights) { + static EventT* newEvent(long evno, double weight, const map& optionalWeights) { EventT* e = new EventT(); e->set_event_number(evno); std::vector wnames; @@ -82,7 +82,7 @@ namespace ThePEG { #ifdef HEPMC_HAS_NAMED_WEIGHTS for (size_t i = 0; i < wnames.size(); i++) - e->weights()[wnames[i]] = wvalues[i]; + e->weights()[wnames[i]] = wvalues[i]; #else e->weights() = wvalues; #endif @@ -132,7 +132,7 @@ namespace ThePEG { #ifndef HEPMC_HAS_UNITS return GeV; #else - return HepMC3::Units::default_momentum_unit() == HepMC3::Units::GEV ? GeV: MeV; + return HepMC3::Units::default_momentum_unit() == HepMC3::Units::GEV ? GeV : MeV; #endif } @@ -143,7 +143,7 @@ namespace ThePEG { #ifndef HEPMC_HAS_UNITS return millimeter; #else - return HepMC3::Units::default_length_unit() == HepMC3::Units::MM ? millimeter: 10.0 * millimeter; + return HepMC3::Units::default_length_unit() == HepMC3::Units::MM ? millimeter : 10.0 * millimeter; #endif } @@ -153,7 +153,7 @@ namespace ThePEG { */ static Energy momentumUnit(const EventT& e) { #ifdef HEPMC_HAS_UNITS - return e.momentum_unit() == HepMC3::Units::MEV ? MeV: GeV; + return e.momentum_unit() == HepMC3::Units::MEV ? MeV : GeV; #else return GeV; #endif @@ -178,7 +178,7 @@ namespace ThePEG { #ifdef HEPMC_HAS_UNITS static void setUnits(EventT& e, Energy momu, Length lenu) { e.use_units(momu == MeV ? HepMC3::Units::MEV : HepMC3::Units::GEV, - lenu == centimeter ? HepMC3::Units::CM : HepMC3::Units::MM); + lenu == centimeter ? HepMC3::Units::CM : HepMC3::Units::MM); } #else static void setUnits(EventT&, Energy, Length) {} diff --git a/GeneratorInterface/Herwig7Interface/plugins/Herwig7HepMC3Hadronizer.cc b/GeneratorInterface/Herwig7Interface/plugins/Herwig7HepMC3Hadronizer.cc index 471c2adf62b1..3858a175dcbd 100644 --- a/GeneratorInterface/Herwig7Interface/plugins/Herwig7HepMC3Hadronizer.cc +++ b/GeneratorInterface/Herwig7Interface/plugins/Herwig7HepMC3Hadronizer.cc @@ -35,7 +35,6 @@ namespace CLHEP { class HepRandomEngine; } - class Herwig7HepMC3Hadronizer : public Herwig7HepMC3Interface, public gen::BaseHadronizer { public: Herwig7HepMC3Hadronizer(const edm::ParameterSet& params); @@ -189,12 +188,12 @@ bool Herwig7HepMC3Hadronizer::hadronize() { } return true; } - edm::LogWarning("Generator|Herwig7HepMC3Hadronizer") << "Event " << evtnum << " not generated (likely skipped in merging)"; + edm::LogWarning("Generator|Herwig7HepMC3Hadronizer") + << "Event " << evtnum << " not generated (likely skipped in merging)"; return false; } void Herwig7HepMC3Hadronizer::finalizeEvent() { - eventInfo3() = std::make_unique(event3().get()); eventInfo3()->setBinningValues(std::vector(1, pthat(thepegEvent))); @@ -204,8 +203,8 @@ void Herwig7HepMC3Hadronizer::finalizeEvent() { HepMC3::Print::listing(*(event3().get())); } -// if (iobc_.get()) -// iobc_->write_event(event().get()); + // if (iobc_.get()) + // iobc_->write_event(event().get()); edm::LogInfo("Generator|Herwig7HepMC3Hadronizer") << "Event produced"; } diff --git a/GeneratorInterface/Herwig7Interface/src/Herwig7HepMC3Interface.cc b/GeneratorInterface/Herwig7Interface/src/Herwig7HepMC3Interface.cc index 5456dba71162..6e8d0fcefa6f 100644 --- a/GeneratorInterface/Herwig7Interface/src/Herwig7HepMC3Interface.cc +++ b/GeneratorInterface/Herwig7Interface/src/Herwig7HepMC3Interface.cc @@ -45,7 +45,6 @@ using namespace std; using namespace gen; - Herwig7HepMC3Interface::Herwig7HepMC3Interface(const edm::ParameterSet &pset) : randomEngineGlueProxy_(ThePEG::RandomEngineGlue::Proxy::create()), dataLocation_(ParameterCollector::resolve(pset.getParameter("dataLocation"))), @@ -102,36 +101,38 @@ void Herwig7HepMC3Interface::initRepository(const edm::ParameterSet &pset) { runModeTemp.erase(0, pos + 1); HwUI_ = std::make_shared(pset, dumpConfig_, Herwig::RunMode::READ); - edm::LogInfo("Herwig7HepMC3Interface") << "HerwigUIProvider object with run mode " << HwUI_->runMode() << " created.\n"; + edm::LogInfo("Herwig7HepMC3Interface") + << "HerwigUIProvider object with run mode " << HwUI_->runMode() << " created.\n"; // Chose run mode if (choice == "read") { createInputFile(pset); HwUI_->setRunMode(Herwig::RunMode::READ, pset, dumpConfig_); - edm::LogInfo("Herwig7HepMC3Interface") << "Input file " << dumpConfig_ - << " will be passed to Herwig for the read step.\n"; + edm::LogInfo("Herwig7HepMC3Interface") + << "Input file " << dumpConfig_ << " will be passed to Herwig for the read step.\n"; callHerwigGenerator(); } else if (choice == "build") { createInputFile(pset); HwUI_->setRunMode(Herwig::RunMode::BUILD, pset, dumpConfig_); - edm::LogInfo("Herwig7HepMC3Interface") << "Input file " << dumpConfig_ - << " will be passed to Herwig for the build step.\n"; + edm::LogInfo("Herwig7HepMC3Interface") + << "Input file " << dumpConfig_ << " will be passed to Herwig for the build step.\n"; callHerwigGenerator(); } else if (choice == "integrate") { std::string runFileName = run_ + ".run"; - edm::LogInfo("Herwig7HepMC3Interface") << "Run file " << runFileName - << " will be passed to Herwig for the integrate step.\n"; + edm::LogInfo("Herwig7HepMC3Interface") + << "Run file " << runFileName << " will be passed to Herwig for the integrate step.\n"; HwUI_->setRunMode(Herwig::RunMode::INTEGRATE, pset, runFileName); callHerwigGenerator(); } else if (choice == "run") { std::string runFileName = run_ + ".run"; - edm::LogInfo("Herwig7HepMC3Interface") << "Run file " << runFileName << " will be passed to Herwig for the run step.\n"; + edm::LogInfo("Herwig7HepMC3Interface") + << "Run file " << runFileName << " will be passed to Herwig for the run step.\n"; HwUI_->setRunMode(Herwig::RunMode::RUN, pset, runFileName); } else { edm::LogInfo("Herwig7HepMC3Interface") << "Cannot recognize \"" << choice << "\".\n" - << "Trying to skip step.\n"; + << "Trying to skip step.\n"; continue; } } @@ -139,8 +140,8 @@ void Herwig7HepMC3Interface::initRepository(const edm::ParameterSet &pset) { void Herwig7HepMC3Interface::callHerwigGenerator() { try { - edm::LogInfo("Herwig7HepMC3Interface") << "callHerwigGenerator function invoked with run mode " << HwUI_->runMode() - << ".\n"; + edm::LogInfo("Herwig7HepMC3Interface") + << "callHerwigGenerator function invoked with run mode " << HwUI_->runMode() << ".\n"; // Call program switches according to runMode switch (HwUI_->runMode()) { @@ -276,8 +277,8 @@ void Herwig7HepMC3Interface::createInputFile(const edm::ParameterSet &pset) { // Comment out occurence of saverun in config file since it is set later considering run and generator option string searchKeyword("saverun"); if (configFileContent.find(searchKeyword) != std::string::npos) { - edm::LogInfo("Herwig7HepMC3Interface") << "Commented out saverun command in external input config file(" << iter - << ")" << endl; + edm::LogInfo("Herwig7HepMC3Interface") + << "Commented out saverun command in external input config file(" << iter << ")" << endl; configFileContent.insert(configFileContent.find(searchKeyword), "#"); } herwiginputconfig << "# Begin Config file input" << endl