G3 specific configuration removed.

diff --git a/macros/Config.C b/macros/Config.C
index 63cd733422154cc1572f1b38e718e528bbfd401e..10a8e62e4e1618bdc71fa3257ab4856521296834 100644 (file)
--- a/macros/Config.C
+++ b/macros/Config.C
@@ -37,7 +37,6 @@ void Config()
         gAlice->SetRunLoader(rl);
     }
 
         gAlice->SetRunLoader(rl);
     }
 

-    TGeant3 *geant3 = (TGeant3 *) gMC;

 
     //
     // Set External decayer
 
     //
     // Set External decayer


@@ -46,44 +45,44 @@ void Config()
     decayer->SetForceDecay(kAll);
     decayer->Init();
     gMC->SetExternalDecayer(decayer);
     decayer->SetForceDecay(kAll);
     decayer->Init();
     gMC->SetExternalDecayer(decayer);

-    //
-    //

     //=======================================================================
     //=======================================================================

-    // ******* GEANT STEERING parameters FOR ALICE SIMULATION *******
-    geant3->SetTRIG(1);         //Number of events to be processed 
-    geant3->SetSWIT(4, 10);
-    geant3->SetDEBU(0, 0, 1);
-    //geant3->SetSWIT(2,2);
-    geant3->SetDCAY(1);
-    geant3->SetPAIR(1);
-    geant3->SetCOMP(1);
-    geant3->SetPHOT(1);
-    geant3->SetPFIS(0);
-    geant3->SetDRAY(0);
-    geant3->SetANNI(1);
-    geant3->SetBREM(1);
-    geant3->SetMUNU(1);
-    geant3->SetCKOV(1);
-    geant3->SetHADR(1);         //Select pure GEANH (HADR 1) or GEANH/NUCRIN (HADR 3)
-    geant3->SetLOSS(2);
-    geant3->SetMULS(1);
-    geant3->SetRAYL(1);
-    geant3->SetAUTO(1);         //Select automatic STMIN etc... calc. (AUTO 1) or manual (AUTO 0)
-    geant3->SetABAN(0);         //Restore 3.16 behaviour for abandoned tracks
-    geant3->SetOPTI(2);         //Select optimisation level for GEANT geometry searches (0,1,2)
-    geant3->SetERAN(5.e-7);
+    // ************* STEERING parameters FOR ALICE SIMULATION **************
+    // --- Specify event type to be tracked through the ALICE setup
+    // --- All positions are in cm, angles in degrees, and P and E in GeV
+
+
+    gMC->SetProcess("DCAY",1);
+    gMC->SetProcess("PAIR",1);
+    gMC->SetProcess("COMP",1);
+    gMC->SetProcess("PHOT",1);
+    gMC->SetProcess("PFIS",0);
+    gMC->SetProcess("DRAY",0);
+    gMC->SetProcess("ANNI",1);
+    gMC->SetProcess("BREM",1);
+    gMC->SetProcess("MUNU",1);
+    gMC->SetProcess("CKOV",1);
+    gMC->SetProcess("HADR",1);
+    gMC->SetProcess("LOSS",2);
+    gMC->SetProcess("MULS",1);
+    gMC->SetProcess("RAYL",1);

 
     Float_t cut = 1.e-3;        // 1MeV cut by default
     Float_t tofmax = 1.e10;
 
 
     Float_t cut = 1.e-3;        // 1MeV cut by default
     Float_t tofmax = 1.e10;
 

