21.1.2011 Kamil Sedlak

This version contains many changes!
1) Optical photon simulation is now possible - some work still may need to be done
   (e.g. the manual is not updated yet), but it should basically work already now.
2) Changes in the musrSimAna - correction of some bugs (mainly in the coincidence
    of coincidence and veto detectors) and some other improvements

musrSim.cc

@@ -3,6 +3,7 @@
 #include "musrPrimaryGeneratorAction.hh"
 #include "musrRunAction.hh"
 #include "musrEventAction.hh"
+//#include "StackingAction.hh"
 #include "musrSteppingAction.hh"
 #include "musrSteppingVerbose.hh"
 
@@ -11,6 +12,10 @@
 #include "G4UIterminal.hh"
 #include "G4UItcsh.hh"
 
+//#include <TApplication.h>
+//#include <TSystem.h>
+
+
 // The following two lines are needed to cope with the problem of 
 // "Error in <TPluginManager::FindHandler>: Cannot find plugin handler for TVirtualStreamerInfo! 
 //               Does $ROOTSYS/etc/plugins/TVirtualStreamerInfo exist?"
@@ -53,6 +58,8 @@ int main(int argc,char** argv) {
   // Create class "musrErrorMessage"
   musrErrorMessage* myErrorMessage = new musrErrorMessage();
 
+  //  TApplication* myapp=new TApplication("myapp",0,0);
+  
   // Create Root class for storing the output of the Geant simulation
   musrRootOutput* myRootOutput = new musrRootOutput();
 
@@ -68,13 +75,14 @@ int main(int argc,char** argv) {
 
 
   // UserInitialization classes (mandatory)
-  musrDetectorConstruction* musrdetector = new musrDetectorConstruction;
+  //  musrDetectorConstruction* musrdetector = new musrDetectorConstruction;
   if (argc>1) {
     G4int myRunNr=atoi(argv[1]);       // Get the run number from the name of the 
                                        // parameter file, if it starts with a number.
     if (myRunNr>0)  {runManager->SetRunIDCounter(myRunNr);}
-    musrdetector->SetInputParameterFileName(argv[1]);
+    //    musrdetector->SetInputParameterFileName(argv[1]);
   }
+  musrDetectorConstruction* musrdetector = new musrDetectorConstruction(steeringFileName);
   runManager->SetUserInitialization(musrdetector);
   runManager->SetUserInitialization(new musrPhysicsList);
   
@@ -89,6 +97,7 @@ int main(int argc,char** argv) {
   runManager->SetUserAction(new musrPrimaryGeneratorAction(musrdetector));
   runManager->SetUserAction(new musrRunAction);  
   runManager->SetUserAction(new musrEventAction);
+  //  runManager->SetUserAction(new StackingAction);
   runManager->SetUserAction(new musrSteppingAction);
 
   //Initialize G4 kernel
@@ -133,6 +142,8 @@ int main(int argc,char** argv) {
     }
   }
 
+  //  myapp->Run(kTRUE);
+
 #ifdef G4VIS_USE
   delete visManager;
 #endif