Smaller changes

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

diff --git a/AliGeant4/AliModulesCompositionMessenger.cxx b/AliGeant4/AliModulesCompositionMessenger.cxx
index f7fc39c370a41e2a7149400eb95062daa1db9415..a2ce898a32e91d8e35fce465e58e68deb75ec0ea 100644 (file)
--- a/AliGeant4/AliModulesCompositionMessenger.cxx
+++ b/AliGeant4/AliModulesCompositionMessenger.cxx
@@ -12,7 +12,6 @@
 #include "AliGlobals.h"
 
 #include <G4UIdirectory.hh>
-#include <G4UIcmdWithAString.hh>
 #include <G4UIcmdWithoutParameter.hh>
 #include <G4UIcmdWithABool.hh>
 #include <G4UIcmdWithADoubleAndUnit.hh>
@@ -26,38 +25,6 @@ AliModulesCompositionMessenger::AliModulesCompositionMessenger(
   fDirectory = new G4UIdirectory("/aliDet/");
   fDirectory->SetGuidance("Detector construction control commands.");
 
-  fSwitchOnCmd = new G4UIcmdWithAString("/aliDet/switchOn", this);
-  fSwitchOnCmd->SetGuidance("Define the module to be built.");
-  fSwitchOnCmd->SetGuidance("Available modules:");
-  G4String listAvailableDets = "NONE, ALL, ";  
-  listAvailableDets 
-    = listAvailableDets + modulesComposition->GetAvailableDetsListWithCommas();
-  fSwitchOnCmd->SetGuidance(listAvailableDets);
-  fSwitchOnCmd->SetParameterName("module", false);
-  fSwitchOnCmd->AvailableForStates(PreInit);;
-
-  fSwitchOffCmd = new G4UIcmdWithAString("/aliDet/switchOff", this);
-  fSwitchOffCmd->SetGuidance("Define the module not to be built.");
-  fSwitchOffCmd->SetGuidance("Available modules:");
-  G4String listDetsNames = "ALL, "; 
-  listDetsNames
-    = listDetsNames + modulesComposition->GetDetNamesListWithCommas();
-  fSwitchOffCmd->SetGuidance(listDetsNames);
-  fSwitchOffCmd->SetParameterName("module", false);
-  fSwitchOffCmd->AvailableForStates(PreInit);;
-
-  fListCmd 
-    = new G4UIcmdWithoutParameter("/aliDet/list", this);
-  fListCmd->SetGuidance("List the currently switched modules.");
-  fListCmd
-    ->AvailableForStates(PreInit, Init, Idle, GeomClosed, EventProc);
-
-  fListAvailableCmd 
-    = new G4UIcmdWithoutParameter("/aliDet/listAvailable", this);
-  fListAvailableCmd->SetGuidance("List all available modules.");
-  fListAvailableCmd
-    ->AvailableForStates(PreInit, Init, Idle, GeomClosed, EventProc);
-
   fFieldValueCmd = new G4UIcmdWithADoubleAndUnit("/aliDet/fieldValue", this);
   fFieldValueCmd->SetGuidance("Define magnetic field in Z direction.");
   fFieldValueCmd->SetParameterName("fieldValue", false, false);
@@ -86,13 +53,6 @@ AliModulesCompositionMessenger::AliModulesCompositionMessenger(
     = new G4UIcmdWithoutParameter("/aliDet/generateXML", this);
   fGenerateXMLCmd->SetGuidance("Generate geometry XML file.");
   fGenerateXMLCmd->AvailableForStates(Idle);   
-
-
-  // set candidates list
-  SetCandidates();
-
-  // set default values to a detector
-  fModulesComposition->SwitchDetOn("NONE");
 }
 
 //_____________________________________________________________________________
@@ -113,10 +73,6 @@ AliModulesCompositionMessenger::AliModulesCompositionMessenger(
 AliModulesCompositionMessenger::~AliModulesCompositionMessenger() {
 //
   delete fDirectory;
-  delete fSwitchOnCmd;
-  delete fSwitchOffCmd;
-  delete fListCmd;
-  delete fListAvailableCmd;
   delete fFieldValueCmd;
   delete fSetReadGeometryCmd;
   delete fSetWriteGeometryCmd;
@@ -148,19 +104,7 @@ void AliModulesCompositionMessenger::SetNewValue(G4UIcommand* command, G4String
 // Applies command to the associated object.
 // ---
 
-  if (command == fSwitchOnCmd) {  
-    fModulesComposition->SwitchDetOn(newValues); 
-  }
-  else if (command == fSwitchOffCmd) {  
-    fModulesComposition->SwitchDetOff(newValues); 
-  }
-  else if (command == fListCmd) {  
-    fModulesComposition->PrintSwitchedDets(); 
-  }
-  else if (command == fListAvailableCmd) {  
-    fModulesComposition->PrintAvailableDets(); 
-  }
-  else if (command == fFieldValueCmd) {  
+  if (command == fFieldValueCmd) {  
     fModulesComposition
       ->SetMagField(fFieldValueCmd->GetNewDoubleValue(newValues)); 
   }
@@ -179,19 +123,3 @@ void AliModulesCompositionMessenger::SetNewValue(G4UIcommand* command, G4String
     fModulesComposition->GenerateXMLGeometry();
   }    
 }
-
-//_____________________________________________________________________________
-void AliModulesCompositionMessenger::SetCandidates() 
-{
-// Builds candidates list.
-// ---
-
-  G4String candidatesList = "NONE ALL ";
-  candidatesList += fModulesComposition->GetDetNamesList();;
-  candidatesList += fModulesComposition->GetAvailableDetsList();
-  fSwitchOnCmd->SetCandidates(candidatesList);
-
-  candidatesList = "ALL ";
-  candidatesList += fModulesComposition->GetDetNamesList();;
-  fSwitchOffCmd->SetCandidates(candidatesList);
-}