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