Import Geant4 5.2.0 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
$Id: History,v 1.6 2003/02/12 08:49:13 gcosmo Exp $
|
||||
$Id: History,v 1.7 2003/05/21 16:40:15 gcosmo Exp $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -17,6 +17,10 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
May 21st, 2003 G.Cosmo - (parmodels-V05-01-00)
|
||||
----------------------
|
||||
- Fixed pedantic warnings in G4IrregularXrayTRmodel.cc and G4VXrayTRmodel.cc.
|
||||
|
||||
Feb 12th, 2003 G.Cosmo - (parmodels-V05-00-01)
|
||||
----------------------
|
||||
- Replaced call to RandPoisson::shoot() with G4Poisson(), more performant.
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4FoamXTRdEdx.hh,v 1.3 2003/01/23 11:30:03 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4FoamXrayTRmodel.hh,v 1.4 2003/01/23 11:30:03 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4GamDistrXTRdEdx.hh,v 1.3 2003/01/23 11:30:03 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4GamDistrXrayTRmodel.hh,v 1.4 2003/01/23 11:30:03 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4IrregularXTRdEdx.hh,v 1.3 2003/01/23 11:30:03 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4IrregularXrayTRmodel.hh,v 1.4 2003/01/23 11:30:03 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4PAIclusterModel.hh,v 1.4 2003/01/23 11:30:03 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4PhotoClusterModel.hh,v 1.4 2003/01/23 11:30:04 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4PlateIrrGasXTRdEdx.hh,v 1.3 2003/01/23 11:30:04 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4PlateIrrGasXrayTRmodel.hh,v 1.4 2003/01/23 11:30:04 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RegularXTRdEdx.hh,v 1.3 2003/01/23 11:30:04 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RegularXrayTRmodel.hh,v 1.4 2003/01/23 11:30:04 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VClusterModel.hh,v 1.5 2003/01/23 11:30:04 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4VClusterModel.hh,v 1.6 2003/06/16 16:56:29 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
|
||||
#include "globals.hh"
|
||||
#include "g4std/vector"
|
||||
#include <vector>
|
||||
|
||||
#include "G4PAIonisation.hh"
|
||||
#include "G4VFastSimulationModel.hh"
|
||||
@@ -83,8 +83,8 @@ protected:
|
||||
G4Navigator* fNavigator ;
|
||||
G4bool fNavigatorSetup ;
|
||||
|
||||
G4std::vector<G4ThreeVector> fClusterPositionVector ;
|
||||
G4std::vector<G4double> fClusterEnergyVector ;
|
||||
std::vector<G4ThreeVector> fClusterPositionVector ;
|
||||
std::vector<G4double> fClusterEnergyVector ;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VXTRdEdx.hh,v 1.6 2003/01/23 11:30:04 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4VXTRdEdx.hh,v 1.7 2003/06/16 16:56:30 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
@@ -41,7 +41,7 @@
|
||||
#define G4VXTRdEdx_h 1
|
||||
|
||||
|
||||
#include "g4std/complex"
|
||||
#include <complex>
|
||||
#include "globals.hh"
|
||||
|
||||
#include "G4PhysicsTable.hh"
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VXrayTRadModel.hh,v 1.3 2003/01/23 11:30:04 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4VXrayTRadModel.hh,v 1.4 2003/06/16 16:56:31 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
@@ -41,7 +41,7 @@
|
||||
#define G4VXrayTRadModel_h 1
|
||||
|
||||
|
||||
#include "g4std/complex"
|
||||
#include <complex>
|
||||
#include "globals.hh"
|
||||
|
||||
#include "G4PhysicsTable.hh"
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VXrayTRmodel.hh,v 1.4 2003/01/23 11:30:04 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4VXrayTRmodel.hh,v 1.5 2003/06/16 16:56:32 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
@@ -41,7 +41,7 @@
|
||||
#define G4VXrayTRmodel_h 1
|
||||
|
||||
|
||||
#include "g4std/complex"
|
||||
#include <complex>
|
||||
#include "globals.hh"
|
||||
|
||||
#include "G4PhysicsTable.hh"
|
||||
|
||||
@@ -21,11 +21,11 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4FoamXTRdEdx.cc,v 1.3 2001/09/18 09:02:02 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4FoamXTRdEdx.cc,v 1.4 2003/06/16 16:56:33 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "g4std/complex"
|
||||
#include <complex>
|
||||
|
||||
#include "G4FoamXTRdEdx.hh"
|
||||
#include "Randomize.hh"
|
||||
@@ -87,11 +87,11 @@ G4FoamXTRdEdx::GetStackFactor( G4double energy, G4double gamma, G4double varAngl
|
||||
* G4double(fPlateNumber) ;
|
||||
|
||||
G4complex F2 = (1.0-Ha)*(1.0-Ha)*Hb/(1.0-H)/(1.0-H)
|
||||
* (1.0 - G4std::pow(H,fPlateNumber)) ;
|
||||
* (1.0 - std::pow(H,fPlateNumber)) ;
|
||||
|
||||
G4complex R = (F1 + F2)*OneInterfaceXTRdEdx(energy,gamma,varAngle) ;
|
||||
|
||||
result = 2.0*G4std::real(R) ;
|
||||
result = 2.0*std::real(R) ;
|
||||
|
||||
return result ;
|
||||
}
|
||||
|
||||
@@ -21,11 +21,11 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4FoamXrayTRmodel.cc,v 1.3 2001/07/11 10:01:30 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4FoamXrayTRmodel.cc,v 1.4 2003/06/16 16:56:34 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "g4std/complex"
|
||||
#include <complex>
|
||||
|
||||
#include "G4FoamXrayTRmodel.hh"
|
||||
#include "Randomize.hh"
|
||||
@@ -92,13 +92,13 @@ G4FoamXrayTRmodel::GetStackFactor( G4double energy,
|
||||
|
||||
G4complex F2 = (1.0-Ha)*(Qa-Ha)*Hb/(1.0-H)/(Q-H) ;
|
||||
|
||||
F2 *= pow(Q,G4double(fPlateNumber)) - G4std::pow(H,fPlateNumber) ;
|
||||
F2 *= pow(Q,G4double(fPlateNumber)) - std::pow(H,fPlateNumber) ;
|
||||
|
||||
result = ( 1 - pow(Q,G4double(fPlateNumber)) )/( 1 - Q ) ;
|
||||
|
||||
result *= 2.0*G4std::real(F1) ;
|
||||
result *= 2.0*std::real(F1) ;
|
||||
|
||||
result += 2.0*G4std::real(F2) ;
|
||||
result += 2.0*std::real(F2) ;
|
||||
|
||||
return result ;
|
||||
}
|
||||
|
||||
@@ -21,11 +21,11 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4GamDistrXTRdEdx.cc,v 1.3 2001/09/18 09:02:02 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4GamDistrXTRdEdx.cc,v 1.4 2003/06/16 16:56:35 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "g4std/complex"
|
||||
#include <complex>
|
||||
|
||||
#include "G4GamDistrXTRdEdx.hh"
|
||||
#include "Randomize.hh"
|
||||
@@ -86,19 +86,19 @@ G4GamDistrXTRdEdx::GetStackFactor( G4double energy,
|
||||
G4complex Ca(1.0+0.5*fPlateThick*Ma/fAlphaPlate,fPlateThick/Za/fAlphaPlate) ;
|
||||
G4complex Cb(1.0+0.5*fGasThick*Mb/fAlphaGas,fGasThick/Zb/fAlphaGas) ;
|
||||
|
||||
G4complex Ha = G4std::pow(Ca,-fAlphaPlate) ;
|
||||
G4complex Hb = G4std::pow(Cb,-fAlphaGas) ;
|
||||
G4complex Ha = std::pow(Ca,-fAlphaPlate) ;
|
||||
G4complex Hb = std::pow(Cb,-fAlphaGas) ;
|
||||
G4complex H = Ha*Hb ;
|
||||
|
||||
G4complex F1 = (1.0 - Ha)*(1.0 - Hb )/(1.0 - H)
|
||||
* G4double(fPlateNumber) ;
|
||||
|
||||
G4complex F2 = (1.0-Ha)*(1.0-Ha)*Hb/(1.0-H)/(1.0-H)
|
||||
* (1.0 - G4std::pow(H,fPlateNumber)) ;
|
||||
* (1.0 - std::pow(H,fPlateNumber)) ;
|
||||
|
||||
G4complex R = (F1 + F2)*OneInterfaceXTRdEdx(energy,gamma,varAngle) ;
|
||||
|
||||
result = 2.0*G4std::real(R) ;
|
||||
result = 2.0*std::real(R) ;
|
||||
|
||||
return result ;
|
||||
}
|
||||
|
||||
@@ -21,11 +21,11 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4GamDistrXrayTRmodel.cc,v 1.3 2001/07/11 10:01:31 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4GamDistrXrayTRmodel.cc,v 1.4 2003/06/16 16:56:36 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "g4std/complex"
|
||||
#include <complex>
|
||||
|
||||
#include "G4GamDistrXrayTRmodel.hh"
|
||||
#include "Randomize.hh"
|
||||
@@ -91,21 +91,21 @@ G4GamDistrXrayTRmodel::GetStackFactor( G4double energy,
|
||||
G4complex Ca(1.0+0.5*fPlateThick*Ma/fAlphaPlate,fPlateThick/Za/fAlphaPlate) ;
|
||||
G4complex Cb(1.0+0.5*fGasThick*Mb/fAlphaGas,fGasThick/Zb/fAlphaGas) ;
|
||||
|
||||
G4complex Ha = G4std::pow(Ca,-fAlphaPlate) ;
|
||||
G4complex Hb = G4std::pow(Cb,-fAlphaGas) ;
|
||||
G4complex Ha = std::pow(Ca,-fAlphaPlate) ;
|
||||
G4complex Hb = std::pow(Cb,-fAlphaGas) ;
|
||||
G4complex H = Ha*Hb ;
|
||||
|
||||
G4complex F1 = ( 0.5*(1+Qa)*(1.0+H) - Ha - Qa*Hb )/(1.0-H) ;
|
||||
|
||||
G4complex F2 = (1.0-Ha)*(Qa-Ha)*Hb/(1.0-H)/(Q-H) ;
|
||||
|
||||
F2 *= pow(Q,G4double(fPlateNumber)) - G4std::pow(H,fPlateNumber) ;
|
||||
F2 *= pow(Q,G4double(fPlateNumber)) - std::pow(H,fPlateNumber) ;
|
||||
|
||||
result = ( 1 - pow(Q,G4double(fPlateNumber)) )/( 1 - Q ) ;
|
||||
|
||||
result *= 2.0*G4std::real(F1) ;
|
||||
result *= 2.0*std::real(F1) ;
|
||||
|
||||
result += 2.0*G4std::real(F2) ;
|
||||
result += 2.0*std::real(F2) ;
|
||||
|
||||
return result ;
|
||||
}
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4IrregularXTRdEdx.cc,v 1.3 2001/09/18 09:02:02 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4IrregularXTRdEdx.cc,v 1.4 2003/06/16 16:56:37 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@ G4IrregularXTRdEdx::GetStackFactor( G4double energy,
|
||||
|
||||
G4complex R = OneInterfaceXTRdEdx(energy,gamma,varAngle)
|
||||
* G4double(fPlateNumber) ;
|
||||
result = 2.0*G4std::real(R) ;
|
||||
result = 2.0*std::real(R) ;
|
||||
|
||||
return result ;
|
||||
}
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4IrregularXrayTRmodel.cc,v 1.5 2003/02/12 08:48:56 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4IrregularXrayTRmodel.cc,v 1.6 2003/05/21 16:39:57 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
|
||||
@@ -213,8 +213,7 @@ void G4IrregularXrayTRmodel::DoIt( const G4FastTrack& fastTrack ,
|
||||
// mean absorption length of XTR photons in coresponding material.
|
||||
|
||||
G4double
|
||||
G4IrregularXrayTRmodel::GetStackFactor( G4double energy,
|
||||
G4double gamma, G4double varAngle )
|
||||
G4IrregularXrayTRmodel::GetStackFactor( G4double energy, G4double, G4double )
|
||||
{
|
||||
G4double result, plateFactor, gasFactor, factor ;
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4PAIclusterModel.cc,v 1.6 2001/09/18 09:30:30 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "G4Timer.hh"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4PhotoClusterModel.cc,v 1.3 2001/09/18 09:30:31 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "G4Timer.hh"
|
||||
|
||||
@@ -21,11 +21,11 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4PlateIrrGasXTRdEdx.cc,v 1.3 2001/09/18 09:02:03 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4PlateIrrGasXTRdEdx.cc,v 1.4 2003/06/16 16:56:38 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "g4std/complex"
|
||||
#include <complex>
|
||||
|
||||
#include "G4PlateIrrGasXTRdEdx.hh"
|
||||
#include "Randomize.hh"
|
||||
@@ -88,7 +88,7 @@ G4PlateIrrGasXTRdEdx::GetStackFactor( G4double energy,
|
||||
|
||||
R *= G4double(fPlateNumber)*OneInterfaceXTRdEdx(energy,gamma,varAngle) ;
|
||||
|
||||
result = 2.0*G4std::real(R) ;
|
||||
result = 2.0*std::real(R) ;
|
||||
|
||||
|
||||
return result ;
|
||||
|
||||
@@ -21,11 +21,11 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4PlateIrrGasXrayTRmodel.cc,v 1.4 2001/09/18 09:02:03 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4PlateIrrGasXrayTRmodel.cc,v 1.5 2003/06/16 16:56:39 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "g4std/complex"
|
||||
#include <complex>
|
||||
|
||||
#include "G4PlateIrrGasXrayTRmodel.hh"
|
||||
#include "Randomize.hh"
|
||||
@@ -97,13 +97,13 @@ G4PlateIrrGasXrayTRmodel::GetStackFactor( G4double energy,
|
||||
|
||||
G4complex F2 = (1-Ha)*(Qa-Ha)*Hb/(1-H)/(Q-H) ;
|
||||
|
||||
F2 *= pow(Q,G4double(fPlateNumber)) - G4std::pow(H,fPlateNumber) ;
|
||||
F2 *= pow(Q,G4double(fPlateNumber)) - std::pow(H,fPlateNumber) ;
|
||||
|
||||
result = ( 1 - pow(Q,G4double(fPlateNumber)) )/( 1 - Q ) ;
|
||||
|
||||
result *= 2.0*G4std::real(F1) ;
|
||||
result *= 2.0*std::real(F1) ;
|
||||
|
||||
result += 2.0*G4std::real(F2) ;
|
||||
result += 2.0*std::real(F2) ;
|
||||
|
||||
***************************************************************** */
|
||||
|
||||
|
||||
@@ -21,11 +21,11 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RegularXTRdEdx.cc,v 1.3 2001/09/18 09:02:03 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4RegularXTRdEdx.cc,v 1.4 2003/06/16 16:56:40 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "g4std/complex"
|
||||
#include <complex>
|
||||
|
||||
#include "G4RegularXTRdEdx.hh"
|
||||
#include "Randomize.hh"
|
||||
@@ -89,7 +89,7 @@ G4RegularXTRdEdx::GetStackFactor( G4double energy,
|
||||
|
||||
G4complex H = Ha*Hb ;
|
||||
|
||||
G4complex Hs = G4std::conj(H) ;
|
||||
G4complex Hs = std::conj(H) ;
|
||||
|
||||
D = 1.0 /( (1 - sqrt(Q))*(1 - sqrt(Q)) +
|
||||
4*sqrt(Q)*sin(0.5*(aZa+bZb))*sin(0.5*(aZa+bZb)) ) ;
|
||||
@@ -98,11 +98,11 @@ G4RegularXTRdEdx::GetStackFactor( G4double energy,
|
||||
* G4double(fPlateNumber)*D ;
|
||||
|
||||
G4complex F2 = (1.0-Ha)*(1.0-Ha)*Hb*(1.0-Hs)*(1.0-Hs)
|
||||
* (1.0 - G4std::pow(H,fPlateNumber)) * D*D ;
|
||||
* (1.0 - std::pow(H,fPlateNumber)) * D*D ;
|
||||
|
||||
G4complex R = (F1 + F2)*OneInterfaceXTRdEdx(energy,gamma,varAngle) ;
|
||||
|
||||
result = 2.0*G4std::real(R) ;
|
||||
result = 2.0*std::real(R) ;
|
||||
|
||||
return result ;
|
||||
}
|
||||
|
||||
@@ -21,11 +21,11 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RegularXrayTRmodel.cc,v 1.3 2001/07/11 10:01:31 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4RegularXrayTRmodel.cc,v 1.4 2003/06/16 16:56:41 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "g4std/complex"
|
||||
#include <complex>
|
||||
|
||||
#include "G4RegularXrayTRmodel.hh"
|
||||
#include "Randomize.hh"
|
||||
@@ -92,13 +92,13 @@ G4RegularXrayTRmodel::GetStackFactor( G4double energy,
|
||||
|
||||
G4complex H = Ha*Hb ;
|
||||
|
||||
G4complex Hs = G4std::conj(H) ;
|
||||
G4complex Hs = std::conj(H) ;
|
||||
|
||||
// G4complex F1 = ( 0.5*(1+Qa)*(1+H) - Ha - Qa*Hb )/(1-H) ;
|
||||
|
||||
G4complex F2 = (1.0-Ha)*(Qa-Ha)*Hb*(1.0-Hs)*(Q-Hs) ;
|
||||
|
||||
F2 *= pow(Q,G4double(fPlateNumber)) - G4std::pow(H,fPlateNumber) ;
|
||||
F2 *= pow(Q,G4double(fPlateNumber)) - std::pow(H,fPlateNumber) ;
|
||||
|
||||
result = ( 1 - pow(Q,G4double(fPlateNumber)) )/( 1 - Q ) ;
|
||||
|
||||
@@ -107,7 +107,7 @@ G4RegularXrayTRmodel::GetStackFactor( G4double energy,
|
||||
result /= (1 - sqrt(Q))*(1 - sqrt(Q)) +
|
||||
4*sqrt(Q)*sin(0.5*(aZa+bZb))*sin(0.5*(aZa+bZb)) ;
|
||||
|
||||
I2 = 2.0*G4std::real(F2) ;
|
||||
I2 = 2.0*std::real(F2) ;
|
||||
|
||||
I2 /= (1 - sqrt(Q))*(1 - sqrt(Q)) +
|
||||
4*sqrt(Q)*sin(0.5*(aZa+bZb))*sin(0.5*(aZa+bZb)) ;
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4VClusterModel.cc,v 1.6 2001/11/08 13:53:51 mverderi Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "G4Timer.hh"
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VXTRdEdx.cc,v 1.8 2003/02/12 08:48:56 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4VXTRdEdx.cc,v 1.9 2003/06/16 16:56:42 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "G4Timer.hh"
|
||||
@@ -32,7 +32,7 @@
|
||||
#include "G4Material.hh"
|
||||
#include "G4MaterialTable.hh"
|
||||
#include "globals.hh"
|
||||
#include "g4std/complex"
|
||||
#include <complex>
|
||||
#include "G4PhysicsTable.hh"
|
||||
#include "G4PhysicsVector.hh"
|
||||
#include "G4PhysicsLinearVector.hh"
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VXrayTRadModel.cc,v 1.4 2003/02/12 08:48:56 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4VXrayTRadModel.cc,v 1.5 2003/06/16 16:56:43 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "G4Timer.hh"
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "G4VXrayTRadModel.hh"
|
||||
|
||||
#include "globals.hh"
|
||||
#include "g4std/complex"
|
||||
#include <complex>
|
||||
#include "G4Poisson.hh"
|
||||
#include "G4Material.hh"
|
||||
#include "G4MaterialTable.hh"
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VXrayTRmodel.cc,v 1.5 2001/09/18 09:02:04 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4VXrayTRmodel.cc,v 1.7 2003/06/16 16:56:44 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "G4Timer.hh"
|
||||
@@ -32,7 +32,7 @@
|
||||
#include "G4Material.hh"
|
||||
#include "G4MaterialTable.hh"
|
||||
#include "globals.hh"
|
||||
#include "g4std/complex"
|
||||
#include <complex>
|
||||
#include "G4PhysicsTable.hh"
|
||||
#include "G4PhysicsVector.hh"
|
||||
#include "G4PhysicsLinearVector.hh"
|
||||
@@ -155,7 +155,7 @@ G4bool G4VXrayTRmodel::IsApplicable(const G4ParticleDefinition& particle)
|
||||
// to check distance from boundaries, see below to allow the decision)
|
||||
//
|
||||
|
||||
G4bool G4VXrayTRmodel::ModelTrigger(const G4FastTrack& fastTrack)
|
||||
G4bool G4VXrayTRmodel::ModelTrigger(const G4FastTrack&)
|
||||
{
|
||||
// G4double mass = fastTrack.GetPrimaryTrack()->GetDefinition()->GetPDGMass() ;
|
||||
// G4double kinEnergy = fastTrack.GetPrimaryTrack()->GetKineticEnergy() ;
|
||||
@@ -485,8 +485,8 @@ G4double G4VXrayTRmodel::GetPlateZmuProduct( G4double omega ,
|
||||
|
||||
void G4VXrayTRmodel::GetPlateZmuProduct()
|
||||
{
|
||||
G4std::ofstream outPlate("plateZmu.dat", G4std::ios::out ) ;
|
||||
outPlate.setf( G4std::ios::scientific, G4std::ios::floatfield );
|
||||
std::ofstream outPlate("plateZmu.dat", std::ios::out ) ;
|
||||
outPlate.setf( std::ios::scientific, std::ios::floatfield );
|
||||
|
||||
G4int i ;
|
||||
G4double omega, varAngle, gamma ;
|
||||
@@ -520,8 +520,8 @@ G4double G4VXrayTRmodel::GetGasZmuProduct( G4double omega ,
|
||||
|
||||
void G4VXrayTRmodel::GetGasZmuProduct()
|
||||
{
|
||||
G4std::ofstream outGas("gasZmu.dat", G4std::ios::out ) ;
|
||||
outGas.setf( G4std::ios::scientific, G4std::ios::floatfield );
|
||||
std::ofstream outGas("gasZmu.dat", std::ios::out ) ;
|
||||
outGas.setf( std::ios::scientific, std::ios::floatfield );
|
||||
G4int i ;
|
||||
G4double omega, varAngle, gamma ;
|
||||
gamma = 10000. ;
|
||||
@@ -623,11 +623,11 @@ void G4VXrayTRmodel::GetNumberOfPhotons()
|
||||
G4int iTkin ;
|
||||
G4double gamma, numberE ;
|
||||
|
||||
G4std::ofstream outEn("numberE.dat", G4std::ios::out ) ;
|
||||
outEn.setf( G4std::ios::scientific, G4std::ios::floatfield );
|
||||
std::ofstream outEn("numberE.dat", std::ios::out ) ;
|
||||
outEn.setf( std::ios::scientific, std::ios::floatfield );
|
||||
|
||||
G4std::ofstream outAng("numberAng.dat", G4std::ios::out ) ;
|
||||
outAng.setf( G4std::ios::scientific, G4std::ios::floatfield );
|
||||
std::ofstream outAng("numberAng.dat", std::ios::out ) ;
|
||||
outAng.setf( std::ios::scientific, std::ios::floatfield );
|
||||
|
||||
for(iTkin=0;iTkin<fTotBin;iTkin++) // Lorentz factor loop
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user