Import Geant4 11.0.0 source tree

source/processes/optical/History

@@ -16,6 +16,20 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+21 Oct 21: D. Sawkey (op-V10-07-05)
+- G4OpBoundaryProcess - rename variables: class start with f; lowercase
+  - make comparison to nullptr explicit
+  - remove unneeded intermediate variable
+  - refactor Davis LUT calculation
+
+21 Oct 21: D. Sawkey (op-V10-07-04)
+- G4OpBoundaryProcess - on StepTooSmall, propose velocity corresponding to
+  material of post step point. Addresses bug 2438.
+
+19 Oct 21: D. Sawkey (op-V10-07-03)
+- all process classes - update G4OpticalParameters when process
+  parameters updated directly. Addresses bug 2425.
+
 21 May 21: D. Sawkey (op-V10-07-02)
 - G4OpBoundaryProcess: make some variables local and initialize them
   properly. Addresses bug 2364.

source/processes/optical/include/G4OpAbsorption.hh

@@ -73,6 +73,8 @@ class G4OpAbsorption : public G4VDiscreteProcess
 
   virtual void Initialise();
 
+  void SetVerboseLevel(G4int);
+
  private:
   G4OpAbsorption(const G4OpAbsorption& right) = delete;
   G4OpAbsorption& operator=(const G4OpAbsorption& right) = delete;

source/processes/optical/include/G4OpBoundaryProcess.hh

@@ -64,10 +64,10 @@
 #ifndef G4OpBoundaryProcess_h
 #define G4OpBoundaryProcess_h 1
 
+#include "G4OpticalPhoton.hh"
+#include "G4OpticalSurface.hh"
 #include "G4RandomTools.hh"
 #include "G4VDiscreteProcess.hh"
-#include "G4OpticalSurface.hh"
-#include "G4OpticalPhoton.hh"
 
 enum G4OpBoundaryProcessStatus
 {
@@ -144,6 +144,8 @@ class G4OpBoundaryProcess : public G4VDiscreteProcess
 
   virtual void Initialise();
 
+  void SetVerboseLevel(G4int);
+
  private:
   G4OpBoundaryProcess(const G4OpBoundaryProcess& right) = delete;
   G4OpBoundaryProcess& operator=(const G4OpBoundaryProcess& right) = delete;
@@ -180,53 +182,46 @@ class G4OpBoundaryProcess : public G4VDiscreteProcess
   // Invoke SD for post step point if the photon is 'detected'
   G4bool InvokeSD(const G4Step* step);
 
-  G4double thePhotonMomentum;
+  G4ThreeVector fOldMomentum;
+  G4ThreeVector fOldPolarization;
 
-  G4ThreeVector OldMomentum;
-  G4ThreeVector OldPolarization;
+  G4ThreeVector fNewMomentum;
+  G4ThreeVector fNewPolarization;
 
-  G4ThreeVector NewMomentum;
-  G4ThreeVector NewPolarization;
+  G4ThreeVector fGlobalNormal;
+  G4ThreeVector fFacetNormal;
 
-  G4ThreeVector theGlobalNormal;
-  G4ThreeVector theFacetNormal;
+  G4Material* fMaterial1;
+  G4Material* fMaterial2;
 
-  G4Material* Material1;
-  G4Material* Material2;
-
-  G4OpticalSurface* OpticalSurface;
+  G4OpticalSurface* fOpticalSurface;
 
   G4MaterialPropertyVector* fRealRIndexMPV;
   G4MaterialPropertyVector* fImagRIndexMPV;
+  G4Physics2DVector* fDichroicVector;
 
-  G4double Rindex1;
-  G4double Rindex2;
+  G4double fPhotonMomentum;
+  G4double fRindex1;
+  G4double fRindex2;
 
-  G4double sint1;
+  G4double fSint1;
 
-  G4OpBoundaryProcessStatus theStatus;
+  G4double fReflectivity;
+  G4double fEfficiency;
+  G4double fTransmittance;
+  G4double fSurfaceRoughness;
 
-  G4OpticalSurfaceModel theModel;
+  G4double fProb_sl, fProb_ss, fProb_bs;
+  G4double fCarTolerance;
 
-  G4OpticalSurfaceFinish theFinish;
+  G4OpBoundaryProcessStatus fStatus;
+  G4OpticalSurfaceModel fModel;
+  G4OpticalSurfaceFinish fFinish;
 
-  G4double theReflectivity;
-  G4double theEfficiency;
-  G4double theTransmittance;
-
-  G4double theSurfaceRoughness;
-
-  G4double prob_sl, prob_ss, prob_bs;
-
-  G4int iTE, iTM;
-
-  G4double kCarTolerance;
-
-  size_t idx, idy;
-  G4Physics2DVector* DichroicVector;
-
-  G4bool fInvokeSD;
+  G4int f_iTE, f_iTM;
 
+  size_t idx_dichroicX      = 0;
+  size_t idx_dichroicY      = 0;
   size_t idx_rindex1        = 0;
   size_t idx_rindex_surface = 0;
   size_t idx_reflect        = 0;
@@ -239,6 +234,8 @@ class G4OpBoundaryProcess : public G4VDiscreteProcess
   size_t idx_groupvel       = 0;
   size_t idx_rrindex        = 0;
   size_t idx_irindex        = 0;
+
+  G4bool fInvokeSD;
 };
 
 ////////////////////
