Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/runAndEvent/RE03/src/RE03DetectorConstruction.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/runAndEvent/RE03/src/RE03DetectorConstruction.cc (Version 11.3.0) and /examples/extended/runAndEvent/RE03/src/RE03DetectorConstruction.cc (Version 10.4.p3)


  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 runAndEvent/RE03/src/RE03DetectorCon     26 /// \file runAndEvent/RE03/src/RE03DetectorConstruction.cc
 27 /// \brief Implementation of the RE03DetectorC     27 /// \brief Implementation of the RE03DetectorConstruction class
 28 //                                                 28 //
                                                   >>  29 // $Id$
 29 //                                                 30 //
 30                                                    31 
 31 #include "RE03DetectorConstruction.hh"             32 #include "RE03DetectorConstruction.hh"
 32                                                    33 
                                                   >>  34 #include "G4NistManager.hh"
                                                   >>  35 #include "G4Material.hh"
 33 #include "G4Box.hh"                                36 #include "G4Box.hh"
 34 #include "G4Colour.hh"                         << 
 35 #include "G4LogicalVolume.hh"                      37 #include "G4LogicalVolume.hh"
 36 #include "G4Material.hh"                       <<  38 #include "G4PVPlacement.hh"
                                                   >>  39 
                                                   >>  40 #include "G4VisAttributes.hh"
                                                   >>  41 #include "G4Colour.hh"
                                                   >>  42 
                                                   >>  43 #include "G4SDManager.hh"
 37 #include "G4MultiFunctionalDetector.hh"            44 #include "G4MultiFunctionalDetector.hh"
 38 #include "G4NistManager.hh"                    <<  45 #include "G4VPrimitiveScorer.hh"
 39 #include "G4PSEnergyDeposit.hh"                    46 #include "G4PSEnergyDeposit.hh"
 40 #include "G4PSNofStep.hh"                      << 
 41 #include "G4PSTrackLength.hh"                      47 #include "G4PSTrackLength.hh"
 42 #include "G4PVPlacement.hh"                    <<  48 #include "G4PSNofStep.hh"
 43 #include "G4SDManager.hh"                      << 
 44 #include "G4SDParticleFilter.hh"                   49 #include "G4SDParticleFilter.hh"
 45 #include "G4SystemOfUnits.hh"                  <<  50 
 46 #include "G4VPrimitiveScorer.hh"               <<  51 #include "G4SystemOfUnits.hh"    
 47 #include "G4VisAttributes.hh"                  << 
 48 #include "G4ios.hh"                                52 #include "G4ios.hh"
 49                                                    53 
 50 //....oooOO0OOooo........oooOO0OOooo........oo     54 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 51 RE03DetectorConstruction::RE03DetectorConstruc     55 RE03DetectorConstruction::RE03DetectorConstruction()
 52   : G4VUserDetectorConstruction(),             <<  56   :G4VUserDetectorConstruction(),
 53     fAir(0),                                   <<  57    fAir(0),fWater(0),fWorldPhys(0),fPhantomPhys(0),
 54     fWater(0),                                 <<  58    fConstructed(false)
 55     fWorldPhys(0),                             <<  59 {;}
 56     fPhantomPhys(0),                           << 
 57     fConstructed(false)                        << 
 58 {                                              << 
 59   ;                                            << 
 60 }                                              << 
 61                                                    60 
 62 //....oooOO0OOooo........oooOO0OOooo........oo     61 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 63 RE03DetectorConstruction::~RE03DetectorConstru     62 RE03DetectorConstruction::~RE03DetectorConstruction()
 64 {                                              <<  63 {;}
 65   ;                                            << 
 66 }                                              << 
 67                                                    64 
 68 //....oooOO0OOooo........oooOO0OOooo........oo     65 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 69 G4VPhysicalVolume* RE03DetectorConstruction::C     66 G4VPhysicalVolume* RE03DetectorConstruction::Construct()
 70 {                                                  67 {
 71   if (!fConstructed) {                         <<  68   if(!fConstructed)
                                                   >>  69   { 
 72     fConstructed = true;                           70     fConstructed = true;
 73     DefineMaterials();                             71     DefineMaterials();
 74     SetupGeometry();                               72     SetupGeometry();
 75   }                                                73   }
 76   return fWorldPhys;                               74   return fWorldPhys;
 77 }                                                  75 }
 78                                                    76 
 79 //....oooOO0OOooo........oooOO0OOooo........oo     77 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 80 void RE03DetectorConstruction::DefineMaterials     78 void RE03DetectorConstruction::DefineMaterials()
 81 {                                              <<  79 { 
 82   //-------- NIST Materials ------------------     80   //-------- NIST Materials -----------------------------------------------
 83   //  Material Information imported from NIST  <<  81   //  Material Information imported from NIST database. 
 84   G4NistManager* NISTman = G4NistManager::Inst     82   G4NistManager* NISTman = G4NistManager::Instance();
 85   fWater = NISTman->FindOrBuildMaterial("G4_WA     83   fWater = NISTman->FindOrBuildMaterial("G4_WATER");
 86   fAir = NISTman->FindOrBuildMaterial("G4_AIR" <<  84   fAir   = NISTman->FindOrBuildMaterial("G4_AIR");
 87 }                                                  85 }
 88                                                    86 
 89 //....oooOO0OOooo........oooOO0OOooo........oo     87 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 90 void RE03DetectorConstruction::SetupGeometry()     88 void RE03DetectorConstruction::SetupGeometry()
 91 {                                                  89 {
 92   //                                           <<  90   //     
 93   // World                                         91   // World
 94   //                                               92   //
 95   G4VSolid* worldSolid = new G4Box("World", 2. <<  93   G4VSolid* worldSolid = new G4Box("World",2.*m,2.*m,2.*m);
 96   G4LogicalVolume* worldLogical = new G4Logica <<  94   G4LogicalVolume* worldLogical = new G4LogicalVolume(worldSolid,fAir,"World");
 97   fWorldPhys = new G4PVPlacement(0, G4ThreeVec <<  95   fWorldPhys = new G4PVPlacement(0,G4ThreeVector(),worldLogical,"World",
 98                                                <<  96                         0,false,0);
 99   //                                           <<  97   
                                                   >>  98   //                               
100   // Phantom                                       99   // Phantom
101   //                                           << 100   //  
102   G4VSolid* phantomSolid = new G4Box("Calor",  << 101   G4VSolid* phantomSolid = new G4Box("Calor",1.*m,1.*m,1.*m);
103   G4LogicalVolume* phantomLogical = new G4Logi << 102   G4LogicalVolume* phantomLogical = new G4LogicalVolume(phantomSolid,fWater,"Phantom");
104   fPhantomPhys =                               << 103   fPhantomPhys = new G4PVPlacement(0,G4ThreeVector(),phantomLogical,"Phantom",
105     new G4PVPlacement(0, G4ThreeVector(), phan << 104                          worldLogical,false,0);
106   //                                           << 105   //                                        
107   // Visualization attributes                     106   // Visualization attributes
108   //                                              107   //
109   // worldLogical->SetVisAttributes(G4VisAttri    108   // worldLogical->SetVisAttributes(G4VisAttributes::GetInvisible());
110   G4VisAttributes* simpleBoxVisAtt = new G4Vis << 109   G4VisAttributes* simpleBoxVisAtt= new G4VisAttributes(G4Colour(1.0,1.0,1.0));
111   simpleBoxVisAtt->SetVisibility(true);           110   simpleBoxVisAtt->SetVisibility(true);
112   phantomLogical->SetVisAttributes(simpleBoxVi    111   phantomLogical->SetVisAttributes(simpleBoxVisAtt);
113 }                                                 112 }
114                                                   113 
115 void RE03DetectorConstruction::ConstructSDandF    114 void RE03DetectorConstruction::ConstructSDandField()
116 {                                              << 115 {;}
117   ;                                            << 116 
118 }                                              << 
119                                                   117