Fix for CINT with Root v4-04-02

[u/mrichter/AliRoot.git] / macros / ConfigPPR.C

diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C
index 819a54e2207741de45813b359cdb17e6e9892cd8..e1931326bce89335fb587f2397a21032472cfee2 100644 (file)
--- a/macros/ConfigPPR.C
+++ b/macros/ConfigPPR.C
@@ -74,7 +74,7 @@ enum PprRun_t
     kRunMax
 };
 
-const char* pprRunName[kRunMax] = {
+const char* pprRunName[] = {
     "test50",
     "kParam_8000",   "kParam_4000",  "kParam_2000", 
     "kHijing_cent1", "kHijing_cent2", 
@@ -1171,7 +1171,25 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
       {
        comment = comment.Append(" Cocktail for TRD at 5.5 TeV");
        AliGenCocktail *gener  = new AliGenCocktail();
-
+       
+       AliGenParam *phi = new AliGenParam(10,
+                                           new AliGenMUONlib(),
+                                           AliGenMUONlib::kPhi,
+                                           "Vogt PbPb");
+
+       phi->SetPtRange(0, 100);
+       phi->SetYRange(-1., +1.);
+       phi->SetForceDecay(kDiElectron);
+
+       AliGenParam *omega = new AliGenParam(10,
+                                            new AliGenMUONlib(),
+                                            AliGenMUONlib::kOmega,
+                                            "Vogt PbPb");
+
+       omega->SetPtRange(0, 100);
+       omega->SetYRange(-1., +1.);
+       omega->SetForceDecay(kDiElectron);
+       
        AliGenParam *jpsi = new AliGenParam(10,
                                            new AliGenMUONlib(),
                                            AliGenMUONlib::kJpsiFamily,
@@ -1206,10 +1224,21 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        beauty->SetYRange(-1.5, +1.5);
        beauty->SetForceDecay(kSemiElectronic);
 
+       AliGenParam *beautyJ = new AliGenParam(10,
+                                              new AliGenMUONlib(), 
+                                              AliGenMUONlib::kBeauty,
+                                              "central");
+       beautyJ->SetPtRange(0, 100);
+       beautyJ->SetYRange(-1.5, +1.5);
+       beautyJ->SetForceDecay(kBJpsiDiElectron);
+
+       gener->AddGenerator(phi,"Phi",1);
+       gener->AddGenerator(omega,"Omega",1);
        gener->AddGenerator(jpsi,"J/psi",1);
        gener->AddGenerator(ups,"Upsilon",1);
        gener->AddGenerator(charm,"Charm",1);
        gener->AddGenerator(beauty,"Beauty",1);
+       gener->AddGenerator(beautyJ,"J/Psi from Beauty",1);
        gGener=gener;
       }
       break;
@@ -1246,14 +1275,13 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
       {
        comment = comment.Append(" Muon Cocktail Cent1");
        AliGenMUONCocktail * gener = new AliGenMUONCocktail();
-       gener->SetPtRange(1.0,100.);       // Transverse momentum range   
+       gener->SetPtRange(0.4,100.);       // Transverse momentum range   
        gener->SetPhiRange(0.,360.);    // Azimuthal angle range  
        gener->SetYRange(-4.0,-2.4);
        gener->SetMuonPtCut(0.8);
        gener->SetMuonThetaCut(171.,178.);
        gener->SetMuonMultiplicity(2);
-       gener->SetNumberOfCollisions(1626.);  //Centrality class Cent1 for PDC04
-       gener->SetNumberOfParticipants(359.4);//Centrality class Cent1 for PDC04
+       gener->SetImpactParameterRange(12.,16.);  //Centrality class Cent1 for PDC04
        gGener=gener;
       }
       break;
@@ -1261,14 +1289,13 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
       {
        comment = comment.Append(" Muon Cocktail Per1");
        AliGenMUONCocktail * gener = new AliGenMUONCocktail();
-       gener->SetPtRange(1.0,100.);       // Transverse momentum range   
+       gener->SetPtRange(0.0,100.);       // Transverse momentum range   
        gener->SetPhiRange(0.,360.);    // Azimuthal angle range  
        gener->SetYRange(-4.0,-2.4);
        gener->SetMuonPtCut(0.8);
        gener->SetMuonThetaCut(171.,178.);
        gener->SetMuonMultiplicity(2);
-       gener->SetNumberOfCollisions(820.0);//Centrality class Per1 for PDC04
-       gener->SetNumberOfParticipants(229.3);//Centrality class Per1 for PDC04
+       gener->SetImpactParameterRange(5.,8.6);//Centrality class Per1 for PDC04
        gGener=gener;
       }
       break;
@@ -1276,14 +1303,13 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
       {
        comment = comment.Append(" Muon Cocktail Per4");
        AliGenMUONCocktail * gener = new AliGenMUONCocktail();
-       gener->SetPtRange(1.0,100.);       // Transverse momentum range   
+       gener->SetPtRange(0.0,100.);       // Transverse momentum range   
        gener->SetPhiRange(0.,360.);    // Azimuthal angle range  
        gener->SetYRange(-4.0,-2.4);
        gener->SetMuonPtCut(0.8);
        gener->SetMuonThetaCut(171.,178.);
        gener->SetMuonMultiplicity(2);
-       gener->SetNumberOfCollisions(13.6);//Centrality class Per4 for PDC04
-       gener->SetNumberOfParticipants(13.3);//Centrality class Per4 for PDC04
+       gener->SetImpactParameterRange(13.2,15.0);//Centrality class Per4 for PDC04
        gGener=gener;
       }
       break;
@@ -1291,14 +1317,13 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
       {
        comment = comment.Append(" Muon Cocktail HighPt Cent1");
        AliGenMUONCocktail * gener = new AliGenMUONCocktail();
-       gener->SetPtRange(1.0,100.);       // Transverse momentum range   
+       gener->SetPtRange(0.0,100.);       // Transverse momentum range   
        gener->SetPhiRange(0.,360.);    // Azimuthal angle range  
        gener->SetYRange(-4.0,-2.4);
        gener->SetMuonPtCut(2.5);
        gener->SetMuonThetaCut(171.,178.);
        gener->SetMuonMultiplicity(2);
-       gener->SetNumberOfCollisions(1626.);  //Centrality class Cent1 for PDC04
-       gener->SetNumberOfParticipants(359.4);//Centrality class Cent1 for PDC04
+       gener->SetImpactParameterRange(0.,5.);  //Centrality class Cent1 for PDC04
        gGener=gener;
       }
       break;
@@ -1306,14 +1331,13 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
       {
        comment = comment.Append(" Muon Cocktail HighPt Per1");
        AliGenMUONCocktail * gener = new AliGenMUONCocktail();
-       gener->SetPtRange(1.0,100.);       // Transverse momentum range   
+       gener->SetPtRange(0.0,100.);       // Transverse momentum range   
        gener->SetPhiRange(0.,360.);    // Azimuthal angle range  
        gener->SetYRange(-4.0,-2.4);
        gener->SetMuonPtCut(2.5);
        gener->SetMuonThetaCut(171.,178.);
        gener->SetMuonMultiplicity(2);
-       gener->SetNumberOfCollisions(820.0);//Centrality class Per1 for PDC04
-       gener->SetNumberOfParticipants(229.3);//Centrality class Per1 for PDC04
+       gener->SetImpactParameterRange(5.,8.6);//Centrality class Per1 for PDC04
        gGener=gener;
       }
       break;
@@ -1321,14 +1345,13 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
       {
        comment = comment.Append(" Muon Cocktail HighPt Per4");
        AliGenMUONCocktail * gener = new AliGenMUONCocktail();
-       gener->SetPtRange(1.0,100.);       // Transverse momentum range   
+       gener->SetPtRange(0.0,100.);       // Transverse momentum range   
        gener->SetPhiRange(0.,360.);    // Azimuthal angle range  
        gener->SetYRange(-4.0,-2.4);
        gener->SetMuonPtCut(2.5);
        gener->SetMuonThetaCut(171.,178.);
        gener->SetMuonMultiplicity(2);
-       gener->SetNumberOfCollisions(13.6);//Centrality class Per4 for PDC04
-       gener->SetNumberOfParticipants(13.3);//Centrality class Per4 for PDC04
+       gener->SetImpactParameterRange(13.2,15.0);//Centrality class Per4 for PDC04
        gGener=gener;
       }
       break;
@@ -1336,14 +1359,13 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
       {
        comment = comment.Append(" Muon Cocktail Single Cent1");
        AliGenMUONCocktail * gener = new AliGenMUONCocktail();
-       gener->SetPtRange(1.0,100.);       // Transverse momentum range   
+       gener->SetPtRange(0.0,100.);       // Transverse momentum range   
        gener->SetPhiRange(0.,360.);    // Azimuthal angle range  
        gener->SetYRange(-4.0,-2.4);
        gener->SetMuonPtCut(0.8);
        gener->SetMuonThetaCut(171.,178.);
        gener->SetMuonMultiplicity(1);
-       gener->SetNumberOfCollisions(1626.);  //Centrality class Cent1 for PDC04
-       gener->SetNumberOfParticipants(359.4);//Centrality class Cent1 for PDC04
+       gener->SetImpactParameterRange(0.,5.);  //Centrality class Cent1 for PDC04
        gGener=gener;
       }
       break;
@@ -1351,13 +1373,13 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
       {
        comment = comment.Append(" Muon Cocktail Single Per1");
        AliGenMUONCocktail * gener = new AliGenMUONCocktail();
-       gener->SetPtRange(1.0,100.);       // Transverse momentum range   
+       gener->SetPtRange(0.0,100.);       // Transverse momentum range   
        gener->SetPhiRange(0.,360.);    // Azimuthal angle range  
        gener->SetYRange(-4.0,-2.4);
        gener->SetMuonPtCut(0.8);
        gener->SetMuonThetaCut(171.,178.);
        gener->SetMuonMultiplicity(1);
-       gener->SetNumberOfCollisions(820.0);//Centrality class Per1 for PDC04
+       gener->SetImpactParameterRange(5.,8.6);//Centrality class Per1 for PDC04
        gener->SetNumberOfParticipants(229.3);//Centrality class Per1 for PDC04
        gGener=gener;
       }
@@ -1366,14 +1388,13 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
       {
        comment = comment.Append(" Muon Cocktail Single Per4");
        AliGenMUONCocktail * gener = new AliGenMUONCocktail();
-       gener->SetPtRange(1.0,100.);       // Transverse momentum range   
+       gener->SetPtRange(0.0,100.);       // Transverse momentum range   
        gener->SetPhiRange(0.,360.);    // Azimuthal angle range  
        gener->SetYRange(-4.0,-2.4);
        gener->SetMuonPtCut(0.8);
        gener->SetMuonThetaCut(171.,178.);
        gener->SetMuonMultiplicity(1);
-       gener->SetNumberOfCollisions(13.6);//Centrality class Per4 for PDC04
-       gener->SetNumberOfParticipants(13.3);//Centrality class Per4 for PDC04
+       gener->SetImpactParameterRange(13.2,15.0);//Centrality class Per4 for PDC04
        gGener=gener;
       }
       break;