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

Import Geant4 10.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-10 12:08:39 +02:00
parent 286caacf06
commit c9b32a6c0a
5770 changed files with 1050949 additions and 367105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/persistency/ascii/src/G4tgbGeometryDumper.cc
+6 -10
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbGeometryDumper.cc 77346 2013-11-22 16:01:16Z gcosmo $
// $Id: G4tgbGeometryDumper.cc 80341 2014-04-11 12:48:55Z gcosmo $
// GEANT4 tag $Name: $
//
//
@@ -787,11 +787,9 @@ std::vector<G4double> G4tgbGeometryDumper::GetSolidParams( const G4VSolid * so)
const G4Trap * trp = dynamic_cast < const G4Trap * > (so);
if (trp) {
G4ThreeVector symAxis(trp->GetSymAxis());
G4double theta = symAxis.theta()/deg;
G4double phi = symAxis.phi()/deg;
params.push_back( trp->GetZHalfLength() );
params.push_back( theta );
params.push_back( phi);
params.push_back( symAxis.theta()/deg);
params.push_back( symAxis.phi()/deg);
params.push_back( trp->GetYHalfLength1() );
params.push_back( trp->GetXHalfLength1() );
params.push_back( trp->GetXHalfLength2() );
@@ -813,15 +811,13 @@ std::vector<G4double> G4tgbGeometryDumper::GetSolidParams( const G4VSolid * so)
} else if (solidType == "PARA") {
const G4Para * para = dynamic_cast < const G4Para * > (so);
if (para) {
G4double phi = 0.;
if(para->GetSymAxis().z()!=1.0)
{ phi = std::atan(para->GetSymAxis().y()/para->GetSymAxis().x()); }
G4ThreeVector symAxis(para->GetSymAxis());
params.push_back( para->GetXHalfLength());
params.push_back( para->GetYHalfLength());
params.push_back( para->GetZHalfLength());
params.push_back( std::atan(para->GetTanAlpha())/deg);
params.push_back( std::acos(para->GetSymAxis().z())/deg);
params.push_back( phi/deg);
params.push_back( symAxis.theta()/deg);
params.push_back( symAxis.phi()/deg);
}
} else if (solidType == "CONS") {
const G4Cons * cn = dynamic_cast < const G4Cons * > (so);