Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/persistency/P03/textGeom.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/P03/textGeom.cc (Version 11.3.0) and /examples/extended/persistency/P03/textGeom.cc (Version 10.4.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 // $Id$
 26 //                                                 27 //
 27 /// \file persistency/P03/textGeom.cc              28 /// \file persistency/P03/textGeom.cc
 28 /// \brief Main program of the persistency/P03     29 /// \brief Main program of the persistency/P03 example
 29 //                                                 30 //
 30 //....oooOO0OOooo........oooOO0OOooo........oo     31 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 31                                                    32 
 32 #include "ExTGActionInitialization.hh"         << 
 33 #include "ExTGDetectorConstruction.hh"             33 #include "ExTGDetectorConstruction.hh"
                                                   >>  34 #include "ExTGDetectorConstructionWithSD.hh"
 34 #include "ExTGDetectorConstructionWithCpp.hh"      35 #include "ExTGDetectorConstructionWithCpp.hh"
 35 #include "ExTGDetectorConstructionWithCuts.hh"     36 #include "ExTGDetectorConstructionWithCuts.hh"
 36 #include "ExTGDetectorConstructionWithSD.hh"   <<  37 #include "G4GenericPhysicsList.hh"
 37 #include "ExTGPrimaryGeneratorAction.hh"           38 #include "ExTGPrimaryGeneratorAction.hh"
                                                   >>  39 #include "ExTGActionInitialization.hh"
                                                   >>  40 
                                                   >>  41 #ifdef G4MULTITHREADED
                                                   >>  42 #include "G4MTRunManager.hh"
                                                   >>  43 #else
                                                   >>  44 #include "G4RunManager.hh"
                                                   >>  45 #endif
 38                                                    46 
 39 #include "G4GenericPhysicsList.hh"             << 
 40 #include "G4RunManagerFactory.hh"              << 
 41 #include "G4Types.hh"                          << 
 42 #include "G4UIExecutive.hh"                    << 
 43 #include "G4UImanager.hh"                          47 #include "G4UImanager.hh"
                                                   >>  48 
                                                   >>  49 #ifdef G4VIS_USE
 44 #include "G4VisExecutive.hh"                       50 #include "G4VisExecutive.hh"
                                                   >>  51 #endif
                                                   >>  52 
                                                   >>  53 #ifdef G4UI_USE
                                                   >>  54 #include "G4UIExecutive.hh"
                                                   >>  55 #endif
 45                                                    56 
 46 //....oooOO0OOooo........oooOO0OOooo........oo     57 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 47                                                    58 
 48 int main(int argc, char** argv)                <<  59 int main(int argc,char** argv)
 49 {                                                  60 {
 50   // Instantiate G4UIExecutive if interactive  << 
 51   G4UIExecutive* ui = nullptr;                 << 
 52   if (argc == 1) {                             << 
 53     ui = new G4UIExecutive(argc, argv);        << 
 54   }                                            << 
 55                                                << 
 56   // Run manager                                   61   // Run manager
 57   //                                               62   //
 58   auto* runManager = G4RunManagerFactory::Crea <<  63 #ifdef G4MULTITHREADED
                                                   >>  64   G4MTRunManager* runManager = new G4MTRunManager;
 59   runManager->SetNumberOfThreads(1);               65   runManager->SetNumberOfThreads(1);
                                                   >>  66 #else
                                                   >>  67   G4RunManager* runManager = new G4RunManager;
                                                   >>  68 #endif
 60                                                    69 
 61   // User Initialization classes (mandatory)       70   // User Initialization classes (mandatory)
 62   //                                               71   //
 63   runManager->SetUserInitialization(new ExTGDe     72   runManager->SetUserInitialization(new ExTGDetectorConstruction);
 64                                                    73 
 65   //                                               74   //
 66   std::vector<G4String>* MyConstr = new std::v     75   std::vector<G4String>* MyConstr = new std::vector<G4String>;
 67   MyConstr->push_back("G4EmStandardPhysics");      76   MyConstr->push_back("G4EmStandardPhysics");
 68   G4VModularPhysicsList* phys = new G4GenericP     77   G4VModularPhysicsList* phys = new G4GenericPhysicsList(MyConstr);
 69   runManager->SetUserInitialization(phys);         78   runManager->SetUserInitialization(phys);
 70                                                    79 
 71   // User Action classes                           80   // User Action classes
 72   //                                               81   //
 73   // MT  runManager->SetUserAction(new ExTGPri <<  82   //MT  runManager->SetUserAction(new ExTGPrimaryGeneratorAction);
 74                                                    83 
 75   runManager->SetUserInitialization(new ExTGAc     84   runManager->SetUserInitialization(new ExTGActionInitialization);
 76                                                <<  85    
 77   // Run action that dumps GEANT4 in-memory ge     86   // Run action that dumps GEANT4 in-memory geometry to text file
 78   // MT  runManager->SetUserAction(new ExTGRun <<  87   //MT  runManager->SetUserAction(new ExTGRunAction);
 79                                                    88 
 80   // Initialize G4 kernel                          89   // Initialize G4 kernel
 81   //                                               90   //
 82   //  runManager->Initialize();                    91   //  runManager->Initialize();
 83                                                <<  92       
 84   // Get the pointer to the User Interface man     93   // Get the pointer to the User Interface manager
 85   //                                               94   //
 86   G4UImanager* UImanager = G4UImanager::GetUIp <<  95   G4UImanager * UImanager = G4UImanager::GetUIpointer();  
 87                                                    96 
 88   if (!ui)  // batch mode                      <<  97 #ifdef G4VIS_USE
 89   {                                            <<  98   G4VisManager* visManager = new G4VisExecutive;
 90     G4String command = "/control/execute ";    <<  99   visManager->Initialize();
 91     G4String fileName = argv[1];               << 100 #endif    
 92     UImanager->ApplyCommand(command + fileName << 101 
 93   }                                            << 102   if (argc!=1)   // batch mode  
 94   else  // interactive mode : define visualiza << 103     {
 95   {                                            << 104      G4String command = "/control/execute ";
 96     G4VisManager* visManager = new G4VisExecut << 105      G4String fileName = argv[1];
 97     visManager->Initialize();                  << 106      UImanager->ApplyCommand(command+fileName);
 98                                                << 107     }
 99     UImanager->ApplyCommand("/control/execute  << 108   else           // interactive mode : define visualization and UI terminal
100     ui->SessionStart();                        << 109     { 
101     delete ui;                                 << 110 #ifdef G4UI_USE
102     delete visManager;                         << 111       G4UIExecutive* ui = new G4UIExecutive(argc, argv);
103   }                                            << 112 #ifdef G4VIS_USE
                                                   >> 113       UImanager->ApplyCommand("/control/execute run.mac");     
                                                   >> 114 #endif
                                                   >> 115       ui->SessionStart();
                                                   >> 116       delete ui;
                                                   >> 117 #endif
                                                   >> 118     }
104                                                   119 
105   // Free the store: user actions, physics_lis    120   // Free the store: user actions, physics_list and detector_description are
106   //                 owned and deleted by the     121   //                 owned and deleted by the run manager, so they should not
107   //                 be deleted in the main()     122   //                 be deleted in the main() program !
108                                                   123 
                                                   >> 124 #ifdef G4VIS_USE
                                                   >> 125   delete visManager;
                                                   >> 126 #endif     
109   delete runManager;                              127   delete runManager;
110                                                   128 
111   return 0;                                       129   return 0;
112 }                                                 130 }
113                                                   131 
114 //....oooOO0OOooo........oooOO0OOooo........oo    132 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
                                                   >> 133 
115                                                   134