Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/persistency/gdml/G02/geotest.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/persistency/gdml/G02/geotest.cc (Version 11.3.0) and /examples/extended/persistency/gdml/G02/geotest.cc (Version 9.6.p1)


  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 persistency/gdml/G02/geotest.cc          26 /// \file persistency/gdml/G02/geotest.cc
 27 /// \brief Main program of the persistency/gdm     27 /// \brief Main program of the persistency/gdml/G02 example
 28 //                                                 28 //
 29 //                                                 29 //
                                                   >>  30 // $Id$
 30 //                                                 31 //
 31 //                                                 32 //
 32 // -------------------------------------------     33 // --------------------------------------------------------------
 33 //      GEANT 4 - geotest                          34 //      GEANT 4 - geotest
 34 //                                                 35 //
 35 // -------------------------------------------     36 // --------------------------------------------------------------
 36                                                    37 
 37 // Geant4 includes                                 38 // Geant4 includes
 38 //                                                 39 //
 39 #include "G4RunManagerFactory.hh"              <<  40 #include "G4RunManager.hh"
 40 #include "G4UImanager.hh"                          41 #include "G4UImanager.hh"
 41 #include "globals.hh"                              42 #include "globals.hh"
 42                                                    43 
 43 // A pre-built physics list                        44 // A pre-built physics list
 44 //                                                 45 //
 45 #include "QGSP_BERT.hh"                            46 #include "QGSP_BERT.hh"
 46                                                    47 
 47 // Example includes                                48 // Example includes
 48 //                                                 49 //
 49 #include "G02DetectorConstruction.hh"              50 #include "G02DetectorConstruction.hh"
 50 #include "G02PrimaryGeneratorAction.hh"            51 #include "G02PrimaryGeneratorAction.hh"
 51 #include "G02RunAction.hh"                         52 #include "G02RunAction.hh"
 52                                                    53 
 53 #include "G4UIExecutive.hh"                    <<  54 #ifdef G4VIS_USE
 54 #include "G4VisExecutive.hh"                       55 #include "G4VisExecutive.hh"
                                                   >>  56 #endif
 55                                                    57 
 56 // ------------------------------------------- <<  58 #ifdef G4UI_USE
                                                   >>  59 #include "G4UIExecutive.hh"
                                                   >>  60 #endif
 57                                                    61 
 58 int main(int argc, char** argv)                    62 int main(int argc, char** argv)
 59 {                                                  63 {
 60   // Construct a serial run manager            <<  64        
                                                   >>  65   // Construct the default run manager
 61   //                                               66   //
 62   auto* runManager = G4RunManagerFactory::Crea <<  67   G4RunManager* runManager = new G4RunManager;
 63                                                    68 
 64   // Set mandatory initialization and user act     69   // Set mandatory initialization and user action classes
 65   //                                               70   //
 66   G02DetectorConstruction* detector = new G02D     71   G02DetectorConstruction* detector = new G02DetectorConstruction;
 67   runManager->SetUserInitialization(detector);     72   runManager->SetUserInitialization(detector);
 68   runManager->SetUserInitialization(new QGSP_B     73   runManager->SetUserInitialization(new QGSP_BERT);
 69   runManager->SetUserAction(new G02PrimaryGene     74   runManager->SetUserAction(new G02PrimaryGeneratorAction);
 70   G02RunAction* runAction = new G02RunAction;      75   G02RunAction* runAction = new G02RunAction;
 71   runManager->SetUserAction(runAction);            76   runManager->SetUserAction(runAction);
 72                                                <<  77       
 73   // Initialisation of runManager via macro fo     78   // Initialisation of runManager via macro for the interactive mode
 74   // This gives possibility to give different      79   // This gives possibility to give different names for GDML file to READ
 75                                                <<  80  
 76   // Initialize visualization                  <<  81 #ifdef G4VIS_USE
 77   //                                           << 
 78   G4VisManager* visManager = new G4VisExecutiv     82   G4VisManager* visManager = new G4VisExecutive;
 79   visManager->Initialize();                        83   visManager->Initialize();
                                                   >>  84 #endif
 80                                                    85 
 81   // Open a UI session: will stay there until      86   // Open a UI session: will stay there until the user types "exit"
 82   //                                               87   //
 83   G4UImanager* UImanager = G4UImanager::GetUIp <<  88   G4UImanager* UImanager = G4UImanager::GetUIpointer(); 
 84                                                    89 
 85   if (argc == 1)  // Automatically run default <<  90   if ( argc==1 )   // Automatically run default macro for writing... 
 86   {                                                91   {
                                                   >>  92 #ifdef G4UI_USE
 87     G4UIExecutive* ui = new G4UIExecutive(argc     93     G4UIExecutive* ui = new G4UIExecutive(argc, argv);
 88     UImanager->ApplyCommand("/control/execute  <<  94 #ifdef G4VIS_USE
                                                   >>  95     UImanager->ApplyCommand("/control/execute vis.mac");     
                                                   >>  96 #endif
 89     ui->SessionStart();                            97     ui->SessionStart();
 90     delete ui;                                     98     delete ui;
 91   }                                            <<  99 #endif
 92   else  // Interactive, provides macro in inpu << 100   } else {            // Provides macro in input
 93   {                                            << 101 #ifdef G4UI_USE
 94     G4UIExecutive* ui = new G4UIExecutive(argc    102     G4UIExecutive* ui = new G4UIExecutive(argc, argv);
 95     G4String command = "/control/execute ";    << 103     G4String command = "/control/execute "; 
 96     G4String fileName = argv[1];               << 104     G4String fileName = argv[1]; 
 97     UImanager->ApplyCommand(command + fileName << 105     UImanager->ApplyCommand(command+fileName); 
 98     ui->SessionStart();                           106     ui->SessionStart();
 99     delete ui;                                    107     delete ui;
                                                   >> 108 #endif
100   }                                               109   }
101                                                << 110   
                                                   >> 111 #ifdef G4VIS_USE
                                                   >> 112   delete visManager;
                                                   >> 113 #endif
                                                   >> 114   
102   // Job termination                              115   // Job termination
103   //                                              116   //
104   delete visManager;                           << 
105   delete runManager;                              117   delete runManager;
106                                                   118 
107   return 0;                                       119   return 0;
108 }                                                 120 }
109                                                   121