Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/medical/dna/clustering/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/medical/dna/clustering/src/DetectorConstruction.cc (Version 11.3.0) and /examples/extended/medical/dna/clustering/src/DetectorConstruction.cc (Version 10.6.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 // This example is provided by the Geant4-DNA      26 // This example is provided by the Geant4-DNA collaboration
 27 // Any report or published results obtained us     27 // Any report or published results obtained using the Geant4-DNA software
 28 // shall cite the following Geant4-DNA collabo     28 // shall cite the following Geant4-DNA collaboration publication:
 29 // Med. Phys. 37 (2010) 4692-4708                  29 // Med. Phys. 37 (2010) 4692-4708
 30 // The Geant4-DNA web site is available at htt     30 // The Geant4-DNA web site is available at http://geant4-dna.org
 31 //                                                 31 //
 32 //                                                 32 //
 33 /// \file DetectorConstruction.cc                  33 /// \file DetectorConstruction.cc
 34 /// \brief Implementation of the DetectorConst     34 /// \brief Implementation of the DetectorConstruction class
 35                                                    35 
 36 #include "DetectorConstruction.hh"                 36 #include "DetectorConstruction.hh"
 37                                                    37 
 38 #include "G4Box.hh"                                38 #include "G4Box.hh"
 39 #include "G4NistManager.hh"                        39 #include "G4NistManager.hh"
 40 #include "G4PVPlacement.hh"                        40 #include "G4PVPlacement.hh"
 41 #include "G4RunManager.hh"                         41 #include "G4RunManager.hh"
 42 #include "G4SystemOfUnits.hh"                      42 #include "G4SystemOfUnits.hh"
 43 #include "G4VPhysicalVolume.hh"                << 
 44 #include "G4VisAttributes.hh"                      43 #include "G4VisAttributes.hh"
                                                   >>  44 #include "G4VPhysicalVolume.hh"
 45                                                    45 
 46 //....oooOO0OOooo........oooOO0OOooo........oo     46 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 47                                                    47 
 48 DetectorConstruction::DetectorConstruction() : <<  48 DetectorConstruction::DetectorConstruction():
                                                   >>  49 fpDefaultMaterial(0),fpWaterMaterial(0)
                                                   >>  50 {
                                                   >>  51 }
 49                                                    52 
 50 //....oooOO0OOooo........oooOO0OOooo........oo     53 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 51                                                    54 
 52 DetectorConstruction::~DetectorConstruction()  <<  55 DetectorConstruction::~DetectorConstruction()
                                                   >>  56 {
                                                   >>  57 }
 53                                                    58 
 54 //....oooOO0OOooo........oooOO0OOooo........oo     59 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 55                                                    60 
 56 G4VPhysicalVolume* DetectorConstruction::Const     61 G4VPhysicalVolume* DetectorConstruction::Construct()
 57 {                                                  62 {
 58   DefineMaterials();                               63   DefineMaterials();
 59   return ConstructVolumes();                       64   return ConstructVolumes();
 60 }                                                  65 }
 61                                                    66 
 62 //....oooOO0OOooo........oooOO0OOooo........oo     67 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 63                                                    68 
 64 void DetectorConstruction::DefineMaterials()       69 void DetectorConstruction::DefineMaterials()
 65 {                                              <<  70 { 
 66   G4NistManager* nistManager = G4NistManager::     71   G4NistManager* nistManager = G4NistManager::Instance();
 67                                                    72 
 68   nistManager->FindOrBuildMaterial("G4_WATER",     73   nistManager->FindOrBuildMaterial("G4_WATER", false);
 69   fpWaterMaterial = G4Material::GetMaterial("G     74   fpWaterMaterial = G4Material::GetMaterial("G4_WATER");
 70                                                    75 
 71   nistManager->FindOrBuildMaterial("G4_AIR", f     76   nistManager->FindOrBuildMaterial("G4_AIR", false);
 72   fpDefaultMaterial = G4Material::GetMaterial(     77   fpDefaultMaterial = G4Material::GetMaterial("G4_AIR");
 73 }                                                  78 }
 74                                                    79 
 75 //....oooOO0OOooo........oooOO0OOooo........oo     80 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 76                                                    81 
 77 G4VPhysicalVolume* DetectorConstruction::Const     82 G4VPhysicalVolume* DetectorConstruction::ConstructVolumes()
 78 {                                                  83 {
 79   // World                                         84   // World
 80   G4double worldSize = 2 * micrometer;         <<  85   G4double worldSize  = 2*micrometer;
 81                                                    86 
 82   G4Box* solidWorld = new G4Box("World", world <<  87   G4Box* solidWorld = new G4Box("World",
 83   G4LogicalVolume* logicWorld = new G4LogicalV <<  88                                 worldSize/2.,
 84   G4VPhysicalVolume* physiWorld =              <<  89                                 worldSize/2.,
 85     new G4PVPlacement(0, G4ThreeVector(), "Wor <<  90                                 worldSize/2.);
                                                   >>  91   G4LogicalVolume* logicWorld = new G4LogicalVolume(solidWorld,
                                                   >>  92                                                     fpDefaultMaterial,
                                                   >>  93                                                     "World");
                                                   >>  94   G4VPhysicalVolume* physiWorld = new G4PVPlacement(0,
                                                   >>  95                                                     G4ThreeVector(),
                                                   >>  96                                                     "World",
                                                   >>  97                                                     logicWorld,
                                                   >>  98                                                     0,
                                                   >>  99                                                     false,
                                                   >> 100                                                     0);
 86   // Target Box                                   101   // Target Box
 87   // from Francis et al. Comput. Meth. Program    102   // from Francis et al. Comput. Meth. Programs. Biomed. 2011 101(3)
 88   G4double targetSizeXY = 1 * micrometer;      << 103   G4double targetSizeXY=1*micrometer;
 89   G4double targetSizeZ = 0.5 * micrometer;     << 104   G4double targetSizeZ=0.5*micrometer;
 90                                                   105 
 91   G4Box* solidTarget = new G4Box("Target", tar << 106   G4Box* solidTarget
 92   G4LogicalVolume* logicTarget = new G4Logical << 107   = new G4Box("Target", targetSizeXY/2.,targetSizeXY/2.,targetSizeZ/2.);
 93   new G4PVPlacement(0, G4ThreeVector(), "Targe << 108   G4LogicalVolume* logicTarget
                                                   >> 109   = new G4LogicalVolume(solidTarget, fpWaterMaterial, "Target");
                                                   >> 110   new G4PVPlacement(0,
                                                   >> 111                     G4ThreeVector(),
                                                   >> 112                     "Target",
                                                   >> 113                     logicTarget,
                                                   >> 114                     physiWorld,
                                                   >> 115                     false,
                                                   >> 116                     0);
 94                                                   117 
 95   // Visualization attributes                     118   // Visualization attributes
 96   G4VisAttributes* worldVisAtt = new G4VisAttr << 119   G4VisAttributes* worldVisAtt= new G4VisAttributes(G4Colour(1.0,1.0,1.0));
 97   worldVisAtt->SetVisibility(true);               120   worldVisAtt->SetVisibility(true);
 98   logicWorld->SetVisAttributes(worldVisAtt);      121   logicWorld->SetVisAttributes(worldVisAtt);
 99                                                   122 
100   G4VisAttributes* targetVisAtt = new G4VisAtt << 123   G4VisAttributes* targetVisAtt = new G4VisAttributes(G4Colour(0.0,1.0,0.0));
101   targetVisAtt->SetVisibility(true);              124   targetVisAtt->SetVisibility(true);
102   targetVisAtt->SetForceAuxEdgeVisible(true);     125   targetVisAtt->SetForceAuxEdgeVisible(true);
103   logicTarget->SetVisAttributes(targetVisAtt);    126   logicTarget->SetVisAttributes(targetVisAtt);
104                                                   127 
105   // always return the world volume            << 128   //always return the world volume
106   return physiWorld;                              129   return physiWorld;
107 }                                                 130 }
                                                   >> 131 
108                                                   132