Import Geant4 9.3.0 source tree
This commit is contained in:
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: pyG4GDMLParser.cc,v 1.2 2008/12/03 06:54:39 kmura Exp $
|
||||
// $Name: geant4-09-02 $
|
||||
// $Id: pyG4GDMLParser.cc,v 1.3 2008/12/12 02:26:34 kmura Exp $
|
||||
// $Name: geant4-09-03 $
|
||||
// ====================================================================
|
||||
// pyG4GDMLParser.cc
|
||||
//
|
||||
@@ -34,6 +34,7 @@
|
||||
|
||||
#include <boost/python.hpp>
|
||||
#include "G4GDMLParser.hh"
|
||||
#include "G4Version.hh"
|
||||
|
||||
using namespace boost::python;
|
||||
|
||||
@@ -42,10 +43,11 @@ using namespace boost::python;
|
||||
// ====================================================================
|
||||
namespace pyG4GDMLParser {
|
||||
|
||||
#if G4VERSION_NUMBER >= 920
|
||||
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_Read, Read, 1, 2);
|
||||
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_ReadModule, ReadModule, 1, 2);
|
||||
|
||||
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_Write, Write, 1, 4);
|
||||
#endif
|
||||
|
||||
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_GetWorldVolume,
|
||||
GetWorldVolume, 0, 1);
|
||||
@@ -61,11 +63,15 @@ void export_G4GDMLParser()
|
||||
class_<G4GDMLParser, boost::noncopyable>
|
||||
("G4GDMLParser", "GDML parser")
|
||||
// ---
|
||||
#if G4VERSION_NUMBNER < 920
|
||||
.def("Read", &G4GDMLParser::Read)
|
||||
#else
|
||||
.def("Read", &G4GDMLParser::Read, f_Read())
|
||||
.def("ReadModule", &G4GDMLParser::ReadModule, f_ReadModule())
|
||||
.def("Write", &G4GDMLParser::Write, f_Write())
|
||||
.def("ParseST", &G4GDMLParser::ParseST,
|
||||
return_value_policy<reference_existing_object>())
|
||||
#endif
|
||||
.def("GetWorldVolume", &G4GDMLParser::GetWorldVolume,
|
||||
f_GetWorldVolume()
|
||||
[return_value_policy<reference_existing_object>()])
|
||||
|
||||
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: pyG4ElementVector.cc,v 1.1 2008/12/04 10:31:03 kmura Exp $
|
||||
// $Name: geant4-09-02 $
|
||||
// $Id: pyG4ElementVector.cc,v 1.2 2008/12/12 03:02:30 kmura Exp $
|
||||
// $Name: geant4-09-03 $
|
||||
// ====================================================================
|
||||
// pyG4ElementVector.cc
|
||||
//
|
||||
@@ -32,7 +32,6 @@
|
||||
// ====================================================================
|
||||
#include <boost/python.hpp>
|
||||
#include "pyG4indexing.hh"
|
||||
#include "G4Element.hh"
|
||||
#include "G4ElementVector.hh"
|
||||
|
||||
using namespace boost::python;
|
||||
|
||||
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: pymodG4materials.cc,v 1.7 2008/12/04 08:55:25 kmura Exp $
|
||||
// $Name: geant4-09-02 $
|
||||
// $Id: pymodG4materials.cc,v 1.8 2008/12/12 03:03:59 kmura Exp $
|
||||
// $Name: geant4-09-03 $
|
||||
// ====================================================================
|
||||
// pymodG4materials.cc [Geant4Py module]
|
||||
//
|
||||
@@ -41,7 +41,7 @@ void export_G4Material();
|
||||
void export_G4MaterialTable();
|
||||
void export_G4Element();
|
||||
void export_G4ElementTable();
|
||||
void export_G4ElementVector();
|
||||
//void export_G4ElementVector();
|
||||
void export_G4Isotope();
|
||||
void export_G4NistManager();
|
||||
void export_G4AtomicShells();
|
||||
@@ -52,7 +52,7 @@ BOOST_PYTHON_MODULE(G4materials)
|
||||
export_G4MaterialTable();
|
||||
export_G4Element();
|
||||
export_G4ElementTable();
|
||||
export_G4ElementVector();
|
||||
//export_G4ElementVector();
|
||||
export_G4Isotope();
|
||||
export_G4NistManager();
|
||||
export_G4AtomicShells();
|
||||
|
||||
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: pyPhysicsLists.cc,v 1.8 2008/12/04 10:26:40 kmura Exp $
|
||||
// $Name: geant4-09-02 $
|
||||
// $Id: pyPhysicsLists.cc,v 1.9 2009/11/20 03:36:51 kmura Exp $
|
||||
// $Name: geant4-09-03 $
|
||||
// ====================================================================
|
||||
// pyPhysicsLists.cc
|
||||
//
|
||||
@@ -93,9 +93,23 @@
|
||||
#include "QGSP_BERT_DIF.hh"
|
||||
#endif
|
||||
|
||||
#if G4VERSION_NUMBER >= 930
|
||||
#include "CHIPS.hh"
|
||||
#include "FTFP_BERT_EMV.hh"
|
||||
#include "FTFP_BERT_EMX.hh"
|
||||
#include "FTFP_BERT_TRV.hh"
|
||||
#include "QGSC_CHIPS.hh"
|
||||
#include "QGSC_QGSC.hh"
|
||||
#include "QGSP_BERT_EMX.hh"
|
||||
#include "QGSP_BERT_NOLEP.hh"
|
||||
#include "QGSP_BIC_EMY.hh"
|
||||
#include "QGSP_FTFP_BERT.hh"
|
||||
#include "QGSP_INCL_ABLA.hh"
|
||||
#endif
|
||||
|
||||
// macro for adding physics lists
|
||||
#define ADD_PHYSICS_LIST(plname) \
|
||||
class_<plname, plname*, bases<G4VUserPhysicsList> > \
|
||||
class_<plname, plname*, bases<G4VUserPhysicsList>, boost::noncopyable> \
|
||||
(#plname, #plname " physics list") \
|
||||
; \
|
||||
AddPhysicsList(#plname);
|
||||
@@ -184,6 +198,20 @@ void export_PhysicsLists()
|
||||
ADD_PHYSICS_LIST(QGSP_BERT_DIF);
|
||||
#endif
|
||||
|
||||
#if G4VERSION_NUMBER >= 930
|
||||
ADD_PHYSICS_LIST(CHIPS);
|
||||
ADD_PHYSICS_LIST(FTFP_BERT_EMV);
|
||||
ADD_PHYSICS_LIST(FTFP_BERT_EMX);
|
||||
ADD_PHYSICS_LIST(FTFP_BERT_TRV);
|
||||
ADD_PHYSICS_LIST(QGSC_CHIPS);
|
||||
ADD_PHYSICS_LIST(QGSC_QGSC);
|
||||
ADD_PHYSICS_LIST(QGSP_BERT_EMX);
|
||||
ADD_PHYSICS_LIST(QGSP_BERT_NOLEP);
|
||||
ADD_PHYSICS_LIST(QGSP_BIC_EMY);
|
||||
ADD_PHYSICS_LIST(QGSP_FTFP_BERT);
|
||||
ADD_PHYSICS_LIST(QGSP_INCL_ABLA);
|
||||
#endif
|
||||
|
||||
// sort PL vector
|
||||
std::sort(plList.begin(), plList.end());
|
||||
|
||||
|
||||
@@ -8,9 +8,9 @@
|
||||
# Hava A Fun!
|
||||
# ==================================================================
|
||||
"""
|
||||
# $Id: __init__.py,v 1.19 2008/12/03 07:01:22 kmura Exp $
|
||||
__version__ ='9.2.0'
|
||||
__date__ = '1/Dec/2008'
|
||||
# $Id: __init__.py,v 1.21 2009/11/20 03:36:51 kmura Exp $
|
||||
__version__ ='9.3.0'
|
||||
__date__ = '1/Dec/2009'
|
||||
__author__ = 'K.Murakami (Koichi.Murakami@kek.jp)'
|
||||
__url__ = 'http://www-geant4.kek.jp/projects/Geant4Py/'
|
||||
|
||||
@@ -214,8 +214,8 @@ def _list_material(self):
|
||||
(j+1, elementVec[j].GetName(), elementVec[j].GetSymbol(),
|
||||
elementVec[j].GetZ(),
|
||||
elementVec[j].GetN(),
|
||||
fractionVec[j]/HEPUnit.perCent,
|
||||
abundanceVec[j]/totNAtoms/HEPUnit.perCent)
|
||||
fractionVec[j]/hepunit.perCent,
|
||||
abundanceVec[j]/totNAtoms/hepunit.perCent)
|
||||
|
||||
print " +------------------------------------------------------------------"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user