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

Import Geant4 11.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2022-12-09 14:43:28 +01:00
parent c07cea1fe0
commit 9f34590941
3810 changed files with 200490 additions and 182326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/error_propagation/src/G4ErrorFreeTrajParam.cc
+1 -1
View File
@@ -86,7 +86,7 @@ void G4ErrorFreeTrajParam::Update(const G4Track* aTrack)
//------------------------------------------------------------------------
std::ostream& operator<<(std::ostream& out, const G4ErrorFreeTrajParam& tp)
{
G4int oldprc = out.precision(8);
G4long oldprc = out.precision(8);
out << " InvP= " << tp.fInvP << " Theta= " << tp.fLambda
<< " Phi= " << tp.fPhi << " YPerp= " << tp.fYPerp
<< " ZPerp= " << tp.fZPerp << G4endl;
source/error_propagation/src/G4ErrorFreeTrajState.cc
+3 -3
View File
@@ -301,7 +301,7 @@ G4int G4ErrorFreeTrajState::PropagateError(const G4Track* aTrack)
transf[3][2] = stepLengthCm * sinpPost;
transf[4][1] = stepLengthCm;
for(size_t ii = 0; ii < 5; ii++)
for(auto ii = 0; ii < 5; ++ii)
{
transf[ii][ii] = 1.;
}
@@ -854,9 +854,9 @@ void G4ErrorFreeTrajState::CalculateEffectiveZandA(const G4Material* mate,
{
effZ = 0.;
effA = 0.;
G4int ii, nelem = mate->GetNumberOfElements();
auto nelem = mate->GetNumberOfElements();
const G4double* fracVec = mate->GetFractionVector();
for(ii = 0; ii < nelem; ii++)
for(G4int ii = 0; ii < (G4int)nelem; ++ii)
{
effZ += mate->GetElement(ii)->GetZ() * fracVec[ii];
effA += mate->GetElement(ii)->GetA() * fracVec[ii] / g * mole;
source/error_propagation/src/G4ErrorMatrix.cc
+6 -6
View File
@@ -375,7 +375,7 @@ std::ostream& operator<<(std::ostream& os, const G4ErrorMatrix& q)
// Fixed format needs 3 extra characters for field,
// while scientific needs 7
G4int width;
std::size_t width;
if(os.flags() & std::ios::fixed)
{
width = os.precision() + 3;
@@ -384,9 +384,9 @@ std::ostream& operator<<(std::ostream& os, const G4ErrorMatrix& q)
{
width = os.precision() + 7;
}
for(G4int irow = 1; irow <= q.num_row(); irow++)
for(G4int irow = 1; irow <= q.num_row(); ++irow)
{
for(G4int icol = 1; icol <= q.num_col(); icol++)
for(G4int icol = 1; icol <= q.num_col(); ++icol)
{
os.width(width);
os << q(irow, icol) << " ";
@@ -417,11 +417,11 @@ G4ErrorMatrix G4ErrorMatrix::T() const
G4ErrorMatrix G4ErrorMatrix::apply(G4double (*f)(G4double, G4int, G4int)) const
{
G4ErrorMatrix mret(num_row(), num_col());
G4ErrorMatrixConstIter a = m.begin();
G4ErrorMatrixConstIter a = m.cbegin();
G4ErrorMatrixIter b = mret.m.begin();
for(G4int ir = 1; ir <= num_row(); ir++)
for(G4int ir = 1; ir <= num_row(); ++ir)
{
for(G4int ic = 1; ic <= num_col(); ic++)
for(G4int ic = 1; ic <= num_col(); ++ic)
{
*(b++) = (*f)(*(a++), ir, ic);
}
source/error_propagation/src/G4ErrorSymMatrix.cc
+6 -6
View File
@@ -568,7 +568,7 @@ std::ostream& operator<<(std::ostream& os, const G4ErrorSymMatrix& q)
// Fixed format needs 3 extra characters for field,
// while scientific needs 7
G4int width;
std::size_t width;
if(os.flags() & std::ios::fixed)
{
width = os.precision() + 3;
@@ -577,9 +577,9 @@ std::ostream& operator<<(std::ostream& os, const G4ErrorSymMatrix& q)
{
width = os.precision() + 7;
}
for(G4int irow = 1; irow <= q.num_row(); irow++)
for(G4int irow = 1; irow <= q.num_row(); ++irow)
{
for(G4int icol = 1; icol <= q.num_col(); icol++)
for(G4int icol = 1; icol <= q.num_col(); ++icol)
{
os.width(width);
os << q(irow, icol) << " ";
@@ -593,11 +593,11 @@ G4ErrorSymMatrix G4ErrorSymMatrix::apply(G4double (*f)(G4double, G4int,
G4int)) const
{
G4ErrorSymMatrix mret(num_row());
G4ErrorMatrixConstIter a = m.begin();
G4ErrorMatrixConstIter a = m.cbegin();
G4ErrorMatrixIter b = mret.m.begin();
for(G4int ir = 1; ir <= num_row(); ir++)
for(G4int ir = 1; ir <= num_row(); ++ir)
{
for(G4int ic = 1; ic <= ir; ic++)
for(G4int ic = 1; ic <= ir; ++ic)
{
*(b++) = (*f)(*(a++), ir, ic);
}
source/error_propagation/src/G4ErrorTrackLengthTarget.cc
+2 -2
View File
@@ -71,9 +71,9 @@ G4ErrorTrackLengthTarget::G4ErrorTrackLengthTarget(const G4double maxTrkLength)
else
{
G4ProcessVector* procvec = pmanager->GetProcessList();
size_t isiz = procvec->size();
std::size_t isiz = (G4int)procvec->size();
for(size_t ii = 0; ii < isiz; ii++)
for(G4int ii = 0; ii < (G4int)isiz; ++ii)
{
if(((*procvec)[ii])->GetProcessName() == "G4ErrorTrackLengthTarget")
{