-    //             GAM ELEC NHAD CHAD MUON EBREM MUHAB EDEL MUDEL MUPA TOFMAX
-    geant3->SetCUTS(cut, cut, cut, cut, cut, cut, cut, cut, cut, cut,
-                    tofmax);
-    //
-    //=======================================================================
-    // ************* STEERING parameters FOR ALICE SIMULATION **************
-    // --- Specify event type to be tracked through the ALICE setup
-    // --- All positions are in cm, angles in degrees, and P and E in GeV
+    gMC->SetCut("CUTGAM", cut);
+    gMC->SetCut("CUTELE", cut);
+    gMC->SetCut("CUTNEU", cut);
+    gMC->SetCut("CUTHAD", cut);
+    gMC->SetCut("CUTMUO", cut);
+    gMC->SetCut("BCUTE",  cut); 
+    gMC->SetCut("BCUTM",  cut); 
+    gMC->SetCut("DCUTE",  cut); 
+    gMC->SetCut("DCUTM",  cut); 
+    gMC->SetCut("PPCUTM", cut);
+    gMC->SetCut("TOFMAX", tofmax); 
+
+
+

     if (gSystem->Getenv("CONFIG_NPARTICLES"))
     {
         int     nParticles = atoi(gSystem->Getenv("CONFIG_NPARTICLES"));
     if (gSystem->Getenv("CONFIG_NPARTICLES"))
     {
         int     nParticles = atoi(gSystem->Getenv("CONFIG_NPARTICLES"));

diff --git a/macros/ConfigBeautyPPR.C b/macros/ConfigBeautyPPR.C
index 7cac5f0171239c22816a9da2ee92435900a491c0..5f136d73b2a0def883508da4815364b3f137f4b4 100644 (file)
--- a/macros/ConfigBeautyPPR.C
+++ b/macros/ConfigBeautyPPR.C
@@ -21,8 +21,6 @@ void Config()
    
   TFile *rootfile = new TFile("galice.root","recreate");
   rootfile->SetCompressionLevel(2);
    
   TFile *rootfile = new TFile("galice.root","recreate");
   rootfile->SetCompressionLevel(2);

-  TGeant3 *geant3 = (TGeant3*)gMC;
-

   //
   // Set External decayer
   AliDecayer* decayer = new AliDecayerPythia();
   //
   // Set External decayer
   AliDecayer* decayer = new AliDecayerPythia();


@@ -30,42 +28,44 @@ void Config()
   decayer->Init();
   gMC->SetExternalDecayer(decayer);
 
   decayer->Init();
   gMC->SetExternalDecayer(decayer);
 

-  //
-  //
-  //=======================================================================
-  // ******* GEANT STEERING parameters FOR ALICE SIMULATION *******
-  geant3->SetTRIG(1); //Number of events to be processed 
-  geant3->SetSWIT(4,10);
-  geant3->SetDEBU(0,0,1);
-  //geant3->SetSWIT(2,2);
-  geant3->SetDCAY(1);
-  geant3->SetPAIR(1);
-  geant3->SetCOMP(1);
-  geant3->SetPHOT(1);
-  geant3->SetPFIS(0);
-  geant3->SetDRAY(0);
-  geant3->SetANNI(1);
-  geant3->SetBREM(1);
-  geant3->SetMUNU(1);
-  geant3->SetCKOV(1);
-  geant3->SetHADR(1); //Select pure GEANH (HADR 1) or GEANH/NUCRIN (HADR 3)
-  geant3->SetLOSS(2);
-  geant3->SetMULS(1);
-  geant3->SetRAYL(1);
-  geant3->SetAUTO(1); //Select automatic STMIN etc... calc. (AUTO 1) or manual (AUTO 0)
-  geant3->SetABAN(0); //Restore 3.16 behaviour for abandoned tracks
-  geant3->SetOPTI(2); //Select optimisation level for GEANT geometry searches (0,1,2)
-  geant3->SetERAN(5.e-7);
-
-  Float_t cut    = 1.e-3; // 1MeV cut by default
-  Float_t tofmax = 1.e10;
-  //             GAM ELEC NHAD CHAD MUON EBREM MUHAB EDEL MUDEL MUPA TOFMAX
-  geant3->SetCUTS(cut,cut, cut, cut, cut, cut,  cut,  cut, cut,  cut, tofmax);
+

   //
   //=======================================================================
   // ************* STEERING parameters FOR ALICE SIMULATION **************
   // --- Specify event type to be tracked through the ALICE setup
   // --- All positions are in cm, angles in degrees, and P and E in GeV
   //
   //=======================================================================
   // ************* STEERING parameters FOR ALICE SIMULATION **************
   // --- Specify event type to be tracked through the ALICE setup
   // --- All positions are in cm, angles in degrees, and P and E in GeV

+
+    gMC->SetProcess("DCAY",1);
+    gMC->SetProcess("PAIR",1);
+    gMC->SetProcess("COMP",1);
+    gMC->SetProcess("PHOT",1);
+    gMC->SetProcess("PFIS",0);
+    gMC->SetProcess("DRAY",0);
+    gMC->SetProcess("ANNI",1);
+    gMC->SetProcess("BREM",1);
+    gMC->SetProcess("MUNU",1);
+    gMC->SetProcess("CKOV",1);
+    gMC->SetProcess("HADR",1);
+    gMC->SetProcess("LOSS",2);
+    gMC->SetProcess("MULS",1);
+    gMC->SetProcess("RAYL",1);
+
+    Float_t cut = 1.e-3;        // 1MeV cut by default
+    Float_t tofmax = 1.e10;
+
+    gMC->SetCut("CUTGAM", cut);
+    gMC->SetCut("CUTELE", cut);
+    gMC->SetCut("CUTNEU", cut);
+    gMC->SetCut("CUTHAD", cut);
+    gMC->SetCut("CUTMUO", cut);
+    gMC->SetCut("BCUTE",  cut); 
+    gMC->SetCut("BCUTM",  cut); 
+    gMC->SetCut("DCUTE",  cut); 
+    gMC->SetCut("DCUTM",  cut); 
+    gMC->SetCut("PPCUTM", cut);
+    gMC->SetCut("TOFMAX", tofmax); 
+
+

   // AliGenPythia *gener = new AliGenPythia(ntracks);
   AliGenPythia *gener = new AliGenPythia(-1);
 
   // AliGenPythia *gener = new AliGenPythia(ntracks);
   AliGenPythia *gener = new AliGenPythia(-1);
 

diff --git a/macros/ConfigCharmPPR.C b/macros/ConfigCharmPPR.C
index 619ecb2e23b2e684cccc4ac04c88d72a6ba7f888..c5f306b5f97f1021b13de40968dc7207bc6e33b9 100644 (file)
--- a/macros/ConfigCharmPPR.C
+++ b/macros/ConfigCharmPPR.C
@@ -18,7 +18,6 @@ void Config()
    
   TFile *rootfile = new TFile("galice.root","recreate");
   rootfile->SetCompressionLevel(2);
    
   TFile *rootfile = new TFile("galice.root","recreate");
   rootfile->SetCompressionLevel(2);

-  TGeant3 *geant3 = (TGeant3*)gMC;

 
   //
   // Set External decayer
 
   //
   // Set External decayer


@@ -27,42 +26,45 @@ void Config()
   decayer->Init();
   gMC->SetExternalDecayer(decayer);
 
   decayer->Init();
   gMC->SetExternalDecayer(decayer);
 

-  //
-  //
-  //=======================================================================
-  // ******* GEANT STEERING parameters FOR ALICE SIMULATION *******
-  geant3->SetTRIG(1); //Number of events to be processed 
-  geant3->SetSWIT(4,10);
-  geant3->SetDEBU(0,0,1);
-  //geant3->SetSWIT(2,2);
-  geant3->SetDCAY(1);
-  geant3->SetPAIR(1);
-  geant3->SetCOMP(1);
-  geant3->SetPHOT(1);
-  geant3->SetPFIS(0);
-  geant3->SetDRAY(0);
-  geant3->SetANNI(1);
-  geant3->SetBREM(1);
-  geant3->SetMUNU(1);
-  geant3->SetCKOV(1);
-  geant3->SetHADR(1); //Select pure GEANH (HADR 1) or GEANH/NUCRIN (HADR 3)
-  geant3->SetLOSS(2);
-  geant3->SetMULS(1);
-  geant3->SetRAYL(1);
-  geant3->SetAUTO(1); //Select automatic STMIN etc... calc. (AUTO 1) or manual (AUTO 0)
-  geant3->SetABAN(0); //Restore 3.16 behaviour for abandoned tracks
-  geant3->SetOPTI(2); //Select optimisation level for GEANT geometry searches (0,1,2)
-  geant3->SetERAN(5.e-7);
-
-  Float_t cut    = 1.e-3; // 1MeV cut by default
-  Float_t tofmax = 1.e10;
-  //             GAM ELEC NHAD CHAD MUON EBREM MUHAB EDEL MUDEL MUPA TOFMAX
-  geant3->SetCUTS(cut,cut, cut, cut, cut, cut,  cut,  cut, cut,  cut, tofmax);
+

   //
   //=======================================================================
   // ************* STEERING parameters FOR ALICE SIMULATION **************
   // --- Specify event type to be tracked through the ALICE setup
   // --- All positions are in cm, angles in degrees, and P and E in GeV
   //
   //=======================================================================
   // ************* STEERING parameters FOR ALICE SIMULATION **************
   // --- Specify event type to be tracked through the ALICE setup
   // --- All positions are in cm, angles in degrees, and P and E in GeV

+
+
+    gMC->SetProcess("DCAY",1);
+    gMC->SetProcess("PAIR",1);
+    gMC->SetProcess("COMP",1);
+    gMC->SetProcess("PHOT",1);
+    gMC->SetProcess("PFIS",0);
+    gMC->SetProcess("DRAY",0);
+    gMC->SetProcess("ANNI",1);
+    gMC->SetProcess("BREM",1);
+    gMC->SetProcess("MUNU",1);
+    gMC->SetProcess("CKOV",1);
+    gMC->SetProcess("HADR",1);
+    gMC->SetProcess("LOSS",2);
+    gMC->SetProcess("MULS",1);
+    gMC->SetProcess("RAYL",1);
+
+    Float_t cut = 1.e-3;        // 1MeV cut by default
+    Float_t tofmax = 1.e10;
+
+    gMC->SetCut("CUTGAM", cut);
+    gMC->SetCut("CUTELE", cut);
+    gMC->SetCut("CUTNEU", cut);
+    gMC->SetCut("CUTHAD", cut);
+    gMC->SetCut("CUTMUO", cut);
+    gMC->SetCut("BCUTE",  cut); 
+    gMC->SetCut("BCUTM",  cut); 
+    gMC->SetCut("DCUTE",  cut); 
+    gMC->SetCut("DCUTM",  cut); 
+    gMC->SetCut("PPCUTM", cut);
+    gMC->SetCut("TOFMAX", tofmax); 
+
+

   // AliGenPythia *gener = new AliGenPythia(ntracks);
   AliGenPythia *gener = new AliGenPythia(-1);
 
   // AliGenPythia *gener = new AliGenPythia(ntracks);
   AliGenPythia *gener = new AliGenPythia(-1);
 

diff --git a/macros/ConfigHBT.C b/macros/ConfigHBT.C
index 806a975d27607c83ad82a11242ef588e83c82eff..a25bae576dae19f4e3234feebbf4d0f65ffcbca2 100644 (file)
--- a/macros/ConfigHBT.C
+++ b/macros/ConfigHBT.C
@@ -20,7 +20,6 @@ void Config()
         gAlice->SetRunLoader(rl);
     }
 
         gAlice->SetRunLoader(rl);
     }
 

