Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/eventgenerator/userPrimaryGenerator/userPrimaryGenerator.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/eventgenerator/userPrimaryGenerator/userPrimaryGenerator.cc (Version 11.3.0) and /examples/extended/eventgenerator/userPrimaryGenerator/userPrimaryGenerator.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 eventgenerator/userPrimaryGenerator/     26 /// \file eventgenerator/userPrimaryGenerator/userPrimaryGenerator.cc
 27 /// \brief Main program of the eventgenerator/     27 /// \brief Main program of the eventgenerator/userPrimaryGenerator example
 28 //                                                 28 //
 29 //                                                 29 //
 30 //                                             <<  30 // 
 31 //....oooOO0OOooo........oooOO0OOooo........oo     31 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 32 //....oooOO0OOooo........oooOO0OOooo........oo     32 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
                                                   >>  33  
                                                   >>  34 #include "G4RunManager.hh"
                                                   >>  35 #include "G4UImanager.hh"
                                                   >>  36 #include "Randomize.hh"
 33                                                    37 
 34 #include "DetectorConstruction.hh"                 38 #include "DetectorConstruction.hh"
 35 #include "PhysicsList.hh"                          39 #include "PhysicsList.hh"
 36 #include "PrimaryGeneratorAction.hh"               40 #include "PrimaryGeneratorAction.hh"
                                                   >>  41 #include "SteppingVerbose.hh"
 37                                                    42 
 38 #include "G4RunManager.hh"                     << 
 39 #include "G4SteppingVerbose.hh"                << 
 40 #include "G4UIExecutive.hh"                        43 #include "G4UIExecutive.hh"
 41 #include "G4UImanager.hh"                      << 
 42 #include "G4VisExecutive.hh"                       44 #include "G4VisExecutive.hh"
 43 #include "Randomize.hh"                        << 
 44                                                    45 
 45 //....oooOO0OOooo........oooOO0OOooo........oo     46 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 46                                                    47 
 47 int main(int argc, char** argv)                <<  48 int main(int argc,char** argv) {
 48 {                                              <<  49 
 49   // detect interactive mode (if no arguments) <<  50   //detect interactive mode (if no arguments) and define UI session
 50   G4UIExecutive* ui = 0;                           51   G4UIExecutive* ui = 0;
 51   if (argc == 1) ui = new G4UIExecutive(argc,  <<  52   if (argc == 1) ui = new G4UIExecutive(argc,argv);
 52                                                    53 
 53   // choose the Random engine                  <<  54   //choose the Random engine
 54   CLHEP::HepRandom::setTheEngine(new CLHEP::Ra     55   CLHEP::HepRandom::setTheEngine(new CLHEP::RanecuEngine);
 55                                                    56 
 56   // use G4SteppingVerboseWithUnits            <<  57   //my Verbose output class
 57   G4int precision = 4;                         <<  58   G4VSteppingVerbose::SetInstance(new SteppingVerbose);
 58   G4SteppingVerbose::UseBestUnit(precision);   << 
 59                                                    59 
 60   // construct the default run manager         <<  60   //construct the default run manager
 61   G4RunManager* runManager = new G4RunManager;     61   G4RunManager* runManager = new G4RunManager;
 62                                                    62 
 63   // set mandatory initialization classes      <<  63   //set mandatory initialization classes
 64   //                                               64   //
 65   runManager->SetUserInitialization(new Detect     65   runManager->SetUserInitialization(new DetectorConstruction);
 66   runManager->SetUserInitialization(new Physic     66   runManager->SetUserInitialization(new PhysicsList);
 67                                                    67 
 68   runManager->SetUserAction(new PrimaryGenerat     68   runManager->SetUserAction(new PrimaryGeneratorAction);
 69                                                    69 
 70   // initialize visualization                  <<  70   //initialize visualization
 71   G4VisManager* visManager = nullptr;              71   G4VisManager* visManager = nullptr;
 72                                                    72 
 73   // get the pointer to the User Interface man <<  73   //get the pointer to the User Interface manager 
 74   G4UImanager* UImanager = G4UImanager::GetUIp <<  74   G4UImanager* UImanager = G4UImanager::GetUIpointer();  
 75                                                    75 
 76   if (ui) {                                    <<  76   if (ui)  {
 77     // interactive mode                        <<  77    //interactive mode
 78     visManager = new G4VisExecutive;           <<  78    visManager = new G4VisExecutive;
 79     visManager->Initialize();                  <<  79    visManager->Initialize();
 80     UImanager->ApplyCommand("/control/execute  <<  80    UImanager->ApplyCommand("/control/execute vis.mac");          
 81     ui->SessionStart();                        <<  81    ui->SessionStart();
 82     delete ui;                                 <<  82    delete ui;
 83   }                                                83   }
 84   else {                                       <<  84   else  {
 85     // batch mode                              <<  85    //batch mode  
 86     G4String command = "/control/execute ";    <<  86    G4String command = "/control/execute ";
 87     G4String fileName = argv[1];               <<  87    G4String fileName = argv[1];
 88     UImanager->ApplyCommand(command + fileName <<  88    UImanager->ApplyCommand(command+fileName);
 89   }                                                89   }
 90                                                    90 
 91   // job termination                           <<  91   //job termination 
 92   delete visManager;                               92   delete visManager;
 93   delete runManager;                               93   delete runManager;
 94 }                                                  94 }
 95                                                    95 
 96 //....oooOO0OOooo........oooOO0OOooo........oo <<  96 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
                                                   >>  97 
 97                                                    98