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

Import Geant4 7.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 11:11:55 +02:00
parent e083ffb441
commit 516dbf1a58
5914 changed files with 202605 additions and 71141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/modeling/History
+31 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.26 2003/11/12 13:05:48 johna Exp $
$Id: History,v 1.30 2004/11/11 16:07:33 johna Exp $
-------------------------------------------------------------------
=========================================================
@@ -20,6 +20,36 @@ committal in the CVS repository !
History file for visualization/modeling
---------------------------------------
11th November 2004 John Allison (vis-V06-02-05)
- Made use use of smart method GetPolyhedron for solids. This greatly
speeds 2nd and subsequent drawings when kernel access is required.
22nd September 2004 John Allison (modeling-V06-02-01)
- Changed use of deprecated G4VPhysicalVolume::GetRotation to GetRotationValue.
- Fixed memory leak in G4PhysicalVolumeMassScene.
13th September 2004 John Allison (modeling-V06-02-00)
- Added G4PhysicalVolumeMassScene. From the header file:
// Calculates the mass of a geometry tree taking into account daughters
// up to the depth specified in the G4PhysicalVolumeModel. Culling is
// ignored so that all volumes are seen.
//
// The calculation is quite tricky, since it involves subtracting the
// mass of that part of the mother that is occupied by each daughter and
// then adding the mass of the daughter, and so on down the heirarchy.
//
// Usage for a given G4PhysicalVolumeModel* pvModel:
// G4PhysicalVolumeMassScene massScene;
// massScene.EstablishSpecials (*pvModel);
// pvModel->DescribeYourselfTo (massScene);
// G4double volume = massScene.GetVolume();
// G4double mass = massScene.GetMass();
// massScene.Reset();
// See, for example, G4ASCIITreeSceneHandler::EndModeling().
- Added some access functions to G4PhysicalVolumeModel:
GetTopPhysicalVolume, GetRequestedDepth, SetRequestedDepth.
- Protected GetPhysicalVolumeModel when all volumes "invisible".
12th November 2003 John Allison (modeling-V05-02-02)
- CalculateExtent always searches complete hierarchy.
source/visualization/modeling/include/G4AxesModel.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4AxesModel.hh,v 1.4 2001/08/24 20:34:14 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 3rd April 2001
source/visualization/modeling/include/G4AxesModel.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4AxesModel.icc,v 1.3 2001/08/24 20:34:15 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
inline G4String G4AxesModel::GetCurrentTag () const {
return fGlobalTag;
source/visualization/modeling/include/G4BoundingSphereScene.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4BoundingSphereScene.hh,v 1.13 2003/05/30 13:01:31 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 7th June 1997
source/visualization/modeling/include/G4FlavoredParallelWorldModel.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FlavoredParallelWorldModel.hh,v 1.6 2001/07/11 10:09:20 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// P. Mora de Freitas et M.Verderi - 19 June 1998.
//
source/visualization/modeling/include/G4HitsModel.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4HitsModel.hh,v 1.7 2001/08/24 20:36:13 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 26th August 1998.
source/visualization/modeling/include/G4HitsModel.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4HitsModel.icc,v 1.6 2001/08/24 20:36:14 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
inline G4String G4HitsModel::GetCurrentTag () const {
return fGlobalTag;
source/visualization/modeling/include/G4LogicalVolumeModel.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4LogicalVolumeModel.hh,v 1.5 2001/07/11 10:09:21 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 26th July 1999.
source/visualization/modeling/include/G4ModelingParameters.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ModelingParameters.hh,v 1.8 2003/06/16 17:14:28 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 31st December 1997.
source/visualization/modeling/include/G4ModelingParameters.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ModelingParameters.icc,v 1.4 2001/07/11 10:09:21 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 31st December 1997.
source/visualization/modeling/include/G4NullModel.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4NullModel.hh,v 1.6 2001/08/24 20:36:15 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 4th April 1998.
source/visualization/modeling/include/G4PhysicalVolumeMassScene.hh
+135
View File
@@ -0,0 +1,135 @@
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
// $Id: G4PhysicalVolumeMassScene.hh,v 1.2 2004/12/10 18:19:40 gcosmo Exp $
// GEANT4 tag $Name: geant4-07-00-cand-05 $
//
//
// John Allison 12th September 2004
// Class Description:
//
// Calculates the mass of a geometry tree taking into account daughters
// up to the depth specified in the G4PhysicalVolumeModel. Culling is
// ignored so that all volumes are seen.
//
// The calculation is quite tricky, since it involves subtracting the
// mass of that part of the mother that is occupied by each daughter and
// then adding the mass of the daughter, and so on down the heirarchy.
//
// Usage for a given G4PhysicalVolumeModel* pvModel:
// G4PhysicalVolumeMassScene massScene;
// massScene.EstablishSpecials (*pvModel);
// pvModel->DescribeYourselfTo (massScene);
// G4double volume = massScene.GetVolume();
// G4double mass = massScene.GetMass();
// massScene.Reset();
// See, for example, G4ASCIITreeSceneHandler::EndModeling().
#ifndef G4PHYSICALVOLUMEMASSSCENE_HH
#define G4PHYSICALVOLUMEMASSSCENE_HH
#include "G4VGraphicsScene.hh"
#include "G4Box.hh"
#include "G4Cons.hh"
#include "G4Tubs.hh"
#include "G4Trd.hh"
#include "G4Trap.hh"
#include "G4Sphere.hh"
#include "G4Para.hh"
#include "G4Torus.hh"
#include "G4Polycone.hh"
#include "G4Polyhedra.hh"
#include <deque>
class G4VPhysicalVolume;
class G4LogicalVolume;
class G4PhysicalVolumeModel;
class G4PhysicalVolumeMassScene: public G4VGraphicsScene {
public:
G4PhysicalVolumeMassScene ();
virtual ~G4PhysicalVolumeMassScene ();
public: // With description
G4double GetVolume () const {return fVolume;}
// Overall volume.
G4double GetMass () const {return fMass;}
// Mass of whole tree, i.e., accounting for all daughters.
void Reset ();
// Reset for subsequent re-use.
public:
// Force execution of AccrueMass for all solids...
void AddThis (const G4Box& s) {AccrueMass (s);}
void AddThis (const G4Cons & s) {AccrueMass (s);}
void AddThis (const G4Tubs& s) {AccrueMass (s);}
void AddThis (const G4Trd& s) {AccrueMass (s);}
void AddThis (const G4Trap& s) {AccrueMass (s);}
void AddThis (const G4Sphere& s) {AccrueMass (s);}
void AddThis (const G4Para& s) {AccrueMass (s);}
void AddThis (const G4Torus& s) {AccrueMass (s);}
void AddThis (const G4Polycone& s) {AccrueMass (s);}
void AddThis (const G4Polyhedra& s) {AccrueMass (s);}
void AddThis (const G4VSolid& s) {AccrueMass (s);}
void AddThis (const G4VTrajectory&) {}
void AddThis (const G4VHit&) {}
void PreAddThis (const G4Transform3D&, const G4VisAttributes&) {}
void PostAddThis () {}
void EstablishSpecials (G4PhysicalVolumeModel&);
////////////////////////////////////////////////////////////////
// Functions not used but required by the abstract interface.
virtual void BeginPrimitives (const G4Transform3D&) {}
virtual void EndPrimitives () {}
virtual void AddPrimitive (const G4Polyline&) {}
virtual void AddPrimitive (const G4Scale&) {}
virtual void AddPrimitive (const G4Text&) {}
virtual void AddPrimitive (const G4Circle&) {}
virtual void AddPrimitive (const G4Square&) {}
virtual void AddPrimitive (const G4Polymarker&) {}
virtual void AddPrimitive (const G4Polyhedron&) {}
virtual void AddPrimitive (const G4NURBS&) {}
private:
void AccrueMass (const G4VSolid&);
G4double fVolume;
G4double fMass;
G4VPhysicalVolume* fpLastPV;
G4int fPVPCount;
G4int fLastDepth;
G4double fLastDensity;
std::deque<G4double> fDensityStack;
G4int fCurrentDepth; // Current depth of geom. hierarchy.
G4VPhysicalVolume* fpCurrentPV; // Current physical volume.
G4LogicalVolume* fpCurrentLV; // Current logical volume.
};
#endif
source/visualization/modeling/include/G4PhysicalVolumeModel.hh
+9 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PhysicalVolumeModel.hh,v 1.16 2001/08/24 20:36:17 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// $Id: G4PhysicalVolumeModel.hh,v 1.17 2004/09/13 18:04:55 johna Exp $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 31st December 1997.
@@ -92,6 +92,13 @@ public: // With description
return this;
}
const G4VPhysicalVolume* GetTopPhysicalVolume () const {return fpTopPV;}
G4int GetRequestedDepth () const {return fRequestedDepth;}
void SetRequestedDepth (G4int requestedDepth) {
fRequestedDepth = requestedDepth;
}
G4bool Validate (G4bool warn);
// Validate, but allow internal changes (hence non-const function).
source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PhysicalVolumeSearchScene.hh,v 1.11 2003/05/30 13:01:31 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 10th August 1998.
source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PhysicalVolumeSearchScene.icc,v 1.4 2001/07/11 10:09:21 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 10th August 1998.
source/visualization/modeling/include/G4ScaleModel.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ScaleModel.hh,v 1.2 2001/08/24 20:36:18 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 21st July 2001.
source/visualization/modeling/include/G4ScaleModel.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ScaleModel.icc,v 1.2 2001/08/24 20:36:19 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
inline G4String G4ScaleModel::GetCurrentTag () const {
return fGlobalTag;
source/visualization/modeling/include/G4TextModel.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4TextModel.hh,v 1.4 2001/08/24 20:36:21 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 3rd April 2001
source/visualization/modeling/include/G4TextModel.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4TextModel.icc,v 1.3 2001/08/24 20:36:22 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
inline G4String G4TextModel::GetCurrentTag () const {
return fGlobalTag;
source/visualization/modeling/include/G4TrajectoriesModel.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4TrajectoriesModel.hh,v 1.8 2002/11/11 18:39:28 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 26th August 1998.
source/visualization/modeling/include/G4TrajectoriesModel.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4TrajectoriesModel.icc,v 1.6 2001/08/24 20:36:24 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
inline G4String G4TrajectoriesModel::GetCurrentTag () const {
return fGlobalTag;
source/visualization/modeling/include/G4VModel.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VModel.hh,v 1.14 2003/06/16 17:14:29 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 31st December 1997.
source/visualization/modeling/include/G4VModel.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VModel.icc,v 1.9 2001/07/25 21:12:20 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 31st December 1997.
source/visualization/modeling/src/G4AxesModel.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4AxesModel.cc,v 1.5 2001/08/14 18:43:29 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 3rd April 2001
source/visualization/modeling/src/G4BoundingSphereScene.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4BoundingSphereScene.cc,v 1.8 2001/07/25 21:10:22 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 7th June 1997
source/visualization/modeling/src/G4FlavoredParallelWorldModel.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FlavoredParallelWorldModel.cc,v 1.6 2002/11/20 17:21:47 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// P. Mora de Freitas et M.Verderi - 19 June 1998.
// Model for flavored parallel world volumes.
source/visualization/modeling/src/G4HitsModel.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4HitsModel.cc,v 1.9 2002/10/24 15:07:21 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 26th August 1998.
source/visualization/modeling/src/G4LogicalVolumeModel.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4LogicalVolumeModel.cc,v 1.9 2003/11/03 17:08:50 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-00-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 26th July 1999.
source/visualization/modeling/src/G4ModelingParameters.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ModelingParameters.cc,v 1.6 2003/06/16 17:14:30 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 31st December 1997.
source/visualization/modeling/src/G4NullModel.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4NullModel.cc,v 1.7 2003/05/30 13:01:32 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 4th April 1998.
source/visualization/modeling/src/G4PhysicalVolumeMassScene.cc
+149
View File
@@ -0,0 +1,149 @@
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
// $Id: G4PhysicalVolumeMassScene.cc,v 1.3 2004/11/11 16:06:49 johna Exp $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 10th August 1998.
// An artificial scene to find physical volumes.
#include "G4PhysicalVolumeMassScene.hh"
#include "G4VSolid.hh"
#include "G4Vector3D.hh"
#include "G4PhysicalVolumeModel.hh"
#include "G4LogicalVolume.hh"
#include "G4Polyhedron.hh"
#include "G4Material.hh"
#include "G4VPVParameterisation.hh"
#include "G4UnitsTable.hh"
G4PhysicalVolumeMassScene::G4PhysicalVolumeMassScene ():
fVolume (0.),
fMass (0.),
fpLastPV (0),
fPVPCount (0),
fLastDepth (0),
fLastDensity (0.),
fCurrentDepth (0),
fpCurrentPV (0),
fpCurrentLV (0)
{}
G4PhysicalVolumeMassScene::~G4PhysicalVolumeMassScene () {}
void G4PhysicalVolumeMassScene::EstablishSpecials
(G4PhysicalVolumeModel& pvModel) {
pvModel.DefinePointersToWorkingSpace (&fCurrentDepth,
&fpCurrentPV,
&fpCurrentLV);
}
void G4PhysicalVolumeMassScene::Reset ()
{
fVolume = 0.;
fMass = 0.;
fpLastPV = 0;
fPVPCount = 0;
fLastDepth = 0;
fLastDensity = 0.;
fDensityStack.clear();
fCurrentDepth = 0;
fpCurrentPV = 0;
fpCurrentLV = 0;
}
void G4PhysicalVolumeMassScene::AccrueMass (const G4VSolid& solid)
{
if (fpCurrentPV != fpLastPV) {
fpLastPV = fpCurrentPV;
fPVPCount = 0;
}
G4double currentVolume;
G4double currentDensity;
G4Polyhedron* pPolyhedron = solid.GetPolyhedron();
if (pPolyhedron) {
G4Material* pMaterial;
G4VPVParameterisation* pP = fpCurrentPV->GetParameterisation();
if (pP) {
pMaterial = pP -> ComputeMaterial (fPVPCount++, fpCurrentPV);
} else {
pMaterial = fpCurrentLV->GetMaterial();
}
currentVolume = pPolyhedron->GetVolume();
currentDensity = pMaterial->GetDensity();
} else {
G4cout <<
"G4PhysicalVolumeMassScene::AccrueMass: WARNING:"
"\n No G4Polyhedron for" << solid.GetEntityType() <<
". \"" << solid.GetName() << "\" will not be accounted."
"\n It will be as though not there, i.e., the density as its mother."
"\n Its daughters will still be found and accounted."
<< G4endl;
currentVolume = 0.;
currentDensity = 0.;
}
if (fCurrentDepth == 0) fVolume = currentVolume;
if (fCurrentDepth > fLastDepth) {
fDensityStack.push_back (fLastDensity);
} else if (fCurrentDepth < fLastDepth) {
fDensityStack.pop_back();
}
fLastDepth = fCurrentDepth;
fLastDensity = currentDensity;
G4double motherDensity = 0.;
if (fCurrentDepth > 0) motherDensity = fDensityStack.back();
G4double subtractedMass = currentVolume * motherDensity;
G4double addedMass = currentVolume * currentDensity;
fMass -= subtractedMass;
fMass += addedMass;
/* Debug
G4cout << "current vol = "
<< G4BestUnit (currentVolume,"Volume")
<< ", current density = "
<< G4BestUnit (currentDensity, "Volumic Mass")
<< ", mother density = "
<< G4BestUnit (motherDensity, "Volumic Mass")
<< G4endl;
G4cout << "Subtracted mass = " << G4BestUnit (subtractedMass, "Mass")
<< ", added mass = " << G4BestUnit (addedMass, "Mass")
<< ", new mass = " << G4BestUnit (fMass, "Mass")
<< G4endl;
*/
if (fMass < 0.) {
G4cout <<
"G4PhysicalVolumeMassScene::AccrueMass: WARNING:"
"\n Mass going negative for \""
<< fpCurrentPV->GetName() <<
"\", copy "
<< fpCurrentPV->GetCopyNo() <<
". Larger than mother?"
<< G4endl;
}
}
source/visualization/modeling/src/G4PhysicalVolumeModel.cc
+9 -6
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PhysicalVolumeModel.cc,v 1.23 2003/11/12 13:05:10 johna Exp $
// GEANT4 tag $Name: geant4-06-00-patch-01 $
// $Id: G4PhysicalVolumeModel.cc,v 1.25 2004/09/22 19:50:32 johna Exp $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 31st December 1997.
@@ -99,6 +99,9 @@ void G4PhysicalVolumeModel::CalculateExtent () {
fpMP = &mParams;
DescribeYourselfTo (bsScene);
fExtent = bsScene.GetBoundingSphereExtent ();
if (!(fExtent.GetXmin() < fExtent.GetXmax())) {
fExtent = fpTopPV -> GetLogicalVolume () -> GetSolid () -> GetExtent ();
}
fpMP = tempMP;
fRequestedDepth = tempRequestedDepth;
}
@@ -298,9 +301,9 @@ void G4PhysicalVolumeModel::DescribeAndDescend
if (fppCurrentPV) *fppCurrentPV = fpCurrentPV;
if (fppCurrentLV) *fppCurrentLV = fpCurrentLV;
const HepRotation* pObjectRotation = pVPV -> GetObjectRotation ();
const Hep3Vector& translation = pVPV -> GetTranslation ();
G4Transform3D theLT (G4Transform3D (*pObjectRotation, translation));
const G4RotationMatrix objectRotation = pVPV -> GetObjectRotationValue ();
const G4ThreeVector& translation = pVPV -> GetTranslation ();
G4Transform3D theLT (G4Transform3D (objectRotation, translation));
// Compute the accumulated transformation...
// Note that top volume's transformation relative to the world
@@ -317,7 +320,7 @@ void G4PhysicalVolumeModel::DescribeAndDescend
<< pVPV -> GetName () << "." << pVPV -> GetCopyNo ();
G4cout << "\n theAT: ";
G4cout << "\n Rotation: ";
HepRotation rotation = theAT.getRotation ();
G4RotationMatrix rotation = theAT.getRotation ();
G4cout << rotation.thetaX() << ", "
<< rotation.phiX() << ", "
<< rotation.thetaY() << ", "
source/visualization/modeling/src/G4PhysicalVolumeSearchScene.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PhysicalVolumeSearchScene.cc,v 1.7 2003/05/30 13:01:32 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 10th August 1998.
source/visualization/modeling/src/G4ScaleModel.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ScaleModel.cc,v 1.3 2001/08/14 18:43:31 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 21st July 2001.
source/visualization/modeling/src/G4TextModel.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4TextModel.cc,v 1.4 2001/08/14 18:43:32 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 3rd April 2001
source/visualization/modeling/src/G4TrajectoriesModel.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4TrajectoriesModel.cc,v 1.12 2002/11/11 18:39:28 johna Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 26th August 1998.
source/visualization/modeling/src/G4VModel.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VModel.cc,v 1.9 2003/06/16 17:14:32 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// John Allison 31st December 1997.