Changeset 1315 for trunk/source/processes/optical/src

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

File:

• trunk/source/processes/optical/src/G4OpBoundaryProcess.cc (modified) (3 diffs)

trunk/source/processes/optical/src/G4OpBoundaryProcess.cc

@@ -113 +113 @@
         prob_bs = 0.;
 
+        PropertyPointer  = NULL;
+        PropertyPointer1 = NULL;
+        PropertyPointer2 = NULL;
+
         kCarTolerance = G4GeometryTolerance::GetInstance()
                         ->GetSurfaceTolerance();
@@ -418 +422 @@
         else if (type == dielectric_dielectric) {
 
-          if ( theFinish == polishedfrontpainted ||
-               theFinish == groundfrontpainted ) {
-                  if( !G4BooleanRand(theReflectivity) ) {
-                    DoAbsorption();
-                  }
-                  else {
-                    if ( theFinish == groundfrontpainted )
-                                        theStatus = LambertianReflection;
-                    DoReflection();
-                  }
-          }
+          if ( theFinish == polishedbackpainted ||
+               theFinish == groundbackpainted ) {
+             DielectricDielectric();
+          }
           else {
-                  if( !G4BooleanRand(theReflectivity) ) {
-                    DoAbsorption();
-                  }
-                  else {
-                    DielectricDielectric();
-                  }
-          }
-        }
+             if ( !G4BooleanRand(theReflectivity) ) {
+                DoAbsorption();
+             }
+             else {
+                if ( theFinish == polishedfrontpainted ) {
+                   DoReflection();
+                }
+                else if ( theFinish == groundfrontpainted ) {
+                   theStatus = LambertianReflection;
+                   DoReflection();
+                }
+                else {
+                   DielectricDielectric();
+                }
+             }
+          }
+        }
         else {
 
@@ -781 +787 @@
               G4SwapObj(&Rindex1,&Rindex2);
            }
-
-           if ( theFinish == ground || theFinish == groundbackpainted ) {
-                theFacetNormal = 
-                             GetFacetNormal(OldMomentum,theGlobalNormal);
+        
+           if ( theFinish == polished ) {
+                theFacetNormal = theGlobalNormal;
            }
            else {
-                theFacetNormal = theGlobalNormal;
+                theFacetNormal =
+                             GetFacetNormal(OldMomentum,theGlobalNormal);
            }