Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/electromagnetic/TestEm1/src/DetectorConstruction.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/electromagnetic/TestEm1/src/DetectorConstruction.cc (Version 11.3.0) and /examples/extended/electromagnetic/TestEm1/src/DetectorConstruction.cc (Version 10.3.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 /// \file electromagnetic/TestEm1/src/Detector     26 /// \file electromagnetic/TestEm1/src/DetectorConstruction.cc
 27 /// \brief Implementation of the DetectorConst     27 /// \brief Implementation of the DetectorConstruction class
 28 //                                                 28 //
 29 //                                             <<  29 // $Id: DetectorConstruction.cc 99441 2016-09-22 08:35:13Z gcosmo $
                                                   >>  30 // 
 30                                                    31 
 31 //....oooOO0OOooo........oooOO0OOooo........oo     32 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 32 //....oooOO0OOooo........oooOO0OOooo........oo     33 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 33                                                    34 
 34 #include "DetectorConstruction.hh"                 35 #include "DetectorConstruction.hh"
 35                                                << 
 36 #include "DetectorMessenger.hh"                    36 #include "DetectorMessenger.hh"
 37                                                    37 
 38 #include "G4AutoDelete.hh"                     << 
 39 #include "G4Box.hh"                            << 
 40 #include "G4GeometryManager.hh"                << 
 41 #include "G4GlobalMagFieldMessenger.hh"        << 
 42 #include "G4LogicalVolume.hh"                  << 
 43 #include "G4LogicalVolumeStore.hh"             << 
 44 #include "G4Material.hh"                           38 #include "G4Material.hh"
 45 #include "G4NistManager.hh"                        39 #include "G4NistManager.hh"
                                                   >>  40 #include "G4Box.hh"
                                                   >>  41 #include "G4LogicalVolume.hh"
 46 #include "G4PVPlacement.hh"                        42 #include "G4PVPlacement.hh"
 47 #include "G4PhysicalConstants.hh"              << 
 48 #include "G4PhysicalVolumeStore.hh"            << 
 49 #include "G4RunManager.hh"                         43 #include "G4RunManager.hh"
                                                   >>  44 
                                                   >>  45 #include "G4GeometryManager.hh"
                                                   >>  46 #include "G4PhysicalVolumeStore.hh"
                                                   >>  47 #include "G4LogicalVolumeStore.hh"
 50 #include "G4SolidStore.hh"                         48 #include "G4SolidStore.hh"
 51 #include "G4SystemOfUnits.hh"                  <<  49 
 52 #include "G4UnitsTable.hh"                         50 #include "G4UnitsTable.hh"
                                                   >>  51 #include "G4SystemOfUnits.hh"
                                                   >>  52 #include "G4PhysicalConstants.hh"
 53                                                    53 
 54 //....oooOO0OOooo........oooOO0OOooo........oo     54 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 55                                                    55 
 56 DetectorConstruction::DetectorConstruction()       56 DetectorConstruction::DetectorConstruction()
                                                   >>  57 :G4VUserDetectorConstruction(),fPBox(nullptr), fLBox(nullptr), 
                                                   >>  58   fBox(nullptr), fMaterial(nullptr)
 57 {                                                  59 {
 58   fBoxSize = 10 * m;                           <<  60   fBoxSize = 10*m;
 59   DefineMaterials();                               61   DefineMaterials();
 60   SetMaterial("G4_Al");                        <<  62   SetMaterial("Aluminium");  
 61   fDetectorMessenger = new DetectorMessenger(t     63   fDetectorMessenger = new DetectorMessenger(this);
 62 }                                                  64 }
 63                                                    65 
 64 //....oooOO0OOooo........oooOO0OOooo........oo     66 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 65                                                    67 
 66 DetectorConstruction::~DetectorConstruction()      68 DetectorConstruction::~DetectorConstruction()
 67 {                                              <<  69 { delete fDetectorMessenger;}
 68   delete fDetectorMessenger;                   << 
 69 }                                              << 
 70                                                    70 
 71 //....oooOO0OOooo........oooOO0OOooo........oo     71 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 72                                                    72 
 73 void DetectorConstruction::DefineMaterials()       73 void DetectorConstruction::DefineMaterials()
 74 {                                                  74 {
 75   //                                               75   //
 76   // define Elements                               76   // define Elements
 77   //                                               77   //
 78   G4double z, a;                               <<  78   G4double z,a;
 79                                                <<  79   
 80   G4Element* H = new G4Element("Hydrogen", "H" <<  80   G4Element* H  = new G4Element("Hydrogen" ,"H" , z= 1., a=   1.01*g/mole);
 81   G4Element* C = new G4Element("Hydrogen", "C" <<  81   G4Element* C  = new G4Element("Hydrogen" ,"C" , z= 6., a=  12.00*g/mole);
 82   G4Element* N = new G4Element("Nitrogen", "N" <<  82   G4Element* N  = new G4Element("Nitrogen" ,"N" , z= 7., a=  14.01*g/mole);
 83   G4Element* O = new G4Element("Oxygen", "O",  <<  83   G4Element* O  = new G4Element("Oxygen"   ,"O" , z= 8., a=  16.00*g/mole);
 84   G4Element* Ge = new G4Element("Germanium", " <<  84   G4Element* Ge = new G4Element("Germanium","Ge", z=32., a=  72.59*g/mole);
 85   G4Element* Bi = new G4Element("Bismuth", "Bi <<  85   G4Element* Bi = new G4Element("Bismuth"  ,"Bi", z=83., a= 208.98*g/mole);
 86                                                <<  86   
 87   //                                               87   //
 88   // define materials                              88   // define materials
 89   //                                               89   //
 90   G4double density;                                90   G4double density;
 91   G4int ncomponents, natoms;                       91   G4int ncomponents, natoms;
 92   G4double fractionmass;                       <<  92   G4double fractionmass;  
 93                                                <<  93   
 94   G4Material* Air = new G4Material("Air", dens <<  94   G4Material* Air = 
 95   Air->AddElement(N, fractionmass = 70. * perC <<  95   new G4Material("Air", density= 1.290*mg/cm3, ncomponents=2);
 96   Air->AddElement(O, fractionmass = 30. * perC <<  96   Air->AddElement(N, fractionmass=70.*perCent);
 97                                                <<  97   Air->AddElement(O, fractionmass=30.*perCent);
 98   G4Material* H2l = new G4Material("H2liquid", <<  98 
 99   H2l->AddElement(H, fractionmass = 1.);       <<  99   G4Material* H2l = 
100                                                << 100   new G4Material("H2liquid", density= 70.8*mg/cm3, ncomponents=1);
101   G4Material* H2O = new G4Material("Water", de << 101   H2l->AddElement(H, fractionmass=1.);
102   H2O->AddElement(H, natoms = 2);              << 102 
103   H2O->AddElement(O, natoms = 1);              << 103   G4Material* H2O = 
104   /// H2O->SetChemicalFormula("H_2O");         << 104   new G4Material("Water", density= 1.000*g/cm3, ncomponents=2);
105   H2O->GetIonisation()->SetMeanExcitationEnerg << 105   H2O->AddElement(H, natoms=2);
106                                                << 106   H2O->AddElement(O, natoms=1);
107   density = 0.001 * mg / cm3;                  << 107   ///H2O->SetChemicalFormula("H_2O");
108   G4Material* CO2 = new G4Material("CO2", dens << 108   H2O->GetIonisation()->SetMeanExcitationEnergy(78.0*eV);
109   CO2->AddElement(C, natoms = 1);              << 109 
110   CO2->AddElement(O, natoms = 2);              << 110   density = 0.001*mg/cm3;
                                                   >> 111   G4Material* CO2 = new G4Material("CO2", density, ncomponents=2);
                                                   >> 112   CO2->AddElement(C, natoms=1);
                                                   >> 113   CO2->AddElement(O, natoms=2);
111                                                   114 
112   G4Isotope* d = new G4Isotope("d", 1, 2, 0.0,    115   G4Isotope* d = new G4Isotope("d", 1, 2, 0.0, 0);
113   G4Element* D = new G4Element("Heavy-Hydrogen << 116   G4Element* D = new G4Element("Heavy-Hydrogen" ,"D", ncomponents=1);
114   D->AddIsotope(d, 1.0);                          117   D->AddIsotope(d, 1.0);
115   G4Material* D2 = new G4Material("D2_gas", de << 118   G4Material* D2 = 
116   D2->AddElement(D, natoms = 2);               << 119     new G4Material("D2_gas", density= 0.036*mg/cm3, ncomponents=1);
117                                                << 120   D2->AddElement(D, natoms=2);
118   new G4Material("liquidArgon", z = 18., a = 3 << 121 
119                                                << 122   new G4Material("liquidArgon", z=18., a= 39.95*g/mole, density= 1.390*g/cm3);
120   new G4Material("Aluminium", z = 13., a = 26. << 123 
121                                                << 124   new G4Material("Aluminium"  , z=13., a= 26.98*g/mole, density= 2.700*g/cm3);
122   new G4Material("Silicon", z = 14., a = 28.09 << 125 
123                                                << 126   new G4Material("Silicon"    , z=14., a= 28.09*g/mole, density= 2.330*g/cm3);
124   new G4Material("Chromium", z = 24., a = 51.9 << 127   
125                                                << 128   new G4Material("Chromium"   , z=24., a= 51.99*g/mole, density= 7.140*g/cm3);
126   new G4Material("Germanium", z = 32., a = 72. << 129   
127                                                << 130   new G4Material("Germanium"  , z=32., a= 72.61*g/mole, density= 5.323*g/cm3);
128   G4Material* BGO = new G4Material("BGO", dens << 131   
129   BGO->AddElement(O, natoms = 12);             << 132   G4Material* BGO = 
130   BGO->AddElement(Ge, natoms = 3);             << 133   new G4Material("BGO", density= 7.10*g/cm3, ncomponents=3);
131   BGO->AddElement(Bi, natoms = 4);             << 134   BGO->AddElement(O , natoms=12);
132                                                << 135   BGO->AddElement(Ge, natoms= 3);
133   new G4Material("Iron", z = 26., a = 55.85 *  << 136   BGO->AddElement(Bi, natoms= 4);  
134                                                << 137 
135   new G4Material("Tungsten", z = 74., a = 183. << 138   new G4Material("Iron"       , z=26., a= 55.85*g/mole, density= 7.870*g/cm3);
136                                                << 139 
137   new G4Material("Gold", z = 79., a = 196.97 * << 140   new G4Material("Tungsten"   , z=74., a=183.85*g/mole, density= 19.30*g/cm3);
138                                                << 141   
139   new G4Material("Lead", z = 82., a = 207.19 * << 142   new G4Material("Gold"       , z=79., a=196.97*g/mole, density= 19.32*g/cm3);
140                                                << 143   
141   new G4Material("Uranium", z = 92., a = 238.0 << 144   new G4Material("Lead"       , z=82., a=207.19*g/mole, density= 11.35*g/cm3);
142                                                << 145 
143   G4Material* argonGas =                       << 146   new G4Material("Uranium"    , z=92., a=238.03*g/mole, density= 18.95*g/cm3);
144     new G4Material("ArgonGas", z = 18, a = 39. << 147 
145                    273.15 * kelvin, 1 * atmosp << 148   
146                                                << 149   G4Material* argonGas =   
147   G4Material* butane = new G4Material("Isobuta << 150   new G4Material("ArgonGas", z=18, a=39.948*g/mole, density= 1.782*mg/cm3,
148                                       kStateGa << 151                  kStateGas, 273.15*kelvin, 1*atmosphere);
149   butane->AddElement(C, natoms = 4);           << 152                        
150   butane->AddElement(H, natoms = 10);          << 153  G4Material* butane =
151                                                << 154  new G4Material("Isobutane",density= 2.42*mg/cm3, ncomponents=2,
152   G4Material* ArButane = new G4Material("Argon << 155                  kStateGas,273.15*kelvin, 1*atmosphere);
153                                         kState << 156  butane->AddElement(C, natoms=4);
154   ArButane->AddMaterial(argonGas, fractionmass << 157  butane->AddElement(H, natoms=10);
155   ArButane->AddMaterial(butane, fractionmass = << 158  
156                                                << 159  G4Material* ArButane =
157   // example of vacuum                         << 160  new G4Material("ArgonButane", density= 1.835*mg/cm3, ncomponents=2,
158   //                                           << 161                  kStateGas,273.15*kelvin,1.*atmosphere);
159   density = universe_mean_density;  // from Ph << 162  ArButane->AddMaterial(argonGas, fractionmass=70*perCent);
160   new G4Material("Galactic", z = 1., a = 1.008 << 163  ArButane->AddMaterial(butane ,  fractionmass=30*perCent);
161                  3.e-18 * pascal);             << 164 
162                                                << 165  // example of vacuum
163   // use Nist                                  << 166  //
164   //                                           << 167  density = universe_mean_density;    //from PhysicalConstants.h
165   G4NistManager* man = G4NistManager::Instance << 168  new G4Material("Galactic", z=1., a=1.008*g/mole, density,
166                                                << 169                             kStateGas,2.73*kelvin,3.e-18*pascal);
167   G4bool isotopes = false;                     << 170 
168   /// G4Element*  O = man->FindOrBuildElement( << 171  // use Nist
169   G4Element* Si = man->FindOrBuildElement("Si" << 172  //
170   G4Element* Lu = man->FindOrBuildElement("Lu" << 173  G4NistManager* man = G4NistManager::Instance();
171                                                << 174  
172   G4Material* LSO = new G4Material("Lu2SiO5",  << 175  G4bool isotopes = false;
173   LSO->AddElement(Lu, 2);                      << 176  ///G4Element*  O = man->FindOrBuildElement("O" , isotopes); 
174   LSO->AddElement(Si, 1);                      << 177  G4Element* Si = man->FindOrBuildElement("Si", isotopes);
175   LSO->AddElement(O, 5);                       << 178  G4Element* Lu = man->FindOrBuildElement("Lu", isotopes);  
176                                                << 179  
177   /// G4cout << *(G4Material::GetMaterialTable << 180  G4Material* LSO = new G4Material("Lu2SiO5", 7.4*g/cm3, 3);
                                                   >> 181  LSO->AddElement(Lu, 2);
                                                   >> 182  LSO->AddElement(Si, 1);
                                                   >> 183  LSO->AddElement(O , 5);
                                                   >> 184    
                                                   >> 185   G4cout << *(G4Material::GetMaterialTable()) << G4endl;
178 }                                                 186 }
179                                                   187 
180 //....oooOO0OOooo........oooOO0OOooo........oo    188 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
181                                                   189 
182 G4VPhysicalVolume* DetectorConstruction::Const    190 G4VPhysicalVolume* DetectorConstruction::Construct()
183 {                                                 191 {
184   if (fPBox) {                                 << 192   fBox = new G4Box("Container",                         //its name
185     return fPBox;                              << 193                    fBoxSize/2,fBoxSize/2,fBoxSize/2);   //its dimensions
186   }                                            << 
187   fBox = new G4Box("Container",  // its name   << 
188                    fBoxSize / 2, fBoxSize / 2, << 
189                                                << 
190   fLBox = new G4LogicalVolume(fBox,  // its sh << 
191                               fMaterial,  // i << 
192                               fMaterial->GetNa << 
193                                                << 
194   fPBox = new G4PVPlacement(0,  // no rotation << 
195                             G4ThreeVector(),   << 
196                             fLBox,  // its log << 
197                             fMaterial->GetName << 
198                             0,  // its mother  << 
199                             false,  // no bool << 
200                             0);  // copy numbe << 
201                                                   194 
                                                   >> 195   fLBox = new G4LogicalVolume(fBox,                     //its shape
                                                   >> 196                              fMaterial,                 //its material
                                                   >> 197                              fMaterial->GetName());     //its name
                                                   >> 198 
                                                   >> 199   fPBox = new G4PVPlacement(0,                          //no rotation
                                                   >> 200                            G4ThreeVector(),             //at (0,0,0)
                                                   >> 201                            fLBox,                       //its logical volume
                                                   >> 202                            fMaterial->GetName(),        //its name
                                                   >> 203                            0,                           //its mother  volume
                                                   >> 204                            false,                       //no boolean operation
                                                   >> 205                            0);                          //copy number
                                                   >> 206                            
202   PrintParameters();                              207   PrintParameters();
203                                                << 208   
204   // always return the root volume             << 209   //always return the root volume
205   //                                              210   //
206   return fPBox;                                   211   return fPBox;
207 }                                                 212 }
208                                                   213 
209 //....oooOO0OOooo........oooOO0OOooo........oo    214 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
210                                                   215 
211 void DetectorConstruction::PrintParameters()      216 void DetectorConstruction::PrintParameters()
212 {                                                 217 {
213   G4cout << "\n The Box is " << G4BestUnit(fBo << 218   G4cout << "\n The Box is " << G4BestUnit(fBoxSize,"Length")
214          << G4endl;                            << 219          << " of " << fMaterial->GetName() << G4endl;
215   G4cout << fMaterial << G4endl;               << 
216 }                                                 220 }
217                                                   221 
218 //....oooOO0OOooo........oooOO0OOooo........oo    222 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
219                                                   223 
220 void DetectorConstruction::SetMaterial(const G << 224 void DetectorConstruction::SetMaterial(G4String materialChoice)
221 {                                                 225 {
222   // search the material by its name              226   // search the material by its name
223   G4Material* pttoMaterial = G4NistManager::In << 227   G4Material* pttoMaterial = 
224                                                << 228      G4NistManager::Instance()->FindOrBuildMaterial(materialChoice);
                                                   >> 229   
225   if (pttoMaterial) {                             230   if (pttoMaterial) {
226     fMaterial = pttoMaterial;                     231     fMaterial = pttoMaterial;
227     if (fLBox) {                               << 232     if ( fLBox ) { fLBox->SetMaterial(fMaterial); }
228       fLBox->SetMaterial(fMaterial);           << 233   } else {
229     }                                          << 234     G4cout << "\n--> warning from DetectorConstruction::SetMaterial : "
230   }                                            << 235            << materialChoice << " not found" << G4endl;
231   else {                                       << 
232     G4cout << "\n--> warning from DetectorCons << 
233            << " not found" << G4endl;          << 
234   }                                               236   }
235   G4RunManager::GetRunManager()->PhysicsHasBee    237   G4RunManager::GetRunManager()->PhysicsHasBeenModified();
236 }                                                 238 }
237                                                   239 
238 //....oooOO0OOooo........oooOO0OOooo........oo    240 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
239                                                   241 
240 void DetectorConstruction::SetSize(G4double va    242 void DetectorConstruction::SetSize(G4double value)
241 {                                                 243 {
242   fBoxSize = value;                               244   fBoxSize = value;
243   if (fBox) {                                  << 245   if(fBox) {
244     fBox->SetXHalfLength(fBoxSize / 2);        << 246     fBox->SetXHalfLength(fBoxSize/2);
245     fBox->SetYHalfLength(fBoxSize / 2);        << 247     fBox->SetYHalfLength(fBoxSize/2);
246     fBox->SetZHalfLength(fBoxSize / 2);        << 248     fBox->SetZHalfLength(fBoxSize/2);
247   }                                               249   }
248 }                                                 250 }
249                                                   251 
250 //....oooOO0OOooo........oooOO0OOooo........oo    252 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
251                                                   253 
                                                   >> 254 #include "G4GlobalMagFieldMessenger.hh"
                                                   >> 255 #include "G4AutoDelete.hh"
                                                   >> 256 
252 void DetectorConstruction::ConstructSDandField    257 void DetectorConstruction::ConstructSDandField()
253 {                                                 258 {
254   if (fFieldMessenger.Get() == 0) {            << 259     if ( fFieldMessenger.Get() == 0 ) {
255     // Create global magnetic field messenger. << 260         // Create global magnetic field messenger.
256     // Uniform magnetic field is then created  << 261         // Uniform magnetic field is then created automatically if
257     // the field value is not zero.            << 262         // the field value is not zero.
258     G4ThreeVector fieldValue = G4ThreeVector() << 263         G4ThreeVector fieldValue = G4ThreeVector();
259     G4GlobalMagFieldMessenger* msg = new G4Glo << 264         G4GlobalMagFieldMessenger* msg =
260     // msg->SetVerboseLevel(1);                << 265         new G4GlobalMagFieldMessenger(fieldValue);
261     G4AutoDelete::Register(msg);               << 266         //msg->SetVerboseLevel(1);
262     fFieldMessenger.Put(msg);                  << 267         G4AutoDelete::Register(msg);
263   }                                            << 268         fFieldMessenger.Put( msg );
                                                   >> 269         
                                                   >> 270     }
264 }                                                 271 }
265                                                   272 
266 //....oooOO0OOooo........oooOO0OOooo........oo    273 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
267                                                   274