@@ -247,7 +244,7 @@ class G4OpBoundaryProcess : public G4VDiscreteProcess
 
 inline G4bool G4OpBoundaryProcess::G4BooleanRand(const G4double prob) const
 {
-  /* Returns a random boolean variable with the specified probability */
+  // Returns a random boolean variable with the specified probability
   return (G4UniformRand() < prob);
 }
 
@@ -259,84 +256,80 @@ inline G4bool G4OpBoundaryProcess::IsApplicable(
 
 inline G4OpBoundaryProcessStatus G4OpBoundaryProcess::GetStatus() const
 {
-  return theStatus;
+  return fStatus;
 }
 
-inline void G4OpBoundaryProcess::SetInvokeSD(G4bool flag) { fInvokeSD = flag; }
-
 inline void G4OpBoundaryProcess::ChooseReflection()
 {
   G4double rand = G4UniformRand();
-  if(rand >= 0.0 && rand < prob_ss)
+  if(rand < fProb_ss)
   {
-    theStatus      = SpikeReflection;
-    theFacetNormal = theGlobalNormal;
+    fStatus      = SpikeReflection;
+    fFacetNormal = fGlobalNormal;
   }
-  else if(rand >= prob_ss && rand <= prob_ss + prob_sl)
+  else if(rand < fProb_ss + fProb_sl)
   {
-    theStatus = LobeReflection;
+    fStatus = LobeReflection;
   }
-  else if(rand > prob_ss + prob_sl && rand < prob_ss + prob_sl + prob_bs)
+  else if(rand < fProb_ss + fProb_sl + fProb_bs)
   {
-    theStatus = BackScattering;
+    fStatus = BackScattering;
   }
   else
   {
-    theStatus = LambertianReflection;
+    fStatus = LambertianReflection;
   }
 }
 
 inline void G4OpBoundaryProcess::DoAbsorption()
 {
-  theStatus = Absorption;
+  fStatus = Absorption;
 
-  if(G4BooleanRand(theEfficiency))
+  if(G4BooleanRand(fEfficiency))
   {
     // EnergyDeposited =/= 0 means: photon has been detected
-    theStatus = Detection;
-    aParticleChange.ProposeLocalEnergyDeposit(thePhotonMomentum);
+    fStatus = Detection;
+    aParticleChange.ProposeLocalEnergyDeposit(fPhotonMomentum);
   }
   else
   {
     aParticleChange.ProposeLocalEnergyDeposit(0.0);
   }
 
-  NewMomentum     = OldMomentum;
-  NewPolarization = OldPolarization;
+  fNewMomentum     = fOldMomentum;
+  fNewPolarization = fOldPolarization;
 
   aParticleChange.ProposeTrackStatus(fStopAndKill);
 }
 
 inline void G4OpBoundaryProcess::DoReflection()
 {
-  if(theStatus == LambertianReflection)
+  if(fStatus == LambertianReflection)
   {
-    NewMomentum    = G4LambertianRand(theGlobalNormal);
-    theFacetNormal = (NewMomentum - OldMomentum).unit();
+    fNewMomentum = G4LambertianRand(fGlobalNormal);
+    fFacetNormal = (fNewMomentum - fOldMomentum).unit();
   }
-  else if(theFinish == ground)
+  else if(fFinish == ground)
   {
-    theStatus = LobeReflection;
-    if(fRealRIndexMPV && fImagRIndexMPV)
+    fStatus = LobeReflection;
+    if(!fRealRIndexMPV || !fImagRIndexMPV)
     {
-      //
+      fFacetNormal = GetFacetNormal(fOldMomentum, fGlobalNormal);
     }
-    else
-    {
-      theFacetNormal = GetFacetNormal(OldMomentum, theGlobalNormal);
-    }
-    G4double PdotN = OldMomentum * theFacetNormal;
-    NewMomentum    = OldMomentum - (2. * PdotN) * theFacetNormal;
+    // else
+      // complex ref. index to be implemented
+    fNewMomentum =
+      fOldMomentum - (2. * fOldMomentum * fFacetNormal * fFacetNormal);
   }
   else
   {
-    theStatus      = SpikeReflection;
-    theFacetNormal = theGlobalNormal;
-    G4double PdotN = OldMomentum * theFacetNormal;
-    NewMomentum    = OldMomentum - (2. * PdotN) * theFacetNormal;
+    fStatus      = SpikeReflection;
+    fFacetNormal = fGlobalNormal;
+    fNewMomentum =
+      fOldMomentum - (2. * fOldMomentum * fFacetNormal * fFacetNormal);
   }
-  G4double EdotN  = OldPolarization * theFacetNormal;
-  NewPolarization = -OldPolarization + (2. * EdotN) * theFacetNormal;
+  fNewPolarization =
+    -fOldPolarization + (2. * fOldPolarization * fFacetNormal * fFacetNormal);
 }
 
 #endif /* G4OpBoundaryProcess_h */

source/processes/optical/include/G4OpMieHG.hh

@@ -65,6 +65,8 @@ class G4OpMieHG : public G4VDiscreteProcess
   virtual void PreparePhysicsTable(const G4ParticleDefinition&) override;
   virtual void Initialise();
 
+  void SetVerboseLevel(G4int);
+
  private:
   G4OpMieHG(const G4OpMieHG& right) = delete;
   G4OpMieHG& operator=(const G4OpMieHG& right) = delete;

source/processes/optical/include/G4OpRayleigh.hh

@@ -82,6 +82,8 @@ class G4OpRayleigh : public G4VDiscreteProcess
   virtual void PreparePhysicsTable(const G4ParticleDefinition&) override;
   virtual void Initialise();
 
+  void SetVerboseLevel(G4int);
+
  protected:
   G4PhysicsTable* thePhysicsTable;
 

source/processes/optical/include/G4OpWLS.hh

@@ -84,6 +84,8 @@ class G4OpWLS : public G4VDiscreteProcess
   virtual void PreparePhysicsTable(const G4ParticleDefinition&) override;
   virtual void Initialise();
 
+  void SetVerboseLevel(G4int);
+
  protected:
   G4VWLSTimeGeneratorProfile* WLSTimeGeneratorProfile;
   G4PhysicsTable* theIntegralTable;

source/processes/optical/include/G4OpWLS2.hh

@@ -84,6 +84,8 @@ class G4OpWLS2 : public G4VDiscreteProcess
   virtual void PreparePhysicsTable(const G4ParticleDefinition&) override;
   virtual void Initialise();
 
+  void SetVerboseLevel(G4int);
+
  protected:
   G4VWLSTimeGeneratorProfile* WLSTimeGeneratorProfile;
   G4PhysicsTable* theIntegralTable;

source/processes/optical/src/G4OpAbsorption.cc

@@ -119,3 +119,10 @@ G4double G4OpAbsorption::GetMeanFreePath(const G4Track& aTrack, G4double,
 
   return attLength;
 }
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4OpAbsorption::SetVerboseLevel(G4int verbose)
+{
+  verboseLevel = verbose;
+  G4OpticalParameters::Instance()->SetAbsorptionVerboseLevel(verboseLevel);
+}

source/processes/optical/src/G4OpMieHG.cc

@@ -182,3 +182,10 @@ G4double G4OpMieHG::GetMeanFreePath(const G4Track& aTrack, G4double,
   }
   return attLength;
 }
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4OpMieHG::SetVerboseLevel(G4int verbose)
+{
+  verboseLevel = verbose;
+  G4OpticalParameters::Instance()->SetMieVerboseLevel(verboseLevel);
+}

