Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/analysis/AnaEx02/AnaEx02.cc

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /examples/extended/analysis/AnaEx02/AnaEx02.cc (Version 11.3.0) and /examples/extended/analysis/AnaEx02/AnaEx02.cc (Version 10.6.p3)


  1 //                                                  1 //
  2 // *******************************************      2 // ********************************************************************
  3 // * License and Disclaimer                         3 // * License and Disclaimer                                           *
  4 // *                                                4 // *                                                                  *
  5 // * The  Geant4 software  is  copyright of th      5 // * The  Geant4 software  is  copyright of the Copyright Holders  of *
  6 // * the Geant4 Collaboration.  It is provided      6 // * the Geant4 Collaboration.  It is provided  under  the terms  and *
  7 // * conditions of the Geant4 Software License      7 // * conditions of the Geant4 Software License,  included in the file *
  8 // * LICENSE and available at  http://cern.ch/      8 // * LICENSE and available at  http://cern.ch/geant4/license .  These *
  9 // * include a list of copyright holders.           9 // * include a list of copyright holders.                             *
 10 // *                                               10 // *                                                                  *
 11 // * Neither the authors of this software syst     11 // * Neither the authors of this software system, nor their employing *
 12 // * institutes,nor the agencies providing fin     12 // * institutes,nor the agencies providing financial support for this *
 13 // * work  make  any representation or  warran     13 // * work  make  any representation or  warranty, express or implied, *
 14 // * regarding  this  software system or assum     14 // * regarding  this  software system or assume any liability for its *
 15 // * use.  Please see the license in the file      15 // * use.  Please see the license in the file  LICENSE  and URL above *
 16 // * for the full disclaimer and the limitatio     16 // * for the full disclaimer and the limitation of liability.         *
 17 // *                                               17 // *                                                                  *
 18 // * This  code  implementation is the result      18 // * This  code  implementation is the result of  the  scientific and *
 19 // * technical work of the GEANT4 collaboratio     19 // * technical work of the GEANT4 collaboration.                      *
 20 // * By using,  copying,  modifying or  distri     20 // * By using,  copying,  modifying or  distributing the software (or *
 21 // * any work based  on the software)  you  ag     21 // * any work based  on the software)  you  agree  to acknowledge its *
 22 // * use  in  resulting  scientific  publicati     22 // * use  in  resulting  scientific  publications,  and indicate your *
 23 // * acceptance of all terms of the Geant4 Sof     23 // * acceptance of all terms of the Geant4 Software license.          *
 24 // *******************************************     24 // ********************************************************************
 25 //                                                 25 //
 26 /// \file analysis/AnaEx02/AnaEx02.cc              26 /// \file analysis/AnaEx02/AnaEx02.cc
 27 /// \brief Main program of the analysis/AnaEx0     27 /// \brief Main program of the analysis/AnaEx02 example
 28 //                                                 28 //
 29 //                                                 29 //
 30 //                                                 30 //
 31 //                                                 31 //
 32 //....oooOO0OOooo........oooOO0OOooo........oo     32 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 33 //....oooOO0OOooo........oooOO0OOooo........oo     33 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 34                                                    34 
 35 #include "ActionInitialization.hh"             <<  35 #include "G4RunManager.hh"
 36 #include "DetectorConstruction.hh"             <<  36 #include "G4UImanager.hh"
 37 #include "EventAction.hh"                      << 
 38 #include "FTFP_BERT.hh"                            37 #include "FTFP_BERT.hh"
 39 #include "HistoManager.hh"                     <<  38 
                                                   >>  39 #include "DetectorConstruction.hh"
 40 #include "PrimaryGeneratorAction.hh"               40 #include "PrimaryGeneratorAction.hh"
 41 #include "RunAction.hh"                            41 #include "RunAction.hh"
                                                   >>  42 #include "EventAction.hh"
 42 #include "SteppingAction.hh"                       43 #include "SteppingAction.hh"
                                                   >>  44 #include "HistoManager.hh"
 43                                                    45 
 44 #include "G4RunManagerFactory.hh"              << 
 45 #include "G4UIExecutive.hh"                    << 
 46 #include "G4UImanager.hh"                      << 
 47 #include "G4VisExecutive.hh"                       46 #include "G4VisExecutive.hh"
                                                   >>  47 #include "G4UIExecutive.hh"
 48                                                    48 
 49 //....oooOO0OOooo........oooOO0OOooo........oo     49 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 50                                                    50 
 51 int main(int argc, char** argv)                <<  51 int main(int argc,char** argv)
 52 {                                              <<  52 {     
 53   // Detect interactive mode (if no arguments)     53   // Detect interactive mode (if no arguments) and define UI session
 54   //                                               54   //
 55   G4UIExecutive* ui = nullptr;                 <<  55   G4UIExecutive* ui = 0;
 56   if (argc == 1) {                             <<  56   if ( argc == 1 ) {
 57     ui = new G4UIExecutive(argc, argv);            57     ui = new G4UIExecutive(argc, argv);
 58   }                                                58   }
 59                                                    59 
 60   // Construct a serial run manager            <<  60   // Construct the default run manager
 61   //                                               61   //
 62   auto* runManager = G4RunManagerFactory::Crea <<  62   G4RunManager * runManager = new G4RunManager;
 63                                                    63 
 64   // Set mandatory initialization classes          64   // Set mandatory initialization classes
 65   //                                               65   //
 66   auto detector = new DetectorConstruction;    <<  66   DetectorConstruction* detector = new DetectorConstruction;
 67   runManager->SetUserInitialization(detector);     67   runManager->SetUserInitialization(detector);
                                                   >>  68   //
 68   runManager->SetUserInitialization(new FTFP_B     69   runManager->SetUserInitialization(new FTFP_BERT);
 69   runManager->SetUserInitialization(new Action <<  70  
 70                                                <<  71   // set an HistoManager
                                                   >>  72   //
                                                   >>  73   HistoManager*  histo = new HistoManager();
                                                   >>  74       
                                                   >>  75   // Set user action classes
                                                   >>  76   //
                                                   >>  77   PrimaryGeneratorAction* gen_action = 
                                                   >>  78                           new PrimaryGeneratorAction(detector);
                                                   >>  79   runManager->SetUserAction(gen_action);
                                                   >>  80   //
                                                   >>  81   RunAction* run_action = new RunAction(histo);  
                                                   >>  82   runManager->SetUserAction(run_action);
                                                   >>  83   //
                                                   >>  84   EventAction* event_action = new EventAction(run_action,histo);
                                                   >>  85   runManager->SetUserAction(event_action);
                                                   >>  86   //
                                                   >>  87   SteppingAction* stepping_action =
                                                   >>  88                     new SteppingAction(detector, event_action);
                                                   >>  89   runManager->SetUserAction(stepping_action);
                                                   >>  90   
 71   // Initialize G4 kernel                          91   // Initialize G4 kernel
 72   //                                               92   //
 73   // runManager->Initialize();                 <<  93   runManager->Initialize();
 74                                                    94 
 75   // Initialize visualization                      95   // Initialize visualization
 76   //                                               96   //
 77   G4VisManager* visManager = new G4VisExecutiv     97   G4VisManager* visManager = new G4VisExecutive;
 78   visManager->Initialize();                        98   visManager->Initialize();
 79                                                    99 
 80   // Get the pointer to the User Interface man    100   // Get the pointer to the User Interface manager
 81   //                                              101   //
 82   G4UImanager* UImanager = G4UImanager::GetUIp    102   G4UImanager* UImanager = G4UImanager::GetUIpointer();
 83                                                << 103   
 84   if (ui == nullptr) {                         << 104   if ( ! ui ) {
 85     // batch mode                                 105     // batch mode
 86     G4String command = "/control/execute ";       106     G4String command = "/control/execute ";
 87     G4String fileName = argv[1];                  107     G4String fileName = argv[1];
 88     UImanager->ApplyCommand(command + fileName << 108     UImanager->ApplyCommand(command+fileName);    
 89   }                                               109   }
 90   else {                                       << 110   else {  
 91     // interactive mode                           111     // interactive mode
 92     UImanager->ApplyCommand("/control/execute  << 112     UImanager->ApplyCommand("/control/execute init_vis.mac");     
 93     ui->SessionStart();                           113     ui->SessionStart();
 94     delete ui;                                    114     delete ui;
 95   }                                               115   }
 96                                                << 116   
 97   // Job termination                              117   // Job termination
 98   delete visManager;                              118   delete visManager;
                                                   >> 119   delete histo;                
 99   delete runManager;                              120   delete runManager;
100                                                   121 
101   return 0;                                       122   return 0;
102 }                                                 123 }
103                                                   124 
104 //....oooOO0OOooo........oooOO0OOooo........oo    125 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
105                                                   126