Merge branch 'AliceO2Group:master' into master

Author: motomioya

DATA/production/calib/its-threshold-processing.sh

@@ -27,17 +27,15 @@ if [ $RUNTYPE_ITS == "tuningbb" ]; then
   ADDITIONAL_OPTIONS_CAL="--min-vcasn 30 --max-vcasn 130"
 fi
 if [[ $RUNTYPE_ITS == "tot1row" || $RUNTYPE_ITS == "vresetd" ]]; then
-  ADDITIONAL_OPTIONS_DEC="--allow-empty-rofs"
   ADDITIONAL_OPTIONS_CAL="--ninj 10"
 fi
 if [ $RUNTYPE_ITS == "totfullfast" ]; then
-  ADDITIONAL_OPTIONS_DEC="--allow-empty-rofs"
   ADDITIONAL_OPTIONS_CAL="--calculate-slope --charge-a 30 --charge-b 60 --ninj 10"
 fi
 
 WORKFLOW=
 add_W o2-dpl-raw-proxy "--exit-transition-timeout 20 --dataspec \"$PROXY_INSPEC\" --inject-missing-data --channel-config \"name=readout-proxy,type=pull,method=connect,address=ipc://@$INRAWCHANNAME,rateLogging=0,transport=shmem\"" "" 0
-add_W o2-itsmft-stf-decoder-workflow "${ADDITIONAL_OPTIONS_DEC} --always-parse-trigger --condition-tf-per-query -1 --condition-backend \"http://localhost:8084\" --ignore-dist-stf --nthreads 1  --no-clusters --no-cluster-patterns --pipeline its-stf-decoder:${NDECODERS} --enable-calib-data --digits"
+add_W o2-itsmft-stf-decoder-workflow "${ADDITIONAL_OPTIONS_DEC} --allow-empty-rofs --always-parse-trigger --condition-tf-per-query -1 --condition-backend \"http://localhost:8084\" --ignore-dist-stf --nthreads 1  --no-clusters --no-cluster-patterns --pipeline its-stf-decoder:${NDECODERS} --enable-calib-data --digits"
 for i in $(seq 0 $((CHIPMODBASE-1)))
 do
   add_W o2-its-threshold-calib-workflow "-b ${ADDITIONAL_OPTIONS_CAL} --enable-single-pix-tag --ccdb-mgr-url=\"http://localhost:8084\" --nthreads 1 --chip-mod-selector $i --chip-mod-base $CHIPMODBASE --fittype derivative --output-dir \"/data/calibration\" --meta-output-dir \"/data/epn2eos_tool/epn2eos\" --meta-type \"calibration\"" "" 0

DATA/production/configurations/asyncReco/setenv_extra.sh

@@ -474,7 +474,7 @@ export ITSEXTRAERR="ITSCATrackerParam.sysErrY2[0]=$ERRIB;ITSCATrackerParam.sysEr
 # ad-hoc options for ITS reco workflow
 EXTRA_ITSRECO_CONFIG=
 if [[ $BEAMTYPE == "PbPb" ]]; then
-  EXTRA_ITSRECO_CONFIG="ITSCATrackerParam.deltaRof=0;ITSVertexerParam.clusterContributorsCut=16;ITSVertexerParam.lowMultBeamDistCut=0;ITSCATrackerParam.nROFsPerIterations=12;ITSCATrackerParam.perPrimaryVertexProcessing=false;"
+  EXTRA_ITSRECO_CONFIG="ITSCATrackerParam.deltaRof=0;ITSVertexerParam.clusterContributorsCut=16;ITSVertexerParam.lowMultBeamDistCut=0;ITSCATrackerParam.nROFsPerIterations=12;ITSCATrackerParam.perPrimaryVertexProcessing=false;ITSCATrackerParam.fataliseUponFailure=false;ITSCATrackerParam.dropTFUponFailure=true"
   if [[ -z "$ALIEN_JDL_DISABLE_UPC" || $ALIEN_JDL_DISABLE_UPC != 1 ]]; then
     EXTRA_ITSRECO_CONFIG+=";ITSVertexerParam.nIterations=2;ITSCATrackerParam.doUPCIteration=true;"
   fi

DATA/production/qc-async/mch-tracks.json