-    TGeant3 *geant3 = (TGeant3 *) gMC;

 
     //
     // Set External decayer
 
     //
     // Set External decayer


@@ -30,43 +29,44 @@ void Config()
     decayer->Init();
     gMC->SetExternalDecayer(decayer);
     //
     decayer->Init();
     gMC->SetExternalDecayer(decayer);
     //

-    //

     //=======================================================================
     //=======================================================================

-    // ******* GEANT STEERING parameters FOR ALICE SIMULATION *******
-    geant3->SetTRIG(1);         //Number of events to be processed 
-    geant3->SetSWIT(4, 10);
-    geant3->SetDEBU(0, 0, 1);
-    //geant3->SetSWIT(2,2);
-    geant3->SetDCAY(1);
-    geant3->SetPAIR(1);
-    geant3->SetCOMP(1);
-    geant3->SetPHOT(1);
-    geant3->SetPFIS(0);
-    geant3->SetDRAY(0);
-    geant3->SetANNI(1);
-    geant3->SetBREM(1);
-    geant3->SetMUNU(1);
-    geant3->SetCKOV(1);
-    geant3->SetHADR(1);         //Select pure GEANH (HADR 1) or GEANH/NUCRIN (HADR 3)
-    geant3->SetLOSS(2);
-    geant3->SetMULS(1);
-    geant3->SetRAYL(1);
-    geant3->SetAUTO(1);         //Select automatic STMIN etc... calc. (AUTO 1) or manual (AUTO 0)
-    geant3->SetABAN(0);         //Restore 3.16 behaviour for abandoned tracks
-    geant3->SetOPTI(2);         //Select optimisation level for GEANT geometry searches (0,1,2)
-    geant3->SetERAN(5.e-7);
+    // ************* STEERING parameters FOR ALICE SIMULATION **************
+    // --- Specify event type to be tracked through the ALICE setup
+    // --- All positions are in cm, angles in degrees, and P and E in GeV
+
+
+
+    gMC->SetProcess("DCAY",1);
+    gMC->SetProcess("PAIR",1);
+    gMC->SetProcess("COMP",1);
+    gMC->SetProcess("PHOT",1);
+    gMC->SetProcess("PFIS",0);
+    gMC->SetProcess("DRAY",0);
+    gMC->SetProcess("ANNI",1);
+    gMC->SetProcess("BREM",1);
+    gMC->SetProcess("MUNU",1);
+    gMC->SetProcess("CKOV",1);
+    gMC->SetProcess("HADR",1);
+    gMC->SetProcess("LOSS",2);
+    gMC->SetProcess("MULS",1);
+    gMC->SetProcess("RAYL",1);

 
     Float_t cut = 1.e-3;        // 1MeV cut by default
     Float_t tofmax = 1.e10;
 
 
     Float_t cut = 1.e-3;        // 1MeV cut by default
     Float_t tofmax = 1.e10;
 

