Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/field/field06/src/F06DetectorConstruction.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/field06/src/F06DetectorConstruction.cc (Version 11.3.0) and /examples/extended/field/field06/src/F06DetectorConstruction.cc (Version 10.1.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: F06DetectorConstruction.cc 75572 2013-11-04 11:46:08Z gcosmo $
 26 //                                                 27 //
 27 /// \file field/field06/src/F06DetectorConstru     28 /// \file field/field06/src/F06DetectorConstruction.cc
 28 /// \brief Implementation of the F06DetectorCo     29 /// \brief Implementation of the F06DetectorConstruction class
 29 //                                                 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 "F06DetectorConstruction.hh"              35 #include "F06DetectorConstruction.hh"
 35                                                    36 
 36 #include "G4Box.hh"                            << 
 37 #include "G4Colour.hh"                         << 
 38 #include "G4FieldManager.hh"                   << 
 39 #include "G4GeometryManager.hh"                << 
 40 #include "G4LogicalVolume.hh"                  << 
 41 #include "G4LogicalVolumeStore.hh"             << 
 42 #include "G4Material.hh"                           37 #include "G4Material.hh"
 43 #include "G4NistManager.hh"                        38 #include "G4NistManager.hh"
                                                   >>  39 
                                                   >>  40 #include "G4Box.hh"
                                                   >>  41 #include "G4LogicalVolume.hh"
 44 #include "G4PVPlacement.hh"                        42 #include "G4PVPlacement.hh"
                                                   >>  43 
                                                   >>  44 #include "G4GeometryManager.hh"
 45 #include "G4PhysicalVolumeStore.hh"                45 #include "G4PhysicalVolumeStore.hh"
 46 #include "G4RepleteEofM.hh"                    <<  46 #include "G4LogicalVolumeStore.hh"
 47 #include "G4SolidStore.hh"                         47 #include "G4SolidStore.hh"
                                                   >>  48 
                                                   >>  49 #include "G4VisAttributes.hh"
                                                   >>  50 #include "G4Colour.hh"
                                                   >>  51 
                                                   >>  52 #include "G4UserLimits.hh"
 48 #include "G4SystemOfUnits.hh"                      53 #include "G4SystemOfUnits.hh"
 49 #include "G4TransportationManager.hh"          <<  54 
 50 #include "G4UniformGravityField.hh"                55 #include "G4UniformGravityField.hh"
 51 #include "G4UserLimits.hh"                     << 
 52 #include "G4VisAttributes.hh"                  << 
 53 // #include "G4EqGravityField.hh"              << 
 54                                                    56 
 55 #include "G4ChordFinder.hh"                    <<  57 #include "G4FieldManager.hh"
                                                   >>  58 #include "G4TransportationManager.hh"
                                                   >>  59 
                                                   >>  60 #include "G4RepleteEofM.hh"
                                                   >>  61 //#include "G4EqGravityField.hh"
                                                   >>  62 
 56 #include "G4ClassicalRK4.hh"                       63 #include "G4ClassicalRK4.hh"
 57 #include "G4IntegrationDriver.hh"              << 
 58 #include "G4MagIntegratorStepper.hh"               64 #include "G4MagIntegratorStepper.hh"
                                                   >>  65 #include "G4ChordFinder.hh"
 59 #include "G4PropagatorInField.hh"                  66 #include "G4PropagatorInField.hh"
 60                                                    67 
 61 //....oooOO0OOooo........oooOO0OOooo........oo     68 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 62                                                    69 
 63 F06DetectorConstruction::F06DetectorConstructi <<  70 F06DetectorConstruction::F06DetectorConstruction()
                                                   >>  71  : fVacuum(0), 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 F06DetectorConstruction::~F06DetectorConstruct     79 F06DetectorConstruction::~F06DetectorConstruction()
 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 F06DetectorConstruction::DefineMaterials(     86 void F06DetectorConstruction::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* F06DetectorConstruction::Co     97 G4VPhysicalVolume* F06DetectorConstruction::Construct()
 90 {                                                  98 {
 91   //                                               99   //
 92   // World                                        100   // World
 93   //                                              101   //
 94                                                   102 
 95   G4double expHall_x = 1.0 * m;                << 103   G4double expHall_x = 1.0*m;
 96   G4double expHall_y = 1.0 * m;                << 104   G4double expHall_y = 1.0*m;
 97   G4double expHall_z = 1.0 * m;                << 105   G4double expHall_z = 1.0*m;
 98                                                << 106 
 99   auto solidWorld = new G4Box("World",  // its << 107   fSolidWorld = new G4Box("World",                 //its name
100                               expHall_x, expHa << 108                    expHall_x,expHall_y,expHall_z); //its size
101                                                << 109 
102   auto logicWorld = new G4LogicalVolume(solidW << 110   fLogicWorld = new G4LogicalVolume(fSolidWorld,   //its solid
103                                         fVacuu << 111                                     fVacuum,       //its material
104                                         "World << 112                                     "World");      //its name
105                                                << 113 
106   auto physiWorld = new G4PVPlacement(nullptr, << 114   fPhysiWorld = new G4PVPlacement(0,               //no rotation
107                                       G4ThreeV << 115                                   G4ThreeVector(), //at (0,0,0)
108                                       logicWor << 116                                   fLogicWorld,     //its logical volume
109                                       "World", << 117                                   "World",         //its name
110                                       nullptr, << 118                                   0,               //its mother  volume
111                                       false,   << 119                                   false,           //no boolean operation
112                                       0);  //  << 120                                   0);              //copy number
113                                                   121 
114   G4double maxStep = 1.0 * mm;                 << 122   G4double maxStep = 1.0*mm;
115   G4double maxTime = 41. * s;                  << 123   G4double maxTime = 41.*s;
116                                                   124 
117   auto stepLimit = new G4UserLimits(maxStep, D << 125   G4UserLimits* stepLimit = new G4UserLimits(maxStep,DBL_MAX,maxTime);
118                                                << 
119   logicWorld->SetUserLimits(stepLimit);        << 
120                                                   126 
                                                   >> 127   fLogicWorld->SetUserLimits(stepLimit);
                                                   >> 128  
121   //                                              129   //
122   // Visualization attributes                     130   // Visualization attributes
123   //                                              131   //
124   // logicWorld->SetVisAttributes (G4VisAttrib << 132   // fLogicWorld->SetVisAttributes (G4VisAttributes::Invisible);
125                                                   133 
126   //                                              134   //
127   // always return the physical World          << 135   //always return the physical World
128   //                                              136   //
129   return physiWorld;                           << 137   return fPhysiWorld;
130 }                                                 138 }
131                                                   139 
132 //....oooOO0OOooo........oooOO0OOooo........oo    140 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
133                                                   141 
134 G4ThreadLocal G4UniformGravityField* F06Detect << 142 G4ThreadLocal G4UniformGravityField* F06DetectorConstruction::fField = 0;
135                                                   143 
136 void F06DetectorConstruction::ConstructSDandFi    144 void F06DetectorConstruction::ConstructSDandField()
137 {                                                 145 {
138   using StepperType = G4ClassicalRK4;          << 
139                                                << 
140   if (!fField) {                                  146   if (!fField) {
141     fField = new G4UniformGravityField();      << 
142                                                   147 
143     auto equation = new G4RepleteEofM(fField); << 148      fField = new G4UniformGravityField();
144     //     G4EqGravityField* equation = new G4 << 149 
                                                   >> 150      G4RepleteEofM* equation = new G4RepleteEofM(fField);
                                                   >> 151 //     G4EqGravityField* equation = new G4EqGravityField(fField);
                                                   >> 152 
                                                   >> 153      G4FieldManager* fieldManager
                                                   >> 154       = G4TransportationManager::GetTransportationManager()->GetFieldManager();
                                                   >> 155      fieldManager->SetDetectorField(fField);
                                                   >> 156 
                                                   >> 157 //     G4MagIntegratorStepper* stepper = new G4ClassicalRK4(equation,12);
                                                   >> 158      G4MagIntegratorStepper* stepper = new G4ClassicalRK4(equation,8);
                                                   >> 159 
                                                   >> 160      G4double minStep           = 0.01*mm;
                                                   >> 161 
                                                   >> 162      G4ChordFinder* chordFinder = 
                                                   >> 163                    new G4ChordFinder((G4MagneticField*)fField,minStep,stepper);
                                                   >> 164 
                                                   >> 165      // Set accuracy parameters
                                                   >> 166      G4double deltaChord        = 3.0*mm;
                                                   >> 167      chordFinder->SetDeltaChord( deltaChord );
                                                   >> 168 
                                                   >> 169      G4double deltaOneStep      = 0.01*mm;
                                                   >> 170      fieldManager->SetAccuraciesWithDeltaOneStep(deltaOneStep);
                                                   >> 171 
                                                   >> 172      G4double deltaIntersection = 0.1*mm;
                                                   >> 173      fieldManager->SetDeltaIntersection(deltaIntersection);
                                                   >> 174 
                                                   >> 175      G4TransportationManager* transportManager =
                                                   >> 176                            G4TransportationManager::GetTransportationManager();
                                                   >> 177 
                                                   >> 178      G4PropagatorInField* fieldPropagator =
                                                   >> 179                                       transportManager->GetPropagatorInField();
145                                                   180 
146     G4TransportationManager* transportMgr = G4 << 181      G4double epsMin            = 2.5e-7*mm;
                                                   >> 182      G4double epsMax            = 0.05*mm;
147                                                   183 
148     G4FieldManager* fieldManager = transportMg << 184      fieldPropagator->SetMinimumEpsilonStep(epsMin);
149     fieldManager->SetDetectorField(fField);    << 185      fieldPropagator->SetMaximumEpsilonStep(epsMax);
150                                                << 
151     const int nVar = 8;  // 12 for RepleteEofM << 
152     auto stepper = new StepperType(equation, n << 
153                                                << 
154     G4double minStep = 0.01 * mm;              << 
155     G4ChordFinder* chordFinder = nullptr;      << 
156     if (stepper) {                             << 
157       auto intgrDriver =                       << 
158         new G4IntegrationDriver<StepperType>(m << 
159       if (intgrDriver) {                       << 
160         chordFinder = new G4ChordFinder(intgrD << 
161       }                                        << 
162     }                                          << 
163                                                << 
164     // OLD -- and wrong                        << 
165     // new G4ChordFinder((G4MagneticField*)fFi << 
166                                                << 
167     // Set accuracy parameters                 << 
168     G4double deltaChord = 3.0 * mm;            << 
169     chordFinder->SetDeltaChord(deltaChord);    << 
170                                                << 
171     G4double deltaIntersection = 0.1 * mm;     << 
172     fieldManager->SetDeltaIntersection(deltaIn << 
173                                                << 
174     //  Control accuracy of integration        << 
175     //                                         << 
176     G4double deltaOneStep = 0.01 * mm;         << 
177     fieldManager->SetAccuraciesWithDeltaOneSte << 
178     //                                         << 
179     G4double epsMax = 1.0e-4;  // Pure number  << 
180     G4double epsMin = 2.5e-7;  //              << 
181     fieldManager->SetMinimumEpsilonStep(epsMin << 
182     fieldManager->SetMaximumEpsilonStep(epsMax << 
183     // The acceptable relative accuracy is cal << 
184     //    but bounded to the interval between  << 
185                                                   186 
186     fieldManager->SetChordFinder(chordFinder); << 187      fieldManager->SetChordFinder(chordFinder);
187   }                                               188   }
188 }                                                 189 }
189                                                   190 
190 //....oooOO0OOooo........oooOO0OOooo........oo    191 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
191                                                   192