Import Geant4 4.0.0 source tree
This commit is contained in:
@@ -16,6 +16,16 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
18th October 2001 Peter Gumplinger (op-V03-02-01)
|
||||
Avoid warnings on Linux (gcc-2.95.2) compiler
|
||||
- G4OpRayleigh.cc: remove unused variable 'aMaterial' in PostStepDoIt and
|
||||
'no_unit' in RayleighAttenuationLengthGenerator
|
||||
- G4OpBoundaryProcess.cc: moved definition of E2_perp, E2_parl, E2_total
|
||||
outside IF-statement
|
||||
31st August 2001 Peter Gumplinger (op-V03-02-00)
|
||||
- G4OpRayleigh.hh, G4OpBoundary.hh and G4OpAbsorption.hh: changed processName
|
||||
to 'OpRayleigh', 'OpBoundary' and 'OpAbsorption' respectively
|
||||
|
||||
30th January 2001 Peter Gumplinger (op-V03-00-05)
|
||||
- G4OpRayleigh.cc: allow for positiv and negative CosTheta and force the
|
||||
new momentum direction to be in the same plane as the
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4OpAbsorption.hh,v 1.5.4.1 2001/06/28 19:15:10 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: G4OpAbsorption.hh,v 1.7 2001/08/31 16:43:32 gum Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// Optical Photon Absorption Class Definition
|
||||
@@ -85,7 +85,7 @@ public: // Without description
|
||||
// Constructors and Destructor
|
||||
////////////////////////////////
|
||||
|
||||
G4OpAbsorption(const G4String& processName = "Absorption");
|
||||
G4OpAbsorption(const G4String& processName = "OpAbsorption");
|
||||
|
||||
// G4OpAbsorption(const G4OpAbsorption &right);
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4OpBoundaryProcess.hh,v 1.5.4.1 2001/06/28 19:15:10 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: G4OpBoundaryProcess.hh,v 1.7 2001/08/31 16:44:24 gum Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
@@ -104,7 +104,7 @@ public: // Without description
|
||||
// Constructors and Destructor
|
||||
////////////////////////////////
|
||||
|
||||
G4OpBoundaryProcess(const G4String& processName = "Boundary");
|
||||
G4OpBoundaryProcess(const G4String& processName = "OpBoundary");
|
||||
|
||||
~G4OpBoundaryProcess();
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4OpRayleigh.hh,v 1.4.4.1 2001/06/28 19:15:10 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: G4OpRayleigh.hh,v 1.6 2001/08/31 16:44:46 gum Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
@@ -87,7 +87,7 @@ public: // Without description
|
||||
// Constructors and Destructor
|
||||
////////////////////////////////
|
||||
|
||||
G4OpRayleigh(const G4String& processName = "Rayleigh Scattering");
|
||||
G4OpRayleigh(const G4String& processName = "OpRayleigh");
|
||||
|
||||
// G4OpRayleigh(const G4OpRayleigh &right);
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4OpAbsorption.cc,v 1.3.4.1 2001/06/28 19:15:10 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: G4OpAbsorption.cc,v 1.4 2001/07/11 10:08:22 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// Optical Photon Absorption Class Implementation
|
||||
|
||||
@@ -44,6 +44,9 @@
|
||||
// (thanks to Stefano Magni)
|
||||
// 1999-10-10 - Accommodate changes done in DoAbsorption by
|
||||
// changing logic in DielectricMetal
|
||||
// 2001-10-18 - avoid Linux (gcc-2.95.2) warning about variables
|
||||
// might be used uninitialized in this function
|
||||
// moved E2_perp, E2_parl and E2_total out of 'if'
|
||||
//
|
||||
// Author: Peter Gumplinger
|
||||
// adopted from work by Werner Keil - April 2/96
|
||||
@@ -516,14 +519,15 @@ void G4OpBoundaryProcess::DielectricDielectric()
|
||||
E1_parl = 1.0;
|
||||
}
|
||||
|
||||
G4double E2_perp, E2_parl, E2_total, TransCoeff;
|
||||
G4double s1 = Rindex1*cost1;
|
||||
G4double E2_perp = 2.*s1*E1_perp/(Rindex1*cost1+Rindex2*cost2);
|
||||
G4double E2_parl = 2.*s1*E1_parl/(Rindex2*cost1+Rindex1*cost2);
|
||||
G4double E2_total = E2_perp*E2_perp + E2_parl*E2_parl;
|
||||
G4double s2 = Rindex2*cost2*E2_total;
|
||||
|
||||
G4double TransCoeff;
|
||||
|
||||
if (cost1 != 0.0) {
|
||||
G4double s1 = Rindex1*cost1;
|
||||
E2_perp = 2.*s1*E1_perp/(Rindex1*cost1+Rindex2*cost2);
|
||||
E2_parl = 2.*s1*E1_parl/(Rindex2*cost1+Rindex1*cost2);
|
||||
E2_total = E2_perp*E2_perp + E2_parl*E2_parl;
|
||||
G4double s2 = Rindex2*cost2*E2_total;
|
||||
TransCoeff = s2/s1;
|
||||
}
|
||||
else {
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4OpRayleigh.cc,v 1.5.2.1 2001/06/28 19:15:10 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: G4OpRayleigh.cc,v 1.8 2001/10/18 17:13:54 gum Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
@@ -35,6 +35,10 @@
|
||||
// Version: 1.0
|
||||
// Created: 1996-05-31
|
||||
// Author: Juliet Armstrong
|
||||
// Updated: 2001-10-18 by Peter Gumplinger
|
||||
// eliminate unused variable warning on Linux (gcc-2.95.2)
|
||||
// Updated: 2001-09-18 by mma
|
||||
// >numOfMaterials=G4Material::GetNumberOfMaterials() in BuildPhy
|
||||
// Updated: 2001-01-30 by Peter Gumplinger
|
||||
// > allow for positiv and negative CosTheta and force the
|
||||
// > new momentum direction to be in the same plane as the
|
||||
@@ -108,7 +112,6 @@ G4OpRayleigh::PostStepDoIt(const G4Track& aTrack, const G4Step& aStep)
|
||||
aParticleChange.Initialize(aTrack);
|
||||
|
||||
const G4DynamicParticle* aParticle = aTrack.GetDynamicParticle();
|
||||
const G4Material* aMaterial = aTrack.GetMaterial();
|
||||
|
||||
if (verboseLevel>0) {
|
||||
G4cout << "Scattering Photon!" << G4endl;
|
||||
@@ -188,7 +191,7 @@ void G4OpRayleigh::BuildThePhysicsTable()
|
||||
|
||||
const G4MaterialTable* theMaterialTable=
|
||||
G4Material::GetMaterialTable();
|
||||
G4int numOfMaterials = theMaterialTable->length();
|
||||
G4int numOfMaterials = G4Material::GetNumberOfMaterials();
|
||||
|
||||
// create a new physics table
|
||||
|
||||
@@ -293,8 +296,6 @@ G4OpRayleigh::RayleighAttenuationLengthGenerator(G4MaterialPropertiesTable *aMPT
|
||||
G4double Dist;
|
||||
G4double refraction_index;
|
||||
|
||||
G4double no_unit = 1.0;
|
||||
|
||||
G4PhysicsOrderedFreeVector *RayleighScatteringLengths =
|
||||
new G4PhysicsOrderedFreeVector();
|
||||
Rindex->ResetIterator();
|
||||
|
||||
Reference in New Issue
Block a user