-    //             GAM ELEC NHAD CHAD MUON EBREM MUHAB EDEL MUDEL MUPA TOFMAX
-    geant3->SetCUTS(cut, cut, cut, cut, cut, cut, cut, cut, cut, cut,
-                    tofmax);
-    //
-    //=======================================================================
-    // ************* STEERING parameters FOR ALICE SIMULATION **************
-    // --- Specify event type to be tracked through the ALICE setup
-    // --- All positions are in cm, angles in degrees, and P and E in GeV
+    gMC->SetCut("CUTGAM", cut);
+    gMC->SetCut("CUTELE", cut);
+    gMC->SetCut("CUTNEU", cut);
+    gMC->SetCut("CUTHAD", cut);
+    gMC->SetCut("CUTMUO", cut);
+    gMC->SetCut("BCUTE",  cut); 
+    gMC->SetCut("BCUTM",  cut); 
+    gMC->SetCut("DCUTE",  cut); 
+    gMC->SetCut("DCUTM",  cut); 
+    gMC->SetCut("PPCUTM", cut);
+    gMC->SetCut("TOFMAX", tofmax); 
+
+

     if (gSystem->Getenv("CONFIG_NPARTICLES"))
     {
         int     nParticles = atoi(gSystem->Getenv("CONFIG_NPARTICLES"));
     if (gSystem->Getenv("CONFIG_NPARTICLES"))
     {
         int     nParticles = atoi(gSystem->Getenv("CONFIG_NPARTICLES"));

diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C
index b87c6cc9c945fb167bd060c4c14fb2f30e34f50d..32e4293bf68fb49fe13b8876f01ce1dd61af027c 100644 (file)
--- a/macros/ConfigPPR.C
+++ b/macros/ConfigPPR.C
@@ -60,8 +60,6 @@ void Config()
         rootfile->SetCompressionLevel(2);
     }
 
         rootfile->SetCompressionLevel(2);
     }
 