@@ -37,6 +37,7 @@
 		},
                 "movingWindows": [
                     "ClusterSizePerChamber",
+                    "ClustersPerDualSampa",
                     "ClustersPerChamber",
                     "ClustersPerTrack"
                 ],

DATA/production/qc-workflow.sh

@@ -268,72 +268,72 @@ elif [[ -z ${QC_JSON_FROM_OUTSIDE:-} ]]; then
     DET_JSON_FILE="QC_JSON_GLO_$i"
     if has_matching_qc $i && [ ! -z "${!DET_JSON_FILE:-}" ]; then
       if [[ $i == "PRIMVTX" ]] && ! has_detector_reco ITS; then continue; fi
-      if [[ $i == "ITSTPC" ]] ; then
-        if ! has_detectors_reco ITS TPC; then continue
-        else
-          # replace the input sources depending on the detector compostition and matching detectors
-          ITSTPCMatchQuery="trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS/0;trackITS:ITS/TRACKS/0;trackITSROF:ITS/ITSTrackROF/0;trackITSClIdx:ITS/TRACKCLSID/0;alpparITS:ITS/ALPIDEPARAM/0?lifetime=condition&ccdb-path=ITS/Config/AlpideParam;SVParam:GLO/SVPARAM/0?lifetime=condition&ccdb-path=GLO/Config/SVertexerParam"
-          TRACKSOURCESK0="ITS,TPC,ITS-TPC"
-          if has_processing_step MATCH_SECVTX || has_detector_matching SECVTX ; then
-            if [[ $SYNCMODE == 1 ]] || [[ $EPNSYNCMODE == 1 ]] ; then
-              HAS_K0_ENABLED=$(jq -r .qc.tasks.MTCITSTPC.taskParameters.doK0QC "${!DET_JSON_FILE}")
-	    else
-              HAS_K0_ENABLED=$(jq -r .qc.tasks.GLOMatchTrITSTPC.taskParameters.doK0QC "${!DET_JSON_FILE}")
+      if [[ $i == "ITSTPC" ]] && ! has_detectors_reco ITS TPC; then continue; fi
+      add_QC_JSON GLO_$i ${!DET_JSON_FILE}
+   
+      if [[ $i == "ITSTPC" ]]; then
+        LOCAL_FILENAME=${JSON_FILES//*\ /}
+        # replace the input sources depending on the detector compostition and matching detectors
+        ITSTPCMatchQuery="trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS/0;trackITS:ITS/TRACKS/0;trackITSROF:ITS/ITSTrackROF/0;trackITSClIdx:ITS/TRACKCLSID/0;alpparITS:ITS/ALPIDEPARAM/0?lifetime=condition&ccdb-path=ITS/Config/AlpideParam;SVParam:GLO/SVPARAM/0?lifetime=condition&ccdb-path=GLO/Config/SVertexerParam"
+        TRACKSOURCESK0="ITS,TPC,ITS-TPC"
+        if has_processing_step MATCH_SECVTX || has_detector_matching SECVTX; then
+          if [[ $SYNCMODE == 1 ]] || [[ $EPNSYNCMODE == 1 ]]; then
+            HAS_K0_ENABLED=$(jq -r .qc.tasks.MTCITSTPC.taskParameters.doK0QC "${LOCAL_FILENAME}")
+          else
+            HAS_K0_ENABLED=$(jq -r .qc.tasks.GLOMatchTrITSTPC.taskParameters.doK0QC "${LOCAL_FILENAME}")
+          fi
+          if [[ $HAS_K0_ENABLED == "true" ]]; then
+            ITSTPCMatchQuery+=";p2decay3body:GLO/PVTX_3BODYREFS/0;decay3body:GLO/DECAYS3BODY/0;decay3bodyIdx:GLO/DECAYS3BODY_IDX/0;p2cascs:GLO/PVTX_CASCREFS/0;cascs:GLO/CASCS/0;cascsIdx:GLO/CASCS_IDX/0;p2v0s:GLO/PVTX_V0REFS/0;v0s:GLO/V0S/0;v0sIdx:GLO/V0S_IDX/0;pvtx_tref:GLO/PVTX_TRMTCREFS/0;pvtx_trmtc:GLO/PVTX_TRMTC/0;pvtx:GLO/PVTX/0;clusTPCoccmap:TPC/TPCOCCUPANCYMAP/0;clusTPC:TPC/CLUSTERNATIVE;clusTPCshmap:TPC/CLSHAREDMAP/0;trigTPC:TPC/TRIGGERWORDS/0"
+            if has_secvtx_source ITS-TPC-TRD; then
+              ITSTPCMatchQuery+=";trigITSTPCTRD:TRD/TRGREC_ITSTPC/0;trackITSTPCTRD:TRD/MATCH_ITSTPC/0"
+              TRACKSOURCESK0+=",ITS-TPC-TRD"
+            fi
+            if has_secvtx_source ITS-TPC-TOF; then
+              ITSTPCMatchQuery+=";matchITSTPCTOF:TOF/MTC_ITSTPC/0"
+              TRACKSOURCESK0+=",ITS-TPC-TOF"
+            fi
+            if has_secvtx_source ITS-TPC-TRD-TOF; then
+              ITSTPCMatchQuery+=";matchITSTPCTRDTOF:TOF/MTC_ITSTPCTRD/0"
+              TRACKSOURCESK0+=",ITS-TPC-TRD-TOF"
             fi
-            if [[ $HAS_K0_ENABLED == "true" ]]; then
-              ITSTPCMatchQuery+=";p2decay3body:GLO/PVTX_3BODYREFS/0;decay3body:GLO/DECAYS3BODY/0;decay3bodyIdx:GLO/DECAYS3BODY_IDX/0;p2cascs:GLO/PVTX_CASCREFS/0;cascs:GLO/CASCS/0;cascsIdx:GLO/CASCS_IDX/0;p2v0s:GLO/PVTX_V0REFS/0;v0s:GLO/V0S/0;v0sIdx:GLO/V0S_IDX/0;pvtx_tref:GLO/PVTX_TRMTCREFS/0;pvtx_trmtc:GLO/PVTX_TRMTC/0;pvtx:GLO/PVTX/0;clusTPCoccmap:TPC/TPCOCCUPANCYMAP/0;clusTPC:TPC/CLUSTERNATIVE;clusTPCshmap:TPC/CLSHAREDMAP/0;trigTPC:TPC/TRIGGERWORDS/0"
-              if has_secvtx_source ITS-TPC-TRD ; then
-		ITSTPCMatchQuery+=";trigITSTPCTRD:TRD/TRGREC_ITSTPC/0;trackITSTPCTRD:TRD/MATCH_ITSTPC/0"
-		TRACKSOURCESK0+=",ITS-TPC-TRD"
-              fi
-              if has_secvtx_source ITS-TPC-TOF ; then
-		ITSTPCMatchQuery+=";matchITSTPCTOF:TOF/MTC_ITSTPC/0"
-		TRACKSOURCESK0+=",ITS-TPC-TOF"
-              fi
-              if has_secvtx_source ITS-TPC-TRD-TOF ; then
-		ITSTPCMatchQuery+=";matchITSTPCTRDTOF:TOF/MTC_ITSTPCTRD/0"
-		TRACKSOURCESK0+=",ITS-TPC-TRD-TOF"
-              fi
-              if has_secvtx_source TPC-TRD ; then
-		ITSTPCMatchQuery+=";trigTPCTRD:TRD/TRGREC_TPC/0;trackTPCTRD:TRD/MATCH_TPC/0"
-		TRACKSOURCESK0+=",TPC-TRD"
-              fi
-              if has_secvtx_source TPC-TOF ; then
-		ITSTPCMatchQuery+=";matchTPCTOF:TOF/MTC_TPC/0;trackTPCTOF:TOF/TOFTRACKS_TPC/0"
-		TRACKSOURCESK0+=",TPC-TOF"
-              fi
-              if has_secvtx_source TPC-TRD-TOF ; then
-		ITSTPCMatchQuery+=";matchTPCTRDTOF/TOF/MTC_TPCTRD/0"
-		TRACKSOURCESK0+=",TPC-TRD-TOF"
-              fi
-              if has_secvtx_source TOF ; then
-		ITSTPCMatchQuery+=";tofcluster:TOF/CLUSTERS/0"
-		TRACKSOURCESK0+=",TOF"
-              fi
-              if has_secvtx_source TRD ; then
-		TRACKSOURCESK0+=",TRD"
-              fi
+            if has_secvtx_source TPC-TRD; then
+              ITSTPCMatchQuery+=";trigTPCTRD:TRD/TRGREC_TPC/0;trackTPCTRD:TRD/MATCH_TPC/0"
+              TRACKSOURCESK0+=",TPC-TRD"
             fi
-            TEMP_FILE=$(mktemp "${i}"_XXXXXXX)
-            if [[ $SYNCMODE == 1 ]] || [[ $EPNSYNCMODE == 1 ]] ; then
-              cat "${!DET_JSON_FILE}" | jq "(.dataSamplingPolicies[] | select(.id == \"ITSTPCmSampK0\") | .query) = \"$ITSTPCMatchQuery\" | .qc.tasks.MTCITSTPC.taskParameters.trackSourcesK0 = \"$TRACKSOURCESK0\"" > "$TEMP_FILE"
-            else
-              cat "${!DET_JSON_FILE}" | jq ".qc.tasks.GLOMatchTrITSTPC.dataSource.query = \"$ITSTPCMatchQuery\" | .qc.tasks.GLOMatchTrITSTPC.taskParameters.trackSourcesK0 = \"$TRACKSOURCESK0\"" > "$TEMP_FILE"
+            if has_secvtx_source TPC-TOF; then
+              ITSTPCMatchQuery+=";matchTPCTOF:TOF/MTC_TPC/0;trackTPCTOF:TOF/TOFTRACKS_TPC/0"
+              TRACKSOURCESK0+=",TPC-TOF"
             fi
-	  else
-	    # we need to force that the K0s part is disabled
-            TEMP_FILE=$(mktemp "${i}"_XXXXXXX)
-            if [[ $SYNCMODE == 1 ]] || [[ $EPNSYNCMODE == 1 ]] ; then
-              cat "${!DET_JSON_FILE}" | jq "(.dataSamplingPolicies[] | select(.id == \"ITSTPCmSampK0\") | .query) = \"$ITSTPCMatchQuery\" | .qc.tasks.MTCITSTPC.taskParameters.trackSourcesK0 = \"$TRACKSOURCESK0\" | .qc.tasks.MTCITSTPC.taskParameters.doK0QC = \"false\"" > "$TEMP_FILE"
-            else
-              cat "${!DET_JSON_FILE}" | jq ".qc.tasks.GLOMatchTrITSTPC.dataSource.query = \"$ITSTPCMatchQuery\" | .qc.tasks.GLOMatchTrITSTPC.taskParameters.trackSourcesK0 = \"$TRACKSOURCESK0\" | .qc.tasks.GLOMatchTrITSTPC.taskParameters.doK0QC = \"false\"" > "$TEMP_FILE"
+            if has_secvtx_source TPC-TRD-TOF; then
+              ITSTPCMatchQuery+=";matchTPCTRDTOF/TOF/MTC_TPCTRD/0"
+              TRACKSOURCESK0+=",TPC-TRD-TOF"
             fi
-	  fi
-          DET_JSON_FILE=TEMP_FILE
-          JSON_TEMP_FILES+=("$TEMP_FILE")
+            if has_secvtx_source TOF; then
+              ITSTPCMatchQuery+=";tofcluster:TOF/CLUSTERS/0"
+              TRACKSOURCESK0+=",TOF"
+            fi
+            if has_secvtx_source TRD; then
+              TRACKSOURCESK0+=",TRD"
+            fi
+          fi
+          TEMP_FILE=$(mktemp "${GEN_TOPO_WORKDIR:+$GEN_TOPO_WORKDIR/}${i}"_XXXXXXX)
+          if [[ $SYNCMODE == 1 ]] || [[ $EPNSYNCMODE == 1 ]]; then
+            cat "${LOCAL_FILENAME}" | jq "(.dataSamplingPolicies[] | select(.id == \"ITSTPCmSampK0\") | .query) = \"$ITSTPCMatchQuery\" | .qc.tasks.MTCITSTPC.taskParameters.trackSourcesK0 = \"$TRACKSOURCESK0\"" >"$TEMP_FILE"
+          else
+            cat "${LOCAL_FILENAME}" | jq ".qc.tasks.GLOMatchTrITSTPC.dataSource.query = \"$ITSTPCMatchQuery\" | .qc.tasks.GLOMatchTrITSTPC.taskParameters.trackSourcesK0 = \"$TRACKSOURCESK0\"" >"$TEMP_FILE"
+          fi
+        else
+          # we need to force that the K0s part is disabled
+          TEMP_FILE=$(mktemp "${GEN_TOPO_WORKDIR:+$GEN_TOPO_WORKDIR/}${i}"_XXXXXXX)
+          if [[ $SYNCMODE == 1 ]] || [[ $EPNSYNCMODE == 1 ]]; then
+            cat "${LOCAL_FILENAME}" | jq "(.dataSamplingPolicies[] | select(.id == \"ITSTPCmSampK0\") | .query) = \"$ITSTPCMatchQuery\" | .qc.tasks.MTCITSTPC.taskParameters.trackSourcesK0 = \"$TRACKSOURCESK0\" | .qc.tasks.MTCITSTPC.taskParameters.doK0QC = \"false\"" >"$TEMP_FILE"
+          else
+            cat "${LOCAL_FILENAME}" | jq ".qc.tasks.GLOMatchTrITSTPC.dataSource.query = \"$ITSTPCMatchQuery\" | .qc.tasks.GLOMatchTrITSTPC.taskParameters.trackSourcesK0 = \"$TRACKSOURCESK0\" | .qc.tasks.GLOMatchTrITSTPC.taskParameters.doK0QC = \"false\"" >"$TEMP_FILE"
+          fi
         fi
+        JSON_FILES=${JSON_FILES/$LOCAL_FILENAME/$TEMP_FILE}
+        JSON_TEMP_FILES+=("$TEMP_FILE")
       fi
-      add_QC_JSON GLO_$i ${!DET_JSON_FILE}
     fi
   done
 

MC/bin/o2_hybrid_gen.py

@@ -7,12 +7,48 @@
 # with ini files. The --clone flag allows the user to create multiple instances of the generator list,
 # which is a useful feature when running multi-threaded event pool. This can be enabled via setting
 # the --mode flag to 'parallel', which is set "sequential" by default.
+# Since the script uses the ROOT dictionary to import the parameters names, O2 must be loaded, otherwise
+# the template generation will not work.
 # Example:
 # $O2DPG_ROOT/MC/bin/o2_hybrid_gen.py --gen pythia8 boxgen external extkinO2 hepmc pythia8hf --clone 2 \
 #                                     --output config.json --mode parallel --iniFile /path/to/file0.ini /path/to/file1.ini
 
 import argparse
 import json
+import ROOT
+import cppyy
+import numpy as np
+
+# Get the TClass object for the struct
+tclass = ROOT.TClass.GetClass("o2::eventgen::Pythia8GenConfig")
+tclass1 = ROOT.TClass.GetClass("o2::eventgen::BoxGenConfig")
+
+gens_params = {"pythia8": "o2::eventgen::Pythia8GenConfig", "external": "o2::eventgen::ExternalGenConfig",
+        "evtpool": "o2::eventgen::EventPoolGenConfig", "extkinO2": "o2::eventgen::O2KineGenConfig",
+        "hepmc": "o2::eventgen::HepMCGenConfig", "boxgen": "o2::eventgen::BoxGenConfig"}
+cmd_params = "o2::eventgen::FileOrCmdGenConfig"
+gens_instances = {"pythia8": ROOT.o2.eventgen.Pythia8GenConfig(), "external": ROOT.o2.eventgen.ExternalGenConfig(),
+        "evtpool": ROOT.o2.eventgen.EventPoolGenConfig(), "extkinO2": ROOT.o2.eventgen.O2KineGenConfig(),
+        "hepmc": ROOT.o2.eventgen.HepMCGenConfig(), "boxgen": ROOT.o2.eventgen.BoxGenConfig()}
+cmd_instance = ROOT.o2.eventgen.FileOrCmdGenConfig()
+
+def get_params(instance, class_name):
+    tclass = ROOT.TClass.GetClass(class_name)
+    members = tclass.GetListOfDataMembers()
+    params = {}
+    for member in members:
+        if isinstance(member, ROOT.TDataMember):
+            member_value = getattr(instance, member.GetName())
+            params[member.GetName()] = member_value
+    # replace C++ strings and arrays
+    for key, value in params.items():
+        if isinstance(value, cppyy.gbl.std.string):
+            # convert to a JSON serialisable python string
+            params[key] = str(value)
+        elif hasattr(value, '__len__') and hasattr(value, '__getitem__'):
+            # convert C++ numerical array to python array, no string arrays are declared as parameters, so far
+            params[key] = np.array(value).tolist()
+    return params
 
 def main():
     parser = argparse.ArgumentParser(description='Create a JSON file from command line flags.')
@@ -25,13 +61,13 @@ def main():
     args = parser.parse_args()
 
     # Check if the mode is valid
-    mode = "sequential"
-    if args.mode not in ["sequential", "parallel"]:
-        print(f"Mode {args.mode} not valid. Please use 'seq' or 'par'")
+    valid_modes = ["sequential", "parallel"]
+    mode = args.mode if args.mode in valid_modes else "sequential"
+    if args.mode and args.mode not in valid_modes:
+        print(f"Mode {args.mode} not valid. Please use 'sequential' or 'parallel'")
         print("Setting sequential mode as default")
     else:
-        print(f"Running in {args.mode} mode")
-        mode = args.mode
+        print(f"Running in {mode} mode")
 
     # put in a list all the elementes in the gen flag
     noConfGen = ["pythia8pp", "pythia8hf", "pythia8hi", "pythia8powheg"]
@@ -42,76 +78,22 @@ def main():
     if args.gen:
         print(f"Generators to be used: {args.gen}")
         for gen in args.gen:
-            if gen == "pythia8":
-                gens.append({
-                    'name': 'pythia8',
-                    'config': {
-                        "config": "$O2_ROOT/share/Generators/egconfig/pythia8_inel.cfg",
-                        "hooksFileName": "",
-                        "hooksFuncName": "",
-                        "includePartonEvent": False,
-                        "particleFilter": "",
-                        "verbose": 0
-                    }
-                })
-            elif gen == "external":
-                gens.append({
-                    'name': 'external',
-                    'config': {
-                        "fileName": "${O2DPG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV.C",
-                        "funcName": "GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV()",
-                        "iniFile": ""
-                    }
-                })
-            elif gen == "extkinO2":
-                gens.append({
-                    'name': 'extkinO2',
-                    'config': {
-                        "skipNonTrackable": True,
-                        "continueMode": False,
-                        "roundRobin": False, 
-                        "randomize": False, 
-                        "rngseed": 0, 
-                        "randomphi": False, 
-                        "fileName": "/path/to/filename.root"
-                    }
-                })
-            elif gen == "hepmc":
-                gens.append({
-                    "name": "hepmc",
-                    "config": {
-                        "configcmd": {
-                        "fileNames": "",
-                        "cmd": ""
-                        },
-                        "confighepmc": {
-                        "version": 2,
-                        "eventsToSkip": 0,
-                        "fileName": "/path/to/filename.hepmc",
-                        "prune": False
+            if gen in gens_params:
+                if gen == "hepmc":
+                    configs = [get_params(cmd_instance, cmd_params), get_params(gens_instances[gen], gens_params[gen])]
+                    gens.append({
+                        'name': gen,
+                        'config': {
+                            "configcmd": configs[0],
+                            "confighepmc": configs[1]
                         }
-                    }
-                })
-            elif gen == "boxgen":
-                gens.append({
-                    "name": "boxgen",
-                    "config": {
-                        "pdg": 13,
-                        "number": 1,
-                        "eta": [
-                        -4,
-                        -2.5
-                        ],
-                        "prange": [
-                        0.1,
-                        5
-                        ],
-                        "phirange": [
-                        0,
-                        360
-                        ]
-                    }
-                })
+                    })
+                else:
+                    configs = get_params(gens_instances[gen],gens_params[gen])
+                    gens.append({
+                        'name': gen,
+                        'config': configs
+                    })
             elif gen in noConfGen:
                 gens.append({
                     "name": gen,
@@ -127,13 +109,11 @@ def main():
             if ".ini" != ini[-4:]:
                 print(f"File {ini} is not an ini file")
                 exit(1)
+            configs = get_params(gens_instances["external"],gens_params["external"])
+            configs["iniFile"] = ini
             gens.append({
                 'name': 'external',
-                'config': {
-                    "fileName": "",
-                    "funcName": "",
-                    "iniFile": ini
-                }
+                'config': configs
             })
 
     if args.clone: