Introduced new environment config variable (#1756)

* Introduced new environment config variable O2DPG_MC_CFG_ROOT is going to replace O2DPG_ROOT inside the config files. This will make the system more flexible by allowing the user to change this variable on-the-fly, and hence not be limited by the loaded version of O2DPG.
AliceO2Group · Oct 3, 2024 · 005df11 · 005df11
1 parent 8e68f09
commit 005df11
Show file tree

Hide file tree

Showing 168 changed files with 430 additions and 409 deletions.
diff --git a/.github/workflows/syntax-checks.yml b/.github/workflows/syntax-checks.yml
@@ -71,6 +71,27 @@ jobs:
           jq -r '.comments[] | "Error found in \(.file) line \(.line):\n::error file=\(.file),line=\(.line),endLine=\(.endLine),col=\(.column),endColumn=\(.endColumn)::\(.message)"' errors.json
           exit "$error"
 
+  config-check:
+    name: Config-check
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run .ini configs check
+        run: |
+          error=0
+          readarray -d '' files < \
+            <(find . -path ./.git -prune -false -or -type f -name '*.ini' -print0)
+          for cfg in "${files[@]}"; do
+            if grep -q "O2DPG_ROOT" "$cfg"; then
+              error=1
+              echo "Deprecated O2DPG_ROOT detected in $cfg, replace with O2DPG_MC_CONFIG_ROOT" >&2
+            fi
+          done
+          exit "$error"
+
   pylint:
     name: Pylint
     runs-on: ubuntu-latest

diff --git a/MC/config/ALICE3/ini/pythia8_ArAr.ini b/MC/config/ALICE3/ini/pythia8_ArAr.ini
@@ -2,8 +2,8 @@
 width[2]=6.0
 
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
 funcName=generator_pythia8_ALICE3()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_ArAr.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_ArAr.cfg
diff --git a/MC/config/ALICE3/ini/pythia8_KrKr.ini b/MC/config/ALICE3/ini/pythia8_KrKr.ini
@@ -2,8 +2,8 @@
 width[2]=6.0
 
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
 funcName=generator_pythia8_ALICE3()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_KrKr.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_KrKr.cfg
diff --git a/MC/config/ALICE3/ini/pythia8_OO.ini b/MC/config/ALICE3/ini/pythia8_OO.ini
@@ -2,8 +2,8 @@
 width[2]=6.0
 
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
 funcName=generator_pythia8_ALICE3()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_OO.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_OO.cfg
diff --git a/MC/config/ALICE3/ini/pythia8_PbPb.ini b/MC/config/ALICE3/ini/pythia8_PbPb.ini
@@ -2,8 +2,8 @@
 width[2]=6.0
 
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
 funcName=generator_pythia8_ALICE3()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_PbPb.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_PbPb.cfg
diff --git a/MC/config/ALICE3/ini/pythia8_PbPb_536tev.ini b/MC/config/ALICE3/ini/pythia8_PbPb_536tev.ini
@@ -2,8 +2,8 @@
 width[2]=6.0
 
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
 funcName=generator_pythia8_ALICE3()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_PbPb_536tev.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_PbPb_536tev.cfg
diff --git a/MC/config/ALICE3/ini/pythia8_XeXe.ini b/MC/config/ALICE3/ini/pythia8_XeXe.ini
@@ -2,8 +2,8 @@
 width[2]=6.0
 
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
 funcName=generator_pythia8_ALICE3()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_XeXe.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_XeXe.cfg
diff --git a/MC/config/ALICE3/ini/pythia8_pp.ini b/MC/config/ALICE3/ini/pythia8_pp.ini
@@ -2,8 +2,8 @@
 width[2]=6.0
 
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
 funcName=generator_pythia8_ALICE3()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp.cfg
diff --git a/MC/config/ALICE3/ini/pythia8_pp_136tev.ini b/MC/config/ALICE3/ini/pythia8_pp_136tev.ini
@@ -2,8 +2,8 @@
 width[2]=6.0
 
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
 funcName=generator_pythia8_ALICE3()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_136tev.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_136tev.cfg
diff --git a/MC/config/ALICE3/ini/pythia8_pp_13tev.ini b/MC/config/ALICE3/ini/pythia8_pp_13tev.ini
@@ -2,8 +2,8 @@
 width[2]=6.0
 
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
 funcName=generator_pythia8_ALICE3()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_13tev.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_13tev.cfg
diff --git a/MC/config/ALICE3/ini/pythia8_pp_hardQCD_136tev.ini b/MC/config/ALICE3/ini/pythia8_pp_hardQCD_136tev.ini
@@ -2,9 +2,9 @@
 width[2]=6.0
 
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
 funcName=generator_pythia8_ALICE3()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_hardQCD_136tev.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_hardQCD_136tev.cfg
 includePartonEvent=true
diff --git a/MC/config/ALICE3/ini/pythia8_pp_hf_hardQCD_136tev.ini b/MC/config/ALICE3/ini/pythia8_pp_hf_hardQCD_136tev.ini
@@ -2,9 +2,9 @@
 width[2]=6.0
 
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
 funcName=generator_pythia8_ALICE3()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_hf_hardQCD_136tev.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_hf_hardQCD_136tev.cfg
 includePartonEvent=true
diff --git a/MC/config/ALICE3/ini/pythia8_pp_ropes.ini b/MC/config/ALICE3/ini/pythia8_pp_ropes.ini
@@ -2,8 +2,8 @@
 width[2]=6.0
 
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
 funcName=generator_pythia8_ALICE3()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_ropes.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_ropes.cfg
diff --git a/MC/config/ALICE3/ini/pythia8_pp_ropes_136tev.ini b/MC/config/ALICE3/ini/pythia8_pp_ropes_136tev.ini
@@ -2,8 +2,8 @@
 width[2]=6.0
 
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
 funcName=generator_pythia8_ALICE3()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_ropes_136tev.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_ropes_136tev.cfg
diff --git a/MC/config/ALICE3/ini/pythia8_pp_ropes_13tev.ini b/MC/config/ALICE3/ini/pythia8_pp_ropes_13tev.ini
@@ -2,8 +2,8 @@
 width[2]=6.0
 
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
 funcName=generator_pythia8_ALICE3()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_ropes_13tev.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_ropes_13tev.cfg
diff --git a/MC/config/ALICE3/ini/pythia8_pp_shoving.ini b/MC/config/ALICE3/ini/pythia8_pp_shoving.ini
@@ -2,8 +2,8 @@
 width[2]=6.0
 
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
 funcName=generator_pythia8_ALICE3()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_shoving.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_shoving.cfg
diff --git a/MC/config/ALICE3/ini/pythia8_pp_shoving_136tev.ini b/MC/config/ALICE3/ini/pythia8_pp_shoving_136tev.ini
@@ -2,8 +2,8 @@
 width[2]=6.0
 
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
 funcName=generator_pythia8_ALICE3()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_shoving_136tev.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_shoving_136tev.cfg
diff --git a/MC/config/ALICE3/ini/pythia8_pp_shoving_13tev.ini b/MC/config/ALICE3/ini/pythia8_pp_shoving_13tev.ini
@@ -2,8 +2,8 @@
 width[2]=6.0
 
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
 funcName=generator_pythia8_ALICE3()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_shoving_13tev.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_shoving_13tev.cfg
diff --git a/MC/config/ALICE3/ini/xicc_PbPb.ini b/MC/config/ALICE3/ini/xicc_PbPb.ini
@@ -1,6 +1,6 @@
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_gun_PbPb.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_gun_PbPb.C
 funcName=generateNativeXiCC()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/config_custom_xicc.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/config_custom_xicc.cfg
diff --git a/MC/config/ALICE3/ini/xicc_pp.ini b/MC/config/ALICE3/ini/xicc_pp.ini
@@ -1,6 +1,6 @@
 [GeneratorExternal]
-fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_gun_pp.C
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_gun_pp.C
 funcName=generateNativeXiCC()
 
 [GeneratorPythia8]
-config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/config_custom_xicc.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/config_custom_xicc.cfg
diff --git a/MC/config/PWGDQ/ini/GeneratorHF_JPsiToMuons_fwdy.ini b/MC/config/PWGDQ/ini/GeneratorHF_JPsiToMuons_fwdy.ini
@@ -2,5 +2,5 @@
 ### This part sets the path of the file and the function call to retrieve it
 
 [GeneratorExternal]
-fileName = ${O2DPG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorParamPromptJpsiToMuonEvtGen_pp13TeV.C
+fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorParamPromptJpsiToMuonEvtGen_pp13TeV.C
 funcName = GeneratorParamPromptJpsiToMuonEvtGen_pp13TeV()
diff --git a/MC/config/PWGDQ/ini/GeneratorHF_bbbarToBplus_midy.ini b/MC/config/PWGDQ/ini/GeneratorHF_bbbarToBplus_midy.ini
@@ -2,23 +2,23 @@
 ### This part sets the path of the file and the function call to retrieve it
 
 [GeneratorExternal]
-fileName = ${O2DPG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorBplusToJpsiKaon_EvtGen.C
+fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorBplusToJpsiKaon_EvtGen.C
 funcName = GeneratorBplusToJpsiKaon_EvtGen()
 
 ### The external generator derives from GeneratorPythia8.
 ### This part configures the bits of the interface: configuration and user hooks
 
 [GeneratorPythia8]
-config = ${O2DPG_ROOT}/MC/config/common/pythia8/generator/pythia8_hf.cfg
-hooksFileName = ${O2DPG_ROOT}/MC/config/PWGHF/pythia8/hooks/pythia8_userhooks_qqbar.C
+config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/common/pythia8/generator/pythia8_hf.cfg
+hooksFileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/pythia8/hooks/pythia8_userhooks_qqbar.C
 hooksFuncName = pythia8_userhooks_bbbar(-1.5,1.5)
 
 ### The setup uses an external even generator trigger which is
 ### defined in the following file and it is retrieved and configured
 ### according to the specified function call
 
 [TriggerExternal]
-fileName = ${O2DPG_ROOT}/MC/config/PWGDQ/trigger/selectDaughterFromHFwithinAcc.C
+fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/trigger/selectDaughterFromHFwithinAcc.C
 funcName = selectHFwithinAcc(521,kFALSE,-1.5,1.5)
 
 ### The setup inhibits transport of primary particles which are produce at forward rapidity.

diff --git a/MC/config/PWGDQ/ini/GeneratorHF_bbbarToBplus_midy_triggerGap.ini b/MC/config/PWGDQ/ini/GeneratorHF_bbbarToBplus_midy_triggerGap.ini
@@ -2,15 +2,15 @@
 ### This part sets the path of the file and the function call to retrieve it
 
 [GeneratorExternal]
-fileName = ${O2DPG_ROOT}/MC/config/PWGDQ/external/generator/generator_pythia8_NonPromptSignals_gaptriggered_dq.C 
+fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/generator_pythia8_NonPromptSignals_gaptriggered_dq.C 
 funcName = GeneratorBplusToJpsiKaon_EvtGen()
 
 ### The external generator derives from GeneratorPythia8.
 ### This part configures the bits of the interface: configuration and user hooks
 
 [GeneratorPythia8]
-config = ${O2DPG_ROOT}/MC/config/common/pythia8/generator/pythia8_hf.cfg
-hooksFileName = ${O2DPG_ROOT}/MC/config/PWGHF/pythia8/hooks/pythia8_userhooks_qqbar.C
+config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/common/pythia8/generator/pythia8_hf.cfg
+hooksFileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/pythia8/hooks/pythia8_userhooks_qqbar.C
 hooksFuncName = pythia8_userhooks_bbbar(-1.5,1.5)
 
 ### The setup inhibits transport of primary particles which are produce at forward rapidity.

diff --git a/MC/config/PWGDQ/ini/GeneratorHF_bbbarToDDbarToMuons_fwdy.ini b/MC/config/PWGDQ/ini/GeneratorHF_bbbarToDDbarToMuons_fwdy.ini
@@ -3,21 +3,21 @@
 ### This part sets the path of the file and the function call to retrieve it
 
 [GeneratorExternal]
-fileName = ${O2DPG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorBeautyToMu_EvtGen.C
+fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorBeautyToMu_EvtGen.C
 funcName = GeneratorBeautyToMu_EvtGenFwdY(-4.3,-2.3,true,false)
 
 ### The external generator derives from GeneratorPythia8.
 ### This part configures the bits of the interface: configuration and user hooks
 
 [GeneratorPythia8]
-config = ${O2DPG_ROOT}/MC/config/common/pythia8/generator/pythia8_hf.cfg
-hooksFileName = ${O2DPG_ROOT}/MC/config/PWGHF/pythia8/hooks/pythia8_userhooks_qqbar.C
+config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/common/pythia8/generator/pythia8_hf.cfg
+hooksFileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/pythia8/hooks/pythia8_userhooks_qqbar.C
 hooksFuncName = pythia8_userhooks_bbbar(-4.3,-2.3)
 
 ### The setup uses an external even generator trigger which is
 ### defined in the following file and it is retrieved and configured
 ### according to the specified function call
 
 [TriggerExternal]
-fileName = ${O2DPG_ROOT}/MC/config/PWGDQ/trigger/selectDaughterFromHFwithinAcc.C
+fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/trigger/selectDaughterFromHFwithinAcc.C
 funcName = selectDaughterFromHFwithinAcc(13,kTRUE,-4.3,-2.3)
diff --git a/MC/config/PWGDQ/ini/GeneratorHF_bbbarToMuonsSemileptonic_fwdy.ini b/MC/config/PWGDQ/ini/GeneratorHF_bbbarToMuonsSemileptonic_fwdy.ini
@@ -2,21 +2,21 @@
 ### This part sets the path of the file and the function call to retrieve it
 
 [GeneratorExternal]
-fileName = ${O2DPG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorBeautyToMu_EvtGen.C
+fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorBeautyToMu_EvtGen.C
 funcName = GeneratorBeautyToMu_EvtGenFwdY()
 
 ### The external generator derives from GeneratorPythia8.
 ### This part configures the bits of the interface: configuration and user hooks
 
 [GeneratorPythia8]
-config = ${O2DPG_ROOT}/MC/config/common/pythia8/generator/pythia8_hf.cfg
-hooksFileName = ${O2DPG_ROOT}/MC/config/PWGHF/pythia8/hooks/pythia8_userhooks_qqbar.C
+config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/common/pythia8/generator/pythia8_hf.cfg
+hooksFileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/pythia8/hooks/pythia8_userhooks_qqbar.C
 hooksFuncName = pythia8_userhooks_bbbar(-4.3,-2.3)
 
 ### The setup uses an external even generator trigger which is
 ### defined in the following file and it is retrieved and configured
 ### according to the specified function call
 
 [TriggerExternal]
-fileName = ${O2DPG_ROOT}/MC/config/PWGDQ/trigger/selectDaughterFromHFwithinAcc.C
+fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/trigger/selectDaughterFromHFwithinAcc.C
 funcName = selectDaughterFromHFwithinAcc(13,kTRUE,-4.3,-2.3)
diff --git a/MC/config/PWGDQ/ini/GeneratorHF_bbbar_Psi2S_fwdy.ini b/MC/config/PWGDQ/ini/GeneratorHF_bbbar_Psi2S_fwdy.ini
@@ -2,21 +2,21 @@
 ### This part sets the path of the file and the function call to retrieve it
 
 [GeneratorExternal]
-fileName = ${O2DPG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorBeautyToPsi_EvtGen.C
+fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorBeautyToPsi_EvtGen.C
 funcName = GeneratorBeautyToPsi_EvtGenFwdY()
 
 ### The external generator derives from GeneratorPythia8.
 ### This part configures the bits of the interface: configuration and user hooks
 
 [GeneratorPythia8]
-config = ${O2DPG_ROOT}/MC/config/common/pythia8/generator/pythia8_hf.cfg
-hooksFileName = ${O2DPG_ROOT}/MC/config/PWGHF/pythia8/hooks/pythia8_userhooks_qqbar.C
+config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/common/pythia8/generator/pythia8_hf.cfg
+hooksFileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/pythia8/hooks/pythia8_userhooks_qqbar.C
 hooksFuncName = pythia8_userhooks_bbbar(-4.3,-2.3)
 
 ### The setup uses an external even generator trigger which is
 ### defined in the following file and it is retrieved and configured
 ### according to the specified function call
 
 [TriggerExternal]
-fileName = ${O2DPG_ROOT}/MC/config/PWGDQ/trigger/selectDaughterFromHFwithinAcc.C
+fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/trigger/selectDaughterFromHFwithinAcc.C
 funcName = selectDaughterFromHFwithinAcc(100443,kTRUE,-4.3,-2.3)