-    TGeant3 *geant3 = (TGeant3 *) gMC;
-

     //
     // Set External decayer
     AliDecayer *decayer = new AliDecayerPythia();
     //
     // Set External decayer
     AliDecayer *decayer = new AliDecayerPythia();


@@ -72,42 +70,42 @@ void Config()
     //
     //
     //=======================================================================
     //
     //
     //=======================================================================

-    // ******* GEANT STEERING parameters FOR ALICE SIMULATION *******
-    geant3->SetTRIG(1);         //Number of events to be processed 
-    geant3->SetSWIT(4, 10);
-    geant3->SetDEBU(0, 0, 1);
-    //geant3->SetSWIT(2,2);
-    geant3->SetDCAY(1);
-    geant3->SetPAIR(1);
-    geant3->SetCOMP(1);
-    geant3->SetPHOT(1);
-    geant3->SetPFIS(0);
-    geant3->SetDRAY(0);
-    geant3->SetANNI(1);
-    geant3->SetBREM(1);
-    geant3->SetMUNU(1);
-    geant3->SetCKOV(1);
-    geant3->SetHADR(1);         //Select pure GEANH (HADR 1) or GEANH/NUCRIN (HADR 3)
-    geant3->SetLOSS(2);
-    geant3->SetMULS(1);
-    geant3->SetRAYL(1);
-    geant3->SetAUTO(1);         //Select automatic STMIN etc... calc. (AUTO 1) or manual (AUTO 0)
-    geant3->SetABAN(0);         //Restore 3.16 behaviour for abandoned tracks
-    geant3->SetOPTI(2);         //Select optimisation level for GEANT geometry searches (0,1,2)
-    geant3->SetERAN(5.e-7);
-
-    Float_t cut = 1.e-3;        // 1MeV cut by default
-    Float_t tofmax = 1.e10;
-
-    //             GAM ELEC NHAD CHAD MUON EBREM MUHAB EDEL MUDEL MUPA TOFMAX
-    geant3->SetCUTS(cut, cut, cut, cut, cut, cut, cut, cut, cut, cut,
-                    tofmax);

     //
     //=======================================================================
     // ************* STEERING parameters FOR ALICE SIMULATION **************
     // --- Specify event type to be tracked through the ALICE setup
     // --- All positions are in cm, angles in degrees, and P and E in GeV
 
     //
     //=======================================================================
     // ************* STEERING parameters FOR ALICE SIMULATION **************
     // --- Specify event type to be tracked through the ALICE setup
     // --- All positions are in cm, angles in degrees, and P and E in GeV
 

+    gMC->SetProcess("DCAY",1);
+    gMC->SetProcess("PAIR",1);
+    gMC->SetProcess("COMP",1);
+    gMC->SetProcess("PHOT",1);
+    gMC->SetProcess("PFIS",0);
+    gMC->SetProcess("DRAY",0);
+    gMC->SetProcess("ANNI",1);
+    gMC->SetProcess("BREM",1);
+    gMC->SetProcess("MUNU",1);
+    gMC->SetProcess("CKOV",1);
+    gMC->SetProcess("HADR",1);
+    gMC->SetProcess("LOSS",2);
+    gMC->SetProcess("MULS",1);
+    gMC->SetProcess("RAYL",1);
+
+    Float_t cut = 1.e-3;        // 1MeV cut by default
+    Float_t tofmax = 1.e10;
+
+    gMC->SetCut("CUTGAM", cut);
+    gMC->SetCut("CUTELE", cut);
+    gMC->SetCut("CUTNEU", cut);
+    gMC->SetCut("CUTHAD", cut);
+    gMC->SetCut("CUTMUO", cut);
+    gMC->SetCut("BCUTE",  cut); 
+    gMC->SetCut("BCUTM",  cut); 
+    gMC->SetCut("DCUTE",  cut); 
+    gMC->SetCut("DCUTM",  cut); 
+    gMC->SetCut("PPCUTM", cut);
+    gMC->SetCut("TOFMAX", tofmax); 
+

 
 // Generator Configuration
     gAlice->SetDebug(1);
 
 // Generator Configuration
     gAlice->SetDebug(1);

