Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/runAndEvent/RE01/src/RE01CalorimeterROGeometry.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/RE01/src/RE01CalorimeterROGeometry.cc (Version 11.3.0) and /examples/extended/runAndEvent/RE01/src/RE01CalorimeterROGeometry.cc (Version 10.4.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 /// \file runAndEvent/RE01/src/RE01Calorimeter     26 /// \file runAndEvent/RE01/src/RE01CalorimeterROGeometry.cc
 27 /// \brief Implementation of the RE01Calorimet     27 /// \brief Implementation of the RE01CalorimeterROGeometry class
 28 //                                                 28 //
                                                   >>  29 // $Id: RE01CalorimeterROGeometry.cc 101677 2016-11-21 09:26:55Z gcosmo $
 29 //                                                 30 //
 30                                                    31 
 31 #include "RE01CalorimeterROGeometry.hh"            32 #include "RE01CalorimeterROGeometry.hh"
 32                                                << 
 33 #include "G4Box.hh"                            << 
 34 #include "G4LogicalVolume.hh"                      33 #include "G4LogicalVolume.hh"
 35 #include "G4Material.hh"                       <<  34 #include "G4VPhysicalVolume.hh"
 36 #include "G4NistManager.hh"                    << 
 37 #include "G4PVPlacement.hh"                        35 #include "G4PVPlacement.hh"
 38 #include "G4PVReplica.hh"                          36 #include "G4PVReplica.hh"
 39 #include "G4SDManager.hh"                          37 #include "G4SDManager.hh"
 40 #include "G4SystemOfUnits.hh"                  <<  38 #include "G4Box.hh"
 41 #include "G4ThreeVector.hh"                    << 
 42 #include "G4Tubs.hh"                               39 #include "G4Tubs.hh"
 43 #include "G4VPhysicalVolume.hh"                <<  40 #include "G4ThreeVector.hh"
                                                   >>  41 #include "G4NistManager.hh"
                                                   >>  42 #include "G4Material.hh"
                                                   >>  43 #include "G4SystemOfUnits.hh"     
 44                                                    44 
 45 //....oooOO0OOooo........oooOO0OOooo........oo     45 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 46 RE01CalorimeterROGeometry::RE01CalorimeterROGe <<  46 RE01CalorimeterROGeometry::
                                                   >>  47 RE01CalorimeterROGeometry(G4String& parallelWorldName)
 47   : G4VUserParallelWorld(parallelWorldName)        48   : G4VUserParallelWorld(parallelWorldName)
 48 {                                                  49 {
 49 #include "RE01DetectorParameterDef.icc"            50 #include "RE01DetectorParameterDef.icc"
 50 }                                                  51 }
 51                                                    52 
 52 //....oooOO0OOooo........oooOO0OOooo........oo     53 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 53 RE01CalorimeterROGeometry::~RE01CalorimeterROG     54 RE01CalorimeterROGeometry::~RE01CalorimeterROGeometry()
 54 {                                              <<  55 {;}
 55   ;                                            << 
 56 }                                              << 
 57                                                    56 
 58 //....oooOO0OOooo........oooOO0OOooo........oo     57 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 59 void RE01CalorimeterROGeometry::Construct()        58 void RE01CalorimeterROGeometry::Construct()
 60 {                                                  59 {
 61   // A dummy material is used to fill the volu     60   // A dummy material is used to fill the volumes of the readout geometry.
 62   // ( It will be allowed to set a NULL pointe     61   // ( It will be allowed to set a NULL pointer in volumes of such virtual
 63   // division in future, since this material i     62   // division in future, since this material is irrelevant for tracking.)
 64   G4Material* dummyMat = nullptr;              <<  63   G4Material* dummyMat  = nullptr;
 65                                                    64 
 66   // the ReadOut World:                        <<  65   //the ReadOut World:
 67   G4VPhysicalVolume* ROWorldPhys = GetWorld();     66   G4VPhysicalVolume* ROWorldPhys = GetWorld();
 68   G4LogicalVolume* ROWorldLog = ROWorldPhys->G <<  67   G4LogicalVolume *ROWorldLog = ROWorldPhys->GetLogicalVolume();
 69                                                    68 
 70   // Calorimeter volume:                           69   // Calorimeter volume:
 71   G4VSolid* caloROtub = new G4Tubs("caloROtub" <<  70   G4VSolid * caloROtub
 72                                    fCaloTubs_s <<  71     = new G4Tubs("caloROtub",fCaloTubs_rmin,fCaloTubs_rmax,
 73   G4LogicalVolume* caloROlog = new G4LogicalVo <<  72                  fCaloTubs_dz,fCaloTubs_sphi,fCaloTubs_dphi);
 74   //  G4VPhysicalVolume * caloROphys =         <<  73   G4LogicalVolume * caloROlog
 75   new G4PVPlacement(0, G4ThreeVector(), caloRO <<  74     = new G4LogicalVolume(caloROtub,dummyMat,"caloROlogical",0,0,0);
                                                   >>  75 //  G4VPhysicalVolume * caloROphys =
                                                   >>  76       new G4PVPlacement(0,G4ThreeVector(),caloROlog,"calROphysical",
                                                   >>  77                         ROWorldLog,false,0);
 76                                                    78 
 77   // -------------------------------               79   // -------------------------------
 78   // Calorimeter readout division:                 80   // Calorimeter readout division:
 79   // -------------------------------               81   // -------------------------------
 80   // Phi division first: 48 sectors                82   // Phi division first: 48 sectors
 81   G4VSolid* caloROphiDivisionTub = new G4Tubs( <<  83   G4VSolid * caloROphiDivisionTub
 82                                                <<  84     = new G4Tubs("caloROphiDivision", fCaloCell_rmin, fCaloCell_rmax,
 83   G4LogicalVolume* caloROphiDivisionLog =      <<  85                  fCaloCell_dz, fCaloCell_sphi, fCaloCell_dphi);
 84     new G4LogicalVolume(caloROphiDivisionTub,  <<  86   G4LogicalVolume * caloROphiDivisionLog
 85   //  G4VPhysicalVolume * caloROphiDivisionPhy <<  87     = new G4LogicalVolume(caloROphiDivisionTub, dummyMat, 
 86   new G4PVReplica("caloROphiDivisionPhysical", <<  88                           "caloROphiDivisionLogical",0,0,0);
 87                   fSegmentsinPhi, fCaloCell_dp <<  89 //  G4VPhysicalVolume * caloROphiDivisionPhys =
                                                   >>  90   new G4PVReplica("caloROphiDivisionPhysical", caloROphiDivisionLog, 
                                                   >>  91                       caloROlog, kPhi, fSegmentsinPhi, fCaloCell_dphi);
 88   // then z division: 20 slices:                   92   // then z division: 20 slices:
 89   G4VSolid* caloROcellTub = new G4Tubs("caloRO <<  93   G4VSolid * caloROcellTub
 90                                        fCaloRi <<  94     = new G4Tubs("caloROcellTub", fCaloRing_rmin, fCaloRing_rmax,
 91   G4LogicalVolume* caloROcellLog =             <<  95                  fCaloRing_dz, fCaloRing_sphi, fCaloRing_dphi);
 92     new G4LogicalVolume(caloROcellTub, dummyMa <<  96   G4LogicalVolume * caloROcellLog
 93   //  G4VPhysicalVolume * caloROcellPhys =     <<  97     = new G4LogicalVolume(caloROcellTub, dummyMat, "caloROcellLogical",0,0,0);
 94   new G4PVReplica("caloROcellPhysical", caloRO <<  98 //  G4VPhysicalVolume * caloROcellPhys =
 95                   2. * fCaloRing_dz);          <<  99   new G4PVReplica("caloROcellPhysical", caloROcellLog, caloROphiDivisionLog,
                                                   >> 100                       kZAxis, fSegmentsinZ,2.*fCaloRing_dz);
                                                   >> 101 
 96 }                                                 102 }
 97                                                   103 
 98 #include "RE01CalorimeterSD.hh"                   104 #include "RE01CalorimeterSD.hh"
 99                                                   105 
100 void RE01CalorimeterROGeometry::ConstructSD()     106 void RE01CalorimeterROGeometry::ConstructSD()
101 {                                                 107 {
102   //------------------------------------------    108   //------------------------------------------------------------------
103   // Sensitive Detector                           109   // Sensitive Detector
104   //------------------------------------------    110   //------------------------------------------------------------------
105   G4String calorimeterSDname = "/mydet/calorim    111   G4String calorimeterSDname = "/mydet/calorimeter";
106   RE01CalorimeterSD* calorimeterSD = new RE01C << 112   RE01CalorimeterSD * calorimeterSD = new RE01CalorimeterSD(calorimeterSDname);
107   G4SDManager::GetSDMpointer()->AddNewDetector    113   G4SDManager::GetSDMpointer()->AddNewDetector(calorimeterSD);
108   SetSensitiveDetector("caloROcellLogical", ca    114   SetSensitiveDetector("caloROcellLogical", calorimeterSD);
109 }                                                 115 }
                                                   >> 116 
110                                                   117