Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/persistency/P03/src/ExTGDetectorConstructionWithCpp.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/persistency/P03/src/ExTGDetectorConstructionWithCpp.cc (Version 11.3.0) and /examples/extended/persistency/P03/src/ExTGDetectorConstructionWithCpp.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 //                                                 26 //
 27 /// \file persistency/P03/src/ExTGDetectorCons     27 /// \file persistency/P03/src/ExTGDetectorConstructionWithCpp.cc
 28 /// \brief Implementation of the ExTGDetectorC     28 /// \brief Implementation of the ExTGDetectorConstructionWithCpp class
 29                                                    29 
                                                   >>  30 #include "G4tgbVolumeMgr.hh"
 30 #include "ExTGDetectorConstructionWithCpp.hh"      31 #include "ExTGDetectorConstructionWithCpp.hh"
 31                                                <<  32 #include "G4tgrMessenger.hh"
 32 #include "G4Box.hh"                                33 #include "G4Box.hh"
 33 #include "G4LogicalVolume.hh"                      34 #include "G4LogicalVolume.hh"
 34 #include "G4NistManager.hh"                    << 
 35 #include "G4PVPlacement.hh"                        35 #include "G4PVPlacement.hh"
 36 #include "G4tgbVolumeMgr.hh"                   <<  36 #include "G4NistManager.hh"
 37 #include "G4tgrMessenger.hh"                   << 
 38                                                    37 
 39 //....oooOO0OOooo........oooOO0OOooo........oo     38 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 40 ExTGDetectorConstructionWithCpp::ExTGDetectorC     39 ExTGDetectorConstructionWithCpp::ExTGDetectorConstructionWithCpp()
 41 {                                                  40 {
 42   fMessenger = new G4tgrMessenger;                 41   fMessenger = new G4tgrMessenger;
 43 }                                                  42 }
 44                                                    43 
 45 //....oooOO0OOooo........oooOO0OOooo........oo     44 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 46 ExTGDetectorConstructionWithCpp::~ExTGDetector     45 ExTGDetectorConstructionWithCpp::~ExTGDetectorConstructionWithCpp()
 47 {                                                  46 {
 48   delete fMessenger;                               47   delete fMessenger;
 49 }                                                  48 }
 50                                                    49 
 51 //....oooOO0OOooo........oooOO0OOooo........oo     50 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 52 G4VPhysicalVolume* ExTGDetectorConstructionWit     51 G4VPhysicalVolume* ExTGDetectorConstructionWithCpp::Construct()
 53 {                                                  52 {
 54   //------------------------------------------ <<  53   //------------------------------------------------ 
 55   // Define one or several text files containi     54   // Define one or several text files containing the geometry description
 56   //------------------------------------------ <<  55   //------------------------------------------------ 
 57   G4String filename = "g4geom_simple.txt";         56   G4String filename = "g4geom_simple.txt";
 58   G4tgbVolumeMgr* volmgr = G4tgbVolumeMgr::Get     57   G4tgbVolumeMgr* volmgr = G4tgbVolumeMgr::GetInstance();
 59   volmgr->AddTextFile(filename);                   58   volmgr->AddTextFile(filename);
 60                                                    59 
 61   //------------------------------------------ <<  60   //------------------------------------------------ 
 62   // Read the text files and construct the GEA     61   // Read the text files and construct the GEANT4 geometry
 63   //------------------------------------------ <<  62   //------------------------------------------------ 
 64   G4VPhysicalVolume* physiWorld = volmgr->Read     63   G4VPhysicalVolume* physiWorld = volmgr->ReadAndConstructDetector();
 65                                                    64 
 66   //------------------------------------------ <<  65   //------------------------------------------------ 
 67   // Build another volume and place it in the      66   // Build another volume and place it in the text geometry
 68   //------------------------------------------ <<  67   //------------------------------------------------ 
 69   G4Box* solid = new G4Box("mybox", 2., 2., 3. <<  68   G4Box* solid = new G4Box("mybox",2.,2.,3.);
 70                                                <<  69   
 71   G4Material* water = G4NistManager::Instance(     70   G4Material* water = G4NistManager::Instance()->FindOrBuildMaterial("G4_Fe");
 72                                                    71 
 73   G4LogicalVolume* logicVol = new G4LogicalVol <<  72   G4LogicalVolume* logicVol = new G4LogicalVolume(solid,water,"mybox",0,0,0);
 74                                                    73 
 75   //----- Place the volume in the world of the     74   //----- Place the volume in the world of the text geometry
 76   G4LogicalVolume* textWorldVol = physiWorld->     75   G4LogicalVolume* textWorldVol = physiWorld->GetLogicalVolume();
 77                                                    76 
 78   // NOTE: if you want to place your full text     77   // NOTE: if you want to place your full text geometry in the C++ geometry,
 79   //       you should use this G4LogicalVolume     78   //       you should use this G4LogicalVolume and place it in a C++ logical
 80   //       volume                                  79   //       volume
 81   new G4PVPlacement(0,  // no rotation         <<  80   new G4PVPlacement(0,               // no rotation
 82                     G4ThreeVector(0., -20., 0) <<  81                     G4ThreeVector(0.,-20.,0),  // at (x,y,z)
 83                     logicVol,  // its logical  <<  82                     logicVol,        // its logical volume    
 84                     "myBox1",  // its name     <<  83                     "myBox1",        // its name
 85                     textWorldVol,  // its moth <<  84                     textWorldVol,    // its mother  volume
 86                     false,  // no boolean oper <<  85                     false,           // no boolean operations
 87                     0);  // copy number        <<  86                     0);              // copy number 
 88                                                <<  87   
 89   //----- Place the volume inside a volume of      88   //----- Place the volume inside a volume of the text geometry
 90   G4LogicalVolume* textSphereVol = G4tgbVolume <<  89   G4LogicalVolume* textSphereVol =
 91   new G4PVPlacement(0,  // no rotation         <<  90     G4tgbVolumeMgr::GetInstance()->FindG4LogVol("sphere",1);
 92                     G4ThreeVector(0., 0., 0),  <<  91     new G4PVPlacement(0,             // no rotation
 93                     logicVol,  // its logical  <<  92                     G4ThreeVector(0.,0.,0),  // at (x,y,z)
 94                     "myBox2",  // its name     <<  93                     logicVol,        // its logical volume    
 95                     textSphereVol,  // its mot <<  94                     "myBox2",        // its name
 96                     false,  // no boolean oper <<  95                     textSphereVol,   // its mother  volume
 97                     1);  // copy number        <<  96                     false,           // no boolean operations
 98                                                <<  97                     1);              // copy number 
                                                   >>  98   
 99   return physiWorld;                               99   return physiWorld;
100 }                                                 100 }
101                                                   101