diff --git a/macros/Config_PythiaHeavyFlavours.C b/macros/Config_PythiaHeavyFlavours.C
index 35978cfba497e0ac3a100a3baf0b61b7c559d834..44dca58917255a880566751a30e7be26510633aa 100644 (file)
--- a/macros/Config_PythiaHeavyFlavours.C
+++ b/macros/Config_PythiaHeavyFlavours.C
@@ -75,44 +75,46 @@ void Config()
   //  Create the output file
   TFile *rootfile = new TFile("galice.root","recreate");
   rootfile->SetCompressionLevel(2);
   //  Create the output file
   TFile *rootfile = new TFile("galice.root","recreate");
   rootfile->SetCompressionLevel(2);

-  TGeant3 *geant3 = (TGeant3*)gMC;
-  //
-  //
-  //=======================================================================
-  // ******* GEANT STEERING parameters FOR ALICE SIMULATION *******
-  geant3->SetTRIG(1); //Number of events to be processed 
-  geant3->SetSWIT(4,10);
-  geant3->SetDEBU(0,0,1);
-  //geant3->SetSWIT(2,2);
-  geant3->SetDCAY(1);
-  geant3->SetPAIR(1);
-  geant3->SetCOMP(1);
-  geant3->SetPHOT(1);
-  geant3->SetPFIS(0);
-  geant3->SetDRAY(0);
-  geant3->SetANNI(1);
-  geant3->SetBREM(1);
-  geant3->SetMUNU(1);
-  geant3->SetCKOV(1);
-  geant3->SetHADR(1); //Select pure GEANH (HADR 1) or GEANH/NUCRIN (HADR 3)
-  geant3->SetLOSS(2);
-  geant3->SetMULS(1);
-  geant3->SetRAYL(1);
-  geant3->SetAUTO(1); //Select automatic STMIN etc... calc. (AUTO 1) or manual (AUTO 0)
-  geant3->SetABAN(0); //Restore 3.16 behaviour for abandoned tracks
-  geant3->SetOPTI(2); //Select optimisation level for GEANT geometry searches (0,1,2)
-  geant3->SetERAN(5.e-7);
-
-  Float_t cut    = 1.e-3; // 1MeV cut by default
-  Float_t tofmax = 1.e10;
-  //             GAM ELEC NHAD CHAD MUON EBREM MUHAB EDEL MUDEL MUPA TOFMAX
-  geant3->SetCUTS(cut,cut, cut, cut, cut, cut,  cut,  cut, cut,  cut, tofmax);

   //
   //=======================================================================
   // ************* STEERING parameters FOR ALICE SIMULATION **************
   // --- Specify event type to be tracked through the ALICE setup
   // --- All positions are in cm, angles in degrees, and P and E in GeV
   //
   //=======================================================================
   // ************* STEERING parameters FOR ALICE SIMULATION **************
   // --- Specify event type to be tracked through the ALICE setup
   // --- All positions are in cm, angles in degrees, and P and E in GeV

-  //======================//
+
+
+    gMC->SetProcess("DCAY",1);
+    gMC->SetProcess("PAIR",1);
+    gMC->SetProcess("COMP",1);
+    gMC->SetProcess("PHOT",1);
+    gMC->SetProcess("PFIS",0);
+    gMC->SetProcess("DRAY",0);
+    gMC->SetProcess("ANNI",1);
+    gMC->SetProcess("BREM",1);
+    gMC->SetProcess("MUNU",1);
+    gMC->SetProcess("CKOV",1);
+    gMC->SetProcess("HADR",1);
+    gMC->SetProcess("LOSS",2);
+    gMC->SetProcess("MULS",1);
+    gMC->SetProcess("RAYL",1);
+
+    Float_t cut = 1.e-3;        // 1MeV cut by default
+    Float_t tofmax = 1.e10;
+
+    gMC->SetCut("CUTGAM", cut);
+    gMC->SetCut("CUTELE", cut);
+    gMC->SetCut("CUTNEU", cut);
+    gMC->SetCut("CUTHAD", cut);
+    gMC->SetCut("CUTMUO", cut);
+    gMC->SetCut("BCUTE",  cut); 
+    gMC->SetCut("BCUTM",  cut); 
+    gMC->SetCut("DCUTE",  cut); 
+    gMC->SetCut("DCUTM",  cut); 
+    gMC->SetCut("PPCUTM", cut);
+    gMC->SetCut("TOFMAX", tofmax); 
+
+
+
+

   // Set External decayer //
   //======================//
   TVirtualMCDecayer* decayer = new AliDecayerPythia();
   // Set External decayer //
   //======================//
   TVirtualMCDecayer* decayer = new AliDecayerPythia();

