Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/persistency/gdml/G03/gdml_ext.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/G03/gdml_ext.cc (Version 11.3.0) and /examples/extended/persistency/gdml/G03/gdml_ext.cc (Version 9.5.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/G03/gdml_ext.cc     << 
 27 /// \brief Main program of the persistency/gdm << 
 28 //                                             << 
 29 //                                                 26 //
                                                   >>  27 // $Id: gdml_ext.cc,v 1.7 2010-11-07 13:31:07 allison Exp $
                                                   >>  28 // GEANT4 tag $Name: not supported by cvs2svn $
 30 //                                                 29 //
 31 //                                                 30 //
 32 // -------------------------------------------     31 // --------------------------------------------------------------
 33 //      GEANT 4 - read_ext                         32 //      GEANT 4 - read_ext
 34 //                                                 33 //
 35 // -------------------------------------------     34 // --------------------------------------------------------------
 36                                                    35 
 37 // Geant4 includes                                 36 // Geant4 includes
 38 //                                                 37 //
 39 #include "G4RunManagerFactory.hh"              <<  38 #include "G4RunManager.hh"
 40 #include "G4UImanager.hh"                          39 #include "G4UImanager.hh"
 41 #include "globals.hh"                              40 #include "globals.hh"
 42                                                    41 
 43 // A pre-built physics list                        42 // A pre-built physics list
 44 //                                                 43 //
 45 #include "QGSP_BERT.hh"                            44 #include "QGSP_BERT.hh"
 46                                                    45 
 47 // Example includes                                46 // Example includes
 48 //                                                 47 //
 49 #include "G03DetectorConstruction.hh"          <<  48 #include "DetectorConstruction.hh"
 50 #include "G03PrimaryGeneratorAction.hh"        <<  49 #include "PrimaryGeneratorAction.hh"
 51 #include "G03RunAction.hh"                     <<  50 #include "RunAction.hh"
 52                                                    51 
 53 #include "G4UIExecutive.hh"                    <<  52 #ifdef G4VIS_USE
 54 #include "G4VisExecutive.hh"                       53 #include "G4VisExecutive.hh"
                                                   >>  54 #endif
 55                                                    55 
 56 // ------------------------------------------- <<  56 #ifdef G4UI_USE
                                                   >>  57 #include "G4UIExecutive.hh"
                                                   >>  58 #endif
 57                                                    59 
 58 int main(int argc, char** argv)                    60 int main(int argc, char** argv)
 59 {                                                  61 {
 60   // Construct a serial run manager            <<  62        
                                                   >>  63   // Construct the default run manager
 61   //                                               64   //
 62   auto* runManager = G4RunManagerFactory::Crea <<  65   G4RunManager* runManager = new G4RunManager;
 63                                                    66 
 64   // Set mandatory initialization and user act     67   // Set mandatory initialization and user action classes
 65   //                                               68   //
 66   G03DetectorConstruction* detector = new G03D <<  69   DetectorConstruction* detector = new DetectorConstruction;
 67   runManager->SetUserInitialization(detector);     70   runManager->SetUserInitialization(detector);
 68   runManager->SetUserInitialization(new QGSP_B     71   runManager->SetUserInitialization(new QGSP_BERT);
 69   runManager->SetUserAction(new G03PrimaryGene <<  72   runManager->SetUserAction(new PrimaryGeneratorAction);
 70   G03RunAction* runAction = new G03RunAction;  <<  73   RunAction* runAction = new RunAction;
 71   runManager->SetUserAction(runAction);            74   runManager->SetUserAction(runAction);
 72                                                <<  75       
 73   // Initialisation of runManager via macro fo     76   // Initialisation of runManager via macro for the interactive mode
 74   // This gives possibility to give different      77   // This gives possibility to give different names for GDML file to READ
 75                                                <<  78  
                                                   >>  79 #ifdef G4VIS_USE
 76   // Initialize visualization                      80   // Initialize visualization
 77   //                                               81   //
 78   G4VisManager* visManager = new G4VisExecutiv     82   G4VisManager* visManager = new G4VisExecutive;
 79   visManager->Initialize();                        83   visManager->Initialize();
                                                   >>  84 #endif
 80                                                    85 
 81   // Run initialisation macro                  <<  86   // run initialisation macro
 82   //                                           << 
 83   G4UImanager* UImanager = G4UImanager::GetUIp     87   G4UImanager* UImanager = G4UImanager::GetUIpointer();
 84                                                <<  88   if ( argc==1 )   // Define UI session for interactive mode. 
 85   if (argc == 1)  // Define UI session for int << 
 86   {                                                89   {
                                                   >>  90 #ifdef G4UI_USE
 87     G4UIExecutive* ui = new G4UIExecutive(argc     91     G4UIExecutive* ui = new G4UIExecutive(argc, argv);
 88     UImanager->ApplyCommand("/control/execute  <<  92 #ifdef G4VIS_USE
                                                   >>  93     UImanager->ApplyCommand("/control/execute vis.mac");     
                                                   >>  94 #endif
 89     ui->SessionStart();                            95     ui->SessionStart();
 90     delete ui;                                     96     delete ui;
                                                   >>  97 #endif
 91   }                                                98   }
 92   else  // Batch mode                          <<  99   else             // Batch mode
 93   {                                            << 100   { 
                                                   >> 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