Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/advanced/underground_physics/DMX.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/underground_physics/DMX.cc (Version 11.3.0) and /examples/advanced/underground_physics/DMX.cc (Version 10.2.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 //                                                 26 //
 27 // -------------------------------------------     27 // --------------------------------------------------------------
 28 //   GEANT 4 - Underground Dark Matter Detecto     28 //   GEANT 4 - Underground Dark Matter Detector Advanced Example
 29 //                                                 29 //
 30 //      For information related to this code c     30 //      For information related to this code contact: Alex Howard
 31 //      e-mail: alexander.howard@cern.ch           31 //      e-mail: alexander.howard@cern.ch
 32 // -------------------------------------------     32 // --------------------------------------------------------------
 33 // Comments                                        33 // Comments
 34 //                                                 34 //
 35 //            Underground Advanced example mai     35 //            Underground Advanced example main program
 36 //               by A. Howard and H. Araujo    <<  36 //               by A. Howard and H. Araujo 
 37 //                    (27th November 2001)         37 //                    (27th November 2001)
 38 //                                                 38 //
 39 // main program                                    39 // main program
 40 // -------------------------------------------     40 // --------------------------------------------------------------
 41                                                    41 
 42 #include "G4Types.hh"                          <<  42 #ifdef G4MULTITHREADED
 43 #include "G4RunManagerFactory.hh"              <<  43 #include "G4MTRunManager.hh"
                                                   >>  44 #else
                                                   >>  45 #include "G4RunManager.hh"
                                                   >>  46 #endif
 44                                                    47 
 45 #include "G4UImanager.hh"                          48 #include "G4UImanager.hh"
 46 #include "Randomize.hh"                            49 #include "Randomize.hh"
 47                                                    50 
                                                   >>  51 #ifdef G4VIS_USE
 48 #include "G4VisExecutive.hh"                       52 #include "G4VisExecutive.hh"
                                                   >>  53 #endif
                                                   >>  54 
                                                   >>  55 #ifdef G4UI_USE
 49 #include "G4UIExecutive.hh"                        56 #include "G4UIExecutive.hh"
 50 #include "G4AnalysisManager.hh"                <<  57 #endif
 51                                                    58 
                                                   >>  59 #include "DMXAnalysisManager.hh"
 52 #include "DMXDetectorConstruction.hh"              60 #include "DMXDetectorConstruction.hh"
 53 #include "DMXPhysicsList.hh"                       61 #include "DMXPhysicsList.hh"
 54 #include "DMXActionInitializer.hh"                 62 #include "DMXActionInitializer.hh"
 55                                                    63 
 56 int main(int argc,char** argv) {                   64 int main(int argc,char** argv) {
 57                                                    65 
                                                   >>  66   // choose the Random engine
                                                   >>  67   G4Random::setTheEngine(new CLHEP::RanecuEngine);
                                                   >>  68   
 58   // Construct the default run manager             69   // Construct the default run manager
 59   auto* runManager = G4RunManagerFactory::Crea <<  70 #ifdef G4MULTITHREADED
 60   G4int nThreads = 4;                          <<  71   G4MTRunManager* runManager = new G4MTRunManager;
 61   runManager->SetNumberOfThreads(nThreads);    <<  72   //runManager->SetNumberOfThreads(2); 
                                                   >>  73 #else
                                                   >>  74   G4RunManager* runManager = new G4RunManager;
                                                   >>  75 #endif
 62                                                    76 
 63   // set mandatory initialization classes          77   // set mandatory initialization classes
 64   runManager->SetUserInitialization(new DMXDet     78   runManager->SetUserInitialization(new DMXDetectorConstruction);
 65   runManager->SetUserInitialization(new DMXPhy     79   runManager->SetUserInitialization(new DMXPhysicsList);
 66   runManager->SetUserInitialization(new DMXAct     80   runManager->SetUserInitialization(new DMXActionInitializer());
 67                                                    81 
                                                   >>  82 #ifdef G4VIS_USE
 68   // visualization manager                         83   // visualization manager
 69   G4VisManager* visManager = new G4VisExecutiv     84   G4VisManager* visManager = new G4VisExecutive;
 70   visManager->Initialize();                        85   visManager->Initialize();
                                                   >>  86 #endif
                                                   >>  87 
 71                                                    88 
 72 #ifdef DMXENV_GPS_USE                              89 #ifdef DMXENV_GPS_USE
 73   G4cout << " Using GPS and not DMX gun " << G     90   G4cout << " Using GPS and not DMX gun " << G4endl;
 74 #else                                              91 #else
 75   G4cout << " Using the DMX gun " << G4endl;       92   G4cout << " Using the DMX gun " << G4endl;
 76 #endif                                             93 #endif
 77                                                <<  94     
 78                                                <<  95  
 79   //Initialize G4 kernel                           96   //Initialize G4 kernel
 80   runManager->Initialize();                        97   runManager->Initialize();
 81                                                <<  98     
 82   // get the pointer to the User Interface man <<  99   // get the pointer to the User Interface manager 
 83   G4UImanager* UImanager = G4UImanager::GetUIp << 100   G4UImanager* UImanager = G4UImanager::GetUIpointer();  
 84                                                   101 
 85   // Define UI session for interactive mode.      102   // Define UI session for interactive mode.
 86   if(argc == 1)                                   103   if(argc == 1)
 87     {                                             104     {
                                                   >> 105 #ifdef G4UI_USE
 88       G4UIExecutive* ui = new G4UIExecutive(ar    106       G4UIExecutive* ui = new G4UIExecutive(argc, argv);
 89       UImanager->ApplyCommand("/control/execut << 107 #ifdef G4VIS_USE
                                                   >> 108       UImanager->ApplyCommand("/control/execute initInter.mac");     
                                                   >> 109 #endif
 90       ui->SessionStart();                         110       ui->SessionStart();
 91       delete ui;                                  111       delete ui;
                                                   >> 112 #endif
 92     }                                             113     }
 93   // Batch mode                                   114   // Batch mode
 94   else                                            115   else
 95     {                                          << 116     { 
 96       G4String command = "/control/execute ";     117       G4String command = "/control/execute ";
 97       G4String fileName = argv[1];                118       G4String fileName = argv[1];
 98       UImanager->ApplyCommand(command+fileName    119       UImanager->ApplyCommand(command+fileName);
 99     }                                             120     }
100                                                   121 
101   //Close-out analysis:                           122   //Close-out analysis:
102   // Save histograms                              123   // Save histograms
103   G4AnalysisManager* man = G4AnalysisManager::    124   G4AnalysisManager* man = G4AnalysisManager::Instance();
104   man->Write();                                   125   man->Write();
105   man->CloseFile();                               126   man->CloseFile();
                                                   >> 127   // Complete clean-up
                                                   >> 128   delete G4AnalysisManager::Instance();
106                                                   129 
                                                   >> 130 #ifdef G4VIS_USE
107   if(visManager) delete visManager;               131   if(visManager) delete visManager;
108                                                << 132 #endif
109   delete runManager;                              133   delete runManager;
110                                                   134 
111   return 0;                                       135   return 0;
112 }                                                 136 }
113                                                   137 
114                                                   138