LMU/musrsim
LMU/musrsim
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed VIS issue, G4UI_USE and G4VIS_USE retired in 4.10.06

Browse Source
This commit is contained in:
Janka Gianluca 2023-02-07 16:17:46 +01:00
parent 023d7dc701
commit 6ea856c591
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
musrSim.cc
View File

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