Import Geant4 11.1.0 source tree

source/processes/optical/include/G4OpBoundaryProcess.hh

@@ -110,7 +110,10 @@ enum G4OpBoundaryProcessStatus
   GroundTyvekAirReflection,
   GroundVM2000AirReflection,
   GroundVM2000GlueReflection,
-  Dichroic
+  Dichroic,
+  CoatedDielectricReflection,
+  CoatedDielectricRefraction,
+  CoatedDielectricFrustratedTransmission
 };
 
 class G4OpBoundaryProcess : public G4VDiscreteProcess
@@ -162,6 +165,7 @@ class G4OpBoundaryProcess : public G4VDiscreteProcess
   void DielectricLUTDAVIS();
 
   void DielectricDichroic();
+  void CoatedDielectricDielectric();
 
   void ChooseReflection();
   void DoAbsorption();
@@ -173,7 +177,12 @@ class G4OpBoundaryProcess : public G4VDiscreteProcess
   G4double GetReflectivity(G4double E1_perp, G4double E1_parl,
                            G4double incidentangle, G4double RealRindex,
                            G4double ImaginaryRindex);
-  // Returns the Reflectivity on a metalic surface
+  // Returns the Reflectivity on a metallic surface
+
+  G4double GetReflectivityThroughThinLayer(G4double sinTL, G4double E1_perp,
+                                           G4double E1_parl, G4double wavelength,
+                                           G4double cost1, G4double cost2);
+  // Returns the Reflectivity on a coated surface
 
   void CalculateReflectivity();
 
@@ -214,12 +223,17 @@ class G4OpBoundaryProcess : public G4VDiscreteProcess
   G4double fProb_sl, fProb_ss, fProb_bs;
   G4double fCarTolerance;
 
+  // Used by CoatedDielectricDielectric()
+  G4double fCoatedRindex, fCoatedThickness;
+
   G4OpBoundaryProcessStatus fStatus;
   G4OpticalSurfaceModel fModel;
   G4OpticalSurfaceFinish fFinish;
 
   G4int f_iTE, f_iTM;
 
+  G4int fNumWarnings; // number of times small step warning printed
+
   size_t idx_dichroicX      = 0;
   size_t idx_dichroicY      = 0;
   size_t idx_rindex1        = 0;
@@ -234,6 +248,10 @@ class G4OpBoundaryProcess : public G4VDiscreteProcess
   size_t idx_groupvel       = 0;
   size_t idx_rrindex        = 0;
   size_t idx_irindex        = 0;
+  size_t idx_coatedrindex   = 0;
+
+  // Used by CoatedDielectricDielectric()
+  G4bool fCoatedFrustratedTransmission = true;
 
   G4bool fInvokeSD;
 };

source/processes/optical/include/G4OpWLS.hh

@@ -94,7 +94,7 @@ class G4OpWLS : public G4VDiscreteProcess
   G4OpWLS(const G4OpWLS& right) = delete;
   G4OpWLS& operator=(const G4OpWLS& right) = delete;
 
-  size_t idx_wls = 0;
+  std::size_t idx_wls = 0;
 };
 
 ////////////////////
@@ -113,10 +113,10 @@ inline G4PhysicsTable* G4OpWLS::GetIntegralTable() const
 
 inline void G4OpWLS::DumpPhysicsTable() const
 {
-  G4int PhysicsTableSize = theIntegralTable->entries();
+  std::size_t PhysicsTableSize = theIntegralTable->entries();
   G4PhysicsFreeVector* v;
 
-  for(G4int i = 0; i < PhysicsTableSize; ++i)
+  for(std::size_t i = 0; i < PhysicsTableSize; ++i)
   {
     v = (G4PhysicsFreeVector*) (*theIntegralTable)[i];
     v->DumpValues();

source/processes/optical/include/G4OpWLS2.hh

@@ -94,7 +94,7 @@ class G4OpWLS2 : public G4VDiscreteProcess
   G4OpWLS2(const G4OpWLS2& right) = delete;
   G4OpWLS2& operator=(const G4OpWLS2& right) = delete;
 
-  size_t idx_wls2 = 0;
+  std::size_t idx_wls2 = 0;
 };
 
 ////////////////////
@@ -113,10 +113,10 @@ inline G4PhysicsTable* G4OpWLS2::GetIntegralTable() const
 
 inline void G4OpWLS2::DumpPhysicsTable() const
 {
-  G4int PhysicsTableSize = theIntegralTable->entries();
+  std::size_t PhysicsTableSize = theIntegralTable->entries();
   G4PhysicsFreeVector* v;
 
-  for(G4int i = 0; i < PhysicsTableSize; ++i)
+  for(std::size_t i = 0; i < PhysicsTableSize; ++i)
   {
     v = (G4PhysicsFreeVector*) (*theIntegralTable)[i];
     v->DumpValues();