Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/geometry/solids/CSG/include/G4Torus.icc

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 /geometry/solids/CSG/include/G4Torus.icc (Version 11.3.0) and /geometry/solids/CSG/include/G4Torus.icc (Version 9.6)


  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 //
                                                   >>  27 // $Id$
                                                   >>  28 //
                                                   >>  29 // --------------------------------------------------------------------
                                                   >>  30 // GEANT 4 inline definitions file
                                                   >>  31 //
                                                   >>  32 // G4Torus.icc
                                                   >>  33 //
 26 // Implementation of inline methods of G4Torus     34 // Implementation of inline methods of G4Torus
 27 // -------------------------------------------     35 // --------------------------------------------------------------------
 28                                                    36 
 29 inline                                             37 inline
 30 G4double G4Torus::GetRmin() const                  38 G4double G4Torus::GetRmin() const
 31 {                                                  39 {
 32   return fRmin ;                                   40   return fRmin ;
 33 }                                                  41 }
 34                                                    42 
 35 inline                                             43 inline
 36 G4double G4Torus::GetRmax() const                  44 G4double G4Torus::GetRmax() const
 37 {                                                  45 {
 38   return fRmax ;                                   46   return fRmax ;
 39 }                                                  47 }
 40                                                    48 
 41 inline                                             49 inline
 42 G4double G4Torus::GetRtor() const                  50 G4double G4Torus::GetRtor() const
 43 {                                                  51 {
 44   return fRtor ;                                   52   return fRtor ;
 45 }                                                  53 }
 46                                                    54 
 47 inline                                             55 inline
 48 G4double G4Torus::GetSPhi() const                  56 G4double G4Torus::GetSPhi() const
 49 {                                                  57 {
 50   return fSPhi ;                                   58   return fSPhi ;
 51 }                                                  59 }
 52                                                    60 
 53 inline                                             61 inline
 54 G4double G4Torus::GetDPhi() const                  62 G4double G4Torus::GetDPhi() const
 55 {                                                  63 {
 56   return fDPhi ;                                   64   return fDPhi ;
 57 }                                              << 
 58                                                << 
 59 inline                                         << 
 60 G4double G4Torus::GetSinStartPhi () const      << 
 61 {                                              << 
 62   return std::sin(fSPhi);                      << 
 63 }                                              << 
 64                                                << 
 65 inline                                         << 
 66 G4double G4Torus::GetCosStartPhi () const      << 
 67 {                                              << 
 68   return std::cos(fSPhi);                      << 
 69 }                                              << 
 70                                                << 
 71 inline                                         << 
 72 G4double G4Torus::GetSinEndPhi () const        << 
 73 {                                              << 
 74   return std::sin(fSPhi+fDPhi);                << 
 75 }                                              << 
 76                                                << 
 77 inline                                         << 
 78 G4double G4Torus::GetCosEndPhi () const        << 
 79 {                                              << 
 80   return std::cos(fSPhi+fDPhi);                << 
 81 }                                                  65 }
 82                                                    66 
 83 inline                                             67 inline
 84 G4double G4Torus::GetCubicVolume()                 68 G4double G4Torus::GetCubicVolume()
 85 {                                                  69 {
 86   if(fCubicVolume != 0.) {;}                       70   if(fCubicVolume != 0.) {;}
 87   else  { fCubicVolume = fDPhi*CLHEP::pi*fRtor     71   else  { fCubicVolume = fDPhi*CLHEP::pi*fRtor*(fRmax*fRmax-fRmin*fRmin); }
 88   return fCubicVolume;                             72   return fCubicVolume;
 89 }                                                  73 }
 90                                                    74 
 91 inline                                             75 inline
 92 G4double G4Torus::GetSurfaceArea()                 76 G4double G4Torus::GetSurfaceArea()
 93 {                                                  77 {
 94   if(fSurfaceArea != 0.) {;}                       78   if(fSurfaceArea != 0.) {;}
 95   else                                             79   else
 96   {                                                80   { 
 97     fSurfaceArea = fDPhi*CLHEP::twopi*fRtor*(f     81     fSurfaceArea = fDPhi*CLHEP::twopi*fRtor*(fRmax+fRmin);
 98     if(fDPhi < CLHEP::twopi)                       82     if(fDPhi < CLHEP::twopi)
 99     {                                              83     {
100       fSurfaceArea = fSurfaceArea + CLHEP::two     84       fSurfaceArea = fSurfaceArea + CLHEP::twopi*(fRmax*fRmax-fRmin*fRmin);
101     }                                              85     } 
102   }                                                86   }
103   return fSurfaceArea;                             87   return fSurfaceArea;
104 }                                                  88 }
105                                                    89