From fd5698e77964f31076fc884bb4684dbc1a8f18ef Mon Sep 17 00:00:00 2001
From: Gustavo Conesa Balbastre <Gustavo.Conesa.Balbastre@cern.ch>
Date: Sat, 27 Mar 2021 16:12:35 +0100
Subject: [PATCH 1/2] Fixes for Root6 in PWGDQ, casting AliGenCocktail

---
 MC/CustomGenerators/PWGDQ/EPOS_Jpsiee002.C                      | 2 +-
 MC/CustomGenerators/PWGDQ/EPOS_Jpsiee_pPb8TeV.C                 | 2 +-
 MC/CustomGenerators/PWGDQ/Muon_LowMassCocktail.C                | 2 +-
 MC/CustomGenerators/PWGDQ/Pythia6_Perugia2011_Jpsi2ee13TeV.C    | 2 +-
 .../PWGDQ/Pythia6_Perugia2011_Jpsi2ee5TeV_2017.C                | 2 +-
 MC/CustomGenerators/PWGDQ/Pythia6_Perugia2011_Jpsiee001.C       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MC/CustomGenerators/PWGDQ/EPOS_Jpsiee002.C b/MC/CustomGenerators/PWGDQ/EPOS_Jpsiee002.C
index d922a015..7a2fd1e6 100644
--- a/MC/CustomGenerators/PWGDQ/EPOS_Jpsiee002.C
+++ b/MC/CustomGenerators/PWGDQ/EPOS_Jpsiee002.C
@@ -1,7 +1,7 @@
 AliGenerator *
 GeneratorCustom()
 {
-  AliGenCocktail *ctl = GeneratorCocktail("EPOSLHC_Jpsiee002");
+  AliGenCocktail *ctl = (AliGenCocktail *) GeneratorCocktail("EPOSLHC_Jpsiee002");
   AliGenerator *epos = GeneratorEPOSLHC();
   ctl->AddGenerator(epos, "EPOS-LHC", 1.);
   if (uidConfig % 10 < 7)
diff --git a/MC/CustomGenerators/PWGDQ/EPOS_Jpsiee_pPb8TeV.C b/MC/CustomGenerators/PWGDQ/EPOS_Jpsiee_pPb8TeV.C
index 4ce7d601..8ad70e18 100644
--- a/MC/CustomGenerators/PWGDQ/EPOS_Jpsiee_pPb8TeV.C
+++ b/MC/CustomGenerators/PWGDQ/EPOS_Jpsiee_pPb8TeV.C
@@ -1,7 +1,7 @@
 AliGenerator *
 GeneratorCustom()
 {
-  AliGenCocktail *ctl = GeneratorCocktail("EPOSLHC_Jpsiee_pPb8TeV");
+  AliGenCocktail *ctl = (AliGenCocktail *) GeneratorCocktail("EPOSLHC_Jpsiee_pPb8TeV");
   AliGenerator *epos = GeneratorEPOSLHC();
   ctl->AddGenerator(epos, "EPOS-LHC", 1.);
   if (uidConfig % 10 < 7)
diff --git a/MC/CustomGenerators/PWGDQ/Muon_LowMassCocktail.C b/MC/CustomGenerators/PWGDQ/Muon_LowMassCocktail.C
index 2f50361c..399c3166 100644
--- a/MC/CustomGenerators/PWGDQ/Muon_LowMassCocktail.C
+++ b/MC/CustomGenerators/PWGDQ/Muon_LowMassCocktail.C
@@ -1,7 +1,7 @@
 AliGenerator* GeneratorCustom()
 {
  
-  AliGenCocktail *ctl   = GeneratorCocktail("Muon_LowMassCocktail");
+  AliGenCocktail *ctl   = (AliGenCocktail *) GeneratorCocktail("Muon_LowMassCocktail");
   
   enum {kEta2Body, kEtaDalitz, kRho2Body, kOmega2Body, kOmegaDalitz, kPhi2Body, kEtaPrimeDalitz, kPionLMR, kKaonLMR};
   Int_t   nPart  = 1;
diff --git a/MC/CustomGenerators/PWGDQ/Pythia6_Perugia2011_Jpsi2ee13TeV.C b/MC/CustomGenerators/PWGDQ/Pythia6_Perugia2011_Jpsi2ee13TeV.C
index fb91c44d..f2e95115 100644
--- a/MC/CustomGenerators/PWGDQ/Pythia6_Perugia2011_Jpsi2ee13TeV.C
+++ b/MC/CustomGenerators/PWGDQ/Pythia6_Perugia2011_Jpsi2ee13TeV.C
@@ -1,7 +1,7 @@
 AliGenerator *
 GeneratorCustom()
 {
-  AliGenCocktail *ctl   = GeneratorCocktail("Pythia6_Perugia2011_Jpsiee001");
+  AliGenCocktail *ctl   = (AliGenCocktail *) GeneratorCocktail("Pythia6_Perugia2011_Jpsiee001");
   AliGenerator   *pyt   = GeneratorPythia6(kPythia6Tune_Perugia2011);
   ctl->AddGenerator(pyt,  "Pythia6", 1.);
   if (uidConfig % 10 < 7) {
diff --git a/MC/CustomGenerators/PWGDQ/Pythia6_Perugia2011_Jpsi2ee5TeV_2017.C b/MC/CustomGenerators/PWGDQ/Pythia6_Perugia2011_Jpsi2ee5TeV_2017.C
index 14201e31..728400bc 100644
--- a/MC/CustomGenerators/PWGDQ/Pythia6_Perugia2011_Jpsi2ee5TeV_2017.C
+++ b/MC/CustomGenerators/PWGDQ/Pythia6_Perugia2011_Jpsi2ee5TeV_2017.C
@@ -1,7 +1,7 @@
 AliGenerator *
 GeneratorCustom()
 {
-  AliGenCocktail *ctl   = GeneratorCocktail("Pythia6_Perugia2011_Jpsi2ee5TeV_2017");
+  AliGenCocktail *ctl   = (AliGenCocktail *) GeneratorCocktail("Pythia6_Perugia2011_Jpsi2ee5TeV_2017");
   AliGenerator   *pyt   = GeneratorPythia6(kPythia6Tune_Perugia2011);
   ctl->AddGenerator(pyt,  "Pythia6", 1.);
   if (uidConfig % 10 < 7) {
diff --git a/MC/CustomGenerators/PWGDQ/Pythia6_Perugia2011_Jpsiee001.C b/MC/CustomGenerators/PWGDQ/Pythia6_Perugia2011_Jpsiee001.C
index fb91c44d..f2e95115 100644
--- a/MC/CustomGenerators/PWGDQ/Pythia6_Perugia2011_Jpsiee001.C
+++ b/MC/CustomGenerators/PWGDQ/Pythia6_Perugia2011_Jpsiee001.C
@@ -1,7 +1,7 @@
 AliGenerator *
 GeneratorCustom()
 {
-  AliGenCocktail *ctl   = GeneratorCocktail("Pythia6_Perugia2011_Jpsiee001");
+  AliGenCocktail *ctl   = (AliGenCocktail *) GeneratorCocktail("Pythia6_Perugia2011_Jpsiee001");
   AliGenerator   *pyt   = GeneratorPythia6(kPythia6Tune_Perugia2011);
   ctl->AddGenerator(pyt,  "Pythia6", 1.);
   if (uidConfig % 10 < 7) {

From c9001534174672a4675cc5f8ca58445793387b52 Mon Sep 17 00:00:00 2001
From: Gustavo Conesa Balbastre <Gustavo.Conesa.Balbastre@cern.ch>
Date: Sat, 27 Mar 2021 16:13:26 +0100
Subject: [PATCH 2/2] Fix for Root6, proper TObjString to TString use

---
 MC/Geant4Config.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MC/Geant4Config.C b/MC/Geant4Config.C
index 3801b6aa..236d1ab7 100644
--- a/MC/Geant4Config.C
+++ b/MC/Geant4Config.C
@@ -56,7 +56,7 @@ void Geant4Config()
 	return;
       }
       else if (str->String().Atoi() < 4 || !g4Version.Contains("monopole")) {
-	Printf("We cannot use monopoles with the current version of G4: %s", str->Data());
+	Printf("We cannot use monopoles with the current version of G4: %s", str->String().Data());
 	delete og4;
 	og4 = 0;
 	return;