| 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 26
27 // ------------------------------------------- 27 // --------------------------------------------------------------------
28 // GEANT 4 inline definitions file 28 // GEANT 4 inline definitions file
29 // 29 //
30 // FastAerosolSolid.icc 30 // FastAerosolSolid.icc
31 // 31 //
32 // Implementation of inline methods of FastAer 32 // Implementation of inline methods of FastAerosolSolid
33 // 33 //
34 // Author: A.Knaian (ara@nklabs.com), N.MacFad 34 // Author: A.Knaian (ara@nklabs.com), N.MacFadden (natemacfadden@gmail.com)
35 // ------------------------------------------- 35 // --------------------------------------------------------------------
36 36
37 inline 37 inline
38 G4double FastAerosolSolid::GetCubicVolume() 38 G4double FastAerosolSolid::GetCubicVolume()
39 { 39 {
40 if(fCubicVolume != 0 ) {;} 40 if(fCubicVolume != 0 ) {;}
41 else 41 else
42 { 42 {
43 fCubicVolume = (fDroplet->GetCubicVolume() 43 fCubicVolume = (fDroplet->GetCubicVolume())*(fCloud->GetNumDroplets());
44 } 44 }
45 return(fCubicVolume); 45 return(fCubicVolume);
46 } 46 }
47 47
48 inline 48 inline
49 G4double FastAerosolSolid::GetSurfaceArea() 49 G4double FastAerosolSolid::GetSurfaceArea()
50 { 50 {
51 if(fSurfaceArea != 0.) {;} 51 if(fSurfaceArea != 0.) {;}
52 else 52 else
53 { 53 {
54 fSurfaceArea = (fDroplet->GetSurfaceArea() 54 fSurfaceArea = (fDroplet->GetSurfaceArea())*(fCloud->GetNumDroplets());
55 } 55 }
56 return(fSurfaceArea); 56 return(fSurfaceArea);
57 } 57 }
58 58
59 inline 59 inline
60 void FastAerosolSolid::SetStepLim(G4double new 60 void FastAerosolSolid::SetStepLim(G4double newLim)
61 { 61 {
62 fStepLim = newLim; 62 fStepLim = newLim;
63 } 63 }
64 64