Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/electromagnetic/TestEm16/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/electromagnetic/TestEm16/include/DetectorConstruction.hh (Version 11.3.0) and /examples/extended/electromagnetic/TestEm16/include/DetectorConstruction.hh (Version 10.7)


  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 electromagnetic/TestEm16/include/Det     26 /// \file electromagnetic/TestEm16/include/DetectorConstruction.hh
 27 /// \brief Definition of the DetectorConstruct     27 /// \brief Definition of the DetectorConstruction class
 28 //                                                 28 //
 29 //                                                 29 //
 30 //....oooOO0OOooo........oooOO0OOooo........oo     30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 31 //....oooOO0OOooo........oooOO0OOooo........oo     31 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 32                                                    32 
 33 #ifndef DetectorConstruction_h                     33 #ifndef DetectorConstruction_h
 34 #define DetectorConstruction_h 1                   34 #define DetectorConstruction_h 1
 35                                                    35 
 36 #include "G4Cache.hh"                          << 
 37 #include "G4VUserDetectorConstruction.hh"          36 #include "G4VUserDetectorConstruction.hh"
 38 #include "globals.hh"                              37 #include "globals.hh"
                                                   >>  38 #include "G4Cache.hh"
 39                                                    39 
 40 class G4Material;                                  40 class G4Material;
 41 class G4UserLimits;                                41 class G4UserLimits;
 42 class DetectorMessenger;                           42 class DetectorMessenger;
 43 class G4GlobalMagFieldMessenger;                   43 class G4GlobalMagFieldMessenger;
 44                                                    44 
 45 //....oooOO0OOooo........oooOO0OOooo........oo     45 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 46                                                    46 
 47 class DetectorConstruction : public G4VUserDet     47 class DetectorConstruction : public G4VUserDetectorConstruction
 48 {                                                  48 {
 49   public:                                          49   public:
                                                   >>  50 
 50     DetectorConstruction();                        51     DetectorConstruction();
 51     ~DetectorConstruction() override = default <<  52    ~DetectorConstruction();
 52                                                    53 
 53   public:                                          54   public:
 54     G4VPhysicalVolume* Construct() override;   << 
 55     void ConstructSDandField() override;       << 
 56                                                    55 
 57     void SetSize(G4double);                    <<  56      virtual G4VPhysicalVolume* Construct();
 58     void SetMaterial(G4String);                <<  57      virtual void ConstructSDandField();
 59     void SetMaxStepSize(G4double);             <<  58 
 60     void SetMaxStepLength(G4double);           <<  59      void SetSize        (G4double);
 61     void SetGeomFileName(G4String);            <<  60      void SetMaterial    (G4String);
                                                   >>  61      void SetMaxStepSize (G4double);
                                                   >>  62      void SetMaxStepLength (G4double);
 62                                                    63 
 63   public:                                          64   public:
 64     const G4VPhysicalVolume* GetWorld() { retu << 
 65                                                    65 
 66     G4double GetSize() { return fBoxSize; };   <<  66      const
 67     G4Material* GetMaterial() { return fMateri <<  67      G4VPhysicalVolume* GetWorld()      {return fBox;};
                                                   >>  68 
                                                   >>  69      G4double           GetSize()       {return fBoxSize;};
                                                   >>  70      G4Material*        GetMaterial()   {return fMaterial;};
 68                                                    71 
 69     void PrintParameters();                    <<  72      void               PrintParameters();
 70                                                    73 
 71   private:                                         74   private:
 72     G4LogicalVolume* fLBox = nullptr;          << 
 73     G4VPhysicalVolume* fBox = nullptr;         << 
 74                                                    75 
 75     G4double fBoxSize;                         <<  76      G4LogicalVolume*    fLBox;
 76     G4Material* fMaterial = nullptr;           <<  77      G4VPhysicalVolume*  fBox;
 77     G4UserLimits* fUserLimits = nullptr;       << 
 78     G4String fGeomFileName;                    << 
 79                                                    78 
 80     DetectorMessenger* fDetectorMessenger = nu <<  79      G4double            fBoxSize;
 81     G4Cache<G4GlobalMagFieldMessenger*> fField <<  80      G4Material*         fMaterial;
                                                   >>  81      G4UserLimits*       fUserLimits;
                                                   >>  82 
                                                   >>  83      DetectorMessenger*  fDetectorMessenger;
                                                   >>  84      G4Cache<G4GlobalMagFieldMessenger*> fFieldMessenger;
 82                                                    85 
 83   private:                                         86   private:
 84     void DefineMaterials();                    <<  87 
 85     G4VPhysicalVolume* ConstructVolumes();     <<  88      void               DefineMaterials();
                                                   >>  89      G4VPhysicalVolume* ConstructVolumes();
 86 };                                                 90 };
 87                                                    91 
 88 //....oooOO0OOooo........oooOO0OOooo........oo     92 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 89                                                    93 
                                                   >>  94 
 90 #endif                                             95 #endif
                                                   >>  96 
 91                                                    97