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

Import Geant4 10.4.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2017-12-08 12:52:30 +01:00
parent 98e455a940
commit fc6af9e721
2166 changed files with 276760 additions and 100873 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/advanced/ChargeExchangeMC/src/CexmcASTEval.cc
+14 -14
View File
@@ -148,9 +148,9 @@ namespace
const G4double CexmcASTEval::constants[] = { eV, keV, MeV, GeV, mm, cm, m };
CexmcASTEval::CexmcASTEval( const CexmcEventFastSObject * evFastSObject,
const CexmcEventSObject * evSObject ) :
evFastSObject( evFastSObject ), evSObject( evSObject )
CexmcASTEval::CexmcASTEval( const CexmcEventFastSObject * evFastSObject_,
const CexmcEventSObject * evSObject_ ) :
evFastSObject( evFastSObject_ ), evSObject( evSObject_ )
{
}
@@ -208,10 +208,10 @@ CexmcAST::BasicEval::ScalarValueType CexmcASTEval::GetVarScalarValue(
}
else
{
const int * const & addr( boost::get< const int * >( var.addr ) );
const int * const & addr_( boost::get< const int * >( var.addr ) );
if ( addr )
return *addr;
if ( addr_ )
return *addr_;
}
/* found in varAddrMap */
@@ -220,26 +220,26 @@ CexmcAST::BasicEval::ScalarValueType CexmcASTEval::GetVarScalarValue(
if ( found != varAddrMap.end() )
{
const CexmcEnergyDepositCalorimeterCollection * const * addr(
const CexmcEnergyDepositCalorimeterCollection * const * addr_(
boost::get< const CexmcEnergyDepositCalorimeterCollection * >(
&found->second ) );
if ( addr )
if ( addr_ )
{
if ( *addr )
if ( *addr_ )
{
if ( ( *addr )->size() == 0 )
if ( ( *addr_ )->size() == 0 )
throw CexmcException( CexmcCFUninitializedVector );
if ( var.index1 == 0 || var.index2 == 0 )
throw CexmcException( CexmcCFUnexpectedVectorIndex );
return ( *addr )->at( var.index1 - 1 ).at( var.index2 - 1 );
return ( *addr_ )->at( var.index1 - 1 ).at( var.index2 - 1 );
}
}
else
{
const bool * const & addr( boost::get< const bool * >(
const bool * const & addr__( boost::get< const bool * >(
found->second ) );
if ( addr )
return int( *addr );
if ( addr__ )
return int( *addr__ );
}
}