External generator configuration moved to configurable params

preghenella · sawenzel · commit 7a967a6be15e · 2020-09-16T10:23:44.000+02:00
diff --git a/Common/SimConfig/include/SimConfig/SimConfig.h b/Common/SimConfig/include/SimConfig/SimConfig.h
@@ -27,8 +27,6 @@ struct SimConfigData {
   std::string mTrigger;                      // chosen VMC generator trigger
   unsigned int mNEvents;                     // number of events to be simulated
   std::string mExtKinFileName;               // file name of external kinematics file (needed for ext kinematics generator)
-  std::string mExtGenFileName;               // file name containing the external generator configuration
-  std::string mExtGenFuncName;               // function call to retrieve the external generator configuration
   std::string mEmbedIntoFileName;            // filename containing the reference events to be used for the embedding
   unsigned int mStartEvent;                  // index of first event to be taken
   float mBMax;                               // maximum for impact parameter sampling
@@ -98,8 +96,6 @@ class SimConfig
   unsigned int getNEvents() const { return mConfigData.mNEvents; }
 
   std::string getExtKinematicsFileName() const { return mConfigData.mExtKinFileName; }
-  std::string getExtGeneratorFileName() const { return mConfigData.mExtGenFileName; }
-  std::string getExtGeneratorFuncName() const { return mConfigData.mExtGenFuncName; }
   std::string getEmbedIntoFileName() const { return mConfigData.mEmbedIntoFileName; }
   unsigned int getStartEvent() const { return mConfigData.mStartEvent; }
   float getBMax() const { return mConfigData.mBMax; }
diff --git a/Common/SimConfig/src/SimConfig.cxx b/Common/SimConfig/src/SimConfig.cxx
@@ -31,10 +31,6 @@ void SimConfig::initOptions(boost::program_options::options_description& options
     "startEvent", bpo::value<unsigned int>()->default_value(0), "index of first event to be used (when applicable)")(
     "extKinFile", bpo::value<std::string>()->default_value("Kinematics.root"),
     "name of kinematics file for event generator from file (when applicable)")(
-    "extGenFile", bpo::value<std::string>()->default_value("extgen.C"),
-    "name of .C file with definition of external event generator")(
-    "extGenFunc", bpo::value<std::string>()->default_value(""),
-    "function call to load the definition of external event generator")(
     "embedIntoFile", bpo::value<std::string>()->default_value(""),
     "filename containing the reference events to be used for the embedding")(
     "bMax,b", bpo::value<float>()->default_value(0.), "maximum value for impact parameter sampling (when applicable)")(
@@ -94,8 +90,6 @@ bool SimConfig::resetFromParsedMap(boost::program_options::variables_map const&
   mConfigData.mTrigger = vm["trigger"].as<std::string>();
   mConfigData.mNEvents = vm["nEvents"].as<unsigned int>();
   mConfigData.mExtKinFileName = vm["extKinFile"].as<std::string>();
-  mConfigData.mExtGenFileName = vm["extGenFile"].as<std::string>();
-  mConfigData.mExtGenFuncName = vm["extGenFunc"].as<std::string>();
   mConfigData.mEmbedIntoFileName = vm["embedIntoFile"].as<std::string>();
   mConfigData.mStartEvent = vm["startEvent"].as<unsigned int>();
   mConfigData.mBMax = vm["bMax"].as<float>();
diff --git a/Generators/CMakeLists.txt b/Generators/CMakeLists.txt
@@ -25,6 +25,7 @@ o2_add_library(Generators
 	       	       src/Trigger.cxx
 	       	       src/TriggerParticle.cxx
                        src/GeneratorTGenerator.cxx
+                       src/GeneratorExternalParam.cxx
                        src/GeneratorFromFile.cxx
                        src/PDG.cxx
                        src/PrimaryGenerator.cxx
@@ -65,6 +66,7 @@ set(headers
     include/Generators/Trigger.h
     include/Generators/TriggerParticle.h
     include/Generators/GeneratorTGenerator.h
+    include/Generators/GeneratorExternalParam.h
     include/Generators/GeneratorFromFile.h
     include/Generators/PDG.h
     include/Generators/PrimaryGenerator.h
diff --git a/Generators/include/Generators/GeneratorExternalParam.h b/Generators/include/Generators/GeneratorExternalParam.h
@@ -0,0 +1,38 @@
+// Copyright CERN and copyright holders of ALICE O2. This software is
+// distributed under the terms of the GNU General Public License v3 (GPL
+// Version 3), copied verbatim in the file "COPYING".
+//
+// See http://alice-o2.web.cern.ch/license for full licensing information.
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+/// \author R+Preghenella - September 2020
+
+#ifndef ALICEO2_EVENTGEN_GENERATOREXTERNALPARAM_H_
+#define ALICEO2_EVENTGEN_GENERATOREXTERNALPARAM_H_
+
+#include "CommonUtils/ConfigurableParam.h"
+#include "CommonUtils/ConfigurableParamHelper.h"
+
+namespace o2
+{
+namespace eventgen
+{
+
+/**
+ ** a parameter class/struct to keep the settings of
+ ** the external event-generator and
+ ** allow the user to modify them 
+ **/
+struct GeneratorExternalParam : public o2::conf::ConfigurableParamHelper<GeneratorExternalParam> {
+  std::string fileName = "";
+  std::string funcName = "";
+  O2ParamDef(GeneratorExternalParam, "GeneratorExternal");
+};
+
+} // end namespace eventgen
+} // end namespace o2
+
+#endif // ALICEO2_EVENTGEN_GENERATOREXTERNALPARAM_H_
diff --git a/Generators/share/external/QEDLoader.C b/Generators/share/external/QEDLoader.C
@@ -9,7 +9,7 @@
 // or submit itself to any jurisdiction.
 
 //< Loader macro to run QED background generator from QEDepem.C macro, use it as e.g.
-//< o2-sim -n10000 -m PIPE ITS T0 MFT  --noemptyevents -g extgen --extGenFile QEDloader.C
+//< o2-sim -n10000 -m PIPE ITS T0 MFT  --noemptyevents -g external --configKeyValues "GeneratorExternal.fileName=QEDloader.C"
 #include <FairLogger.h>
 
 FairGenerator* fg = nullptr;
diff --git a/Generators/share/external/QEDepem.C b/Generators/share/external/QEDepem.C
@@ -9,7 +9,7 @@
 // or submit itself to any jurisdiction.
 
 //< Macro to run QED background generator, us it as e.g.
-//< o2-sim -n10000 -m PIPE ITS T0 MFT  --noemptyevents -g extgen --extGenFile QEDloader.C
+//< o2-sim -n10000 -m PIPE ITS T0 MFT  --noemptyevents -g external --configKeyValues "GeneratorExternal.fileName=QEDloader.C"
 
 R__LOAD_LIBRARY(libTEPEMGEN.so)
 
diff --git a/Generators/share/external/README.md b/Generators/share/external/README.md
@@ -13,7 +13,7 @@
 -  Invokes TGenEpEmv1 generator from [AEGIS](https://github.com/AliceO2Group/AEGIS) package for Pb-Pb &rarr;  e+e- generation.
 	+	optional parameters are rapidity and pT ranges to generate, can be provided as key/value option, e.g.
 ``
-o2-sim -n 1000 -m PIPE ITS -g extgen --extGenFile $O2_ROOT/share/Generators/external/QEDLoader.C  --configKeyValues 'QEDGenParam.yMin=-3;QEDGenParam.ptMin=0.001'
+o2-sim -n 1000 -m PIPE ITS -g external --configKeyValues 'GeneratorExternal.fileName=$O2_ROOT/share/Generators/external/QEDLoader.C;QEDGenParam.yMin=-3;QEDGenParam.ptMin=0.001'
 ``
 The x-section of the process depends on the applied cuts, it is calculated on the fly and stored in the ``qedgenparam.ini`` file.
 
diff --git a/Generators/share/external/hijing.C b/Generators/share/external/hijing.C
@@ -1,6 +1,5 @@
 // configures a AliGenHijing class from AliRoot
-//   usage: o2sim -g extgen --extGenFile hijing.C
-// options:                 --extGenFunc hijing(5020., 0., 20.)
+//   usage: o2sim -g external --configKeyValues 'GeneratorExternal.fileName=hijing.C;GeneratorExternal.funcName="hijing(5020., 0., 20.)"'
 
 /// \author R+Preghenella - October 2018
 
diff --git a/Generators/share/external/pythia6.C b/Generators/share/external/pythia6.C
@@ -1,6 +1,5 @@
 // configures a TPythia6 class
-//   usage: o2sim -g extgen --extGenFile pythia6.C
-// options:                 --extGenFunc pythia6(14000., "pythia.settings")
+//   usage: o2sim -g external --configKeyValues 'GeneratorExternal.fileName=pythia6.C;GeneratorExternal.funcName="pythia6(14000., "pythia.settings")"'
 
 /// \author R+Preghenella - October 2018
 
diff --git a/Generators/src/GeneratorExternalParam.cxx b/Generators/src/GeneratorExternalParam.cxx
@@ -0,0 +1,14 @@
+// Copyright CERN and copyright holders of ALICE O2. This software is
+// distributed under the terms of the GNU General Public License v3 (GPL
+// Version 3), copied verbatim in the file "COPYING".
+//
+// See http://alice-o2.web.cern.ch/license for full licensing information.
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+/// \author R+Preghenella - September 2020
+
+#include "Generators/GeneratorExternalParam.h"
+O2ParamImpl(o2::eventgen::GeneratorExternalParam);
diff --git a/Generators/src/GeneratorFactory.cxx b/Generators/src/GeneratorFactory.cxx
@@ -26,6 +26,7 @@
 #include <Generators/GeneratorPythia8Param.h>
 #endif
 #include <Generators/GeneratorTGenerator.h>
+#include <Generators/GeneratorExternalParam.h>
 #ifdef GENERATORS_WITH_HEPMC3
 #include <Generators/GeneratorHepMC.h>
 #include <Generators/GeneratorHepMCParam.h>
@@ -191,10 +192,13 @@ void GeneratorFactory::setPrimaryGenerator(o2::conf::SimConfig const& conf, Fair
     auto py8 = makePythia8Gen(py8config);
     primGen->AddGenerator(py8);
 #endif
-  } else if (genconfig.compare("extgen") == 0) {
+  } else if (genconfig.compare("external") == 0 || genconfig.compare("extgen") == 0) {
     // external generator via configuration macro
-    auto extgen_filename = conf.getExtGeneratorFileName();
-    auto extgen_func = conf.getExtGeneratorFuncName();
+    auto& params = GeneratorExternalParam::Instance();
+    LOG(INFO) << "Setting up external generator with following parameters";
+    LOG(INFO) << params;
+    auto extgen_filename = params.fileName;
+    auto extgen_func = params.funcName;
     auto extgen = GetFromMacro<FairGenerator*>(extgen_filename, extgen_func, "FairGenerator*", "extgen");
     if (!extgen) {
       LOG(FATAL) << "Failed to retrieve \'extgen\': problem with configuration ";
diff --git a/Generators/src/GeneratorsLinkDef.h b/Generators/src/GeneratorsLinkDef.h
@@ -27,6 +27,7 @@
 
 #pragma link C++ class o2::eventgen::Generator + ;
 #pragma link C++ class o2::eventgen::GeneratorTGenerator + ;
+#pragma link C++ class o2::eventgen::GeneratorExternalParam + ;
 #ifdef GENERATORS_WITH_HEPMC3
 #pragma link C++ class o2::eventgen::GeneratorHepMC + ;
 #pragma link C++ class o2::eventgen::GeneratorHepMCParam + ;
diff --git a/doc/DetectorSimulation.md b/doc/DetectorSimulation.md
@@ -132,15 +132,15 @@ o2-sim -m PIPE ITS MFT -g pythia8 -n 50
 You may contribute to the documentation by asking a question
 
 #### 1. **How can I interface an event generator from ALIROOT**?
-In order to access event generators from ALIROOT, such as `THijing` or `TPyhtia6`, you may use the `-g extgen` command line option followed by a ROOT macro setting up the event 
+In order to access event generators from ALIROOT, such as `THijing` or `TPyhtia6`, you may use the `-g external` command line option followed by a ROOT macro setting up the event 
 generator. Examples thereof are available in the installation directory `$O2_ROOT/share/Generators/external`.
 
 For example, in order to simulate with 10 Pythia6 events, the following command can be run:
 ```
-o2-sim -n 10 -g extgen --extGenFile $O2_ROOT/share/Generators/external/pythia6.C
+o2-sim -n 10 -g external --configKeyValues 'GeneratorExternal.fileName=$O2_ROOT/share/Generators/external/pythia6.C'
 ```
-Macro arguments can be passed via
-`--extGenFunc pythia6(14000., "pythia.settings")`.
+Macro arguments can be passed setting `GeneratorExternal.funcName`  
+`GeneratorExternal.funcName=pythia6(14000., "pythia.settings")`.
 
 Users may write there own macros in order to customize to their needs.
 
diff --git a/prodtests/produce_QEDhits.sh b/prodtests/produce_QEDhits.sh
@@ -26,6 +26,6 @@ echo "Running simulation for $nev $collSyst events with $gener generator and eng
 # we only need passive material and QED sensitive detectors close to beampipe
 #
 set -x
-o2-sim -j 8 -m PIPE ABSO DIPO SHIL ITS FT0 MFT -n"$nev" -e "$engine" --noemptyevents -g extgen --extGenFile ${O2_ROOT}/share/Generators/external/QEDLoader.C --configKeyValues "SimCutParams.maxRTracking=300" -o o2simqed
+o2-sim -j 8 -m PIPE ABSO DIPO SHIL ITS FT0 MFT -n"$nev" -e "$engine" --noemptyevents -g external --configKeyValues "GeneratorExternal.fileName=${O2_ROOT}/share/Generators/external/QEDLoader.C;SimCutParams.maxRTracking=300" -o o2simqed
 
 root -q -b -l ${O2_ROOT}/share/macro/analyzeHits.C\(\"o2simqed\"\) > QEDhitstats.log
diff --git a/run/SimExamples/Adaptive_Pythia8/README.md b/run/SimExamples/Adaptive_Pythia8/README.md
@@ -11,4 +11,4 @@ Pythia8 events are generated according to the configuration given in the file `a
 The settings are as such that Pythia8 is initialised using the `pythia8_inel.cfg` configuration file.
 The customisation allows the generator to receive and react to a notification that signals the embedding status of the simulation, giving the header of the background event for determination of the subsequent actions. In this case, the number of pythia8 events to be embedded is calculated according to a formula that uses the number of primary particles of the background events.
 
-The macro file is specified via the argument of `--extGenFile` whereas the specific function call to retrieve the configuration and define the formula is specified via the argument of `--extGenFunc`.
+The macro file is specified via `--configKeyValues` setting `GeneratorExternal.fileName` whereas the specific function call to retrieve the configuration and define the formula is specified via `GeneratorExternal.funcName`.
diff --git a/run/SimExamples/Adaptive_Pythia8/adaptive_pythia8.macro b/run/SimExamples/Adaptive_Pythia8/adaptive_pythia8.macro
@@ -3,15 +3,14 @@
 // Example of an implementation of an external event generator
 // that is used and adapts it behavior in an embedding scenario.
 //
-//   usage: o2sim -g extgen --extGenFile adaptive_pythia8.C
-// options:                 --extGenFunc "adaptive_pythia8(\"0.001 * x\")
+//   usage: o2sim -g external --configKeyValues 'GeneratorExternal.fileName=adaptive_pythia8.C;GeneratorExternal.funcName="adaptive_pythia8(\"0.001 * x\")"'
 
 using namespace o2::eventgen;
 
 class Adaptive_Pythia8 : public GeneratorPythia8
 {
 public:
-  Adaptive_Pythia8(char *formula = "0.01 * x") :
+  Adaptive_Pythia8(const char *formula = "0.01 * x") :
     GeneratorPythia8(), mFormula("formula", formula) { };
   ~Adaptive_Pythia8() = default;
 
@@ -43,7 +42,7 @@ private:
 };
 
 FairGenerator*
-adaptive_pythia8(char *formula = "0.01 * x")
+adaptive_pythia8(const char *formula = "0.01 * x")
 {
   std::cout << " --- adaptive_pythia8 initialising with formula: " << formula << std::endl;
   auto py8 = new Adaptive_Pythia8(formula);
diff --git a/run/SimExamples/Adaptive_Pythia8/run.sh b/run/SimExamples/Adaptive_Pythia8/run.sh
@@ -22,6 +22,6 @@ o2-sim -j 20 -n ${NBGR} -g pythia8hi -m PIPE ITS -o bkg --configKeyValues \
 # of subsequent actions. In this case, the number of pythia8 events to be embedded is calculated according
 # to a formula that uses the number of primary particles of the background events
 NSGN=10
-o2-sim -j 20 -n ${NSGN} extgen -m PIPE ITS \
-       -g extgen --extGenFile pythia8_adaptive.macro --extGenFunc "pythia8_adaptive(\"0.002 * x\")" \
+o2-sim -j 20 -n ${NSGN} -m PIPE ITS \
+       -g external --configKeyValues 'GeneratorExternal.fileName=adaptive_pythia8.macro;GeneratorExternal.funcName=adaptive_pythia8("0.002 * x")' \
        --embedIntoFile bkg_Kine.root -o sgn > logsgn 2>&1
diff --git a/run/SimExamples/AliRoot_AMPT/README.md b/run/SimExamples/AliRoot_AMPT/README.md
@@ -7,7 +7,7 @@ A wrapper class AliRoot_AMPT is defined to keep the AliGenAmpt instance and conf
 It also provides methods to set a random event plane before event generation and to update the event header.
 The overall setup is steered by the function `ampt(double energy = 5020., double bMin = 0., double bMax = 20.)` defined in the macro `aliroot_ampt.macro`.
 
-The macro file is specified via the argument of `--extGenFile` whereas the specific function call to retrieven the configuration is specified via the argument of `--extGenFunc`.
+The macro file is specified via `--configKeyValues` setting `GeneratorExternal.fileName` whereas the specific function call to retrieven the configuration is specified via `GeneratorExternal.funcName`.
  
 # IMPORTANT
 To run this example you need to load an AliRoot package compatible with the O2.
diff --git a/run/SimExamples/AliRoot_AMPT/aliroot_ampt.macro b/run/SimExamples/AliRoot_AMPT/aliroot_ampt.macro
@@ -1,6 +1,5 @@
 // configures a AliGenAmpt class from AliRoot
-//   usage: o2sim -g extgen --extGenFile aliroot_ampt.macro
-// options:                 --extGenFunc aliroot_ampt(5020., 0., 20.)
+//   usage: o2sim -g external --configKeyValues 'GeneratorExternal.fileName=aliroot_ampt.macro;GeneratorExternal.funcName="aliroot_ampt(5020., 0., 20.)"'
 
 /// \author R+Preghenella - October 2018
 
diff --git a/run/SimExamples/AliRoot_AMPT/run.sh b/run/SimExamples/AliRoot_AMPT/run.sh
@@ -9,5 +9,5 @@ NEV=5
 ENERGY=5020.
 BMIN=15.
 BMAX=20.
-o2-sim -j 20 -n ${NEV} -g extgen -m PIPE ITS TPC -o sim \
-       --extGenFile "aliroot_ampt.macro" --extGenFunc "ampt(${ENERGY}, ${BMIN}, ${BMAX})"
+o2-sim -j 20 -n ${NEV} -g external -m PIPE ITS TPC -o sim \
+       --configKeyValues "GeneratorExternal.fileName=aliroot_ampt.macro;GeneratorExternal.funcName=ampt(${ENERGY}, ${BMIN}, ${BMAX})"
diff --git a/run/SimExamples/AliRoot_Hijing/README.md b/run/SimExamples/AliRoot_Hijing/README.md
@@ -5,7 +5,7 @@
 This is a simple simulation example showing how to run event simulation using the Hijing event generator interface from AliRoot.
 The configuration of AliGenHijing is performed by the function `hijing(double energy = 5020., double bMin = 0., double bMax = 20.)` defined in the macro `aliroot_hijing.macro`.
 
-The macro file is specified via the argument of `--extGenFile` whereas the specific function call to retrieven the configuration is specified via the argument of `--extGenFunc`.
+The macro file is specified via `--configKeyValues` setting `GeneratorExternal.fileName` whereas the specific function call to retrieven the configuration is specified via `GeneratorExternal.funcName`.
  
 # IMPORTANT
 To run this example you need to load an AliRoot package compatible with the O2.
diff --git a/run/SimExamples/AliRoot_Hijing/aliroot_hijing.macro b/run/SimExamples/AliRoot_Hijing/aliroot_hijing.macro
@@ -1,6 +1,5 @@
 // configures a AliGenHijing class from AliRoot
-//   usage: o2sim -g extgen --extGenFile hijing.C
-// options:                 --extGenFunc hijing(5020., 0., 20.)
+//   usage: o2sim -g external --configKeyValues 'GeneratorExternal.fileName=hijing.C;GeneratorExternal.funcName="hijing(5020., 0., 20.)"'
 
 /// \author R+Preghenella - October 2018
 
diff --git a/run/SimExamples/AliRoot_Hijing/run.sh b/run/SimExamples/AliRoot_Hijing/run.sh
@@ -7,9 +7,9 @@
 # 'hijing(double energy = 5020., double bMin = 0., double bMax = 20.)' defined 
 # in the macro 'aliroot_hijing.macro'.
 #
-# The macro file is specified via the argument of '--extGenFile'
+# The macro file is specified via '--configKeyValues' setting 'GeneratorExternal.fileName'
 # whereas the specific function call to retrieven the configuration
-# is specified via the argument of '--extGenFunc'
+# is specified via 'GeneratorExternal.funcName'
 # 
 # IMPORTANT
 # To run this example you need to load an AliRoot package compatible with the O2.
@@ -25,6 +25,5 @@ NEV=5
 ENERGY=5020.
 BMIN=0
 BMAX=20.
-o2-sim -j 20 -n ${NEV} -g extgen -m PIPE ITS TPC -o sim \
-       --extGenFile "aliroot_hijing.macro" --extGenFunc "hijing(${ENERGY}, ${BMIN}, ${BMAX})" \
-       --configKeyValues "Diamond.position[2]=0.1;Diamond.width[2]=0.05"
+o2-sim -j 20 -n ${NEV} -g external -m PIPE ITS TPC -o sim \
+       --configKeyValues "GeneratorExternal.fileName=aliroot_hijing.macro;GeneratorExternal.funcName=hijing(${ENERGY}, ${BMIN}, ${BMAX})"
diff --git a/run/SimExamples/HF_Embedding_Pythia8/run.sh b/run/SimExamples/HF_Embedding_Pythia8/run.sh
@@ -9,8 +9,8 @@
 #
 # The main focus in this example is on PART c). PART b) just relaces some template values in the Pythia8 configuration file.
 #
-# An external event generator configuration  `-g extgen` is loaded from the file `--extGenFile "GeneratorHF.macro"`
-# by running the code defined in the function `--extGenFunc "GeneratorHF()"`.
+# An external event generator configuration  `-g external` is loaded from the file defined via `--configKeyValues` setting
+# `GeneratorExternal.fileName=GeneratorHF.macro` by running the code defined in the function `GeneratorExternal.funcName="GeneratorHF()"`.
 # Special configuration parameters are loaded from the INI file `--configFile o2sim_configuration_sgn.ini`.
 #
 # Pythia8.config defines the Pythia8 configuration file name.
@@ -57,8 +57,8 @@ sed -e "s/\${rndSeed}/$RNDSEED/" \
 
 # PART c)
 
-o2-sim -j ${NWORKERS} -n ${SIGEVENTS} -g extgen -m ${MODULES} -o sgn \
-       --extGenFile "GeneratorHF.macro" --extGenFunc "GeneratorHF()" \
+o2-sim -j ${NWORKERS} -n ${SIGEVENTS} -g external -m ${MODULES} -o sgn \
+       --configKeyValues "GeneratorExternal.fileName=GeneratorHF.macro;GeneratorExternal.funcName=GeneratorHF()" \
        --configFile o2sim_configuration_sgn.ini \
        --embedIntoFile bkg_Kine.root \
        > logsgn 2>&1
diff --git a/run/SimExamples/Signal_ImpactB/README.md b/run/SimExamples/Signal_ImpactB/README.md
@@ -11,6 +11,6 @@ Custom signal events generated according to the configuration given in a file 's
 The custom event generator receives and react to a notification that signals the embedding status of the simulation, giving the header of the background event for determination of subsequent actions.
 In this case, the impact paramereter from the background event is used to calculate the number of particles to be generated as signal
 
-The macro file is specified via the argument of `--extGenFile` whereas the specific function call to retrieve the configuration and define the formula is specified via the argument of `--extGenFunc`.
+The macro file is specified via `--configKeyValues` setting `GeneratorExternal.funcName` whereas the specific function call to retrieve the configuration and define the formula is specified via `GeneratorExternal.funcName`.
 
 The event generator for the background embedding needs to be capable of providing an impact parameter. In this case, Pythia8 heavy-ion model provides such value.
diff --git a/run/SimExamples/Signal_ImpactB/run.sh b/run/SimExamples/Signal_ImpactB/run.sh
diff --git a/run/SimExamples/Signal_ImpactB/signal_impactb.macro b/run/SimExamples/Signal_ImpactB/signal_impactb.macro
diff --git a/run/SimExamples/Trigger_ImpactB_Pythia8/run.sh b/run/SimExamples/Trigger_ImpactB_Pythia8/run.sh