diff --git a/macros/Config_gener.C b/macros/Config_gener.C
index e01dad6202ac3b440b9d541ba3bef12494ea3730..ab399a06b1479f95a02e8920609ab85b02f84283 100644 (file)
--- a/macros/Config_gener.C
+++ b/macros/Config_gener.C
@@ -16,8 +16,6 @@ new TGeant3("C++ Interface to Geant3");
    
 TFile *rootfile = new TFile("galice.root","recreate");
 rootfile->SetCompressionLevel(2);
    
 TFile *rootfile = new TFile("galice.root","recreate");
 rootfile->SetCompressionLevel(2);

-TGeant3 *geant3 = (TGeant3*)gMC;
-

 //
 // Set External decayer
  AliDecayer* decayer = new AliDecayerPythia();
 //
 // Set External decayer
  AliDecayer* decayer = new AliDecayerPythia();


@@ -25,39 +23,45 @@ TGeant3 *geant3 = (TGeant3*)gMC;
  decayer->Init();
  gMC->SetExternalDecayer(decayer);
 
  decayer->Init();
  gMC->SetExternalDecayer(decayer);
 

-//=======================================================================
-// ******* GEANT STEERING parameters FOR ALICE SIMULATION *******
-geant3->SetTRIG(1); //Number of events to be processed 
-geant3->SetSWIT(4,10);
-geant3->SetDEBU(0,0,1);
-//geant3->SetSWIT(2,2);
-geant3->SetDCAY(1);
-geant3->SetPAIR(1);
-geant3->SetCOMP(1);
-geant3->SetPHOT(1);
-geant3->SetPFIS(0);
-geant3->SetDRAY(0);
-geant3->SetANNI(1);
-geant3->SetBREM(1);
-geant3->SetMUNU(1);
-geant3->SetCKOV(1);
-geant3->SetHADR(1); //Select pure GEANH (HADR 1) or GEANH/NUCRIN (HADR 3)
-geant3->SetLOSS(2);
-geant3->SetMULS(1);
-geant3->SetRAYL(1);
-geant3->SetAUTO(1); //Select automatic STMIN etc... calc. (AUTO 1) or manual (AUTO 0)
-geant3->SetABAN(0); //Restore 3.16 behaviour for abandoned tracks
-geant3->SetOPTI(2); //Select optimisation level for GEANT geometry searches (0,1,2)
-Float_t cut    = 1.e-3; // 1MeV cut by default
-Float_t tofmax = 1.e10;
-//             GAM ELEC NHAD CHAD MUON EBREM MUHAB EDEL MUDEL MUPA TOFMAX
-geant3->SetCUTS(cut,cut, cut, cut, cut, cut,  cut,  cut, cut,  cut, tofmax);
+

 //
 //=======================================================================
 // ************* STEERING parameters FOR ALICE SIMULATION **************
 // --- Specify event type to be tracked through the ALICE setup
 // --- All positions are in cm, angles in degrees, and P and E in GeV
 
 //
 //=======================================================================
 // ************* STEERING parameters FOR ALICE SIMULATION **************
 // --- Specify event type to be tracked through the ALICE setup
 // --- All positions are in cm, angles in degrees, and P and E in GeV
 

+
+    gMC->SetProcess("DCAY",1);
+    gMC->SetProcess("PAIR",1);
+    gMC->SetProcess("COMP",1);
+    gMC->SetProcess("PHOT",1);
+    gMC->SetProcess("PFIS",0);
+    gMC->SetProcess("DRAY",0);
+    gMC->SetProcess("ANNI",1);
+    gMC->SetProcess("BREM",1);
+    gMC->SetProcess("MUNU",1);
+    gMC->SetProcess("CKOV",1);
+    gMC->SetProcess("HADR",1);
+    gMC->SetProcess("LOSS",2);
+    gMC->SetProcess("MULS",1);
+    gMC->SetProcess("RAYL",1);
+
+    Float_t cut = 1.e-3;        // 1MeV cut by default
+    Float_t tofmax = 1.e10;
+
+    gMC->SetCut("CUTGAM", cut);
+    gMC->SetCut("CUTELE", cut);
+    gMC->SetCut("CUTNEU", cut);
+    gMC->SetCut("CUTHAD", cut);
+    gMC->SetCut("CUTMUO", cut);
+    gMC->SetCut("BCUTE",  cut); 
+    gMC->SetCut("BCUTM",  cut); 
+    gMC->SetCut("DCUTE",  cut); 
+    gMC->SetCut("DCUTM",  cut); 
+    gMC->SetCut("PPCUTM", cut);
+    gMC->SetCut("TOFMAX", tofmax); 
+
+

  switch(gentype)
  {
  case gun:
  switch(gentype)
  {
  case gun:

diff --git a/macros/Config_pp.C b/macros/Config_pp.C
index fa52b1b795a969ca25265f5ee7cea7bdd58096fd..a01615c3b6c5c42598ecf6fd8cb9a9f268220a4b 100644 (file)
--- a/macros/Config_pp.C
+++ b/macros/Config_pp.C
@@ -64,7 +64,6 @@ void Config()
       rootfile->SetCompressionLevel(2);
     }
 
       rootfile->SetCompressionLevel(2);
     }
 

