Changeset 1055 for trunk/source/processes/optical/include

Timestamp:

May 28, 2009, 4:26:57 PM (15 years ago)

Author:

garnier

Message:

maj sur la beta de geant 4.9.3

File:

• trunk/source/processes/optical/include/G4OpBoundaryProcess.hh (modified) (5 diffs)

trunk/source/processes/optical/include/G4OpBoundaryProcess.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpBoundaryProcess.hh,v 1.18 2008/11/07 17:59:37 gum Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4OpBoundaryProcess.hh,v 1.19 2009/03/23 21:18:20 gum Exp $
+// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
 //
 // 
@@ -54 +54 @@
 // mail:        gum@triumf.ca
 //
-// CVS version tag: 
 ////////////////////////////////////////////////////////////////////////
 
@@ -160 +159 @@
         // Returns the Reflectivity on a metalic surface
 
-        void           SetModel(G4OpticalSurfaceModel model);
+        void CalculateReflectivity(void);
+
+        void SetModel(G4OpticalSurfaceModel model);
         // Set the optical surface model to be followed
         // (glisur || unified).
@@ -195 +196 @@
 
         G4OpticalSurface* OpticalSurface;
+
+        G4MaterialPropertyVector* PropertyPointer;
+        G4MaterialPropertyVector* PropertyPointer1;
+        G4MaterialPropertyVector* PropertyPointer2;
 
         G4double Rindex1;
@@ -308 +313 @@
 
           theStatus = LobeReflection;
-          theFacetNormal = GetFacetNormal(OldMomentum,theGlobalNormal);
+          if ( PropertyPointer1 && PropertyPointer2 ){
+          } else {
+             theFacetNormal =
+                 GetFacetNormal(OldMomentum,theGlobalNormal);
+          }
           G4double PdotN = OldMomentum * theFacetNormal;
           NewMomentum = OldMomentum - (2.*PdotN)*theFacetNormal;