Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/field/field05/src/F05DetectorConstruction.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/field05/src/F05DetectorConstruction.cc (Version 11.3.0) and /examples/extended/field/field05/src/F05DetectorConstruction.cc (Version 11.1.2)


  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 /// \file field/field05/src/F05DetectorConstru     27 /// \file field/field05/src/F05DetectorConstruction.cc
 28 /// \brief Implementation of the F05DetectorCo     28 /// \brief Implementation of the F05DetectorConstruction class
 29 //                                                 29 //
 30                                                    30 
 31 //....oooOO0OOooo........oooOO0OOooo........oo     31 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 32 //....oooOO0OOooo........oooOO0OOooo........oo     32 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 33                                                    33 
 34 #include "F05DetectorConstruction.hh"              34 #include "F05DetectorConstruction.hh"
 35                                                    35 
 36 #include "F05Field.hh"                         <<  36 #include "G4Material.hh"
                                                   >>  37 #include "G4NistManager.hh"
 37                                                    38 
 38 #include "G4Box.hh"                                39 #include "G4Box.hh"
 39 #include "G4Colour.hh"                         << 
 40 #include "G4FieldManager.hh"                   << 
 41 #include "G4GeometryManager.hh"                << 
 42 #include "G4LogicalVolume.hh"                      40 #include "G4LogicalVolume.hh"
 43 #include "G4LogicalVolumeStore.hh"             << 
 44 #include "G4Material.hh"                       << 
 45 #include "G4NistManager.hh"                    << 
 46 #include "G4PVPlacement.hh"                        41 #include "G4PVPlacement.hh"
                                                   >>  42 
                                                   >>  43 #include "G4GeometryManager.hh"
 47 #include "G4PhysicalVolumeStore.hh"                44 #include "G4PhysicalVolumeStore.hh"
                                                   >>  45 #include "G4LogicalVolumeStore.hh"
 48 #include "G4SolidStore.hh"                         46 #include "G4SolidStore.hh"
                                                   >>  47 
                                                   >>  48 #include "G4VisAttributes.hh"
                                                   >>  49 #include "G4Colour.hh"
                                                   >>  50 
                                                   >>  51 #include "G4UserLimits.hh"
 49 #include "G4SystemOfUnits.hh"                      52 #include "G4SystemOfUnits.hh"
                                                   >>  53 
                                                   >>  54 #include "F05Field.hh"
                                                   >>  55 
                                                   >>  56 #include "G4FieldManager.hh"
 50 #include "G4TransportationManager.hh"              57 #include "G4TransportationManager.hh"
 51 #include "G4UserLimits.hh"                     << 
 52 #include "G4VisAttributes.hh"                  << 
 53                                                    58 
 54 // #include "G4RepleteEofM.hh"                 <<  59 //#include "G4RepleteEofM.hh"
 55 #include "G4ChordFinder.hh"                    << 
 56 #include "G4ClassicalRK4.hh"                   << 
 57 #include "G4EqEMFieldWithSpin.hh"                  60 #include "G4EqEMFieldWithSpin.hh"
                                                   >>  61 
                                                   >>  62 #include "G4ClassicalRK4.hh"
 58 #include "G4MagIntegratorStepper.hh"               63 #include "G4MagIntegratorStepper.hh"
                                                   >>  64 #include "G4ChordFinder.hh"
 59 #include "G4PropagatorInField.hh"                  65 #include "G4PropagatorInField.hh"
 60                                                    66 
 61 //....oooOO0OOooo........oooOO0OOooo........oo     67 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 62                                                    68 
 63 F05DetectorConstruction::F05DetectorConstructi <<  69 F05DetectorConstruction::F05DetectorConstruction()
                                                   >>  70  : fVacuum(0), fWorldSizeXY(0), fWorldSizeZ(0), 
                                                   >>  71    fSolidWorld(0), fLogicWorld(0), fPhysiWorld(0)
 64 {                                                  72 {
 65   // materials                                     73   // materials
 66   DefineMaterials();                               74   DefineMaterials();
 67 }                                                  75 }
 68                                                    76 
 69 //....oooOO0OOooo........oooOO0OOooo........oo     77 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 70                                                    78 
 71 F05DetectorConstruction::~F05DetectorConstruct     79 F05DetectorConstruction::~F05DetectorConstruction()
 72 {                                                  80 {
 73   delete fField;                               <<  81   if (fField) delete fField;
 74 }                                                  82 }
 75                                                    83 
 76 //....oooOO0OOooo........oooOO0OOooo........oo     84 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 77                                                    85 
 78 void F05DetectorConstruction::DefineMaterials(     86 void F05DetectorConstruction::DefineMaterials()
 79 {                                                  87 {
 80   G4NistManager* nistMan = G4NistManager::Inst     88   G4NistManager* nistMan = G4NistManager::Instance();
 81                                                    89 
 82   fVacuum = nistMan->FindOrBuildMaterial("G4_G     90   fVacuum = nistMan->FindOrBuildMaterial("G4_Galactic");
 83                                                    91 
 84   G4cout << *(G4Material::GetMaterialTable())      92   G4cout << *(G4Material::GetMaterialTable()) << G4endl;
 85 }                                                  93 }
 86                                                    94 
 87 //....oooOO0OOooo........oooOO0OOooo........oo     95 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 88                                                    96 
 89 G4VPhysicalVolume* F05DetectorConstruction::Co     97 G4VPhysicalVolume* F05DetectorConstruction::Construct()
 90 {                                                  98 {
 91   //                                               99   //
 92   // World                                        100   // World
 93   //                                              101   //
 94                                                   102 
 95   G4double worldSizeXY = 20.0 * m;             << 103   fWorldSizeXY = 20.0*m;
 96   G4double worldSizeZ = 1.0 * mm;              << 104   fWorldSizeZ  =  1.0*mm;
 97                                                << 
 98   auto solidWorld = new G4Box("World",  // its << 
 99                               worldSizeXY / 2, << 
100                                                << 
101   auto logicWorld = new G4LogicalVolume(solidW << 
102                                         fVacuu << 
103                                         "World << 
104                                                << 
105   auto physiWorld = new G4PVPlacement(nullptr, << 
106                                       G4ThreeV << 
107                                       logicWor << 
108                                       "World", << 
109                                       nullptr, << 
110                                       false,   << 
111                                       0);  //  << 
112                                                   105 
                                                   >> 106   fSolidWorld = new G4Box("World",                               //its name
                                                   >> 107                    fWorldSizeXY/2,fWorldSizeXY/2,fWorldSizeZ/2); //its size
                                                   >> 108  
                                                   >> 109   fLogicWorld = new G4LogicalVolume(fSolidWorld,        //its solid
                                                   >> 110                                     fVacuum,            //its material
                                                   >> 111                                     "World");           //its name
                                                   >> 112  
                                                   >> 113   fPhysiWorld = new G4PVPlacement(0,                    //no rotation
                                                   >> 114                                   G4ThreeVector(),      //at (0,0,0)
                                                   >> 115                                   fLogicWorld,          //its logical volume
                                                   >> 116                                   "World",              //its name
                                                   >> 117                                   0,                    //its mother  volume
                                                   >> 118                                   false,                //no boolean operation
                                                   >> 119                                   0);                   //copy number
                                                   >> 120   
113   G4UserLimits* stepLimit;                        121   G4UserLimits* stepLimit;
114   stepLimit = new G4UserLimits(5 * mm);        << 122   stepLimit = new G4UserLimits(5*mm);
115                                                << 
116   logicWorld->SetUserLimits(stepLimit);        << 
117                                                   123 
                                                   >> 124   fLogicWorld->SetUserLimits(stepLimit);
                                                   >> 125  
118   //                                              126   //
119   // Visualization attributes                     127   // Visualization attributes
120   //                                              128   //
121   // fLogicWorld->SetVisAttributes (G4VisAttri    129   // fLogicWorld->SetVisAttributes (G4VisAttributes::GetInvisible());
122                                                   130 
123   //                                              131   //
124   // always return the physical World          << 132   //always return the physical World
125   //                                              133   //
126   return physiWorld;                           << 134   return fPhysiWorld;
127 }                                                 135 }
128                                                   136 
129 //....oooOO0OOooo........oooOO0OOooo........oo    137 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
130                                                   138 
131 G4ThreadLocal F05Field* F05DetectorConstructio << 139 G4ThreadLocal F05Field* F05DetectorConstruction::fField = 0;
132                                                   140 
133 void F05DetectorConstruction::ConstructSDandFi    141 void F05DetectorConstruction::ConstructSDandField()
134                                                   142 
135 {                                                 143 {
136   if (!fField) {                                  144   if (!fField) {
137     fField = new F05Field();                   << 
138                                                   145 
139     //     G4RepleteEofM* equation = new G4Rep << 146      fField = new F05Field();
140     auto equation = new G4EqEMFieldWithSpin(fF << 147 
141     //     equation->SetBField();              << 148 //     G4RepleteEofM* equation = new G4RepleteEofM(fField);
142     //     equation->SetEField();              << 149      G4EqEMFieldWithSpin* equation = new G4EqEMFieldWithSpin(fField);
143     //     equation->SetSpin();                << 150 //     equation->SetBField();
                                                   >> 151 //     equation->SetEField();
                                                   >> 152 //     equation->SetSpin();
144                                                   153 
145     G4FieldManager* fieldManager =             << 154      G4FieldManager* fieldManager
146       G4TransportationManager::GetTransportati << 155       = G4TransportationManager::GetTransportationManager()->GetFieldManager();
147     fieldManager->SetDetectorField(fField);    << 156      fieldManager->SetDetectorField(fField);
148                                                   157 
149     G4MagIntegratorStepper* stepper = new G4Cl << 158      G4MagIntegratorStepper* stepper = new G4ClassicalRK4(equation,12);
150                                                   159 
151     G4double minStep = 0.01 * mm;              << 160      G4double minStep           = 0.01*mm;
152                                                   161 
153     auto chordFinder = new G4ChordFinder((G4Ma << 162      G4ChordFinder* chordFinder =
                                                   >> 163                     new G4ChordFinder((G4MagneticField*)fField,minStep,stepper);
154                                                   164 
155     // Set accuracy parameters                 << 165      // Set accuracy parameters
156     G4double deltaChord = 3.0 * mm;            << 166      G4double deltaChord        = 3.0*mm;
157     chordFinder->SetDeltaChord(deltaChord);    << 167      chordFinder->SetDeltaChord( deltaChord );
158                                                   168 
159     // Maximum allowed integration error in on << 169      // Maximum allowed integration error in one integration sub-step
160     G4double deltaOneStep = 0.01 * mm;         << 170      G4double deltaOneStep      = 0.01*mm;
161     fieldManager->SetAccuraciesWithDeltaOneSte << 171      fieldManager->SetAccuraciesWithDeltaOneStep(deltaOneStep);
162                                                   172 
163     G4double deltaIntersection = 0.1 * mm;     << 173      G4double deltaIntersection = 0.1*mm;
164     fieldManager->SetDeltaIntersection(deltaIn << 174      fieldManager->SetDeltaIntersection(deltaIntersection);
165                                                   175 
166     G4TransportationManager* transportManager  << 176      G4TransportationManager* transportManager =
                                                   >> 177                            G4TransportationManager::GetTransportationManager();
167                                                   178 
168     G4PropagatorInField* fieldPropagator = tra << 179      G4PropagatorInField* fieldPropagator =
                                                   >> 180                                       transportManager->GetPropagatorInField();
169                                                   181 
170     // Limits for relative accuracy of integra << 182      // Limits for relative accuracy of integration
171     G4double epsMin = 2.5e-7;                  << 183      G4double epsMin            = 2.5e-7;
172     G4double epsMax = 0.001;                   << 184      G4double epsMax            = 0.001;
173                                                   185 
174     fieldPropagator->SetMinimumEpsilonStep(eps << 186      fieldPropagator->SetMinimumEpsilonStep(epsMin);
175     fieldPropagator->SetMaximumEpsilonStep(eps << 187      fieldPropagator->SetMaximumEpsilonStep(epsMax);
176                                                   188 
177     fieldManager->SetChordFinder(chordFinder); << 189      fieldManager->SetChordFinder(chordFinder);
178   }                                               190   }
179 }                                                 191 }
180                                                   192 
181 //....oooOO0OOooo........oooOO0OOooo........oo    193 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
182                                                   194