Merging the VirtualMC branch to the main development branch (HEAD)

[u/mrichter/AliRoot.git] / AliGeant4 / AliPrimaryGeneratorMessenger.cxx

diff --git a/AliGeant4/AliPrimaryGeneratorMessenger.cxx b/AliGeant4/AliPrimaryGeneratorMessenger.cxx
index 2b4d0e8c4751b548307b883885a23d0b3474b8d3..5f6fcba34a50f7f9814d5cd860e1776565a5f7a9 100644 (file)
--- a/AliGeant4/AliPrimaryGeneratorMessenger.cxx
+++ b/AliGeant4/AliPrimaryGeneratorMessenger.cxx
@@ -29,11 +29,11 @@ AliPrimaryGeneratorMessenger::AliPrimaryGeneratorMessenger(
   guidance = guidance + "  Gun:               particle gun (default)\n";
   guidance = guidance + "  Geantino:          geantino with random momentum(default)\n";
   guidance = guidance + "  ChargedGeantino:   chargedgeantino with random momentum\n";
-  guidance = guidance + "  AliGenerator:      standard aliroot generator";
+  guidance = guidance + "  Stack:             standard generator from MC stack";
   fGeneratorCmd->SetGuidance(guidance);
   fGeneratorCmd->SetParameterName("Generator", true);
-  fGeneratorCmd->SetCandidates("Gun Geantino ChargedGeantino AliGenerator");   
-  fGeneratorCmd->SetDefaultValue("AliGenerator");
+  fGeneratorCmd->SetCandidates("Gun Geantino ChargedGeantino Stack");   
+  fGeneratorCmd->SetDefaultValue("Stack");
   fGeneratorCmd->AvailableForStates(PreInit,Idle);
 
   fNofParticlesCmd = new G4UIcmdWithAnInteger("/aliGenerator/nofParticles", this);
@@ -98,8 +98,8 @@ void AliPrimaryGeneratorMessenger::SetNewValue(G4UIcommand * command,
       fPrimaryGenAction->SetGenerator(kGeantino); 
     else if (newValue == "ChargedGeantino")  
       fPrimaryGenAction->SetGenerator(kChargedGeantino); 
-    else if (newValue == "AliGenerator")  
-      fPrimaryGenAction->SetGenerator(kAliGenerator);       
+    else if (newValue == "Stack")  
+      fPrimaryGenAction->SetGenerator(kStack);       
   }
   else if( command == fNofParticlesCmd ) { 
     fPrimaryGenAction