lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 5.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 10:15:15 +02:00
parent 37fff30d2e
commit fbd4999cf7
4396 changed files with 56662 additions and 52446 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/electromagnetic/xrays/History
+18 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.18 2002/11/25 18:50:19 gum Exp $
$Id: History,v 1.23 2003/03/21 08:01:33 gcosmo Exp $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,23 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
21 March 03: G. Cosmo (xrays-V05-00-04)
- G4VXTRenergyLoss.cc: fix for porting on Windows .NET compiler.
11 March 03: V. Ivanchenko (xrays-V05-00-03)
- Minor fix to cut per region
10 March 03: V. Ivanchenko (xrays-V05-00-02)
- Cut per region G4ForwardXrayTR.cc
12 February 03: G. Cosmo (xrays-V05-00-01)
- Replaced call to RandPoisson::shoot() with G4Poisson(), more performant.
Affected files: G4Cerenkov.cc, G4ForwardXrayTR.cc, G4VXTRenergyLoss.cc.
23 January 03: G. Cosmo (xrays-V05-00-00)
- G4VXTRenergyLoss[.hh.cc]: removed reduntant headers inclusions and
ordered inclusion for complex numbers to allow porting on Windows .NET VC++.
25 November 02: P. Gumplinger (xrays-V04-01-03)
- G4Scintillation now allows for particle dependent excitation levels
source/processes/electromagnetic/xrays/include/G4Cerenkov.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Cerenkov.hh,v 1.5 2001/07/11 10:03:41 gunter Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
////////////////////////////////////////////////////////////////////////
source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh
+5 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ForwardXrayTR.hh,v 1.7 2001/07/11 10:03:42 gunter Exp $
// GEANT4 tag $Name: geant4-05-00 $
// $Id: G4ForwardXrayTR.hh,v 1.9 2003/03/11 08:43:34 vnivanch Exp $
// GEANT4 tag $Name: geant4-05-01 $
//
// G4ForwardXrayTR -- header file
//
@@ -38,6 +38,7 @@
// History:
// 22.09.97, V. Grichine (Vladimir.Grichine@cern.ch)
// 26.01.00, V.Grichine, new constructor and protected DM for fast sim. models
// 10.03.03, V.Ivanchenko migrade to "cut per region"
#ifndef G4FORWARDXRAYTR_H
#define G4FORWARDXRAYTR_H
@@ -156,7 +157,8 @@ protected : // for access from X-ray TR fast simulation models
G4Gamma* fPtrGamma ; // pointer to TR photon
G4double* fGammaCutInKineticEnergy ; // TR photon cut in energy array
const G4std::vector<G4double>* fGammaCutInKineticEnergy ;
// TR photon cut in energy array
G4double fGammaTkinCut ; // Tkin cut of TR photon in current mat.
G4PhysicsTable* fAngleDistrTable ;
source/processes/electromagnetic/xrays/include/G4GammaXTRadiator.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GammaXTRadiator.hh,v 1.1 2002/01/22 15:22:53 grichine Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
///////////////////////////////////////////////////////////////////////////
source/processes/electromagnetic/xrays/include/G4RegularXTRadiator.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4RegularXTRadiator.hh,v 1.2 2002/01/18 17:26:20 grichine Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
///////////////////////////////////////////////////////////////////////////
source/processes/electromagnetic/xrays/include/G4Scintillation.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Scintillation.hh,v 1.11 2002/11/25 18:48:51 gum Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
////////////////////////////////////////////////////////////////////////
source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4TransitionRadiation.hh,v 1.6 2001/07/11 10:03:42 gunter Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
// G4TransitionRadiation -- header file
//
source/processes/electromagnetic/xrays/include/G4VXTRenergyLoss.hh
+3 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4VXTRenergyLoss.hh,v 1.3 2002/01/18 17:26:21 grichine Exp $
// GEANT4 tag $Name: geant4-05-00 $
// $Id: G4VXTRenergyLoss.hh,v 1.4 2003/01/23 11:26:16 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
//
//
///////////////////////////////////////////////////////////////////////////
@@ -40,9 +40,8 @@
#define G4VXTRenergyLoss_h 1
#include "globals.hh"
#include "templates.hh"
#include "g4std/complex"
#include "globals.hh"
#include "Randomize.hh"
#include "G4LogicalVolume.hh"
source/processes/electromagnetic/xrays/src/G4Cerenkov.cc
+4 -6
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Cerenkov.cc,v 1.13 2002/05/16 21:21:14 gum Exp $
// GEANT4 tag $Name: geant4-05-00 $
// $Id: G4Cerenkov.cc,v 1.14 2003/02/12 08:52:55 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
//
////////////////////////////////////////////////////////////////////////
// Cerenkov Radiation Class Implementation
@@ -52,6 +52,7 @@
////////////////////////////////////////////////////////////////////////
#include "G4ios.hh"
#include "G4Poisson.hh"
#include "G4Cerenkov.hh"
/////////////////////////
@@ -163,10 +164,7 @@ G4Cerenkov::AlongStepDoIt(const G4Track& aTrack, const G4Step& aStep)
MeanNumPhotons = MeanNumPhotons * step_length;
// RandPoisson is a utility class. It provides functions
// that act on HepRandom
G4int NumPhotons = (G4int) RandPoisson::shoot(MeanNumPhotons);
G4int NumPhotons = (G4int) G4Poisson(MeanNumPhotons);
if (NumPhotons <= 0) {
source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc
+117 -119
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ForwardXrayTR.cc,v 1.7 2001/10/24 16:40:54 maire Exp $
// GEANT4 tag $Name: geant4-05-00 $
// $Id: G4ForwardXrayTR.cc,v 1.9 2003/03/10 11:34:17 vnivanch Exp $
// GEANT4 tag $Name: geant4-05-01 $
//
// G4ForwardXrayTR class -- implementation file
@@ -34,22 +34,20 @@
// History:
// 1st version 11.09.97 V. Grichine (Vladimir.Grichine@cern.ch )
// 2nd version 17.12.97 V. Grichine
// 17-09-01, migration of Materials to pure STL (mma)
#include <math.h>
// #include "G4ios.hh"
// #include <fstream.h>
// #include <stdlib.h>
// 17-09-01, migration of Materials to pure STL (mma)
// 10-03-03, migration to "cut per region" (V.Ivanchenko)
#include "G4ForwardXrayTR.hh"
#include "G4Material.hh"
#include "globals.hh"
#include "G4Poisson.hh"
#include "G4Material.hh"
#include "G4PhysicsTable.hh"
#include "G4PhysicsVector.hh"
#include "G4PhysicsLinearVector.hh"
#include "G4PhysicsLogVector.hh"
#include "G4ProductionCutsTable.hh"
// Table initialization
@@ -92,14 +90,14 @@ G4double G4ForwardXrayTR::fCofTR = fine_structure_const/pi ;
// in all materials involved in test program. Lorentz factors correspond to
// kinetic energies of protons between 100*GeV and 100*TeV, ~ 10^2-10^5
//
// Recommended only for use in applications with
// Recommended only for use in applications with
// few light materials involved !!!!!!!!!!!!!!
G4ForwardXrayTR::G4ForwardXrayTR()
: G4TransitionRadiation("XrayTR")
{
G4int iMat, jMat, iTkin, iTR, iPlace ;
static
static
const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable();
G4int numOfMat = G4Material::GetNumberOfMaterials();
fGammaCutInKineticEnergy = new G4double[numOfMat] ;
@@ -129,7 +127,7 @@ G4ForwardXrayTR::G4ForwardXrayTR()
// fGammaTkinCut = fGammaCutInKineticEnergy[jMat] ; // TR photon in jMat !
fGammaTkinCut = 0.0 ;
if(fGammaTkinCut > fTheMinEnergyTR) // setting of min/max TR energies
if(fGammaTkinCut > fTheMinEnergyTR) // setting of min/max TR energies
{
fMinEnergyTR = fGammaTkinCut ;
}
@@ -160,7 +158,7 @@ G4ForwardXrayTR::G4ForwardXrayTR()
fGamma = 1.0 + (aVector->GetLowEdgeEnergy(iTkin)/proton_mass_c2) ;
fMaxThetaTR = 10000.0/(fGamma*fGamma) ;
if(fMaxThetaTR > fTheMaxAngle)
{
{
fMaxThetaTR = fTheMaxAngle ;
}
else
@@ -176,7 +174,7 @@ G4ForwardXrayTR::G4ForwardXrayTR()
for(iTR=fBinTR-2;iTR>=0;iTR--)
{
energySum += fCofTR*EnergySum(energyVector->GetLowEdgeEnergy(iTR),
energyVector->GetLowEdgeEnergy(iTR+1)) ;
energyVector->GetLowEdgeEnergy(iTR+1)) ;
angleSum += fCofTR*AngleSum(angleVector->GetLowEdgeEnergy(iTR),
angleVector->GetLowEdgeEnergy(iTR+1)) ;
@@ -187,13 +185,13 @@ G4ForwardXrayTR::G4ForwardXrayTR()
{
iPlace = (iMat*(numOfMat-1)+jMat)*fTotBin+iTkin ;
}
else // jMat > iMat right part of matrices (jMat-1) !
else // jMat > iMat right part of matrices (jMat-1) !
{
iPlace = (iMat*(numOfMat-1)+jMat-1)*fTotBin+iTkin ;
}
}
fEnergyDistrTable->insertAt(iPlace,energyVector) ;
fAngleDistrTable->insertAt(iPlace,angleVector) ;
} // iTkin
} // iTkin
} // jMat != iMat
} // jMat
} // iMat
@@ -205,7 +203,7 @@ G4ForwardXrayTR::G4ForwardXrayTR()
//////////////////////////////////////////////////////////////////////
//
// Constructor for creation of physics tables (angle and energy TR
// Constructor for creation of physics tables (angle and energy TR
// distributions) for a couple of selected materials.
//
// Recommended for use in applications with many materials involved,
@@ -217,38 +215,39 @@ G4ForwardXrayTR::
G4ForwardXrayTR( const G4String& matName1, // G4Material* pMat1,
const G4String& matName2, // G4Material* pMat2,
const G4String& processName )
: G4TransitionRadiation(processName)
: G4TransitionRadiation(processName)
{
// fMatIndex1 = pMat1->GetIndex() ;
// fMatIndex2 = pMat2->GetIndex() ;
G4int iMat;
static
const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable() ;
const G4ProductionCutsTable* theCoupleTable=
G4ProductionCutsTable::GetProductionCutsTable();
G4int numOfCouples = theCoupleTable->GetTableSize();
G4int numOfMat = G4Material::GetNumberOfMaterials();
for(iMat=0;iMat<numOfMat;iMat++) // check first material name
for(iMat=0;iMat<numOfCouples;iMat++) // check first material name
{
if( matName1 == (*theMaterialTable)[iMat]->GetName() )
const G4MaterialCutsCouple* couple = theCoupleTable->GetMaterialCutsCouple(iMat);
if( matName1 == couple->GetMaterial()->GetName() )
{
fMatIndex1 = (*theMaterialTable)[iMat]->GetIndex() ;
fMatIndex1 = couple->GetIndex() ;
break ;
}
}
if(iMat == numOfMat)
if(iMat == numOfCouples)
{
G4Exception("Invalid first material name in G4ForwardXrayTR constructor") ;
}
for(iMat=0;iMat<numOfMat;iMat++) // check second material name
for(iMat=0;iMat<numOfCouples;iMat++) // check second material name
{
if( matName2 == (*theMaterialTable)[iMat]->GetName() )
const G4MaterialCutsCouple* couple = theCoupleTable->GetMaterialCutsCouple(iMat);
if( matName2 == couple->GetMaterial()->GetName() )
{
fMatIndex2 = (*theMaterialTable)[iMat]->GetIndex() ;
fMatIndex2 = couple->GetIndex() ;
break ;
}
}
if(iMat == numOfMat)
if(iMat == numOfCouples)
{
G4Exception("Invalid second material name in G4ForwardXrayTR constructor") ;
}
@@ -262,7 +261,7 @@ G4ForwardXrayTR( const G4String& matName1, // G4Material* pMat1,
G4ForwardXrayTR::
G4ForwardXrayTR( const G4String& processName )
: G4TransitionRadiation(processName)
: G4TransitionRadiation(processName)
{
;
}
@@ -285,32 +284,32 @@ G4ForwardXrayTR::~G4ForwardXrayTR()
void G4ForwardXrayTR::BuildXrayTRtables()
{
G4int iMat, jMat, iTkin, iTR, iPlace ;
static
const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable() ;
const G4ProductionCutsTable* theCoupleTable=
G4ProductionCutsTable::GetProductionCutsTable();
G4int numOfCouples = theCoupleTable->GetTableSize();
G4int numOfMat = G4Material::GetNumberOfMaterials() ;
fGammaCutInKineticEnergy = new G4double[numOfMat] ;
fGammaCutInKineticEnergy = fPtrGamma->GetEnergyCuts() ;
fGammaCutInKineticEnergy = theCoupleTable->GetEnergyCutsVector(idxG4GammaCut);
fAngleDistrTable = new G4PhysicsTable(2*fTotBin) ;
fEnergyDistrTable = new G4PhysicsTable(2*fTotBin) ;
for(iMat=0;iMat<numOfMat;iMat++) // loop over pairs of different materials
for(iMat=0;iMat<numOfCouples;iMat++) // loop over pairs of different materials
{
if( iMat != fMatIndex1 && iMat != fMatIndex2 ) continue ;
for(jMat=0;jMat<numOfMat;jMat++) // transition iMat -> jMat !!!
for(jMat=0;jMat<numOfCouples;jMat++) // transition iMat -> jMat !!!
{
if( iMat == jMat || ( jMat != fMatIndex1 && jMat != fMatIndex2 ) )
{
continue ;
}
if( iMat == jMat || ( jMat != fMatIndex1 && jMat != fMatIndex2 ) )
{
continue ;
}
else
{
const G4Material* mat1 = (*theMaterialTable)[iMat] ;
const G4Material* mat2 = (*theMaterialTable)[jMat] ;
const G4MaterialCutsCouple* iCouple = theCoupleTable->GetMaterialCutsCouple(iMat);
const G4MaterialCutsCouple* jCouple = theCoupleTable->GetMaterialCutsCouple(jMat);
const G4Material* mat1 = iCouple->GetMaterial() ;
const G4Material* mat2 = jCouple->GetMaterial() ;
fSigma1 = fPlasmaCof*(mat1->GetElectronDensity()) ;
fSigma2 = fPlasmaCof*(mat2->GetElectronDensity()) ;
@@ -319,7 +318,7 @@ void G4ForwardXrayTR::BuildXrayTRtables()
fGammaTkinCut = 0.0 ;
if(fGammaTkinCut > fTheMinEnergyTR) // setting of min/max TR energies
if(fGammaTkinCut > fTheMinEnergyTR) // setting of min/max TR energies
{
fMinEnergyTR = fGammaTkinCut ;
}
@@ -329,7 +328,7 @@ void G4ForwardXrayTR::BuildXrayTRtables()
}
if(fGammaTkinCut > fTheMaxEnergyTR)
{
fMaxEnergyTR = 2.0*fGammaTkinCut ; // usually very low TR rate
fMaxEnergyTR = 2.0*fGammaTkinCut ; // usually very low TR rate
}
else
{
@@ -337,7 +336,7 @@ void G4ForwardXrayTR::BuildXrayTRtables()
}
for(iTkin=0;iTkin<fTotBin;iTkin++) // Lorentz factor loop
{
G4PhysicsLogVector*
G4PhysicsLogVector*
energyVector = new G4PhysicsLogVector( fMinEnergyTR,
fMaxEnergyTR,
fBinTR ) ;
@@ -346,9 +345,9 @@ void G4ForwardXrayTR::BuildXrayTRtables()
GetLowEdgeEnergy(iTkin)/proton_mass_c2) ;
fMaxThetaTR = 10000.0/(fGamma*fGamma) ;
if(fMaxThetaTR > fTheMaxAngle)
{
{
fMaxThetaTR = fTheMaxAngle ;
}
else
@@ -359,7 +358,7 @@ void G4ForwardXrayTR::BuildXrayTRtables()
}
}
// G4cout<<G4endl<<"fGamma = "<<fGamma<<" fMaxThetaTR = "<<fMaxThetaTR<<G4endl ;
G4PhysicsLinearVector*
G4PhysicsLinearVector*
angleVector = new G4PhysicsLinearVector( 0.0,
fMaxThetaTR,
fBinTR ) ;
@@ -372,7 +371,7 @@ void G4ForwardXrayTR::BuildXrayTRtables()
for(iTR=fBinTR-2;iTR>=0;iTR--)
{
energySum += fCofTR*EnergySum(energyVector->GetLowEdgeEnergy(iTR),
energyVector->GetLowEdgeEnergy(iTR+1)) ;
energyVector->GetLowEdgeEnergy(iTR+1)) ;
angleSum += fCofTR*AngleSum(angleVector->GetLowEdgeEnergy(iTR),
angleVector->GetLowEdgeEnergy(iTR+1)) ;
@@ -386,13 +385,13 @@ void G4ForwardXrayTR::BuildXrayTRtables()
{
iPlace = fTotBin+iTkin ; // (iMat*(numOfMat-1)+jMat)*
}
else // jMat > iMat right part of matrices (jMat-1) !
else // jMat > iMat right part of matrices (jMat-1) !
{
iPlace = iTkin ; // (iMat*(numOfMat-1)+jMat-1)*fTotBin+
}
}
fEnergyDistrTable->insertAt(iPlace,energyVector) ;
fAngleDistrTable->insertAt(iPlace,angleVector) ;
} // iTkin
} // iTkin
} // jMat != iMat
} // jMat
} // iMat
@@ -431,7 +430,7 @@ G4ForwardXrayTR::SpectralAngleTRdensity( G4double energy,
//////////////////////////////////////////////////////////////////
//
// Analytical formula for angular density of X-ray TR photons
//
//
G4double G4ForwardXrayTR::AngleDensity( G4double energy,
G4double varAngle ) const
@@ -564,13 +563,10 @@ G4VParticleChange* G4ForwardXrayTR::PostStepDoIt(const G4Track& aTrack,
{
aParticleChange.Initialize(aTrack);
// G4cout<<"call G4ForwardXrayTR::PostStepDoIt"<<G4endl ;
G4int iMat, jMat, iTkin, iPlace, numOfMat, numOfTR, iTR, iTransfer ;
G4int iMat, jMat, iTkin, iPlace, numOfTR, iTR, iTransfer ;
G4double energyPos, anglePos, energyTR, theta, phi, dirX, dirY, dirZ ;
G4double W, W1, W2, E1, E2 ;
static
const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable() ;
numOfMat = G4Material::GetNumberOfMaterials() ;
G4StepPoint* pPreStepPoint = aStep.GetPreStepPoint();
G4StepPoint* pPostStepPoint = aStep.GetPostStepPoint();
@@ -586,35 +582,36 @@ G4VParticleChange* G4ForwardXrayTR::PostStepDoIt(const G4Track& aTrack,
}
// Come on boundary, so begin to try TR
iMat = pPreStepPoint ->GetPhysicalVolume()->
GetLogicalVolume()->GetMaterial()->GetIndex() ;
jMat = pPostStepPoint->GetPhysicalVolume()->
GetLogicalVolume()->GetMaterial()->GetIndex() ;
const G4MaterialCutsCouple* iCouple = pPreStepPoint ->GetPhysicalVolume()->
GetLogicalVolume()->GetMaterialCutsCouple();
const G4MaterialCutsCouple* jCouple = pPostStepPoint ->GetPhysicalVolume()->
GetLogicalVolume()->GetMaterialCutsCouple();
const G4Material* iMaterial = iCouple->GetMaterial();
const G4Material* jMaterial = jCouple->GetMaterial();
iMat = iCouple->GetIndex();
jMat = jCouple->GetIndex();
// The case of equal or approximate (in terms of plasma energy) materials
// No TR photons ?!
if ( iMat == jMat
|| ( (fMatIndex1 >= 0 && fMatIndex1 >= 0)
|| ( (fMatIndex1 >= 0 && fMatIndex1 >= 0)
&& ( iMat != fMatIndex1 && iMat != fMatIndex2 )
&& ( jMat != fMatIndex1 && jMat != fMatIndex2 ) )
|| (*theMaterialTable)[iMat]->GetState() ==
(*theMaterialTable)[jMat]->GetState()
||( (*theMaterialTable)[iMat]->GetState() == kStateSolid
&& (*theMaterialTable)[jMat]->GetState() == kStateLiquid )
||( (*theMaterialTable)[iMat]->GetState() == kStateLiquid
&& (*theMaterialTable)[jMat]->GetState() == kStateSolid ) )
|| iMaterial->GetState() == jMaterial->GetState()
||(iMaterial->GetState() == kStateSolid && jMaterial->GetState() == kStateLiquid )
||(iMaterial->GetState() == kStateLiquid && jMaterial->GetState() == kStateSolid ) )
{
return G4VDiscreteProcess::PostStepDoIt(aTrack, aStep) ;
}
const G4DynamicParticle* aParticle = aTrack.GetDynamicParticle();
G4double charge = aParticle->GetDefinition()->GetPDGCharge();
if(charge == 0.0) // Uncharged particle doesn't Generate TR photons
if(charge == 0.0) // Uncharged particle doesn't Generate TR photons
{
return G4VDiscreteProcess::PostStepDoIt(aTrack, aStep);
}
@@ -629,7 +626,7 @@ G4VParticleChange* G4ForwardXrayTR::PostStepDoIt(const G4Track& aTrack,
if(TkinScaled < fProtonEnergyVector->GetLowEdgeEnergy(iTkin)) // <= ?
{
break ;
}
}
}
if(jMat < iMat)
{
@@ -637,7 +634,7 @@ G4VParticleChange* G4ForwardXrayTR::PostStepDoIt(const G4Track& aTrack,
}
else
{
iPlace = iTkin - 1 ; // (iMat*(numOfMat - 1) + jMat - 1)*fTotBin +
iPlace = iTkin - 1 ; // (iMat*(numOfMat - 1) + jMat - 1)*fTotBin +
}
// G4PhysicsVector* energyVector1 = (*fEnergyDistrTable)(iPlace) ;
// G4PhysicsVector* energyVector2 = (*fEnergyDistrTable)(iPlace + 1) ;
@@ -653,9 +650,9 @@ G4VParticleChange* G4ForwardXrayTR::PostStepDoIt(const G4Track& aTrack,
// (*(*fAngleDistrTable)(iPlace))(0) )
// *chargeSq*0.5<<G4endl ;
numOfTR = RandPoisson::shoot( ( (*(*fEnergyDistrTable)(iPlace))(0) +
(*(*fAngleDistrTable)(iPlace))(0) )
*chargeSq*0.5 ) ;
numOfTR = G4Poisson( ( (*(*fEnergyDistrTable)(iPlace))(0) +
(*(*fAngleDistrTable)(iPlace))(0) )
*chargeSq*0.5 ) ;
if(numOfTR == 0)
{
return G4VDiscreteProcess::PostStepDoIt(aTrack, aStep);
@@ -677,7 +674,7 @@ G4VParticleChange* G4ForwardXrayTR::PostStepDoIt(const G4Track& aTrack,
// G4cout<<"energyTR = "<<energyTR/keV<<"keV"<<G4endl ;
kinEnergy -= energyTR ;
kinEnergy -= energyTR ;
aParticleChange.SetEnergyChange(kinEnergy);
anglePos = (*(*fAngleDistrTable)(iPlace))(0)*G4UniformRand() ;
@@ -707,26 +704,26 @@ G4VParticleChange* G4ForwardXrayTR::PostStepDoIt(const G4Track& aTrack,
if(iTkin == 0) // Tkin is too small, neglect of TR photon generation
{
return G4VDiscreteProcess::PostStepDoIt(aTrack, aStep);
}
}
else // general case: Tkin between two vectors of the material
{
E1 = fProtonEnergyVector->GetLowEdgeEnergy(iTkin - 1) ;
E1 = fProtonEnergyVector->GetLowEdgeEnergy(iTkin - 1) ;
E2 = fProtonEnergyVector->GetLowEdgeEnergy(iTkin) ;
W = 1.0/(E2 - E1) ;
W1 = (E2 - TkinScaled)*W ;
W2 = (TkinScaled - E1)*W ;
// G4cout<<iTkin<<" mean TR number = "<<(((*(*fEnergyDistrTable)(iPlace))(0)+
// (*(*fAngleDistrTable)(iPlace))(0))*W1 +
// (*(*fAngleDistrTable)(iPlace))(0))*W1 +
// ((*(*fEnergyDistrTable)(iPlace + 1))(0)+
// (*(*fAngleDistrTable)(iPlace + 1))(0))*W2)
// *chargeSq*0.5<<G4endl ;
numOfTR = RandPoisson::shoot((((*(*fEnergyDistrTable)(iPlace))(0)+
(*(*fAngleDistrTable)(iPlace))(0))*W1 +
((*(*fEnergyDistrTable)(iPlace + 1))(0)+
(*(*fAngleDistrTable)(iPlace + 1))(0))*W2)
*chargeSq*0.5 ) ;
numOfTR = G4Poisson((((*(*fEnergyDistrTable)(iPlace))(0)+
(*(*fAngleDistrTable)(iPlace))(0))*W1 +
((*(*fEnergyDistrTable)(iPlace + 1))(0)+
(*(*fAngleDistrTable)(iPlace + 1))(0))*W2)
*chargeSq*0.5 ) ;
if(numOfTR == 0)
{
return G4VDiscreteProcess::PostStepDoIt(aTrack, aStep);
@@ -750,7 +747,7 @@ G4VParticleChange* G4ForwardXrayTR::PostStepDoIt(const G4Track& aTrack,
// G4cout<<"energyTR = "<<energyTR/keV<<"keV"<<G4endl ;
kinEnergy -= energyTR ;
kinEnergy -= energyTR ;
aParticleChange.SetEnergyChange(kinEnergy);
anglePos = ((*(*fAngleDistrTable)(iPlace))(0)*W1+
@@ -790,51 +787,52 @@ G4VParticleChange* G4ForwardXrayTR::PostStepDoIt(const G4Track& aTrack,
// energy
//
G4double
G4double
G4ForwardXrayTR::GetEnergyTR(G4int iMat, G4int jMat, G4int iTkin) const
{
G4int iPlace, numOfMat, numOfTR, iTR, iTransfer ;
G4int iPlace, numOfTR, iTR, iTransfer ;
G4double energyTR = 0.0 ; // return this value for no TR photons
G4double energyPos ;
G4double W1, W2;
static
const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable() ;
numOfMat = G4Material::GetNumberOfMaterials() ;
const G4ProductionCutsTable* theCoupleTable=
G4ProductionCutsTable::GetProductionCutsTable();
G4int numOfCouples = theCoupleTable->GetTableSize();
// The case of equal or approximate (in terms of plasma energy) materials
// No TR photons ?!
const G4MaterialCutsCouple* iCouple = theCoupleTable->GetMaterialCutsCouple(iMat);
const G4MaterialCutsCouple* jCouple = theCoupleTable->GetMaterialCutsCouple(jMat);
const G4Material* iMaterial = iCouple->GetMaterial();
const G4Material* jMaterial = jCouple->GetMaterial();
if ( iMat == jMat
|| (*theMaterialTable)[iMat]->GetState() ==
(*theMaterialTable)[jMat]->GetState()
||( (*theMaterialTable)[iMat]->GetState() == kStateSolid
&& (*theMaterialTable)[jMat]->GetState() == kStateLiquid )
||( (*theMaterialTable)[iMat]->GetState() == kStateLiquid
&& (*theMaterialTable)[jMat]->GetState() == kStateSolid ) )
|| iMaterial->GetState() == jMaterial->GetState()
||(iMaterial->GetState() == kStateSolid && jMaterial->GetState() == kStateLiquid )
||(iMaterial->GetState() == kStateLiquid && jMaterial->GetState() == kStateSolid ) )
{
return energyTR ;
}
if(jMat < iMat)
{
iPlace = (iMat*(numOfMat - 1) + jMat)*fTotBin + iTkin - 1 ;
iPlace = (iMat*(numOfCouples - 1) + jMat)*fTotBin + iTkin - 1 ;
}
else
{
iPlace = (iMat*(numOfMat - 1) + jMat - 1)*fTotBin + iTkin - 1 ;
iPlace = (iMat*(numOfCouples - 1) + jMat - 1)*fTotBin + iTkin - 1 ;
}
G4PhysicsVector* energyVector1 = (*fEnergyDistrTable)(iPlace) ;
G4PhysicsVector* energyVector2 = (*fEnergyDistrTable)(iPlace + 1) ;
if(iTkin == fTotBin) // TR plato, try from left
{
numOfTR = RandPoisson::shoot( (*energyVector1)(0) ) ;
numOfTR = G4Poisson( (*energyVector1)(0) ) ;
if(numOfTR == 0)
{
return energyTR ;
@@ -857,13 +855,13 @@ G4ForwardXrayTR::GetEnergyTR(G4int iMat, G4int jMat, G4int iTkin) const
if(iTkin == 0) // Tkin is too small, neglect of TR photon generation
{
return energyTR ;
}
}
else // general case: Tkin between two vectors of the material
{ // use trivial mean half/half
W1 = 0.5 ;
W1 = 0.5 ;
W2 = 0.5 ;
numOfTR = RandPoisson::shoot( (*energyVector1)(0)*W1 +
(*energyVector2)(0)*W2 ) ;
numOfTR = G4Poisson( (*energyVector1)(0)*W1 +
(*energyVector2)(0)*W2 ) ;
if(numOfTR == 0)
{
return energyTR ;
@@ -896,10 +894,10 @@ G4ForwardXrayTR::GetEnergyTR(G4int iMat, G4int jMat, G4int iTkin) const
// Test function for checking of PostStepDoIt random preparation of TR photon
// theta angle relative to particle direction
//
G4double
G4ForwardXrayTR::GetThetaTR(G4int iMat, G4int jMat, G4int iTkin) const
G4double
G4ForwardXrayTR::GetThetaTR(G4int iMat, G4int jMat, G4int iTkin) const
{
G4double theta = 0.0 ;
@@ -908,6 +906,6 @@ G4ForwardXrayTR::GetThetaTR(G4int iMat, G4int jMat, G4int iTkin) const
// end of G4ForwardXrayTR implementation file
// end of G4ForwardXrayTR implementation file
//
///////////////////////////////////////////////////////////////////////////
source/processes/electromagnetic/xrays/src/G4GammaXTRadiator.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GammaXTRadiator.cc,v 1.1 2002/01/22 15:22:53 grichine Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
#include "g4std/complex"
source/processes/electromagnetic/xrays/src/G4RegularXTRadiator.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4RegularXTRadiator.cc,v 1.2 2002/01/18 17:26:21 grichine Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
#include "g4std/complex"
source/processes/electromagnetic/xrays/src/G4Scintillation.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Scintillation.cc,v 1.16 2002/11/26 00:52:13 gum Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
////////////////////////////////////////////////////////////////////////
// Scintillation Light Class Implementation
source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4TransitionRadiation.cc,v 1.3 2001/07/11 10:03:42 gunter Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
// G4TransitionRadiation class -- implementation file
source/processes/electromagnetic/xrays/src/G4VXTRenergyLoss.cc
+5 -14
View File
@@ -21,27 +21,18 @@
// ********************************************************************
//
//
// $Id: G4VXTRenergyLoss.cc,v 1.5 2002/03/28 07:58:29 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
// $Id: G4VXTRenergyLoss.cc,v 1.8 2003/03/21 08:01:09 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
//
#include "G4Timer.hh"
#include "G4VXTRenergyLoss.hh"
#include "Randomize.hh"
#include "G4Material.hh"
#include "G4Poisson.hh"
#include "G4MaterialTable.hh"
#include "globals.hh"
#include "g4std/complex"
#include "G4LogicalVolume.hh"
#include "G4PhysicsTable.hh"
#include "G4PhysicsVector.hh"
#include "G4PhysicsLinearVector.hh"
#include "G4PhysicsLogVector.hh"
#include "G4Integrator.hh"
#include "G4Gamma.hh"
// Initialization of local constants
@@ -351,7 +342,7 @@ G4VParticleChange* G4VXTRenergyLoss::AlongStepDoIt( const G4Track& aTrack,
if(iTkin == fTotBin)
{
meanNumOfTR = (*(*fEnergyDistrTable)(iPlace))(0)*chargeSq*distance ;
numOfTR = RandPoisson::shoot(meanNumOfTR) ;
numOfTR = G4Poisson(meanNumOfTR) ;
}
else
{
@@ -373,7 +364,7 @@ G4VParticleChange* G4VXTRenergyLoss::AlongStepDoIt( const G4Track& aTrack,
(*(*fAngleDistrTable)(iPlace + 1))(0))*W2)*chargeSq*0.5
<<G4endl ;
}
numOfTR = RandPoisson::shoot( meanNumOfTR ) ;
numOfTR = G4Poisson( meanNumOfTR ) ;
}
if( numOfTR == 0 ) // no change, return
{