Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/field/field04/src/F04Materials.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/field/field04/src/F04Materials.cc (Version 11.3.0) and /examples/extended/field/field04/src/F04Materials.cc (Version 10.4.p2)


  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 // $Id: F04Materials.cc 68021 2013-03-13 13:36:07Z gcosmo $
 26 //                                                 27 //
 27 /// \file field/field04/src/F04Materials.cc        28 /// \file field/field04/src/F04Materials.cc
 28 /// \brief Implementation of the F04Materials      29 /// \brief Implementation of the F04Materials class
 29 //                                                 30 //
 30                                                    31 
 31 #include "F04Materials.hh"                         32 #include "F04Materials.hh"
 32                                                << 
 33 #include "G4SystemOfUnits.hh"                      33 #include "G4SystemOfUnits.hh"
 34                                                    34 
 35 //....oooOO0OOooo........oooOO0OOooo........oo     35 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 36                                                    36 
 37 F04Materials::F04Materials()                       37 F04Materials::F04Materials()
 38 {                                                  38 {
 39   fNistMan = G4NistManager::Instance();            39   fNistMan = G4NistManager::Instance();
 40                                                    40 
 41   fNistMan->SetVerbose(2);                         41   fNistMan->SetVerbose(2);
 42                                                    42 
 43   CreateMaterials();                               43   CreateMaterials();
 44 }                                                  44 }
 45                                                    45 
 46 //....oooOO0OOooo........oooOO0OOooo........oo     46 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 47                                                    47 
 48 F04Materials::~F04Materials()                      48 F04Materials::~F04Materials()
 49 {                                                  49 {
 50   delete fVacuum;                              <<  50   delete    fVacuum;
 51   delete fAir;                                 <<  51   delete    fAir;
 52   delete fSci;                                 <<  52   delete    fSci;
 53   delete fBeO;                                 <<  53   delete    fBeO;
 54 }                                                  54 }
 55                                                    55 
 56 //....oooOO0OOooo........oooOO0OOooo........oo     56 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 57                                                    57 
 58 F04Materials* F04Materials::fInstance = nullpt <<  58 F04Materials* F04Materials::fInstance = 0;
 59                                                    59 
 60 F04Materials* F04Materials::GetInstance()          60 F04Materials* F04Materials::GetInstance()
 61 {                                                  61 {
 62   if (fInstance == nullptr) {                  <<  62   if (fInstance == 0)
 63     fInstance = new F04Materials();            <<  63     {
 64   }                                            <<  64       fInstance = new F04Materials();
                                                   >>  65     }
 65   return fInstance;                                66   return fInstance;
 66 }                                                  67 }
 67                                                    68 
 68 //....oooOO0OOooo........oooOO0OOooo........oo     69 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 69                                                    70 
 70 G4Material* F04Materials::GetMaterial(const G4     71 G4Material* F04Materials::GetMaterial(const G4String material)
 71 {                                                  72 {
 72   G4Material* mat = fNistMan->FindOrBuildMater <<  73   G4Material* mat =  fNistMan->FindOrBuildMaterial(material);
 73                                                    74 
 74   if (!mat) mat = G4Material::GetMaterial(mate     75   if (!mat) mat = G4Material::GetMaterial(material);
 75   if (!mat) {                                  <<  76   if (!mat) {G4cout << material << "Not Found, Please Retry"<< G4endl;}
 76     G4cout << material << "Not Found, Please R << 
 77   }                                            << 
 78                                                    77 
 79   return mat;                                      78   return mat;
 80 }                                                  79 }
 81                                                    80 
 82 //....oooOO0OOooo........oooOO0OOooo........oo     81 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 83                                                    82 
 84 void F04Materials::CreateMaterials()               83 void F04Materials::CreateMaterials()
 85 {                                                  84 {
 86   G4double density;                                85   G4double density;
 87   std::vector<G4int> natoms;                   <<  86   std::vector<G4int>  natoms;
 88   std::vector<G4double> fractionMass;              87   std::vector<G4double> fractionMass;
 89   std::vector<G4String> elements;                  88   std::vector<G4String> elements;
 90                                                    89 
 91   // Materials Definitions                         90   // Materials Definitions
 92   // =====================                         91   // =====================
 93                                                    92 
 94   // Define Vacuum                                 93   // Define Vacuum
 95                                                    94 
 96   fVacuum = fNistMan->FindOrBuildMaterial("G4_     95   fVacuum = fNistMan->FindOrBuildMaterial("G4_Galactic");
 97                                                    96 
 98   // Define Air                                    97   // Define Air
 99                                                    98 
100   fAir = fNistMan->FindOrBuildMaterial("G4_AIR     99   fAir = fNistMan->FindOrBuildMaterial("G4_AIR");
101                                                   100 
102   // Define BeO                                   101   // Define BeO
103                                                   102 
104   fBeO = fNistMan->FindOrBuildMaterial("G4_BER    103   fBeO = fNistMan->FindOrBuildMaterial("G4_BERYLLIUM_OXIDE");
105                                                   104 
106   // Define Scintillator                          105   // Define Scintillator
107                                                   106 
108   elements.push_back("C");                     << 107   elements.push_back("C");     natoms.push_back(9);
109   natoms.push_back(9);                         << 108   elements.push_back("H");     natoms.push_back(10);
110   elements.push_back("H");                     << 
111   natoms.push_back(10);                        << 
112                                                   109 
113   density = 1.032 * g / cm3;                   << 110   density = 1.032*g/cm3;;
114   ;                                            << 
115                                                   111 
116   fSci = fNistMan->ConstructNewMaterial("Scint << 112   fSci = fNistMan->
                                                   >> 113           ConstructNewMaterial("Scintillator", elements, natoms, density);
117                                                   114 
118   elements.clear();                               115   elements.clear();
119   natoms.clear();                                 116   natoms.clear();
120                                                   117 
121   G4cout << G4endl << "The materials defined a    118   G4cout << G4endl << "The materials defined are: " << G4endl << G4endl;
122                                                << 119   
123   G4cout << *(G4Material::GetMaterialTable())     120   G4cout << *(G4Material::GetMaterialTable()) << G4endl;
124 }                                                 121 }
125                                                   122