Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/advanced/xray_telescope/XrayTel.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/advanced/xray_telescope/XrayTel.cc (Version 11.3.0) and /examples/advanced/xray_telescope/XrayTel.cc (Version 10.2.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 //                                                 26 //
 27 // *******************************************     27 // **********************************************************************
 28 // *                                               28 // *                                                                    *
 29 // *                    GEANT 4 xray_telescope     29 // *                    GEANT 4 xray_telescope advanced example         *
 30 // *                                               30 // *                                                                    *
 31 // * MODULE:            XrayTel.cc             <<  31 // * MODULE:            XrayTel.cc                            main file *     
 32 // * -------                                       32 // * -------                                                            *
 33 // *                                               33 // *                                                                    *
 34 // * Version:           0.4                        34 // * Version:           0.4                                             *
 35 // * Date:              06/11/00                   35 // * Date:              06/11/00                                        *
 36 // * Author:            R Nartallo                 36 // * Author:            R Nartallo                                      *
 37 // * Organisation:      ESA/ESTEC, Noordwijk,      37 // * Organisation:      ESA/ESTEC, Noordwijk, THe Netherlands           *
 38 // *                                               38 // *                                                                    *
 39 // *******************************************     39 // **********************************************************************
 40 //                                                 40 //
 41 // HISTORY                                         41 // HISTORY
 42 // -------                                         42 // -------
 43 //                                                 43 //
 44 // The development of this advanced example is <<  44 // The development of this advanced example is based on earlier work 
 45 // carried out by a team of Geant4 collaborato     45 // carried out by a team of Geant4 collaborators  to simulate the Chandra
 46 // and XMM X-ray observatories. The authors in     46 // and XMM X-ray observatories. The authors involved in those models are
 47 // J Apostolakis, P Arce, S Giani, F Lei, R Na     47 // J Apostolakis, P Arce, S Giani, F Lei, R Nartallo, S Magni,
 48 // P Truscott, L Urban                             48 // P Truscott, L Urban
 49 //                                                 49 //
 50 // *******************************************     50 // **********************************************************************
 51 //                                             <<  51 // 
 52 // CHANGE HISTORY                                  52 // CHANGE HISTORY
 53 // --------------                                  53 // --------------
 54 //                                                 54 //
 55 // 05.12.2001 R. Nartallo                          55 // 05.12.2001 R. Nartallo
 56 // -Removed XM vis option                          56 // -Removed XM vis option
 57 //                                                 57 //
 58 // 07.11.2001 M.G. Pia                             58 // 07.11.2001 M.G. Pia
 59 // - Modified the analysis management              59 // - Modified the analysis management
 60 // - Small design iteration                        60 // - Small design iteration
 61 //                                                 61 //
 62 // 30.11.2000 R. Nartallo, A. Pfeiffer             62 // 30.11.2000 R. Nartallo, A. Pfeiffer
 63 // - Implementation of analysis manager code f     63 // - Implementation of analysis manager code for histograming
 64 //                                                 64 //
 65 // 15.11.2000 R. Nartallo                          65 // 15.11.2000 R. Nartallo
 66 // - Minor changes proposed by F. Lei to imple <<  66 // - Minor changes proposed by F. Lei to implement the GPS module now 
 67 //   replacing the standard particle gun       <<  67 //   replacing the standard particle gun 
 68 // - Remove commented lines related to old his     68 // - Remove commented lines related to old histograming code
 69 //                                                 69 //
 70 // 06.11.2000 R.Nartallo                           70 // 06.11.2000 R.Nartallo
 71 // - First implementation of X-ray Telescope a     71 // - First implementation of X-ray Telescope advanced example.
 72 // - Based on Chandra and XMM models               72 // - Based on Chandra and XMM models
 73 // - Lines for using GAG and the histogram man     73 // - Lines for using GAG and the histogram manager are commented out.
 74 //                                                 74 //
 75 //                                                 75 //
 76 // *******************************************     76 // **********************************************************************
 77                                                    77 
 78 #include "G4Types.hh"                          <<  78 #ifdef G4MULTITHREADED
 79 #include "G4RunManagerFactory.hh"              <<  79 #include "G4MTRunManager.hh"
                                                   >>  80 #else
                                                   >>  81 #include "G4RunManager.hh"
                                                   >>  82 #endif
                                                   >>  83 
 80 #include "G4UImanager.hh"                          84 #include "G4UImanager.hh"
 81 #include "XrayTelDetectorConstruction.hh"          85 #include "XrayTelDetectorConstruction.hh"
 82 #include "XrayTelPhysicsList.hh"                   86 #include "XrayTelPhysicsList.hh"
 83 #include "XrayTelActionInitializer.hh"             87 #include "XrayTelActionInitializer.hh"
 84 #include "G4VisExecutive.hh"                   <<  88 
 85 #include "G4UIExecutive.hh"                    <<  89 #ifdef G4VIS_USE
                                                   >>  90   #include "G4VisExecutive.hh"
                                                   >>  91 #endif
                                                   >>  92 
                                                   >>  93 #ifdef G4UI_USE
                                                   >>  94   #include "G4UIExecutive.hh"
                                                   >>  95 #endif
                                                   >>  96 
                                                   >>  97 
 86                                                    98 
 87 int main( int argc, char** argv )                  99 int main( int argc, char** argv )
 88 {                                                 100 {
 89   // Construct the default run manager            101   // Construct the default run manager
 90   auto* runManager = G4RunManagerFactory::Crea << 102 #ifdef G4MULTITHREADED
 91   G4int nThreads = 4;                          << 103   G4MTRunManager* runManager = new G4MTRunManager;
 92   runManager->SetNumberOfThreads(nThreads);    << 104 #else
 93                                                << 105   G4RunManager* runManager = new G4RunManager;
                                                   >> 106 #endif
                                                   >> 107 
 94   // set mandatory initialization classes         108   // set mandatory initialization classes
 95   runManager->SetUserInitialization(new XrayTe    109   runManager->SetUserInitialization(new XrayTelDetectorConstruction ) ;
 96   runManager->SetUserInitialization(new XrayTe    110   runManager->SetUserInitialization(new XrayTelPhysicsList);
 97   runManager->SetUserInitialization(new XrayTe    111   runManager->SetUserInitialization(new XrayTelActionInitializer());
 98                                                   112 
                                                   >> 113 #ifdef G4VIS_USE
                                                   >> 114   // visualization manager
                                                   >> 115   G4VisManager* visManager = new G4VisExecutive;
                                                   >> 116   visManager->Initialize();    
                                                   >> 117 #endif
                                                   >> 118 
 99   //Initialize G4 kernel                          119   //Initialize G4 kernel
100   runManager->Initialize();                       120   runManager->Initialize();
101                                                << 121     
102   // get the pointer to the User Interface man << 122   // get the pointer to the User Interface manager 
103   auto* UImanager = G4UImanager::GetUIpointer( << 123   G4UImanager *UImanager = G4UImanager::GetUIpointer();  
104   if ( argc==1 ){                                 124   if ( argc==1 ){
105     auto* visManager = new G4VisExecutive;     << 125 #ifdef G4UI_USE
106     visManager->Initialize();                  << 126       G4UIExecutive* ui = new G4UIExecutive(argc, argv);    
107                                                << 127 #ifdef G4VIS_USE
108     auto* ui = new G4UIExecutive(argc, argv);  << 128        UImanager->ApplyCommand("/control/execute vis.mac");     
109     UImanager->ApplyCommand("/control/execute  << 129 #endif    
110     ui->SessionStart();                        << 130        ui->SessionStart();
111     delete ui;                                 << 131        delete ui;
112     delete visManager;                         << 132 #endif
113   }                                               133   }
114   else {                                          134   else {
115     // Create a pointer to the User Interface  << 135     // Create a pointer to the User Interface manager 
116     G4String command = "/control/execute ";       136     G4String command = "/control/execute ";
117     for (int i=2; i<=argc; i++) {                 137     for (int i=2; i<=argc; i++) {
118       G4String macroFileName = argv[i-1];         138       G4String macroFileName = argv[i-1];
119       UImanager->ApplyCommand(command+macroFil    139       UImanager->ApplyCommand(command+macroFileName);
120     }                                             140     }
121   }                                            << 141   }                                  
122                                                   142 
123   // job termination                              143   // job termination
                                                   >> 144 #ifdef G4VIS_USE
                                                   >> 145   delete visManager;
                                                   >> 146 #endif
124   delete runManager;                              147   delete runManager;
125   return 0;                                       148   return 0;
126 }                                                 149 }
127                                                   150