Minor improvements in Generator/Pythia8

sawenzel · sawenzel · commit 5bf29489c539 · 2020-05-16T11:50:27.000+02:00
diff --git a/Generators/include/Generators/ConfigurationMacroHelper.h b/Generators/include/Generators/ConfigurationMacroHelper.h
@@ -26,7 +26,7 @@ namespace eventgen
 {
 
 template <typename T>
-T GetFromMacro(const std::string file, const std::string funcname, const std::string type, const std::string unique)
+T GetFromMacro(const std::string& file, const std::string& funcname, const std::string& type, const std::string& unique)
 {
 
   /** tweak the string to get the required global function **/
diff --git a/Generators/src/GeneratorPythia8.cxx b/Generators/src/GeneratorPythia8.cxx
@@ -64,8 +64,10 @@ Bool_t GeneratorPythia8::Init()
   /** user hooks via configuration macro **/
   if (!mHooksFileName.empty()) {
     auto hooks = GetFromMacro<Pythia8::UserHooks*>(mHooksFileName, mHooksFuncName, "Pythia8::UserHooks*", "pythia8_user_hooks");
-    if (!hooks)
+    if (!hooks) {
       LOG(FATAL) << "Failed to init \'Pythia8\': problem with user hooks configuration ";
+      return false;
+    }
 #if PYTHIA_VERSION_INTEGER < 8300
     mPythia.setUserHooksPtr(hooks);
 #else

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ namespace eventgen`
`26`	`26`	`{`
`27`	`27`
`28`	`28`	`template <typename T>`
`29`		`-T GetFromMacro(const std::string file, const std::string funcname, const std::string type, const std::string unique)`
	`29`	`+T GetFromMacro(const std::string& file, const std::string& funcname, const std::string& type, const std::string& unique)`
`30`	`30`	`{`
`31`	`31`
`32`	`32`	`/ tweak the string to get the required global function /`