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

Import Geant4 10.6.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2019-12-06 15:12:28 +01:00
parent b2a62ae692
commit 5baee230e9
2997 changed files with 141580 additions and 98673 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/FukuiRenderer/History
+4
View File
@@ -19,6 +19,10 @@ committal in the CVS repository !
History file for visualization/FukuiRenderer sub-category
---------------------------------------------------------
29 August 2019 John Allison (DAWN-V10-05-00)
- Part of vis-V10-05-24.
- Add G4TessellatedSolid to list of solids that may be specially treated
26th May 2018 John Allison (DAWN-V10-04-00)
- G4DAWNFILESceneHandler.cc: Fix gcc-8 warnings.
source/visualization/FukuiRenderer/include/G4DAWNFILESceneHandler.hh
+5 -2
View File
@@ -84,15 +84,18 @@ public:
void AddSolid ( const G4Polycone& polycone ) {
G4VSceneHandler::AddSolid (polycone);
}
void AddSolid ( const G4Polyhedra& polyhedra) {
void AddSolid ( const G4Polyhedra& polyhedra ) {
G4VSceneHandler::AddSolid (polyhedra);
}
void AddSolid ( const G4Orb& orb ) {
G4VSceneHandler::AddSolid (orb);
}
void AddSolid ( const G4Ellipsoid& ellipsoid) {
void AddSolid ( const G4Ellipsoid& ellipsoid ) {
G4VSceneHandler::AddSolid (ellipsoid);
}
void AddSolid ( const G4TessellatedSolid& tess ) {
G4VSceneHandler::AddSolid (tess);
}
void AddSolid ( const G4VSolid& solid );
void AddCompound ( const G4VTrajectory& traj) {
G4VSceneHandler::AddCompound(traj);
source/visualization/FukuiRenderer/include/G4FRSceneFunc.icc
+2 -2
View File
@@ -979,8 +979,8 @@ G4bool G4FRSCENEHANDLER::IsVisible()
fpViewer->GetApplicableVisAttributes( fpVisAttribs );
//-----
if( ( getenv( FR_ENV_CULL_INVISIBLE_OBJECTS ) != NULL ) && \
( strcmp( getenv( FR_ENV_CULL_INVISIBLE_OBJECTS ),"0" ) ) && \
if( ( std::getenv( FR_ENV_CULL_INVISIBLE_OBJECTS ) != NULL ) && \
( strcmp( std::getenv( FR_ENV_CULL_INVISIBLE_OBJECTS ),"0" ) ) && \
( pVisAttribs ) )
{
visibility = pVisAttribs->IsVisible();
source/visualization/FukuiRenderer/include/G4FukuiRendererSceneHandler.hh
+6 -3
View File
@@ -87,16 +87,19 @@ public:
void AddSolid ( const G4Polycone& polycone) {
G4VSceneHandler::AddSolid (polycone);
}
void AddSolid ( const G4Polyhedra& polyhedra) {
void AddSolid ( const G4Polyhedra& polyhedra ) {
G4VSceneHandler::AddSolid (polyhedra);
}
void AddSolid ( const G4Orb& orb ) {
G4VSceneHandler::AddSolid (orb);
}
void AddSolid ( const G4Ellipsoid& ellipsoid) {
void AddSolid ( const G4Ellipsoid& ellipsoid ) {
G4VSceneHandler::AddSolid (ellipsoid);
}
void AddSolid ( const G4VSolid& solid );
void AddSolid ( const G4TessellatedSolid& tess ) {
G4VSceneHandler::AddSolid (tess);
}
void AddSolid ( const G4VSolid& solid );
void AddCompound ( const G4VTrajectory& traj) {
G4VSceneHandler::AddCompound(traj);
}
source/visualization/FukuiRenderer/src/G4DAWNFILESceneHandler.cc
+6 -6
View File
@@ -93,19 +93,19 @@ COMMAND_BUF_SIZE (G4FRofstream::SEND_BUFMAX),
fPrec (9), fPrec2 (16)
{
// g4.prim filename and its directory
if ( getenv( "G4DAWNFILE_DEST_DIR" ) == NULL ) {
if ( std::getenv( "G4DAWNFILE_DEST_DIR" ) == NULL ) {
strcpy( fG4PrimDestDir , "" ) ; // output dir
strcpy( fG4PrimFileName, DEFAULT_G4PRIM_FILE_NAME ); // filename
} else {
strcpy( fG4PrimDestDir , getenv( "G4DAWNFILE_DEST_DIR" ) ); // output dir
strcpy( fG4PrimDestDir , std::getenv( "G4DAWNFILE_DEST_DIR" ) ); // output dir
strcpy( fG4PrimFileName, DEFAULT_G4PRIM_FILE_NAME ); // filename
}
// maximum number of g4.prim files in the dest directory
fMaxFileNum = FR_MAX_FILE_NUM ; // initialization
if ( getenv( "G4DAWNFILE_MAX_FILE_NUM" ) != NULL ) {
if ( std::getenv( "G4DAWNFILE_MAX_FILE_NUM" ) != NULL ) {
sscanf( getenv("G4DAWNFILE_MAX_FILE_NUM"), "%d", &fMaxFileNum ) ;
sscanf( std::getenv("G4DAWNFILE_MAX_FILE_NUM"), "%d", &fMaxFileNum ) ;
} else {
fMaxFileNum = FR_MAX_FILE_NUM ;
@@ -114,8 +114,8 @@ fPrec (9), fPrec2 (16)
//----- precision control
if( getenv( "G4DAWNFILE_PRECISION" ) != NULL ) {
sscanf( getenv("G4DAWNFILE_PRECISION"), "%d", &fPrec ) ;
if( std::getenv( "G4DAWNFILE_PRECISION" ) != NULL ) {
sscanf( std::getenv("G4DAWNFILE_PRECISION"), "%d", &fPrec ) ;
} else {
fPrec = 9 ;
}
source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc
+8 -8
View File
@@ -68,8 +68,8 @@ G4DAWNFILEViewer::G4DAWNFILEViewer (G4DAWNFILESceneHandler& sceneHandler,
{
// Set a g4.prim-file viewer
strcpy( fG4PrimViewer, "dawn" );
if( getenv( "G4DAWNFILE_VIEWER" ) != NULL ) {
strcpy( fG4PrimViewer, getenv( "G4DAWNFILE_VIEWER" ) ) ;
if( std::getenv( "G4DAWNFILE_VIEWER" ) != NULL ) {
strcpy( fG4PrimViewer, std::getenv( "G4DAWNFILE_VIEWER" ) ) ;
}
// string for viewer invocation
@@ -86,8 +86,8 @@ G4DAWNFILEViewer::G4DAWNFILEViewer (G4DAWNFILESceneHandler& sceneHandler,
// Set a PostScript Viewer
// strcpy( fPSViewer, "ghostview" );
strcpy( fPSViewer, "gv" );
if( getenv( "G4DAWNFILE_PS_VIEWER" ) != NULL ) {
strcpy( fPSViewer, getenv( "G4DAWNFILE_PS_VIEWER" ) ) ;
if( std::getenv( "G4DAWNFILE_PS_VIEWER" ) != NULL ) {
strcpy( fPSViewer, std::getenv( "G4DAWNFILE_PS_VIEWER" ) ) ;
}
}
@@ -354,10 +354,10 @@ void G4DAWNFILEViewer::SendViewParameters ()
//######### P4
//----- drawing device
// enum {PS=1, XWIN=2, PS2=3, XWIN2=4, OPEN_GL=5, DEVICE_END=6};
if( ( ( getenv( FR_ENV_MULTI_WINDOW ) != NULL ) && \
( strcmp( getenv( FR_ENV_MULTI_WINDOW ),"0" ) ) ) || \
( ( getenv( FR_ENV_MULTI_WINDOW2 ) != NULL ) && \
( strcmp( getenv( FR_ENV_MULTI_WINDOW2 ),"0" ) ) ) )
if( ( ( std::getenv( FR_ENV_MULTI_WINDOW ) != NULL ) && \
( strcmp( std::getenv( FR_ENV_MULTI_WINDOW ),"0" ) ) ) || \
( ( std::getenv( FR_ENV_MULTI_WINDOW2 ) != NULL ) && \
( strcmp( std::getenv( FR_ENV_MULTI_WINDOW2 ),"0" ) ) ) )
{
gui_out << 2 << G4endl; // OpenWindow
} else {
source/visualization/FukuiRenderer/src/G4FRClientServer.cc
+2 -2
View File
@@ -226,10 +226,10 @@ int G4FRClientServer::ConnectINET()
}
//----- get IP address of server from its name
if( getenv( FR_ENV_SERVER_HOST_NAME ) != NULL )
if( std::getenv( FR_ENV_SERVER_HOST_NAME ) != NULL )
{
//----- get server name
strcpy( server_hostname, getenv( FR_ENV_SERVER_HOST_NAME ) );
strcpy( server_hostname, std::getenv( FR_ENV_SERVER_HOST_NAME ) );
//----- get IP address of server from its name,
//..... reading /etc/hosts
source/visualization/FukuiRenderer/src/G4FukuiRenderer.cc
+6 -6
View File
@@ -66,8 +66,8 @@ G4FukuiRenderer::G4FukuiRenderer ():
flag_connected (0)
{
//----- sorting of objects
if( ( getenv( FR_ENV_DAWN_GUI_ALWAYS ) != NULL ) && \
( strcmp( getenv( FR_ENV_DAWN_GUI_ALWAYS ),"0" ) ) )
if( ( std::getenv( FR_ENV_DAWN_GUI_ALWAYS ) != NULL ) && \
( strcmp( std::getenv( FR_ENV_DAWN_GUI_ALWAYS ),"0" ) ) )
{
flag_use_gui = true ;
}
@@ -126,9 +126,9 @@ void G4FukuiRenderer::UseInetDomainAuto()
//----- Set waiting time to ensure connection
int connection_time = FR_DEFAULT_CONNECTION_TIME ;
if( getenv( FR_ENV_CONNECTION_TIME ) != NULL ) {
if( std::getenv( FR_ENV_CONNECTION_TIME ) != NULL ) {
int sscanf_status = \
sscanf( getenv( FR_ENV_CONNECTION_TIME ), "%d", &connection_time) ;
sscanf( std::getenv( FR_ENV_CONNECTION_TIME ), "%d", &connection_time) ;
if ( sscanf_status == EOF ) {
connection_time = FR_DEFAULT_CONNECTION_TIME ;
}
@@ -242,9 +242,9 @@ void G4FukuiRenderer::UseBSDUnixDomainAuto()
//----- Sleep for a while to make sure that
//..... FukuiRenderer is ready
int connection_time = FR_DEFAULT_CONNECTION_TIME ;
if( getenv( FR_ENV_CONNECTION_TIME ) != NULL ) {
if( std::getenv( FR_ENV_CONNECTION_TIME ) != NULL ) {
int sscanf_status = \
sscanf( getenv( FR_ENV_CONNECTION_TIME ), "%d", &connection_time) ;
sscanf( std::getenv( FR_ENV_CONNECTION_TIME ), "%d", &connection_time) ;
if ( sscanf_status == EOF ) { connection_time = FR_DEFAULT_CONNECTION_TIME ;}
}
sleep(connection_time);
source/visualization/FukuiRenderer/src/G4FukuiRendererSceneHandler.cc
+7 -7
View File
@@ -91,13 +91,13 @@ fPrec (9), fPrec2 (16)
//----- Connection to FukuiRenderer is set in the first scene
if( !fSystem.IsConnected() )
{
if ( getenv( FR_ENV_NAMED_PIPE_CONNECTION ) != NULL &&\
strcmp( getenv( FR_ENV_NAMED_PIPE_CONNECTION ), "0" ) )
if ( std::getenv( FR_ENV_NAMED_PIPE_CONNECTION ) != NULL &&\
strcmp( std::getenv( FR_ENV_NAMED_PIPE_CONNECTION ), "0" ) )
{
// Invoke DAWN locally and make connection
// via named pipe (not supported in AIX etc)
fSystem.UseBSDUnixDomainAuto();
} else if( getenv( FR_ENV_SERVER_HOST_NAME ) == NULL )
} else if( std::getenv( FR_ENV_SERVER_HOST_NAME ) == NULL )
{
// Invoke DAWN locally and make connection
// via socket
@@ -109,8 +109,8 @@ fPrec (9), fPrec2 (16)
}
//----- precision control
if( getenv( "G4DAWN_PRECISION" ) != NULL ) {
sscanf( getenv("G4DAWN_PRECISION"), "%d", &fPrec ) ;
if( std::getenv( "G4DAWN_PRECISION" ) != NULL ) {
sscanf( std::getenv("G4DAWN_PRECISION"), "%d", &fPrec ) ;
} else {
fPrec = 9 ;
}
@@ -149,8 +149,8 @@ void G4FukuiRendererSceneHandler::FRBeginModeling( void )
//----- drawing device
// !Device
// (Note: Not saved in g4.prim)
if( ( getenv( FR_ENV_MULTI_WINDOW ) != NULL ) && \
( strcmp( getenv( FR_ENV_MULTI_WINDOW ),"0" ) ) )
if( ( std::getenv( FR_ENV_MULTI_WINDOW ) != NULL ) && \
( strcmp( std::getenv( FR_ENV_MULTI_WINDOW ),"0" ) ) )
{
((G4FukuiRendererViewer*)fpViewer)->SendDevice( G4FukuiRendererViewer::FRDEV_XWIN ) ;
} else {