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

Import Geant4 9.6.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 17:01:34 +02:00
parent b1eb5424d2
commit e2d2f9810a
10384 changed files with 698580 additions and 628834 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/error_propagation/History
+22
View File
@@ -16,6 +16,28 @@ committal in the CVS repository !
----------------------------------------------------------
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
21 November 2012 - P.Arce (error-propagation-V09-05-06)
- Changes to G4ErrorRunManagerHelper to correct check for G4ErrorPhysicsList"
19 September 2012 - P.Arce (error_propagation-V09-05-05)
- Changes in G4ErrorFreeTrajState (partType -> partName) and delete code not needed in G4ErrorPhysicsList
23 August 2012 - P.Arce (error_propagation-V09-05-04)
- Changes in G4ErrorTrackLengthTarget and G4VErrorLimitProcess to solve memory leak
5 July 2012 - G.Cosmo (error_propagation-V09-05-03)
- Explicitly use inclusion of headers for system of units and physical
constants, in plan to remove implicit inclusion from globals.hh.
6 June 2012 - G.Cosmo (error_propagation-V09-05-02)
- Fixed spurious cases of hidden variable visibility, detected with
'-Wshadow' compilation option on gcc compiler.
17 January 2012 - G.Cosmo (error_propagation-V09-05-01)
- Set navigator to stepping manager and field locators; fixing crash on Windows.
14 December 2011 - G.Cosmo (error_propagation-V09-05-00)
- Fixed minor Coverity defects.
13 November 2011 - P.Arce (error_propagation-V09-04-04)
- Add GetTranfMat in G4ErrorFreeTrajectoryState.hh
source/error_propagation/include/G4ErrorFreeTrajParam.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ErrorFreeTrajParam.hh,v 1.2 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// Class Description:
//
source/error_propagation/include/G4ErrorFreeTrajState.hh
+2 -3
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ErrorFreeTrajState.hh,v 1.4 2007-05-31 20:27:06 arce Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// Class Description:
//
@@ -68,7 +67,7 @@ class G4ErrorFreeTrajState : public G4ErrorTrajState
public: // with description
G4ErrorFreeTrajState() : theFirstStep(true) {}
G4ErrorFreeTrajState( const G4String& partType,
G4ErrorFreeTrajState( const G4String& partName,
const G4Point3D& pos,
const G4Vector3D& mom,
const G4ErrorTrajErr& errmat = G4ErrorTrajErr(5,0) );
source/error_propagation/include/G4ErrorGeomVolumeTarget.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ErrorGeomVolumeTarget.hh,v 1.3 2007-05-31 15:28:51 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// Class Description:
//
source/error_propagation/include/G4ErrorMagFieldLimitProcess.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ErrorMagFieldLimitProcess.hh,v 1.2 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// Class description:
//
source/error_propagation/include/G4ErrorMatrix.hh
+1 -2
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorMatrix.hh,v 1.2 2007-06-01 12:43:28 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// Class Description:
//
source/error_propagation/include/G4ErrorMatrix.icc
+1 -2
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorMatrix.icc,v 1.2 2007-06-01 12:43:28 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class inline implementation
source/error_propagation/include/G4ErrorMessenger.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ErrorMessenger.hh,v 1.2 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// Class Description:
//
source/error_propagation/include/G4ErrorPhysicsList.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ErrorPhysicsList.hh,v 1.2 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// Class Description:
source/error_propagation/include/G4ErrorPropagator.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ErrorPropagator.hh,v 1.3 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// Class Description:
source/error_propagation/include/G4ErrorPropagatorManager.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ErrorPropagatorManager.hh,v 1.2 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// Class Description:
//
source/error_propagation/include/G4ErrorRunManagerHelper.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ErrorRunManagerHelper.hh,v 1.2 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// Class Description:
source/error_propagation/include/G4ErrorStepLengthLimitProcess.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ErrorStepLengthLimitProcess.hh,v 1.2 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// Class Description:
source/error_propagation/include/G4ErrorSurfaceTrajParam.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ErrorSurfaceTrajParam.hh,v 1.2 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// Class Description:
source/error_propagation/include/G4ErrorSurfaceTrajState.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ErrorSurfaceTrajState.hh,v 1.2 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// Class description:
source/error_propagation/include/G4ErrorSymMatrix.hh
+1 -2
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorSymMatrix.hh,v 1.2 2007-06-01 12:43:28 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// Class Description:
//
source/error_propagation/include/G4ErrorSymMatrix.icc
+3 -4
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorSymMatrix.icc,v 1.2 2007-06-01 12:43:28 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class inline implementation
@@ -73,9 +72,9 @@ G4ErrorSymMatrix::operator()(G4int row, G4int col) const
return (row>=col? fast(row,col) : fast(col,row));
}
inline void G4ErrorSymMatrix::assign(const G4ErrorSymMatrix &m2)
inline void G4ErrorSymMatrix::assign(const G4ErrorSymMatrix &mat)
{
(*this)=m2;
(*this)=mat;
}
inline G4ErrorSymMatrix G4ErrorSymMatrix::T() const
source/error_propagation/include/G4ErrorTrackLengthTarget.hh
+2 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ErrorTrackLengthTarget.hh,v 1.2 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// Class Description:
@@ -87,6 +86,7 @@ class G4ErrorTrackLengthTarget : public G4VDiscreteProcess,
private:
G4double theMaximumTrackLength;
G4VParticleChange theParticleChange;
};
#endif
source/error_propagation/include/G4ErrorTrajErr.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ErrorTrajErr.hh,v 1.3 2007-05-31 20:27:07 arce Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// Class Description:
source/error_propagation/include/G4ErrorTrajState.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ErrorTrajState.hh,v 1.2 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// Class Description:
source/error_propagation/include/G4VErrorLimitProcess.hh
+3 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VErrorLimitProcess.hh,v 1.2 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// Class description:
@@ -87,6 +86,8 @@ class G4VErrorLimitProcess : public G4VDiscreteProcess
G4double theStepLimit; // limit set by the user
G4double theStepLength; // step length extracted from the user step limit,
// with the algorithms of each concrete class
G4VParticleChange theParticleChange;
};
#endif
source/error_propagation/src/G4ErrorFreeTrajParam.cc
+2 -2
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorFreeTrajParam.cc,v 1.3 2007-09-24 16:24:45 arce Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
@@ -33,6 +32,7 @@
#include "G4ErrorFreeTrajParam.hh"
#include "G4ThreeVector.hh"
#include "G4SystemOfUnits.hh"
#include <iomanip>
source/error_propagation/src/G4ErrorFreeTrajState.cc
+8 -5
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorFreeTrajState.cc,v 1.8 2009-05-14 13:53:06 arce Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
@@ -33,6 +32,8 @@
#include <iomanip>
#include "G4PhysicalConstants.hh"
#include "G4SystemOfUnits.hh"
#include "G4Field.hh"
#include "G4FieldManager.hh"
#include "G4TransportationManager.hh"
@@ -45,7 +46,7 @@
#include "G4ErrorMatrix.hh"
//------------------------------------------------------------------------
G4ErrorFreeTrajState::G4ErrorFreeTrajState( const G4String& partType, const G4Point3D& pos, const G4Vector3D& mom, const G4ErrorTrajErr& errmat) : G4ErrorTrajState( partType, pos, mom, errmat )
G4ErrorFreeTrajState::G4ErrorFreeTrajState( const G4String& partName, const G4Point3D& pos, const G4Vector3D& mom, const G4ErrorTrajErr& errmat) : G4ErrorTrajState( partName, pos, mom, errmat )
{
fTrajParam = G4ErrorFreeTrajParam( pos, mom );
Init();
@@ -185,15 +186,17 @@ G4int G4ErrorFreeTrajState::Update( const G4Track* aTrack )
//------------------------------------------------------------------------
std::ostream& operator<<(std::ostream& out, const G4ErrorFreeTrajState& ts)
{
out.setf(std::ios::fixed,std::ios::floatfield);
std::ios::fmtflags orig_flags = out.flags();
out.setf(std::ios::fixed,std::ios::floatfield);
ts.DumpPosMomError( out );
out << " G4ErrorFreeTrajState: Params: " << ts.fTrajParam << G4endl;
return out;
out.flags(orig_flags);
return out;
}
source/error_propagation/src/G4ErrorGeomVolumeTarget.cc
+1 -2
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorGeomVolumeTarget.cc,v 1.3 2007-05-31 15:28:51 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
source/error_propagation/src/G4ErrorMagFieldLimitProcess.cc
+1 -2
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorMagFieldLimitProcess.cc,v 1.3 2009-11-11 17:10:33 arce Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
source/error_propagation/src/G4ErrorMatrix.cc
+90 -89
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorMatrix.cc,v 1.3 2007-06-21 15:04:06 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
@@ -47,15 +46,15 @@
#define SIMPLE_BOP(OPER) \
G4ErrorMatrixIter a=m.begin(); \
G4ErrorMatrixConstIter b=m2.m.begin(); \
G4ErrorMatrixConstIter b=mat2.m.begin(); \
G4ErrorMatrixIter e=m.end(); \
for(;a!=e; a++, b++) (*a) OPER (*b);
#define SIMPLE_TOP(OPER) \
G4ErrorMatrixConstIter a=m1.m.begin(); \
G4ErrorMatrixConstIter b=m2.m.begin(); \
G4ErrorMatrixConstIter a=mat1.m.begin(); \
G4ErrorMatrixConstIter b=mat2.m.begin(); \
G4ErrorMatrixIter t=mret.m.begin(); \
G4ErrorMatrixConstIter e=m1.m.end(); \
G4ErrorMatrixConstIter e=mat1.m.end(); \
for(;a!=e; a++, b++, t++) (*t) = (*a) OPER (*b);
// Static functions.
@@ -115,19 +114,19 @@ G4ErrorMatrix::~G4ErrorMatrix()
{
}
G4ErrorMatrix::G4ErrorMatrix(const G4ErrorMatrix &m1)
: m(m1.size), nrow(m1.nrow), ncol(m1.ncol), size(m1.size)
G4ErrorMatrix::G4ErrorMatrix(const G4ErrorMatrix &mat1)
: m(mat1.size), nrow(mat1.nrow), ncol(mat1.ncol), size(mat1.size)
{
m = m1.m;
m = mat1.m;
}
G4ErrorMatrix::G4ErrorMatrix(const G4ErrorSymMatrix &m1)
: m(m1.nrow*m1.nrow), nrow(m1.nrow), ncol(m1.nrow)
G4ErrorMatrix::G4ErrorMatrix(const G4ErrorSymMatrix &mat1)
: m(mat1.nrow*mat1.nrow), nrow(mat1.nrow), ncol(mat1.nrow)
{
size = nrow * ncol;
G4int n = ncol;
G4ErrorMatrixConstIter sjk = m1.m.begin();
G4ErrorMatrixConstIter sjk = mat1.m.begin();
G4ErrorMatrixIter m1j = m.begin();
G4ErrorMatrixIter mj = m.begin();
// j >= k
@@ -175,19 +174,19 @@ G4ErrorMatrix G4ErrorMatrix::sub(G4int min_row, G4int max_row,
return mret;
}
void G4ErrorMatrix::sub(G4int row,G4int col,const G4ErrorMatrix &m1)
void G4ErrorMatrix::sub(G4int row,G4int col,const G4ErrorMatrix &mat1)
{
if(row <1 || row+m1.num_row()-1 > num_row() ||
col <1 || col+m1.num_col()-1 > num_col() )
if(row <1 || row+mat1.num_row()-1 > num_row() ||
col <1 || col+mat1.num_col()-1 > num_col() )
{ error("G4ErrorMatrix::sub: Index out of range"); }
G4ErrorMatrixConstIter a = m1.m.begin();
G4ErrorMatrixConstIter a = mat1.m.begin();
G4int nc = num_col();
G4ErrorMatrixIter b1 = m.begin() + (row - 1) * nc + col - 1;
for(G4int irow=1; irow<=m1.num_row(); irow++)
for(G4int irow=1; irow<=mat1.num_row(); irow++)
{
G4ErrorMatrixIter brc = b1;
for(G4int icol=1; icol<=m1.num_col(); icol++)
for(G4int icol=1; icol<=mat1.num_col(); icol++)
{
*(brc++) = *(a++);
}
@@ -199,12 +198,12 @@ void G4ErrorMatrix::sub(G4int row,G4int col,const G4ErrorMatrix &m1)
// Direct sum of two matricies
//
G4ErrorMatrix dsum(const G4ErrorMatrix &m1, const G4ErrorMatrix &m2)
G4ErrorMatrix dsum(const G4ErrorMatrix &mat1, const G4ErrorMatrix &mat2)
{
G4ErrorMatrix mret(m1.num_row() + m2.num_row(), m1.num_col() + m2.num_col(),
0);
mret.sub(1,1,m1);
mret.sub(m1.num_row()+1,m1.num_col()+1,m2);
G4ErrorMatrix mret(mat1.num_row() + mat2.num_row(),
mat1.num_col() + mat2.num_col(), 0);
mret.sub(1,1,mat1);
mret.sub(mat1.num_row()+1,mat1.num_col()+1,mat2);
return mret;
}
@@ -215,18 +214,18 @@ G4ErrorMatrix dsum(const G4ErrorMatrix &m1, const G4ErrorMatrix &m2)
G4ErrorMatrix G4ErrorMatrix::operator- () const
{
G4ErrorMatrix m2(nrow, ncol);
G4ErrorMatrix mat2(nrow, ncol);
G4ErrorMatrixConstIter a=m.begin();
G4ErrorMatrixIter b=m2.m.begin();
G4ErrorMatrixIter b=mat2.m.begin();
G4ErrorMatrixConstIter e=m.end();
for(;a<e; a++, b++) (*b) = -(*a);
return m2;
return mat2;
}
G4ErrorMatrix operator+(const G4ErrorMatrix &m1,const G4ErrorMatrix &m2)
G4ErrorMatrix operator+(const G4ErrorMatrix &mat1,const G4ErrorMatrix &mat2)
{
G4ErrorMatrix mret(m1.nrow, m1.ncol);
CHK_DIM_2(m1.num_row(),m2.num_row(), m1.num_col(),m2.num_col(),+);
G4ErrorMatrix mret(mat1.nrow, mat1.ncol);
CHK_DIM_2(mat1.num_row(),mat2.num_row(), mat1.num_col(),mat2.num_col(),+);
SIMPLE_TOP(+)
return mret;
}
@@ -235,11 +234,11 @@ G4ErrorMatrix operator+(const G4ErrorMatrix &m1,const G4ErrorMatrix &m2)
// operator -
//
G4ErrorMatrix operator-(const G4ErrorMatrix &m1,const G4ErrorMatrix &m2)
G4ErrorMatrix operator-(const G4ErrorMatrix &mat1,const G4ErrorMatrix &mat2)
{
G4ErrorMatrix mret(m1.num_row(), m1.num_col());
CHK_DIM_2(m1.num_row(),m2.num_row(),
m1.num_col(),m2.num_col(),-);
G4ErrorMatrix mret(mat1.num_row(), mat1.num_col());
CHK_DIM_2(mat1.num_row(),mat2.num_row(),
mat1.num_col(),mat2.num_col(),-);
SIMPLE_TOP(-)
return mret;
}
@@ -249,45 +248,45 @@ G4ErrorMatrix operator-(const G4ErrorMatrix &m1,const G4ErrorMatrix &m2)
The two argument functions *,/. They call copy constructor and then /=,*=.
----------------------------------------------------------------------- */
G4ErrorMatrix operator/(const G4ErrorMatrix &m1,G4double t)
G4ErrorMatrix operator/(const G4ErrorMatrix &mat1,G4double t)
{
G4ErrorMatrix mret(m1);
G4ErrorMatrix mret(mat1);
mret /= t;
return mret;
}
G4ErrorMatrix operator*(const G4ErrorMatrix &m1,G4double t)
G4ErrorMatrix operator*(const G4ErrorMatrix &mat1,G4double t)
{
G4ErrorMatrix mret(m1);
G4ErrorMatrix mret(mat1);
mret *= t;
return mret;
}
G4ErrorMatrix operator*(G4double t,const G4ErrorMatrix &m1)
G4ErrorMatrix operator*(G4double t,const G4ErrorMatrix &mat1)
{
G4ErrorMatrix mret(m1);
G4ErrorMatrix mret(mat1);
mret *= t;
return mret;
}
G4ErrorMatrix operator*(const G4ErrorMatrix &m1,const G4ErrorMatrix &m2)
G4ErrorMatrix operator*(const G4ErrorMatrix &mat1,const G4ErrorMatrix &mat2)
{
// initialize matrix to 0.0
G4ErrorMatrix mret(m1.nrow,m2.ncol,0);
CHK_DIM_1(m1.ncol,m2.nrow,*);
G4ErrorMatrix mret(mat1.nrow,mat2.ncol,0);
CHK_DIM_1(mat1.ncol,mat2.nrow,*);
G4int m1cols = m1.ncol;
G4int m2cols = m2.ncol;
G4int m1cols = mat1.ncol;
G4int m2cols = mat2.ncol;
for (G4int i=0; i<m1.nrow; i++)
for (G4int i=0; i<mat1.nrow; i++)
{
for (G4int j=0; j<m1cols; j++)
{
G4double temp = m1.m[i*m1cols+j];
G4double temp = mat1.m[i*m1cols+j];
G4ErrorMatrixIter pt = mret.m.begin() + i*m2cols;
// Loop over k (the column index in matrix m2)
G4ErrorMatrixConstIter pb = m2.m.begin() + m2cols*j;
// Loop over k (the column index in matrix mat2)
G4ErrorMatrixConstIter pb = mat2.m.begin() + m2cols*j;
const G4ErrorMatrixConstIter pblast = pb + m2cols;
while (pb < pblast)
{
@@ -304,16 +303,16 @@ G4ErrorMatrix operator*(const G4ErrorMatrix &m1,const G4ErrorMatrix &m2)
This section contains the assignment and inplace operators =,+=,-=,*=,/=.
----------------------------------------------------------------------- */
G4ErrorMatrix & G4ErrorMatrix::operator+=(const G4ErrorMatrix &m2)
G4ErrorMatrix & G4ErrorMatrix::operator+=(const G4ErrorMatrix &mat2)
{
CHK_DIM_2(num_row(),m2.num_row(),num_col(),m2.num_col(),+=);
CHK_DIM_2(num_row(),mat2.num_row(),num_col(),mat2.num_col(),+=);
SIMPLE_BOP(+=)
return (*this);
}
G4ErrorMatrix & G4ErrorMatrix::operator-=(const G4ErrorMatrix &m2)
G4ErrorMatrix & G4ErrorMatrix::operator-=(const G4ErrorMatrix &mat2)
{
CHK_DIM_2(num_row(),m2.num_row(),num_col(),m2.num_col(),-=);
CHK_DIM_2(num_row(),mat2.num_row(),num_col(),mat2.num_col(),-=);
SIMPLE_BOP(-=)
return (*this);
}
@@ -330,44 +329,46 @@ G4ErrorMatrix & G4ErrorMatrix::operator*=(G4double t)
return (*this);
}
G4ErrorMatrix & G4ErrorMatrix::operator=(const G4ErrorMatrix &m1)
G4ErrorMatrix & G4ErrorMatrix::operator=(const G4ErrorMatrix &mat1)
{
if(m1.nrow*m1.ncol != size) //??fixme?? m1.size != size
if (&mat1 == this) { return *this; }
if(mat1.nrow*mat1.ncol != size) //??fixme?? mat1.size != size
{
size = m1.nrow * m1.ncol;
m.resize(size); //??fixme?? if (size < m1.size) m.resize(m1.size);
size = mat1.nrow * mat1.ncol;
m.resize(size); //??fixme?? if (size < mat1.size) m.resize(mat1.size);
}
nrow = m1.nrow;
ncol = m1.ncol;
m = m1.m;
nrow = mat1.nrow;
ncol = mat1.ncol;
m = mat1.m;
return (*this);
}
// Print the G4ErrorMatrix.
std::ostream& operator<<(std::ostream &s, const G4ErrorMatrix &q)
std::ostream& operator<<(std::ostream &os, const G4ErrorMatrix &q)
{
s << "\n";
os << "\n";
// Fixed format needs 3 extra characters for field,
// while scientific needs 7
G4int width;
if(s.flags() & std::ios::fixed)
{ width = s.precision()+3; }
if(os.flags() & std::ios::fixed)
{ width = os.precision()+3; }
else
{ width = s.precision()+7; }
{ width = os.precision()+7; }
for(G4int irow = 1; irow<= q.num_row(); irow++)
{
for(G4int icol = 1; icol <= q.num_col(); icol++)
{
s.width(width);
s << q(irow,icol) << " ";
os.width(width);
os << q(irow,icol) << " ";
}
s << G4endl;
os << G4endl;
}
return s;
return os;
}
G4ErrorMatrix G4ErrorMatrix::T() const
@@ -492,9 +493,9 @@ G4int G4ErrorMatrix::dfinv_matrix(G4int *ir) {
}
G4int nxch = ir[n];
if (nxch==0) return 0;
for (G4int mm=1;mm<=nxch;mm++)
for (G4int mq=1;mq<=nxch;mq++)
{
G4int k = nxch - mm + 1;
G4int k = nxch - mq + 1;
G4int ij = ir[k];
G4int i = ij >> 12;
G4int j = ij%4096;
@@ -656,7 +657,7 @@ void G4ErrorMatrix::invert(G4int &ierr)
ir = new G4int [max_array+1];
}
G4double t1, t2, t3;
G4double det, temp, s;
G4double det, temp, ss;
G4int ifail;
switch(nrow)
{
@@ -713,17 +714,17 @@ void G4ErrorMatrix::invert(G4int &ierr)
return;
}
{
G4double s = temp/det;
G4ErrorMatrixIter mm = m.begin();
*(mm++) = s*c11;
*(mm++) = s*c21;
*(mm++) = s*c31;
*(mm++) = s*c12;
*(mm++) = s*c22;
*(mm++) = s*c32;
*(mm++) = s*c13;
*(mm++) = s*c23;
*(mm) = s*c33;
ss = temp/det;
G4ErrorMatrixIter mq = m.begin();
*(mq++) = ss*c11;
*(mq++) = ss*c21;
*(mq++) = ss*c31;
*(mq++) = ss*c12;
*(mq++) = ss*c22;
*(mq++) = ss*c32;
*(mq++) = ss*c13;
*(mq++) = ss*c23;
*(mq) = ss*c33;
}
break;
case 2:
@@ -734,11 +735,11 @@ void G4ErrorMatrix::invert(G4int &ierr)
ierr = 1;
return;
}
s = 1.0/det;
temp = s*(*(m.begin()+3));
*(m.begin()+1) *= -s;
*(m.begin()+2) *= -s;
*(m.begin()+3) = s*(*m.begin());
ss = 1.0/det;
temp = ss*(*(m.begin()+3));
*(m.begin()+1) *= -ss;
*(m.begin()+2) *= -ss;
*(m.begin()+3) = ss*(*m.begin());
*(m.begin()) = temp;
break;
case 1:
@@ -801,9 +802,9 @@ G4double G4ErrorMatrix::trace() const
return t;
}
void G4ErrorMatrix::error(const char *s)
void G4ErrorMatrix::error(const char *msg)
{
G4cerr << s << G4endl;
G4cerr << msg << G4endl;
G4cerr << "---Exiting to System." << G4endl;
abort();
}
source/error_propagation/src/G4ErrorMessenger.cc
+1 -2
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorMessenger.cc,v 1.2 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
source/error_propagation/src/G4ErrorPhysicsList.cc
+6 -3
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorPhysicsList.cc,v 1.3 2009-05-14 13:54:34 arce Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
@@ -32,6 +31,9 @@
#include "globals.hh"
#include "G4PhysicalConstants.hh"
#include "G4SystemOfUnits.hh"
#include "G4ErrorPhysicsList.hh"
#include "G4ComptonScattering.hh"
#include "G4GammaConversion.hh"
@@ -192,7 +194,7 @@ void G4ErrorPhysicsList::ConstructEM()
pmanager->AddDiscreteProcess( stepLengthLimitProcess, 2 );
pmanager->AddDiscreteProcess( magFieldLimitProcess, 3 );
} else if ((!particle->IsShortLived()) &&
/* } else if ((!particle->IsShortLived()) &&
(particle->GetPDGCharge() != 0.0) &&
(particle->GetParticleName() != "chargedgeantino")) {
// all others charged particles except geantino
@@ -216,6 +218,7 @@ void G4ErrorPhysicsList::ConstructEM()
// pmanager->SetProcessOrdering(aMultipleScattering, idxPostStep,1);
pmanager->SetProcessOrdering(anIonisation, idxPostStep,1);
////pmanager->SetProcessOrdering(theUserCuts, idxPostStep,2);
*/
}
}
}
source/error_propagation/src/G4ErrorPropagator.cc
+6 -4
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorPropagator.cc,v 1.7 2007-11-14 17:01:14 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
@@ -38,6 +37,7 @@
#include "G4ErrorGeomVolumeTarget.hh"
#include "G4ErrorSurfaceTarget.hh"
#include "G4SystemOfUnits.hh"
#include "G4DynamicParticle.hh"
#include "G4Track.hh"
#include "G4SteppingManager.hh"
@@ -55,14 +55,14 @@
//---------------------------------------------------------------------------
G4ErrorPropagator::G4ErrorPropagator()
: theInitialTrajState(0), theFinalTrajState(0)
: theStepLength(0.), theInitialTrajState(0),
theFinalTrajState(0), theStepN(0), theG4Track(0)
{
verbose = G4ErrorPropagatorData::verbose();
#ifdef G4EVERBOSE
if(verbose >= 5) { G4cout << "G4ErrorPropagator " << this << G4endl; }
#endif
theG4Track = 0;
fpSteppingManager = G4EventManager::GetEventManager()
->GetTrackingManager()->GetSteppingManager();
thePropIsInitialized = false;
@@ -170,6 +170,8 @@ G4int G4ErrorPropagator::Propagate( G4ErrorTrajState* currentTS,
InvokePostUserTrackingAction( theG4Track );
// delete currentTS_FREE;
return ierr;
}
source/error_propagation/src/G4ErrorPropagatorManager.cc
+15 -4
View File
@@ -23,14 +23,16 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorPropagatorManager.cc,v 1.3 2007-05-31 15:28:51 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
// ------------------------------------------------------------
//
#include "G4ErrorPropagatorManager.hh"
#include "G4SystemOfUnits.hh"
#include "G4MagIntegratorStepper.hh"
#include "G4Mag_UsualEqRhs.hh"
#include "G4Mag_EqRhs.hh"
@@ -40,8 +42,6 @@
#include "G4ExactHelixStepper.hh"
#include "G4HelixExplicitEuler.hh"
#include "G4ErrorPropagatorManager.hh"
#include "G4EventManager.hh"
#include "G4ErrorRunManagerHelper.hh"
#include "G4ErrorPropagator.hh"
@@ -58,6 +58,8 @@
#include "G4ChordFinder.hh"
#include "G4EquationOfMotion.hh"
#include "G4FieldManager.hh"
#include "G4PropagatorInField.hh"
#include "G4RunManager.hh"
#include "G4VParticleChange.hh"
G4ErrorPropagatorManager*
@@ -106,6 +108,11 @@ G4ErrorPropagatorManager::G4ErrorPropagatorManager()
//-----------------------------------------------------------------------
G4ErrorPropagatorManager::~G4ErrorPropagatorManager()
{
delete theEquationOfMotion;
delete theG4ErrorPropagationNavigator;
delete thePropagator;
delete theG4ErrorRunManagerHelper;
delete theG4ErrorPropagatorManager;
}
@@ -147,6 +154,10 @@ void G4ErrorPropagatorManager::StartNavigator()
theG4ErrorPropagationNavigator->SetVerboseLevel( verb );
transportationManager->SetNavigatorForTracking(theG4ErrorPropagationNavigator);
transportationManager->GetPropagatorInField()->GetIntersectionLocator()
->SetNavigatorFor(theG4ErrorPropagationNavigator);
G4EventManager::GetEventManager()->GetTrackingManager()->GetSteppingManager()
->SetNavigator(theG4ErrorPropagationNavigator);
// G4ThreeVector center(0,0,0);
// theG4ErrorPropagationNavigator->LocateGlobalPointAndSetup(center,0,false);
source/error_propagation/src/G4ErrorRunManagerHelper.cc
+2 -3
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorRunManagerHelper.cc,v 1.2 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
@@ -143,7 +142,7 @@ void G4ErrorRunManagerHelper::InitializePhysics()
//----- Second option: physics list has been defined to GEANT4, do nothing GEANT4 should take care
if( G4RunManager::GetRunManager() != 0 && G4RunManager::GetRunManager()->GetUserPhysicsList() != 0 ){
//--- Physics should be G4ErrorPhysicsList, else send a warning
if( static_cast<const G4ErrorPhysicsList*>(G4RunManager::GetRunManager()->GetUserPhysicsList()) != 0 ) {
if( static_cast<const G4ErrorPhysicsList*>(G4RunManager::GetRunManager()->GetUserPhysicsList()) == 0 ) {
G4cerr << " WARNING G4ErrorRunManagerHelper::InitializePhysics() physics list is not G4ErrorPhysicsList. Are you sure? " << G4endl;
}
} else {
source/error_propagation/src/G4ErrorStepLengthLimitProcess.cc
+2 -2
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorStepLengthLimitProcess.cc,v 1.2 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
@@ -33,6 +32,7 @@
#include "G4ErrorStepLengthLimitProcess.hh"
#include "G4ErrorMessenger.hh"
#include "G4SystemOfUnits.hh"
#ifdef G4VERBOSE
#include "G4ErrorPropagatorData.hh"
source/error_propagation/src/G4ErrorSurfaceTrajParam.cc
+1 -2
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorSurfaceTrajParam.cc,v 1.3 2007-05-31 20:22:45 arce Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
source/error_propagation/src/G4ErrorSurfaceTrajState.cc
+3 -2
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorSurfaceTrajState.cc,v 1.6 2007-06-21 15:04:08 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
@@ -34,6 +33,8 @@
#include "G4ErrorSurfaceTrajState.hh"
#include "G4ErrorPropagatorData.hh"
#include "G4PhysicalConstants.hh"
#include "G4SystemOfUnits.hh"
#include "G4Field.hh"
#include "G4FieldManager.hh"
#include "G4TransportationManager.hh"
source/error_propagation/src/G4ErrorSymMatrix.cc
+155 -155
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorSymMatrix.cc,v 1.3 2007-06-21 15:04:10 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
@@ -46,15 +45,15 @@
#define SIMPLE_BOP(OPER) \
G4ErrorMatrixIter a=m.begin(); \
G4ErrorMatrixConstIter b=m2.m.begin(); \
G4ErrorMatrixConstIter b=mat2.m.begin(); \
G4ErrorMatrixConstIter e=m.begin()+num_size(); \
for(;a<e; a++, b++) (*a) OPER (*b);
#define SIMPLE_TOP(OPER) \
G4ErrorMatrixConstIter a=m1.m.begin(); \
G4ErrorMatrixConstIter b=m2.m.begin(); \
G4ErrorMatrixConstIter a=mat1.m.begin(); \
G4ErrorMatrixConstIter b=mat2.m.begin(); \
G4ErrorMatrixIter t=mret.m.begin(); \
G4ErrorMatrixConstIter e=m1.m.begin()+m1.num_size(); \
G4ErrorMatrixConstIter e=mat1.m.begin()+mat1.num_size(); \
for( ;a<e; a++, b++, t++) (*t) = (*a) OPER (*b);
#define CHK_DIM_2(r1,r2,c1,c2,fun) \
@@ -110,10 +109,10 @@ G4ErrorSymMatrix::~G4ErrorSymMatrix()
{
}
G4ErrorSymMatrix::G4ErrorSymMatrix(const G4ErrorSymMatrix &m1)
: m(m1.size), nrow(m1.nrow), size(m1.size)
G4ErrorSymMatrix::G4ErrorSymMatrix(const G4ErrorSymMatrix &mat1)
: m(mat1.size), nrow(mat1.nrow), size(mat1.size)
{
m = m1.m;
m = mat1.m;
}
//
@@ -160,13 +159,13 @@ G4ErrorSymMatrix G4ErrorSymMatrix::sub(G4int min_row, G4int max_row)
return mret;
}
void G4ErrorSymMatrix::sub(G4int row,const G4ErrorSymMatrix &m1)
void G4ErrorSymMatrix::sub(G4int row,const G4ErrorSymMatrix &mat1)
{
if(row <1 || row+m1.num_row()-1 > num_row() )
if(row <1 || row+mat1.num_row()-1 > num_row() )
{ G4ErrorMatrix::error("G4ErrorSymMatrix::sub: Index out of range"); }
G4ErrorMatrixConstIter a = m1.m.begin();
G4ErrorMatrixConstIter a = mat1.m.begin();
G4ErrorMatrixIter b1 = m.begin() + (row+2)*(row-1)/2;
for(G4int irow=1; irow<=m1.num_row(); irow++)
for(G4int irow=1; irow<=mat1.num_row(); irow++)
{
G4ErrorMatrixIter b = b1;
for(G4int icol=1; icol<=irow; icol++)
@@ -181,12 +180,12 @@ void G4ErrorSymMatrix::sub(G4int row,const G4ErrorSymMatrix &m1)
// Direct sum of two matricies
//
G4ErrorSymMatrix dsum(const G4ErrorSymMatrix &m1,
const G4ErrorSymMatrix &m2)
G4ErrorSymMatrix dsum(const G4ErrorSymMatrix &mat1,
const G4ErrorSymMatrix &mat2)
{
G4ErrorSymMatrix mret(m1.num_row() + m2.num_row(), 0);
mret.sub(1,m1);
mret.sub(m1.num_row()+1,m2);
G4ErrorSymMatrix mret(mat1.num_row() + mat2.num_row(), 0);
mret.sub(1,mat1);
mret.sub(mat1.num_row()+1,mat2);
return mret;
}
@@ -197,35 +196,35 @@ G4ErrorSymMatrix dsum(const G4ErrorSymMatrix &m1,
G4ErrorSymMatrix G4ErrorSymMatrix::operator- () const
{
G4ErrorSymMatrix m2(nrow);
G4ErrorSymMatrix mat2(nrow);
G4ErrorMatrixConstIter a=m.begin();
G4ErrorMatrixIter b=m2.m.begin();
G4ErrorMatrixIter b=mat2.m.begin();
G4ErrorMatrixConstIter e=m.begin()+num_size();
for(;a<e; a++, b++) { (*b) = -(*a); }
return m2;
return mat2;
}
G4ErrorMatrix operator+(const G4ErrorMatrix &m1, const G4ErrorSymMatrix &m2)
G4ErrorMatrix operator+(const G4ErrorMatrix &mat1, const G4ErrorSymMatrix &mat2)
{
G4ErrorMatrix mret(m1);
CHK_DIM_2(m1.num_row(),m2.num_row(), m1.num_col(),m2.num_col(),+);
mret += m2;
G4ErrorMatrix mret(mat1);
CHK_DIM_2(mat1.num_row(),mat2.num_row(), mat1.num_col(),mat2.num_col(),+);
mret += mat2;
return mret;
}
G4ErrorMatrix operator+(const G4ErrorSymMatrix &m1, const G4ErrorMatrix &m2)
G4ErrorMatrix operator+(const G4ErrorSymMatrix &mat1, const G4ErrorMatrix &mat2)
{
G4ErrorMatrix mret(m2);
CHK_DIM_2(m1.num_row(),m2.num_row(),m1.num_col(),m2.num_col(),+);
mret += m1;
G4ErrorMatrix mret(mat2);
CHK_DIM_2(mat1.num_row(),mat2.num_row(),mat1.num_col(),mat2.num_col(),+);
mret += mat1;
return mret;
}
G4ErrorSymMatrix operator+(const G4ErrorSymMatrix &m1,
const G4ErrorSymMatrix &m2)
G4ErrorSymMatrix operator+(const G4ErrorSymMatrix &mat1,
const G4ErrorSymMatrix &mat2)
{
G4ErrorSymMatrix mret(m1.nrow);
CHK_DIM_1(m1.nrow, m2.nrow,+);
G4ErrorSymMatrix mret(mat1.nrow);
CHK_DIM_1(mat1.nrow, mat2.nrow,+);
SIMPLE_TOP(+)
return mret;
}
@@ -234,27 +233,27 @@ G4ErrorSymMatrix operator+(const G4ErrorSymMatrix &m1,
// operator -
//
G4ErrorMatrix operator-(const G4ErrorMatrix &m1, const G4ErrorSymMatrix &m2)
G4ErrorMatrix operator-(const G4ErrorMatrix &mat1, const G4ErrorSymMatrix &mat2)
{
G4ErrorMatrix mret(m1);
CHK_DIM_2(m1.num_row(),m2.num_row(),m1.num_col(),m2.num_col(),-);
mret -= m2;
G4ErrorMatrix mret(mat1);
CHK_DIM_2(mat1.num_row(),mat2.num_row(),mat1.num_col(),mat2.num_col(),-);
mret -= mat2;
return mret;
}
G4ErrorMatrix operator-(const G4ErrorSymMatrix &m1, const G4ErrorMatrix &m2)
G4ErrorMatrix operator-(const G4ErrorSymMatrix &mat1, const G4ErrorMatrix &mat2)
{
G4ErrorMatrix mret(m1);
CHK_DIM_2(m1.num_row(),m2.num_row(),m1.num_col(),m2.num_col(),-);
mret -= m2;
G4ErrorMatrix mret(mat1);
CHK_DIM_2(mat1.num_row(),mat2.num_row(),mat1.num_col(),mat2.num_col(),-);
mret -= mat2;
return mret;
}
G4ErrorSymMatrix operator-(const G4ErrorSymMatrix &m1,
const G4ErrorSymMatrix &m2)
G4ErrorSymMatrix operator-(const G4ErrorSymMatrix &mat1,
const G4ErrorSymMatrix &mat2)
{
G4ErrorSymMatrix mret(m1.num_row());
CHK_DIM_1(m1.num_row(),m2.num_row(),-);
G4ErrorSymMatrix mret(mat1.num_row());
CHK_DIM_1(mat1.num_row(),mat2.num_row(),-);
SIMPLE_TOP(-)
return mret;
}
@@ -264,40 +263,40 @@ G4ErrorSymMatrix operator-(const G4ErrorSymMatrix &m1,
The two argument functions *,/. They call copy constructor and then /=,*=.
----------------------------------------------------------------------- */
G4ErrorSymMatrix operator/(const G4ErrorSymMatrix &m1,G4double t)
G4ErrorSymMatrix operator/(const G4ErrorSymMatrix &mat1,G4double t)
{
G4ErrorSymMatrix mret(m1);
G4ErrorSymMatrix mret(mat1);
mret /= t;
return mret;
}
G4ErrorSymMatrix operator*(const G4ErrorSymMatrix &m1,G4double t)
G4ErrorSymMatrix operator*(const G4ErrorSymMatrix &mat1,G4double t)
{
G4ErrorSymMatrix mret(m1);
G4ErrorSymMatrix mret(mat1);
mret *= t;
return mret;
}
G4ErrorSymMatrix operator*(G4double t,const G4ErrorSymMatrix &m1)
G4ErrorSymMatrix operator*(G4double t,const G4ErrorSymMatrix &mat1)
{
G4ErrorSymMatrix mret(m1);
G4ErrorSymMatrix mret(mat1);
mret *= t;
return mret;
}
G4ErrorMatrix operator*(const G4ErrorMatrix &m1, const G4ErrorSymMatrix &m2)
G4ErrorMatrix operator*(const G4ErrorMatrix &mat1, const G4ErrorSymMatrix &mat2)
{
G4ErrorMatrix mret(m1.num_row(),m2.num_col());
CHK_DIM_1(m1.num_col(),m2.num_row(),*);
G4ErrorMatrix mret(mat1.num_row(),mat2.num_col());
CHK_DIM_1(mat1.num_col(),mat2.num_row(),*);
G4ErrorMatrixConstIter mit1, mit2, sp,snp; //mit2=0
G4double temp;
G4ErrorMatrixIter mir=mret.m.begin();
for(mit1=m1.m.begin();
mit1<m1.m.begin()+m1.num_row()*m1.num_col();
for(mit1=mat1.m.begin();
mit1<mat1.m.begin()+mat1.num_row()*mat1.num_col();
mit1 = mit2)
{
snp=m2.m.begin();
for(int step=1;step<=m2.num_row();++step)
snp=mat2.m.begin();
for(int step=1;step<=mat2.num_row();++step)
{
mit2=mit1;
sp=snp;
@@ -305,12 +304,12 @@ G4ErrorMatrix operator*(const G4ErrorMatrix &m1, const G4ErrorSymMatrix &m2)
temp=0;
while(sp<snp)
temp+=*(sp++)*(*(mit2++));
if( step<m2.num_row() ) { // only if we aren't on the last row
if( step<mat2.num_row() ) { // only if we aren't on the last row
sp+=step-1;
for(int stept=step+1;stept<=m2.num_row();stept++)
for(int stept=step+1;stept<=mat2.num_row();stept++)
{
temp+=*sp*(*(mit2++));
if(stept<m2.num_row()) sp+=stept;
if(stept<mat2.num_row()) sp+=stept;
}
} // if(step
*(mir++)=temp;
@@ -319,17 +318,17 @@ G4ErrorMatrix operator*(const G4ErrorMatrix &m1, const G4ErrorSymMatrix &m2)
return mret;
}
G4ErrorMatrix operator*(const G4ErrorSymMatrix &m1, const G4ErrorMatrix &m2)
G4ErrorMatrix operator*(const G4ErrorSymMatrix &mat1, const G4ErrorMatrix &mat2)
{
G4ErrorMatrix mret(m1.num_row(),m2.num_col());
CHK_DIM_1(m1.num_col(),m2.num_row(),*);
G4ErrorMatrix mret(mat1.num_row(),mat2.num_col());
CHK_DIM_1(mat1.num_col(),mat2.num_row(),*);
G4int step,stept;
G4ErrorMatrixConstIter mit1,mit2,sp,snp;
G4double temp;
G4ErrorMatrixIter mir=mret.m.begin();
for(step=1,snp=m1.m.begin();step<=m1.num_row();snp+=step++)
for(step=1,snp=mat1.m.begin();step<=mat1.num_row();snp+=step++)
{
for(mit1=m2.m.begin();mit1<m2.m.begin()+m2.num_col();mit1++)
for(mit1=mat2.m.begin();mit1<mat2.m.begin()+mat2.num_col();mit1++)
{
mit2=mit1;
sp=snp;
@@ -337,13 +336,13 @@ G4ErrorMatrix operator*(const G4ErrorSymMatrix &m1, const G4ErrorMatrix &m2)
while(sp<snp+step)
{
temp+=*mit2*(*(sp++));
mit2+=m2.num_col();
mit2+=mat2.num_col();
}
sp+=step-1;
for(stept=step+1;stept<=m1.num_row();stept++)
for(stept=step+1;stept<=mat1.num_row();stept++)
{
temp+=*mit2*(*sp);
mit2+=m2.num_col();
mit2+=mat2.num_col();
sp+=stept;
}
*(mir++)=temp;
@@ -352,17 +351,17 @@ G4ErrorMatrix operator*(const G4ErrorSymMatrix &m1, const G4ErrorMatrix &m2)
return mret;
}
G4ErrorMatrix operator*(const G4ErrorSymMatrix &m1, const G4ErrorSymMatrix &m2)
G4ErrorMatrix operator*(const G4ErrorSymMatrix &mat1, const G4ErrorSymMatrix &mat2)
{
G4ErrorMatrix mret(m1.num_row(),m1.num_row());
CHK_DIM_1(m1.num_col(),m2.num_row(),*);
G4ErrorMatrix mret(mat1.num_row(),mat1.num_row());
CHK_DIM_1(mat1.num_col(),mat2.num_row(),*);
G4int step1,stept1,step2,stept2;
G4ErrorMatrixConstIter snp1,sp1,snp2,sp2;
G4double temp;
G4ErrorMatrixIter mr = mret.m.begin();
for(step1=1,snp1=m1.m.begin();step1<=m1.num_row();snp1+=step1++)
for(step1=1,snp1=mat1.m.begin();step1<=mat1.num_row();snp1+=step1++)
{
for(step2=1,snp2=m2.m.begin();step2<=m2.num_row();)
for(step2=1,snp2=mat2.m.begin();step2<=mat2.num_row();)
{
sp1=snp1;
sp2=snp2;
@@ -376,7 +375,7 @@ G4ErrorMatrix operator*(const G4ErrorSymMatrix &m1, const G4ErrorSymMatrix &m2)
for(stept1=step1+1;stept1!=step2+1;sp1+=stept1++)
{ temp+=(*sp1)*(*(sp2++)); }
sp2+=step2-1;
for(stept2=++step2;stept2<=m2.num_row();sp1+=stept1++,sp2+=stept2++)
for(stept2=++step2;stept2<=mat2.num_row();sp1+=stept1++,sp2+=stept2++)
{ temp+=(*sp1)*(*sp2); }
}
else
@@ -387,7 +386,7 @@ G4ErrorMatrix operator*(const G4ErrorSymMatrix &m1, const G4ErrorSymMatrix &m2)
for(stept2=++step2;stept2!=step1+1;sp2+=stept2++)
{ temp+=(*(sp1++))*(*sp2); }
sp1+=step1-1;
for(stept1=step1+1;stept1<=m1.num_row();sp1+=stept1++,sp2+=stept2++)
for(stept1=step1+1;stept1<=mat1.num_row();sp1+=stept1++,sp2+=stept2++)
{ temp+=(*sp1)*(*sp2); }
}
*(mr++)=temp;
@@ -400,11 +399,11 @@ G4ErrorMatrix operator*(const G4ErrorSymMatrix &m1, const G4ErrorSymMatrix &m2)
This section contains the assignment and inplace operators =,+=,-=,*=,/=.
----------------------------------------------------------------------- */
G4ErrorMatrix & G4ErrorMatrix::operator+=(const G4ErrorSymMatrix &m2)
G4ErrorMatrix & G4ErrorMatrix::operator+=(const G4ErrorSymMatrix &mat2)
{
CHK_DIM_2(num_row(),m2.num_row(),num_col(),m2.num_col(),+=);
CHK_DIM_2(num_row(),mat2.num_row(),num_col(),mat2.num_col(),+=);
G4int n = num_col();
G4ErrorMatrixConstIter sjk = m2.m.begin();
G4ErrorMatrixConstIter sjk = mat2.m.begin();
G4ErrorMatrixIter m1j = m.begin();
G4ErrorMatrixIter mj = m.begin();
// j >= k
@@ -425,18 +424,18 @@ G4ErrorMatrix & G4ErrorMatrix::operator+=(const G4ErrorSymMatrix &m2)
return (*this);
}
G4ErrorSymMatrix & G4ErrorSymMatrix::operator+=(const G4ErrorSymMatrix &m2)
G4ErrorSymMatrix & G4ErrorSymMatrix::operator+=(const G4ErrorSymMatrix &mat2)
{
CHK_DIM_2(num_row(),m2.num_row(),num_col(),m2.num_col(),+=);
CHK_DIM_2(num_row(),mat2.num_row(),num_col(),mat2.num_col(),+=);
SIMPLE_BOP(+=)
return (*this);
}
G4ErrorMatrix & G4ErrorMatrix::operator-=(const G4ErrorSymMatrix &m2)
G4ErrorMatrix & G4ErrorMatrix::operator-=(const G4ErrorSymMatrix &mat2)
{
CHK_DIM_2(num_row(),m2.num_row(),num_col(),m2.num_col(),-=);
CHK_DIM_2(num_row(),mat2.num_row(),num_col(),mat2.num_col(),-=);
G4int n = num_col();
G4ErrorMatrixConstIter sjk = m2.m.begin();
G4ErrorMatrixConstIter sjk = mat2.m.begin();
G4ErrorMatrixIter m1j = m.begin();
G4ErrorMatrixIter mj = m.begin();
// j >= k
@@ -457,9 +456,9 @@ G4ErrorMatrix & G4ErrorMatrix::operator-=(const G4ErrorSymMatrix &m2)
return (*this);
}
G4ErrorSymMatrix & G4ErrorSymMatrix::operator-=(const G4ErrorSymMatrix &m2)
G4ErrorSymMatrix & G4ErrorSymMatrix::operator-=(const G4ErrorSymMatrix &mat2)
{
CHK_DIM_2(num_row(),m2.num_row(),num_col(),m2.num_col(),-=);
CHK_DIM_2(num_row(),mat2.num_row(),num_col(),mat2.num_col(),-=);
SIMPLE_BOP(-=)
return (*this);
}
@@ -476,17 +475,17 @@ G4ErrorSymMatrix & G4ErrorSymMatrix::operator*=(G4double t)
return (*this);
}
G4ErrorMatrix & G4ErrorMatrix::operator=(const G4ErrorSymMatrix &m1)
G4ErrorMatrix & G4ErrorMatrix::operator=(const G4ErrorSymMatrix &mat1)
{
if(m1.nrow*m1.nrow != size)
if(mat1.nrow*mat1.nrow != size)
{
size = m1.nrow * m1.nrow;
size = mat1.nrow * mat1.nrow;
m.resize(size);
}
nrow = m1.nrow;
ncol = m1.nrow;
nrow = mat1.nrow;
ncol = mat1.nrow;
G4int n = ncol;
G4ErrorMatrixConstIter sjk = m1.m.begin();
G4ErrorMatrixConstIter sjk = mat1.m.begin();
G4ErrorMatrixIter m1j = m.begin();
G4ErrorMatrixIter mj = m.begin();
// j >= k
@@ -507,46 +506,47 @@ G4ErrorMatrix & G4ErrorMatrix::operator=(const G4ErrorSymMatrix &m1)
return (*this);
}
G4ErrorSymMatrix & G4ErrorSymMatrix::operator=(const G4ErrorSymMatrix &m1)
G4ErrorSymMatrix & G4ErrorSymMatrix::operator=(const G4ErrorSymMatrix &mat1)
{
if(m1.nrow != nrow)
if (&mat1 == this) { return *this; }
if(mat1.nrow != nrow)
{
nrow = m1.nrow;
size = m1.size;
nrow = mat1.nrow;
size = mat1.size;
m.resize(size);
}
m = m1.m;
m = mat1.m;
return (*this);
}
// Print the Matrix.
std::ostream& operator<<(std::ostream &s, const G4ErrorSymMatrix &q)
std::ostream& operator<<(std::ostream &os, const G4ErrorSymMatrix &q)
{
s << G4endl;
os << G4endl;
// Fixed format needs 3 extra characters for field,
// while scientific needs 7
G4int width;
if(s.flags() & std::ios::fixed)
if(os.flags() & std::ios::fixed)
{
width = s.precision()+3;
width = os.precision()+3;
}
else
{
width = s.precision()+7;
width = os.precision()+7;
}
for(G4int irow = 1; irow<= q.num_row(); irow++)
{
for(G4int icol = 1; icol <= q.num_col(); icol++)
{
s.width(width);
s << q(irow,icol) << " ";
os.width(width);
os << q(irow,icol) << " ";
}
s << G4endl;
os << G4endl;
}
return s;
return os;
}
G4ErrorSymMatrix G4ErrorSymMatrix::
@@ -565,15 +565,15 @@ apply(G4double (*f)(G4double, G4int, G4int)) const
return mret;
}
void G4ErrorSymMatrix::assign (const G4ErrorMatrix &m1)
void G4ErrorSymMatrix::assign (const G4ErrorMatrix &mat1)
{
if(m1.nrow != nrow)
if(mat1.nrow != nrow)
{
nrow = m1.nrow;
nrow = mat1.nrow;
size = nrow * (nrow+1) / 2;
m.resize(size);
}
G4ErrorMatrixConstIter a = m1.m.begin();
G4ErrorMatrixConstIter a = mat1.m.begin();
G4ErrorMatrixIter b = m.begin();
for(G4int r=1;r<=nrow;r++)
{
@@ -586,26 +586,26 @@ void G4ErrorSymMatrix::assign (const G4ErrorMatrix &m1)
}
}
G4ErrorSymMatrix G4ErrorSymMatrix::similarity(const G4ErrorMatrix &m1) const
G4ErrorSymMatrix G4ErrorSymMatrix::similarity(const G4ErrorMatrix &mat1) const
{
G4ErrorSymMatrix mret(m1.num_row());
G4ErrorMatrix temp = m1*(*this);
G4ErrorSymMatrix mret(mat1.num_row());
G4ErrorMatrix temp = mat1*(*this);
// If m1*(*this) has correct dimensions, then so will the m1.T multiplication.
// If mat1*(*this) has correct dimensions, then so will the mat1.T multiplication.
// So there is no need to check dimensions again.
G4int n = m1.num_col();
G4int n = mat1.num_col();
G4ErrorMatrixIter mr = mret.m.begin();
G4ErrorMatrixIter tempr1 = temp.m.begin();
for(G4int r=1;r<=mret.num_row();r++)
{
G4ErrorMatrixConstIter m1c1 = m1.m.begin();
G4ErrorMatrixConstIter m1c1 = mat1.m.begin();
for(G4int c=1;c<=r;c++)
{
G4double tmp = 0.0;
G4ErrorMatrixIter tempri = tempr1;
G4ErrorMatrixConstIter m1ci = m1c1;
for(G4int i=1;i<=m1.num_col();i++)
for(G4int i=1;i<=mat1.num_col();i++)
{
tmp+=(*(tempri++))*(*(m1ci++));
}
@@ -617,16 +617,16 @@ G4ErrorSymMatrix G4ErrorSymMatrix::similarity(const G4ErrorMatrix &m1) const
return mret;
}
G4ErrorSymMatrix G4ErrorSymMatrix::similarity(const G4ErrorSymMatrix &m1) const
G4ErrorSymMatrix G4ErrorSymMatrix::similarity(const G4ErrorSymMatrix &mat1) const
{
G4ErrorSymMatrix mret(m1.num_row());
G4ErrorMatrix temp = m1*(*this);
G4int n = m1.num_col();
G4ErrorSymMatrix mret(mat1.num_row());
G4ErrorMatrix temp = mat1*(*this);
G4int n = mat1.num_col();
G4ErrorMatrixIter mr = mret.m.begin();
G4ErrorMatrixIter tempr1 = temp.m.begin();
for(G4int r=1;r<=mret.num_row();r++)
{
G4ErrorMatrixConstIter m1c1 = m1.m.begin();
G4ErrorMatrixConstIter m1c1 = mat1.m.begin();
G4int c;
for(c=1;c<=r;c++)
{
@@ -638,7 +638,7 @@ G4ErrorSymMatrix G4ErrorSymMatrix::similarity(const G4ErrorSymMatrix &m1) const
{
tmp+=(*(tempri++))*(*(m1ci++));
}
for(i=c;i<=m1.num_col();i++)
for(i=c;i<=mat1.num_col();i++)
{
tmp+=(*(tempri++))*(*(m1ci));
m1ci += i;
@@ -651,22 +651,22 @@ G4ErrorSymMatrix G4ErrorSymMatrix::similarity(const G4ErrorSymMatrix &m1) const
return mret;
}
G4ErrorSymMatrix G4ErrorSymMatrix::similarityT(const G4ErrorMatrix &m1) const
G4ErrorSymMatrix G4ErrorSymMatrix::similarityT(const G4ErrorMatrix &mat1) const
{
G4ErrorSymMatrix mret(m1.num_col());
G4ErrorMatrix temp = (*this)*m1;
G4int n = m1.num_col();
G4ErrorSymMatrix mret(mat1.num_col());
G4ErrorMatrix temp = (*this)*mat1;
G4int n = mat1.num_col();
G4ErrorMatrixIter mrc = mret.m.begin();
G4ErrorMatrixIter temp1r = temp.m.begin();
for(G4int r=1;r<=mret.num_row();r++)
{
G4ErrorMatrixConstIter m11c = m1.m.begin();
G4ErrorMatrixConstIter m11c = mat1.m.begin();
for(G4int c=1;c<=r;c++)
{
G4double tmp = 0.0;
G4ErrorMatrixIter tempir = temp1r;
G4ErrorMatrixConstIter m1ic = m11c;
for(G4int i=1;i<=m1.num_row();i++)
for(G4int i=1;i<=mat1.num_row();i++)
{
tmp+=(*(tempir))*(*(m1ic));
tempir += n;
@@ -735,30 +735,30 @@ void G4ErrorSymMatrix::invert(G4int &ifail)
return;
}
{
G4double s = temp/det;
G4ErrorMatrixIter mm = m.begin();
*(mm++) = s*c11;
*(mm++) = s*c12;
*(mm++) = s*c22;
*(mm++) = s*c13;
*(mm++) = s*c23;
*(mm) = s*c33;
G4double ss = temp/det;
G4ErrorMatrixIter mq = m.begin();
*(mq++) = ss*c11;
*(mq++) = ss*c12;
*(mq++) = ss*c22;
*(mq++) = ss*c13;
*(mq++) = ss*c23;
*(mq) = ss*c33;
}
}
break;
case 2:
{
G4double det, temp, s;
G4double det, temp, ss;
det = (*m.begin())*(*(m.begin()+2)) - (*(m.begin()+1))*(*(m.begin()+1));
if (det==0)
{
ifail = 1;
return;
}
s = 1.0/det;
*(m.begin()+1) *= -s;
temp = s*(*(m.begin()+2));
*(m.begin()+2) = s*(*m.begin());
ss = 1.0/det;
*(m.begin()+1) *= -ss;
temp = ss*(*(m.begin()+2));
*(m.begin()+2) = ss*(*m.begin());
*m.begin() = temp;
break;
}
@@ -834,7 +834,7 @@ void G4ErrorSymMatrix::invertBunchKaufman(G4int &ifail)
// has a bug.) and implemented in "lapack"
// Mario Stanke, 09/97
G4int i, j, k, s;
G4int i, j, k, ss;
G4int pivrow;
// Establish the two working-space arrays needed: x and piv are
@@ -879,7 +879,7 @@ void G4ErrorSymMatrix::invertBunchKaufman(G4int &ifail)
// L is unit lower triangular, D is direct sum of 1x1 and 2x2 matrices
// L and D^-1 are stored in A = *this, P is stored in piv[]
for (j=1; j < nrow; j+=s) // main loop over columns
for (j=1; j < nrow; j+=ss) // main loop over columns
{
mjj = m.begin() + j*(j-1)/2 + j-1;
lambda = 0; // compute lambda = max of A(j+1:n,j)
@@ -900,14 +900,14 @@ void G4ErrorSymMatrix::invertBunchKaufman(G4int &ifail)
ifail = 1;
return;
}
s=1;
ss=1;
*mjj = 1./ *mjj;
}
else
{
if (std::fabs(*mjj) >= lambda*alpha)
{
s=1;
ss=1;
pivrow=j;
}
else
@@ -922,14 +922,14 @@ void G4ErrorSymMatrix::invertBunchKaufman(G4int &ifail)
}
if (sigma * std::fabs(*mjj) >= alpha * lambda * lambda)
{
s=1;
ss=1;
pivrow = j;
}
else if (std::fabs(*(m.begin()+pivrow*(pivrow-1)/2+pivrow-1))
>= alpha * sigma)
{ s=1; }
{ ss=1; }
else
{ s=2; }
{ ss=2; }
}
if (pivrow == j) // no permutation neccessary
{
@@ -961,7 +961,7 @@ void G4ErrorSymMatrix::invertBunchKaufman(G4int &ifail)
*ip *= temp2;
}
}
else if (s==1) // 1x1 pivot
else if (ss==1) // 1x1 pivot
{
piv[j-1] = pivrow;
@@ -1013,7 +1013,7 @@ void G4ErrorSymMatrix::invertBunchKaufman(G4int &ifail)
*ip *= temp2;
}
}
else // s=2, ie use a 2x2 pivot
else // ss=2, ie use a 2x2 pivot
{
piv[j-1] = -pivrow;
piv[j] = 0; // that means this is the second row of a 2x2 pivot
@@ -1117,12 +1117,12 @@ void G4ErrorSymMatrix::invertBunchKaufman(G4int &ifail)
// computing the inverse from the factorization
for (j = nrow ; j >= 1 ; j -= s) // loop over columns
for (j = nrow ; j >= 1 ; j -= ss) // loop over columns
{
mjj = m.begin() + j*(j-1)/2 + j-1;
if (piv[j-1] > 0) // 1x1 pivot, compute column j of inverse
{
s = 1;
ss = 1;
if (j < nrow)
{
ip = m.begin() + (j+1)*j/2 + j-1;
@@ -1151,7 +1151,7 @@ void G4ErrorSymMatrix::invertBunchKaufman(G4int &ifail)
{
if (piv[j-1] != 0)
{ G4cerr << "error in piv" << piv[j-1] << G4endl; }
s=2;
ss=2;
if (j < nrow)
{
ip = m.begin() + (j+1)*j/2 + j-1;
@@ -1216,7 +1216,7 @@ void G4ErrorSymMatrix::invertBunchKaufman(G4int &ifail)
temp1 = *mjj;
*mjj = *(m.begin() + pivrow*(pivrow-1)/2 + pivrow-1);
*(m.begin() + pivrow*(pivrow-1)/2 + pivrow-1) = temp1;
if (s==2)
if (ss==2)
{
temp1 = *(mjj-1);
*(mjj-1) = *( m.begin() + pivrow*(pivrow-1)/2 + j-2);
source/error_propagation/src/G4ErrorTrackLengthTarget.cc
+3 -5
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorTrackLengthTarget.cc,v 1.2 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
@@ -124,9 +123,8 @@ GetMeanFreePath(const class G4Track & track, G4double, enum G4ForceCondition *)
G4VParticleChange* G4ErrorTrackLengthTarget::
PostStepDoIt(const G4Track& aTrack, const G4Step& )
{
G4ParticleChange* aParticleChange = new G4ParticleChange;
aParticleChange->Initialize(aTrack);
return aParticleChange;
theParticleChange.Initialize(aTrack);
return &theParticleChange;
}
source/error_propagation/src/G4ErrorTrajState.cc
+2 -3
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ErrorTrajState.cc,v 1.2 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
@@ -44,7 +43,7 @@ G4ErrorTrajState::G4ErrorTrajState( const G4String& partType,
const G4Vector3D& mom,
const G4ErrorTrajErr& errmat)
: fParticleType(partType), fPosition(pos), fMomentum(mom), fCharge(0.),
fError(errmat), theG4Track(0)
fError(errmat), theTSType(G4eTS_FREE), theG4Track(0)
{
iverbose = G4ErrorPropagatorData::verbose();
}
source/error_propagation/src/G4VErrorLimitProcess.cc
+3 -5
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4VErrorLimitProcess.cc,v 1.2 2007-05-29 14:41:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
@@ -61,7 +60,6 @@ GetMeanFreePath(const class G4Track &, G4double, enum G4ForceCondition *)
G4VParticleChange* G4VErrorLimitProcess::
PostStepDoIt(const G4Track& aTrack, const G4Step& )
{
G4ParticleChange* aParticleChange = new G4ParticleChange;
aParticleChange->Initialize(aTrack);
return aParticleChange;
theParticleChange.Initialize(aTrack);
return &theParticleChange;
}