Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/common/include/DetectorConstruction.hh

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/common/include/DetectorConstruction.hh (Version 11.3.0) and /examples/extended/common/include/DetectorConstruction.hh (Version 10.4)


  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 // $Id$
 27 /// \file common/include/DetectorConstruction. <<  27 // 
 28 /// \brief Definition of the Common::DetectorC <<  28 /// \file DetectorConstruction.hh
                                                   >>  29 /// \brief Definition of the DetectorConstruction class
 29                                                    30 
 30 #ifndef DetectorConstruction_h                     31 #ifndef DetectorConstruction_h
 31 #define DetectorConstruction_h 1                   32 #define DetectorConstruction_h 1
 32                                                    33 
 33 #include "CLHEP/Units/SystemOfUnits.h"         << 
 34                                                << 
 35 #include "G4ThreeVector.hh"                    << 
 36 #include "G4VUserDetectorConstruction.hh"          34 #include "G4VUserDetectorConstruction.hh"
                                                   >>  35 #include "G4ThreeVector.hh"
                                                   >>  36 #include "CLHEP/Units/SystemOfUnits.h"
 37                                                    37 
 38 class G4LogicalVolume;                             38 class G4LogicalVolume;
 39 class G4Material;                                  39 class G4Material;
 40 class G4GenericMessenger;                          40 class G4GenericMessenger;
 41                                                    41 
 42 namespace Common                               << 
 43 {                                              << 
 44                                                << 
 45 /// Simple detector construction with a box vo     42 /// Simple detector construction with a box volume placed in a world
 46                                                    43 
 47 class DetectorConstruction : public G4VUserDet     44 class DetectorConstruction : public G4VUserDetectorConstruction
 48 {                                                  45 {
 49   public:                                          46   public:
 50     DetectorConstruction(const G4String& boxMa <<  47     DetectorConstruction(
 51                          G4double boxHx = 40 * <<  48        const G4String& boxMaterialName = "G4_AIR",
 52                          G4double boxHz = 40 * <<  49        G4double boxHx = 40*CLHEP::cm, 
 53                          const G4String& world <<  50        G4double boxHy = 40*CLHEP::cm, 
 54                          G4double worldSizeFac <<  51        G4double boxHz = 40*CLHEP::cm,
 55     ~DetectorConstruction() override;          <<  52        const G4String& worldMaterialName = "G4_AIR",
                                                   >>  53        G4double worldSizeFactor = 1.25);
                                                   >>  54     ~DetectorConstruction();
 56                                                    55 
 57   public:                                          56   public:
 58     // methods from base class                 <<  57     // methods from base class 
 59     G4VPhysicalVolume* Construct() override;   <<  58     virtual G4VPhysicalVolume* Construct();
 60                                                    59 
 61     // set methods                                 60     // set methods
 62     void SetBoxMaterial(const G4String& materi <<  61     void  SetBoxMaterial(const G4String& materialName);
 63     void SetWorldMaterial(const G4String& mate <<  62     void  SetWorldMaterial(const G4String& materialName);
 64     void SetBoxDimensions(G4ThreeVector dimens <<  63     void  SetBoxDimensions(G4ThreeVector dimensions);
 65     void SetWorldSizeFactor(G4double factor);  <<  64     void  SetWorldSizeFactor(G4double factor);
 66                                                <<  65                        
 67   private:                                         66   private:
 68     void DefineCommands();                         67     void DefineCommands();
 69                                                    68 
 70     G4GenericMessenger* fMessenger = nullptr;  <<  69     G4GenericMessenger*  fMessenger; 
 71     G4String fBoxMaterialName;                 <<  70     G4String             fBoxMaterialName;
 72     G4String fWorldMaterialName;               <<  71     G4String             fWorldMaterialName;
 73     G4ThreeVector fBoxDimensions;              <<  72     G4ThreeVector        fBoxDimensions;
 74     G4double fWorldSizeFactor = 0.;            <<  73     G4double             fWorldSizeFactor;
 75     G4LogicalVolume* fBoxVolume = nullptr;     <<  74     G4LogicalVolume*     fBoxVolume;  
 76     G4LogicalVolume* fWorldVolume = nullptr;   <<  75     G4LogicalVolume*     fWorldVolume;  
 77 };                                                 76 };
 78                                                    77 
 79 }  // namespace Common                         << 
 80                                                << 
 81 //....oooOO0OOooo........oooOO0OOooo........oo     78 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 82                                                    79 
 83 #endif                                             80 #endif
                                                   >>  81 
 84                                                    82