Import Geant4 10.1.0 source tree

source/processes/optical/include/G4OpBoundaryProcess.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpBoundaryProcess.hh 73616 2013-09-02 10:18:24Z gcosmo $
+// $Id: G4OpBoundaryProcess.hh 84717 2014-10-20 07:39:47Z gcosmo $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
@@ -96,8 +96,8 @@
 /////////////////////
 
 enum G4OpBoundaryProcessStatus {  Undefined,
-                                  FresnelRefraction, FresnelReflection,
-                                  TotalInternalReflection,
+                                  Transmission, FresnelRefraction,
+                                  FresnelReflection, TotalInternalReflection,
                                   LambertianReflection, LobeReflection,
                                   SpikeReflection, BackScattering,
                                   Absorption, Detection, NotAtBoundary,
@@ -244,6 +244,9 @@ private:
 	G4double theReflectivity;
 	G4double theEfficiency;
         G4double theTransmittance;
+
+        G4double theSurfaceRoughness;
+
 	G4double prob_sl, prob_ss, prob_bs;
 
         G4int iTE, iTM;

source/processes/optical/include/G4OpRayleigh.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpRayleigh.hh 71487 2013-06-17 08:19:40Z gcosmo $
+// $Id: G4OpRayleigh.hh 84596 2014-10-17 07:34:41Z gcosmo $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
@@ -36,7 +36,8 @@
 // Version:     1.0
 // Created:     1996-05-31
 // Author:      Juliet Armstrong
-// Updated:     2005-07-28 add G4ProcessType to constructor
+// Updated:     2014-08-20 allow for more material types
+//              2005-07-28 add G4ProcessType to constructor
 //              1999-10-29 add method and class descriptors
 //              1997-04-09 by Peter Gumplinger
 //              > new physics/tracking scheme
@@ -106,7 +107,7 @@ public:
         // Returns true -> 'is applicable' only for an optical photon.
 
         void BuildPhysicsTable(const G4ParticleDefinition& aParticleType);
-        // Build table at a right time
+        // Build thePhysicsTable at a right time
 
         G4double GetMeanFreePath(const G4Track& aTrack,
 				 G4double ,
@@ -126,14 +127,17 @@ public:
 
 private:
 
-        void BuildThePhysicsTable();
-
         /////////////////////
         // Helper Functions
         /////////////////////
 
-	G4PhysicsOrderedFreeVector* RayleighAttenuationLengthGenerator(
-					G4MaterialPropertiesTable *aMPT);
+        /// Calculates the mean free paths for a material as a function of 
+        /// photon energy
+        ///
+        /// @param[in] material information
+        /// @return the mean free path vector
+        G4PhysicsOrderedFreeVector* 
+        CalculateRayleighMeanFreePaths( const G4Material* material ) const;
 
         ///////////////////////
         // Class Data Members
@@ -147,9 +151,6 @@ protected:
         //  purposes).
 
 private:
-
-        G4bool DefaultWater;
-
 };
 
 ////////////////////

source/processes/optical/include/G4OpWLS.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpWLS.hh 71487 2013-06-17 08:19:40Z gcosmo $
+// $Id: G4OpWLS.hh 85354 2014-10-28 09:58:12Z gcosmo $
 //
 ////////////////////////////////////////////////////////////////////////
 // Optical Photon WaveLength Shifting (WLS) Class Definition
@@ -110,7 +110,7 @@ public:
         // Returns true -> 'is applicable' only for an optical photon.
 
         void BuildPhysicsTable(const G4ParticleDefinition& aParticleType);
-        // Build table at a right time
+        // Build the WLS integral table at the right time
 
         G4double GetMeanFreePath(const G4Track& aTrack,
                                  G4double ,
@@ -132,11 +132,6 @@ public:
         void UseTimeProfile(const G4String name);
         // Selects the time profile generator
 
-private:
-
-        void BuildThePhysicsTable();
-        // Is the WLS integral table;
-
 protected:
 
         G4VWLSTimeGeneratorProfile* WLSTimeGeneratorProfile;