Skip to content

Commit

Permalink
add casting to AliGenCocktail for Root6 (#377)
Browse files Browse the repository at this point in the history
  • Loading branch information
gconesab authored Jun 12, 2020
1 parent e436250 commit 604deac
Show file tree
Hide file tree
Showing 49 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion MC/CustomGenerators/DPG/PerformanceGenerator.C
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
void AddNuclei(AliGenCocktail *ctl);

AliGenerator * GeneratorCustom() {
AliGenCocktail *ctl = GeneratorCocktail("Hijing+Generator for performance (tracking,PID) studies");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing+Generator for performance (tracking,PID) studies");
AliGenerator *hij = GeneratorHijing();
AliGenerator *genJet = PerformanceGenerator();
ctl->AddGenerator(hij, "Hijing", 1.);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/DPG/SingleParticleGun001.C
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AliGenerator *GeneratorCustom(TString opt = "")
{

AliGenCocktail *ctl = GeneratorCocktail("SingleParticleGun001");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("SingleParticleGun001");

Printf("INFO: Particle with PDG = %d will be injected in %2.1f < pT < %2.1f (GeV/c), %2.1f < y < %2.1f, %2.1f < phi < %2.1f \n",pdgConfig,ptminConfig,ptmaxConfig,yminConfig,ymaxConfig,phiminConfig,phimaxConfig);

Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/DPG/Validation_pp001.C
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ AliGenerator *
GeneratorCustom()
{
//
AliGenCocktail *ctl = GeneratorCocktail("GEANT4_validation");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("GEANT4_validation");
//
// Pythia8 Monash 2013
AliGenerator *py8 = GeneratorPythia8(kPythia8Tune_Monash2013);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGHF/EPOS_HFbjetpPb.C
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ GeneratorCustom(TString opt = "")
// set the xmldoc path using PYTHIA8DATA enviroement var
gSystem->Setenv("PYTHIA8DATA", gSystem->ExpandPathName("$ALICE_ROOT/PYTHIA8/pythia8/xmldoc"));

AliGenCocktail *ctl = GeneratorCocktail("EPOS_HF");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("EPOS_HF");
Float_t randHF = gRandom->Rndm();
if(randHF>0.176797){ // add EPOS generator for p-Pb
AliGenerator *epos = GeneratorEPOSLHC();
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGHF/HIJING_HFbjetpPb.C
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AliGenerator *
GeneratorCustom(TString opt = "")
{
AliGenCocktail *ctl = GeneratorCocktail("HIJING_HF");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("HIJING_HF");
Float_t randHF = gRandom->Rndm();
if(randHF>0.176797){ // add HIJING generator for p-Pb
AliGenerator *hij = GeneratorHijing();
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGHF/Hijing_HF001.C
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AliGenerator *GeneratorCustom(TString opt = "")
{
AliGenCocktail *ctl = GeneratorCocktail("Hijing_HF");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_HF");

TString simulation = gSystem->Getenv("CONFIG_SIMULATION");
Int_t ntimes=1;
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGHF/Hijing_HF002.C
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AliGenerator *
GeneratorCustom(TString opt = "")
{
AliGenCocktail *ctl = GeneratorCocktail("Hijing_HF");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_HF");
Float_t randHF = gRandom->Rndm();
if(randHF>0.176797){
AliGenerator *hij = GeneratorHijing();
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGHF/Hijing_HFjetPbPb.C
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ AliGenerator *
GeneratorCustom(TString opt = "")
{

AliGenCocktail *ctl = GeneratorCocktail("Hijing_HF");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_HF");
TString simulation = gSystem->Getenv("CONFIG_SIMULATION");

if(!simulation.Contains("Embed")){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ AliGenerator *GeneratorCustom(TString opt = "")
if (opt.EqualTo(optList[iopt]))
channelOption = iopt;

AliGenCocktail *ctl = GeneratorCocktail("Hijing_Pythia8_HF");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_Pythia8_HF");

TString simulation = gSystem->Getenv("CONFIG_SIMULATION");
Int_t ntimes=1;
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGHF/Hijing_Xe_HF.C
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AliGenerator *
GeneratorCustom(TString opt = "")
{
AliGenCocktail *ctl = GeneratorCocktail("Hijing_HF");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_HF");

AliGenerator *hij = GeneratorHijing();
ctl->AddGenerator(hij, "Hijing", 1.);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGHF/Hijing_Xe_HF_Omegaccc_bkg.C
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ GeneratorCustom(TString opt = "")

AliPDG::AddParticlesToPdgDataBase();

AliGenCocktail *ctl = GeneratorCocktail("Hijing_HF");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_HF");

AliGenerator *hij = GeneratorHijing();
ctl->AddGenerator(hij, "Hijing", 1.);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGHF/Hijing_pPb_Lc.C
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ AliGenerator * GeneratorCustom(TString opt = "")
if (opt.EqualTo(optList[iopt])) idecay = iopt;
}

AliGenCocktail *ctl = GeneratorCocktail("Hijing_Lc");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_Lc");

Float_t randHF = gRandom->Rndm();
if (randHF>0.176797){ // add Hijing for p-Pb
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGHF/PYTHIA_HFjetpp.C
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ GeneratorCustom(TString opt = "")
// set the xmldoc path using PYTHIA8DATA enviroement var
gSystem->Setenv("PYTHIA8DATA", gSystem->ExpandPathName("$ALICE_ROOT/PYTHIA8/pythia8/xmldoc"));

AliGenCocktail *ctl = GeneratorCocktail("PYTHIA_HF");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("PYTHIA_HF");

Int_t process[2] = {kPythia6HeavyProcess_Charm, kPythia6HeavyProcess_Beauty};
Int_t decay[5] = {kPythia6HeavyDecay_Hadrons, kPythia6HeavyDecay_HadronsWithV0, kPythia6HeavyDecay_Electron, kPythia6HeavyDecay_All, kPythia6HeavyDecay_All_bDecaysEvtGen};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ AliGenerator *GeneratorCustom(TString opt = "")
if (opt.EqualTo(optList[imult][iopt])) { multOption = imult; channelOption = iopt;}
}
}
// AliGenCocktail *ctl = GeneratorCocktail("Perugia2011_HF");
// AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Perugia2011_HF");
AliGenPythia* pyth = GeneratorPythia6(kPythia6Tune_Perugia2011);
pyth->SetProcess(iprocess);
pyth->SetTriggerParticle(sign * triggerParticle[channelOption],999,999,-1,1000); //Lc or Ds, etamin, etamax, ptmin, ptmax
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ GeneratorCustom(TString opt = "")
if (opt.Contains(optList[iopt]))
idecay = iopt;
//
AliGenCocktail *ctl = GeneratorCocktail("Perugia2011_HF");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Perugia2011_HF");
//
AliGenerator *phf = GeneratorPythia6Heavy(process[iprocess], decay[idecay], kPythia6Tune_Perugia2011, kFALSE);

Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGHF/Pythia6_Perugia2011_Lc.C
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ AliGenerator *GeneratorCustom(TString opt = "")
if (opt.EqualTo(optList[iopt])) idecay = iopt;
}

// AliGenCocktail *ctl = GeneratorCocktail("Perugia2011_HF");
// AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Perugia2011_HF");
AliGenPythia* pyth = GeneratorPythia6(kPythia6Tune_Perugia2011);
pyth->SetProcess(kPyCharmppMNRwmi);
pyth->SetTriggerParticle(4122,999,999,-1,1000); //Lc, etamin, etamax, ptmin, ptmax
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Box_Nuclex001.C
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AliGenerator *
GeneratorCustom()
{
AliGenCocktail *ctl = GeneratorCocktail("Box_Nuclex001");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Box_Nuclex001");

const Int_t pdgcodes[5] = {
2212,
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Box_Nuclex002.C
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AliGenerator *
GeneratorCustom()
{
AliGenCocktail *ctl = GeneratorCocktail("Box_Nuclex002");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Box_Nuclex002");

const Int_t pdgcode = 1010010030;
const Char_t *name = "Hypertriton";
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Dpmjet_Rsn_pPb001.C
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ AliGenerator *GeneratorCustom(TString opt = "")
else return kFALSE;


AliGenCocktail *ctl = GeneratorCocktail("DPMJET_RsnInject");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("DPMJET_RsnInject");
AliGenDPMjet *dpmjet = (AliGenDPMjet*) GeneratorPhojet();
ctl->AddGenerator(dpmjet,"Dpmjet", 1.);

Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Dpmjet_Rsn_pPb002.C
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ AliGenerator *GeneratorCustom(TString opt = "")
Double_t y_L = -0.6;
Double_t y_H = 0.1;

AliGenCocktail *ctl = GeneratorCocktail("DPMJET_RsnInject");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("DPMJET_RsnInject");
AliGenDPMjet *dpmjet = (AliGenDPMjet*) GeneratorPhojet();
ctl->AddGenerator(dpmjet,"Dpmjet", 1.);

Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/EPOS_StrInj_pPb8.C
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ AliGenerator *GeneratorCustom(){

Int_t sign = uidConfig % 2 == 0 ? 1 : -1;

AliGenCocktail *ctl = GeneratorCocktail("EPOS_StrInj_pPb8");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("EPOS_StrInj_pPb8");
AliGenerator *epos = GeneratorEPOSLHC();

AliGenerator *ixi = GeneratorInjector(ninjxi, sign * 3312, 2., 20., -1.2, 1.2);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Epos_Nuclex001.C
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AliGenerator *
GeneratorCustom()
{
AliGenCocktail *ctl = GeneratorCocktail("Epos_Nuclex001");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Epos_Nuclex001");
AliGenerator *epos = GeneratorEPOSLHC();
ctl->AddGenerator(epos, "EPOSLHC", 1.);
AliGenerator *nu1a = Generator_Nuclex(0xF, kFALSE, 10);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Epos_Nuclex005.C
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
AliGenerator *
GeneratorCustom()
{
AliGenCocktail *ctl = GeneratorCocktail("Epos_Nuclex005");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Epos_Nuclex005");
AliGenerator *epos = GeneratorEPOSLHC();
ctl->AddGenerator(epos, "EPOSLHC", 1.);
AliGenerator *nu1a = Generator_Nuclex(0x70000, kFALSE, 10);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Hijing_Exo.C
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AliGenerator * GeneratorCustom()
{
AliGenerator *gen = GeneratorCocktail("LambdaN");
AliGenerator *gen = (AliGenCocktail*) GeneratorCocktail("LambdaN");

AliGenCocktail *ctl = (AliGenCocktail*) gen;

Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Hijing_Lnn.C
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AliGenerator * GeneratorCustom()
{
AliGenCocktail *ctl = GeneratorCocktail("Hijing_Nuclex001");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_Nuclex001");
AliGenerator *hij = GeneratorHijing();
ctl->AddGenerator(hij, "Hijing", 1.);
AliGenerator *nu1a = Generator_Nuclex(0x2000, kFALSE, 5,10,1);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Hijing_Nuclex001.C
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AliGenerator *
GeneratorCustom()
{
AliGenCocktail *ctl = GeneratorCocktail("Hijing_Nuclex001");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_Nuclex001");
AliGenerator *hij = GeneratorHijing();
ctl->AddGenerator(hij, "Hijing", 1.);
AliGenerator *nu1a = Generator_Nuclex(0xF, kFALSE, 10);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Hijing_Nuclex003.C
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AliGenerator *
GeneratorCustom()
{
AliGenCocktail *ctl = GeneratorCocktail("Hijing_Nuclex003");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_Nuclex003");
AliGenerator *hij = GeneratorHijing();
ctl->AddGenerator(hij, "Hijing", 1.);
AliGenerator *nu1a = Generator_Nuclex(0xF, kFALSE, 10);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Hijing_Nuclex004.C
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ GeneratorCustom()

TString simulation = gSystem->Getenv("CONFIG_SIMULATION");

AliGenCocktail *ctl = GeneratorCocktail("Hijing_Nuclex004");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_Nuclex004");

if(!simulation.Contains("Embed")){
AliGenerator *hij = GeneratorHijing();
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Hijing_Nuclex005.C
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
AliGenerator *
GeneratorCustom()
{
AliGenCocktail *ctl = GeneratorCocktail("Hijing_Nuclex005");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_Nuclex005");
AliGenerator *hij = GeneratorHijing();
ctl->AddGenerator(hij, "Hijing", 1.);
AliGenerator *nu1a = Generator_Nuclex(0x70000, kFALSE, 10);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Hijing_Rsn001.C
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ GeneratorCustom(TString opt = "")
Int_t pdg1 = pdglist1[uidConfig % 2]; // select according to unique ID
Int_t pdg2 = pdglist2[uidConfig % 2]; // select according to unique ID

AliGenCocktail *ctl = GeneratorCocktail("Hijing_Rsn002");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_Rsn002");
AliGenerator *hij = GeneratorHijing();
AliGenerator *inj1 = GeneratorInjector(ninj, pdg1, 0., 10., -0.6, 0.6);
AliGenerator *inj2 = GeneratorInjector(ninj, pdg2, 0., 10., -0.6, 0.6);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Hijing_Rsn002.C
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ GeneratorCustom(TString opt)
for (Int_t iopt = 0; iopt < 3; iopt++)
if (opt.EqualTo(optList[iopt]))
ninj = ninjlist[iopt];
AliGenCocktail *ctl = GeneratorCocktail("Hijing_Rsn002");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_Rsn002");
AliGenerator *hij = GeneratorHijing();
AliGenerator *inj1 = GeneratorInjector(ninj, 3124, 0., 10., -0.6, 0.6);
AliGenerator *inj2 = GeneratorInjector(ninj, -3124, 0., 10., -0.6, 0.6);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Hijing_Rsn003.C
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ AliGenerator *GeneratorCustom(TString opt = "")

AliDecayerPythia *dec = new AliDecayerPythia;

AliGenCocktail *ctl = GeneratorCocktail("Hijing_Rsn003");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_Rsn003");
AliGenerator *hij = GeneratorHijing();
AliGenerator *inj1 = GeneratorParam(ninj, 333, 0., pTmax, -0.6, 0.6, dec);
AliGenerator *inj2 = GeneratorParam(ninj, 313, 0., pTmax, -0.6, 0.6, dec);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Hijing_Rsn004.C
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ AliGenerator *GeneratorCustom(TString opt = "")

AliDecayerPythia *dec = new AliDecayerPythia;

AliGenCocktail *ctl = GeneratorCocktail("Hijing_Rsn004");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_Rsn004");
AliGenerator *hij = GeneratorHijing();
AliGenerator *inj1 = GeneratorParam(ninj, pdg1, 0., pTmax, -0.6, 0.6, dec);
AliGenerator *inj2 = GeneratorParam(ninj, pdg2, 0., pTmax, -0.6, 0.6, dec);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Hijing_Rsn005.C
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ AliGenerator *GeneratorCustom(TString opt = "")

AliDecayerPythia *dec = new AliDecayerPythia;

AliGenCocktail *ctl = GeneratorCocktail("Hijing_Rsn005");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_Rsn005");
AliGenerator *hij = GeneratorHijing();
AliGenerator *inj1 = GeneratorParam(ninj, pdg1, 0., pTmax, -0.6, 0.6, dec);
AliGenerator *inj2 = GeneratorParam(ninj, pdg2, 0., pTmax, -0.6, 0.6, dec);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Hijing_Str001.C
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GeneratorCustom(TString opt)
if (opt.EqualTo(optList[iopt]))
iinj = iopt;
Int_t sign = uidConfig % 2 == 0 ? 1 : -1;
AliGenCocktail *ctl = GeneratorCocktail("Hijing_Str001");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_Str001");
AliGenerator *hij = GeneratorHijing();
AliGenerator *ik0 = GeneratorInjector(ninjk0[iinj], 310, 0., 20., -0.7, 0.7);
AliGenerator *ila = GeneratorInjector(ninjla[iinj], sign * 3122, 0., 20., -0.7, 0.7);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Hijing_Str002.C
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GeneratorCustom(TString opt)
if (opt.EqualTo(optList[iopt]))
iinj = iopt;
Int_t sign = uidConfig % 2 == 0 ? 1 : -1;
AliGenCocktail *ctl = GeneratorCocktail("Hijing_Str002");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_Str002");
AliGenerator *hij = GeneratorHijing();
AliGenerator *ik0 = GeneratorInjector(ninjk0[iinj], 310, 0., 5., -0.7, 0.7);
AliGenerator *ila = GeneratorInjector(ninjla[iinj], sign * 3122, 0., 5., -0.7, 0.7);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Hijing_Str003.C
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ GeneratorCustom(TString opt = "d")
if (opt.EqualTo(optList[iopt]))
iinj = iopt;
Int_t sign = uidConfig % 2 == 0 ? 1 : -1;
AliGenCocktail *ctl = GeneratorCocktail("Hijing_Str003");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_Str003");
AliGenerator *hij = GeneratorHijing();
AliGenerator *ik0 = GeneratorInjector(ninjk0[iinj], 310, 0., 3., -0.7, 0.7);
AliGenerator *ila = GeneratorInjector(ninjla[iinj], sign * 3122, 0., 3., -0.7, 0.7);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Hijing_XeXe_Nuclei.C
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AliGenerator *
GeneratorCustom()
{
AliGenCocktail *ctl = GeneratorCocktail("Hijing_XeXe_Nuclei");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_XeXe_Nuclei");
AliGenerator *hij = GeneratorHijing();
AliGenerator *iom = GeneratorInjector(1, 3334, 0.5, 7., -0.7, 0.7);
AliGenerator *iaom = GeneratorInjector(1, -3334, 0.5, 7., -0.7, 0.7);
Expand Down
4 changes: 2 additions & 2 deletions MC/CustomGenerators/PWGLF/Hijing_XeXe_Omega.C
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
AliGenerator *
GeneratorCustom()
{
AliGenCocktail *ctl = GeneratorCocktail("Hijing_XeXe_Omega");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_XeXe_Omega");
AliGenerator *hij = GeneratorHijing();
AliGenerator *iom = GeneratorInjector(1, 3334, 0.5, 7., -0.7, 0.7);
AliGenerator *iaom = GeneratorInjector(1, -3334, 0.5, 7., -0.7, 0.7);
ctl->AddGenerator(hij, "Hijing", 1.);
ctl->AddGenerator(iom, "Injector (Omega)", 1.);
ctl->AddGenerator(iaom, "Injector (AntiOmega)", 1.);
return ctl;
}
}
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Pythia6_Perugia2011_Nuclex001.C
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AliGenerator *
GeneratorCustom()
{
AliGenCocktail *ctl = GeneratorCocktail("Perugia2011_Nuclex001");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Perugia2011_Nuclex001");
AliGenerator *pyt = GeneratorPythia6(kPythia6Tune_Perugia2011);
ctl->AddGenerator(pyt, "Pythia6", 1.);
AliGenerator *nu1a = Generator_Nuclex(0xF, kFALSE, 10);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Pythia6_Perugia2011_Nuclex002.C
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AliGenerator *
GeneratorCustom()
{
AliGenCocktail *ctl = GeneratorCocktail("Perugia2011_Nuclex002");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Perugia2011_Nuclex002");
AliGenerator *pyt = GeneratorPythia6(kPythia6Tune_Perugia2011);
ctl->AddGenerator(pyt, "Pythia6", 1.);
AliGenerator *nu1a = Generator_Nuclex(0x1F, kFALSE, 10);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Pythia8_Monash2013_Nuclex001.C
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ struct particle_inj {
AliGenerator *
GeneratorCustom()
{
AliGenCocktail *ctl = GeneratorCocktail("Monash2013_Nucl001");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Monash2013_Nucl001");

// pythia8
AliGenerator *py8 = GeneratorPythia8(kPythia8Tune_Monash2013);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Pythia8_Monash2013_Rsn001.C
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AliGenerator *
GeneratorCustom()
{
AliGenCocktail *ctl = GeneratorCocktail("Monash2013_Rsn001");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Monash2013_Rsn001");
// pythia8
AliGenerator *py8 = GeneratorPythia8(kPythia8Tune_Monash2013);
ctl->AddGenerator(py8, "Pythia8 (Monash2013)", 1.);
Expand Down
2 changes: 1 addition & 1 deletion MC/CustomGenerators/PWGLF/Pythia8_Monash2013_Rsn002.C
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ struct particle_inj {

AliGenerator* GeneratorCustom()
{
AliGenCocktail *ctl = GeneratorCocktail("Monash2013_RsnNcl002");
AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Monash2013_RsnNcl002");
// pythia8
AliGenerator *py8 = GeneratorPythia8(kPythia8Tune_Monash2013);
ctl->AddGenerator(py8, "Pythia8 (Monash2013)", 1.);
Expand Down
Loading

0 comments on commit 604deac

Please sign in to comment.