Merge pull request #462 from gconesab/master

Fixes for Root6
alisw · Mar 27, 2021 · 2fbac03 · 2fbac03
2 parents 7d27227 + c900153
commit 2fbac03
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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;