Import Geant4 7.0.0 source tree
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4DAWNFILE.hh,v 1.8 2001/07/27 22:32:55 johna Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
//
|
||||
// Satoshi TANAKA
|
||||
// DAWNFILE driver factory.
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4DAWNFILESceneHandler.hh,v 1.12 2002/12/11 15:58:02 johna Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
//
|
||||
// Satoshi TANAKA
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4DAWNFILEViewer.hh,v 1.9 2003/06/16 17:13:27 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
//
|
||||
// Satoshi TANAKA
|
||||
// DAWNFILE viewer - opens window, hard copy, etc.
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4FRClientServer.hh,v 1.6 2001/07/11 10:08:44 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
//
|
||||
// Satoshi TANAKA, Wed Jul 3 14:13:52 JST 1996
|
||||
////////////////////////////////
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4FRConst.hh,v 1.6 2001/07/11 10:08:44 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
//
|
||||
// Satoshi TANAKA, Tue Jul 2 15:30:49 JST 1996
|
||||
///////////////////////////////////
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4FRFeatures.hh,v 1.5 2001/07/11 10:08:44 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
//
|
||||
#if !defined G4_FR_FEATURES_HH
|
||||
#define G4_FR_FEATURES_HH
|
||||
|
||||
@@ -21,10 +21,11 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4FRSceneFunc.icc,v 1.3 2003/05/30 13:01:19 johna Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
// $Id: G4FRSceneFunc.icc,v 1.6 2004/12/10 18:16:00 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-05 $
|
||||
//
|
||||
|
||||
#include "G4LogicalVolume.hh"
|
||||
|
||||
//========== AddPrimitive() functions ==========//
|
||||
|
||||
@@ -304,7 +305,12 @@ void G4FRSCENEHANDLER::AddPrimitive ( const G4Polyhedron& polyhedron )
|
||||
SendStrInt4(FR_FACET, work[0], work[1], work[2], work[3] );
|
||||
break;
|
||||
default:
|
||||
G4cerr << "ERROR G4FRSCENEHANDLER::AddPrimitive(G4Polyhedron)\n";
|
||||
G4cerr <<
|
||||
"ERROR G4FRSCENEHANDLER::AddPrimitive(G4Polyhedron)\n"
|
||||
"Volume " << fpCurrentPV->GetName() <<
|
||||
", Solid " << fpCurrentLV->GetSolid()->GetName() <<
|
||||
" (" << fpCurrentLV->GetSolid()->GetEntityType() <<
|
||||
"\nG4Polyhedron facet with " << i << " edges\n";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -619,8 +625,8 @@ void G4FRSCENEHANDLER::AddThis ( const G4Sphere& sphere )
|
||||
SendTransformedCoordinates();
|
||||
|
||||
//----- send sphere to Fukui Renderer
|
||||
const G4double PI_minus = 0.9999 * M_PI ;
|
||||
const G4double PI2_minus = 1.9999 * M_PI ;
|
||||
const G4double PI_minus = 0.9999 * pi ;
|
||||
const G4double PI2_minus = 1.9999 * pi ;
|
||||
if( dphi > PI2_minus && dtheta > PI_minus ) {
|
||||
//----- full sphere
|
||||
SendStrDouble ( FR_SPHERE, rmax );
|
||||
@@ -741,28 +747,28 @@ void G4FRSCENEHANDLER::AddThis (const G4Trap& trap)
|
||||
|
||||
//----- parameters (half lengths of box)
|
||||
G4double dz = trap.GetZHalfLength ();
|
||||
G4double theta = acos( cosTheta ) ;
|
||||
G4double theta = std::acos( cosTheta ) ;
|
||||
G4double phi;
|
||||
if ( ny==0. && nx ==0.) {
|
||||
phi = 0.; // atan2(0.,0.) gives undefined value of phi
|
||||
phi = 0.; // std::atan2(0.,0.) gives undefined value of phi
|
||||
} else {
|
||||
phi = atan2( ny, nx ) ; if( phi < 0. ) { phi += twopi ; }
|
||||
// -PI < atan() < PI
|
||||
phi = std::atan2( ny, nx ) ; if( phi < 0. ) { phi += twopi ; }
|
||||
// -PI < std::atan() < PI
|
||||
}
|
||||
/////////////////////////////////////////////////
|
||||
// G4double phi = atan2( ny, nx ) ;
|
||||
// G4double phi = std::atan2( ny, nx ) ;
|
||||
// if( phi < 0.0 ) { phi += twopi ; }
|
||||
// // -PI < atan() < PI
|
||||
// // -PI < std::atan() < PI
|
||||
/////////////////////////////////////////////////
|
||||
|
||||
G4double h1 = trap.GetYHalfLength1 ();
|
||||
G4double bl1 = trap.GetXHalfLength1 ();
|
||||
G4double tl1 = trap.GetXHalfLength2 ();
|
||||
G4double alpha1 = atan( trap.GetTanAlpha1()) ;
|
||||
G4double alpha1 = std::atan( trap.GetTanAlpha1()) ;
|
||||
G4double h2 = trap.GetYHalfLength2 ();
|
||||
G4double bl2 = trap.GetXHalfLength3 ();
|
||||
G4double tl2 = trap.GetXHalfLength4 ();
|
||||
G4double alpha2 = atan( trap.GetTanAlpha2()) ;
|
||||
G4double alpha2 = std::atan( trap.GetTanAlpha2()) ;
|
||||
|
||||
//----- send coordinates to Fukui Renderer
|
||||
SendTransformedCoordinates();
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4FRofstream.hh,v 1.6 2003/06/16 17:13:28 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
//
|
||||
#include <fstream>
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4FukuiRenderer.hh,v 1.7 2001/07/11 10:08:44 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
//
|
||||
//
|
||||
// Satoshi TANAKA
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4FukuiRendererSceneHandler.hh,v 1.11 2002/12/11 15:58:02 johna Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
//
|
||||
//
|
||||
// Satoshi TANAKA, Fri Jun 28 11:19:19 JST 1996
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4FukuiRendererViewer.hh,v 1.7 2001/07/11 10:08:44 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
//
|
||||
//
|
||||
// Satoshi TANAKA, Fri Jun 28 12:10:14 JST 1996
|
||||
|
||||
Reference in New Issue
Block a user