Fixed VIS issue, G4UI_USE and G4VIS_USE retired in 4.10.06
This commit is contained in:
parent
023d7dc701
commit
6ea856c591
16
musrSim.cc
16
musrSim.cc
@ -10,9 +10,7 @@
|
||||
#include "G4RunManager.hh"
|
||||
#include "G4UImanager.hh"
|
||||
#include "G4UIterminal.hh"
|
||||
#ifdef G4UI_USE_TCSH
|
||||
#include "G4UItcsh.hh" //JSL: should be commented on windows ?
|
||||
#endif
|
||||
|
||||
//#include <TApplication.h>
|
||||
//#include <TSystem.h>
|
||||
@ -28,11 +26,9 @@
|
||||
|
||||
// #include <X11/Xlib.h> //JSL
|
||||
|
||||
#ifdef G4VIS_USE
|
||||
// #include "musrVisManager.hh"
|
||||
#include "G4VisExecutive.hh"
|
||||
#include "G4TrajectoryDrawByCharge.hh" // TS Trajectory drawing by ID or charge
|
||||
#endif
|
||||
|
||||
#include "musrRootOutput.hh"
|
||||
#include "musrParameters.hh"
|
||||
@ -90,12 +86,10 @@ int main(int argc,char** argv) {
|
||||
runManager->SetUserInitialization(musrdetector);
|
||||
runManager->SetUserInitialization(new musrPhysicsList);
|
||||
|
||||
#ifdef G4VIS_USE
|
||||
// Visualization, if you choose to have it!
|
||||
// G4VisManager* visManager = new musrVisManager;
|
||||
G4VisManager* visManager = new G4VisExecutive; // TS Trajectory drawing by ID or charge
|
||||
visManager->Initialize();
|
||||
#endif
|
||||
|
||||
// UserAction classes
|
||||
runManager->SetUserAction(new musrPrimaryGeneratorAction(musrdetector));
|
||||
@ -116,11 +110,7 @@ int main(int argc,char** argv) {
|
||||
{
|
||||
// G4UIterminal is a (dumb) terminal.
|
||||
G4UIsession * session = 0;
|
||||
#ifdef G4UI_USE_TCSH
|
||||
session = new G4UIterminal(new G4UItcsh);
|
||||
#else
|
||||
session = new G4UIterminal();
|
||||
#endif
|
||||
|
||||
UI->ApplyCommand("/control/execute vis.mac");
|
||||
session->SessionStart();
|
||||
@ -136,11 +126,7 @@ int main(int argc,char** argv) {
|
||||
G4String SecondArgument = argv[2];
|
||||
if (SecondArgument=="idle") {
|
||||
G4UIsession * session = 0;
|
||||
#ifdef G4UI_USE_TCSH
|
||||
session = new G4UIterminal(new G4UItcsh);
|
||||
#else
|
||||
session = new G4UIterminal();
|
||||
#endif
|
||||
G4cout<<"Go to idle state now:"<<G4endl;
|
||||
session->SessionStart();
|
||||
delete session;
|
||||
@ -150,9 +136,7 @@ int main(int argc,char** argv) {
|
||||
|
||||
// myapp->Run(kTRUE);
|
||||
|
||||
#ifdef G4VIS_USE
|
||||
delete visManager;
|
||||
#endif
|
||||
delete myRootOutput;
|
||||
delete myErrorMessage;
|
||||
delete myParameters;
|
||||
|
Loading…
x
Reference in New Issue
Block a user