-  TGeant3 *geant3 = (TGeant3 *) gMC;

 
   //
   // Set External decayer
 
   //
   // Set External decayer


@@ -73,46 +72,46 @@ void Config()
   decayer->SetForceDecay(kAll);
   decayer->Init();
   gMC->SetExternalDecayer(decayer);
   decayer->SetForceDecay(kAll);
   decayer->Init();
   gMC->SetExternalDecayer(decayer);

-  //
-  //
-  //=======================================================================
-  // ******* GEANT STEERING parameters FOR ALICE SIMULATION *******
-  geant3->SetTRIG(1);         //Number of events to be processed 
-  geant3->SetSWIT(4, 10);
-  geant3->SetDEBU(0, 0, 1);
-  //geant3->SetSWIT(2,2);
-  geant3->SetDCAY(1);
-  geant3->SetPAIR(1);
-  geant3->SetCOMP(1);
-  geant3->SetPHOT(1);
-  geant3->SetPFIS(0);
-  geant3->SetDRAY(0);
-  geant3->SetANNI(1);
-  geant3->SetBREM(1);
-  geant3->SetMUNU(1);
-  geant3->SetCKOV(1);
-  geant3->SetHADR(1);         //Select pure GEANH (HADR 1) or GEANH/NUCRIN (HADR 3)
-  geant3->SetLOSS(2);
-  geant3->SetMULS(1);
-  geant3->SetRAYL(1);
-  geant3->SetAUTO(1);         //Select automatic STMIN etc... calc. (AUTO 1) or manual (AUTO 0)
-  geant3->SetABAN(0);         //Restore 3.16 behaviour for abandoned tracks
-  geant3->SetOPTI(2);         //Select optimisation level for GEANT geometry searches (0,1,2)
-  geant3->SetERAN(5.e-7);
-
-  Float_t cut = 1.e-3;        // 1MeV cut by default
-  Float_t tofmax = 1.e10;
-
-  //             GAM ELEC NHAD CHAD MUON EBREM MUHAB EDEL MUDEL MUPA TOFMAX
-  geant3->SetCUTS(cut, cut, cut, cut, cut, cut, cut, cut, cut, cut,
-                  tofmax);
-  //
+

   //=======================================================================
   // ************* STEERING parameters FOR ALICE SIMULATION **************
   // --- Specify event type to be tracked through the ALICE setup
   // --- All positions are in cm, angles in degrees, and P and E in GeV
 
 
   //=======================================================================
   // ************* STEERING parameters FOR ALICE SIMULATION **************
   // --- Specify event type to be tracked through the ALICE setup
   // --- All positions are in cm, angles in degrees, and P and E in GeV
 
 

+
+    gMC->SetProcess("DCAY",1);
+    gMC->SetProcess("PAIR",1);
+    gMC->SetProcess("COMP",1);
+    gMC->SetProcess("PHOT",1);
+    gMC->SetProcess("PFIS",0);
+    gMC->SetProcess("DRAY",0);
+    gMC->SetProcess("ANNI",1);
+    gMC->SetProcess("BREM",1);
+    gMC->SetProcess("MUNU",1);
+    gMC->SetProcess("CKOV",1);
+    gMC->SetProcess("HADR",1);
+    gMC->SetProcess("LOSS",2);
+    gMC->SetProcess("MULS",1);
+    gMC->SetProcess("RAYL",1);
+
+    Float_t cut = 1.e-3;        // 1MeV cut by default
+    Float_t tofmax = 1.e10;
+
+    gMC->SetCut("CUTGAM", cut);
+    gMC->SetCut("CUTELE", cut);
+    gMC->SetCut("CUTNEU", cut);
+    gMC->SetCut("CUTHAD", cut);
+    gMC->SetCut("CUTMUO", cut);
+    gMC->SetCut("BCUTE",  cut); 
+    gMC->SetCut("BCUTM",  cut); 
+    gMC->SetCut("DCUTE",  cut); 
+    gMC->SetCut("DCUTM",  cut); 
+    gMC->SetCut("PPCUTM", cut);
+    gMC->SetCut("TOFMAX", tofmax); 
+
+
+

   // Generator Configuration
   gAlice->SetDebug(1);
   AliGenerator* gener = GeneratorFactory(run);
   // Generator Configuration
   gAlice->SetDebug(1);
   AliGenerator* gener = GeneratorFactory(run);