source/processes/optical/src/G4OpRayleigh.cc

@@ -307,3 +307,10 @@ G4PhysicsFreeVector* G4OpRayleigh::CalculateRayleighMeanFreePaths(
 
   return rayleighMFPs;
 }
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4OpRayleigh::SetVerboseLevel(G4int verbose)
+{
+  verboseLevel = verbose;
+  G4OpticalParameters::Instance()->SetRayleighVerboseLevel(verboseLevel);
+}

source/processes/optical/src/G4OpWLS.cc

@@ -332,4 +332,12 @@ void G4OpWLS::UseTimeProfile(const G4String name)
     G4Exception("G4OpWLS::UseTimeProfile", "em0202", FatalException,
                 "generator does not exist");
   }
+  G4OpticalParameters::Instance()->SetWLSTimeProfile(name);
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4OpWLS::SetVerboseLevel(G4int verbose)
+{
+  verboseLevel = verbose;
+  G4OpticalParameters::Instance()->SetWLSVerboseLevel(verboseLevel);
 }

source/processes/optical/src/G4OpWLS2.cc

@@ -336,4 +336,12 @@ void G4OpWLS2::UseTimeProfile(const G4String name)
     G4Exception("G4OpWLS::UseTimeProfile", "em0202", FatalException,
                 "generator does not exist");
   }
+  G4OpticalParameters::Instance()->SetWLSTimeProfile(name);
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4OpWLS2::SetVerboseLevel(G4int verbose)
+{
+  verboseLevel = verbose;
+  G4OpticalParameters::Instance()->SetWLS2VerboseLevel(verboseLevel);
 }