Import Geant4 0.0.4 source tree

Author: gcosmo

source/geometry/management/include/G4AffineTransform.icc

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AffineTransform.icc,v 2.1 1998/11/11 11:34:07 japost Exp $
-// GEANT4 tag $Name: geant4-00 $
+// $Id: G4AffineTransform.icc,v 1.2 1999/03/18 18:31:39 japost Exp $
+// GEANT4 tag $Name: geommng-01-00-02 $
 //
 //
 // G4AffineTransformation Inline implementation
@@ -162,7 +162,7 @@ G4AffineTransform::InverseProduct( const G4AffineTransform& tf1,
 	rzz=tf1.rzx*tf2.rzx+tf1.rzy*tf2.rzy+tf1.rzz*tf2.rzz;
 
 	tx=tf1.tx*tf2.rxx+tf1.ty*tf2.rxy+tf1.tz*tf2.rxz+itf2tx;
-	ty=tf1.tx*tf2.ryx+tf1.ty*tf2.ryy+tf1.tz*tf2.rzy+itf2ty;
+	ty=tf1.tx*tf2.ryx+tf1.ty*tf2.ryy+tf1.tz*tf2.ryz+itf2ty;
 	tz=tf1.tx*tf2.rzx+tf1.ty*tf2.rzy+tf1.tz*tf2.rzz+itf2tz;
 
 	return *this;

source/geometry/management/include/G4LogicalVolume.hh

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LogicalVolume.hh,v 2.1 1998/11/11 11:20:28 japost Exp $
-// GEANT4 tag $Name: geant4-00 $
+// $Id: G4LogicalVolume.hh,v 1.2 1999/02/15 10:58:13 japost Exp $
+// GEANT4 tag $Name: geommng-01-00-02 $
 //
 // 
 // class G4LogicalVolume
@@ -104,6 +104,11 @@
 // void SetVoxelHeader(G4VoxelHeader *pVoxel)
 //   Sets VoxelHeader.
 //
+// G4double GetSmartless()
+//   Gets user defined optimisation quality
+// void SetSmartless(G4double)
+//   Sets user defined optimisation quality
+//
 // void BecomeEnvelopeForFastSimulation(G4FastSimulationManager* );
 //   Makes this an Envelope for given FastSimulationManager. 
 //   Ensures that all its daughter volumes get it too - unless they 
@@ -151,6 +156,8 @@
 //   Pointer (possibly NULL) to user Step limit object for this node
 // G4VoxelHeader *fVoxel
 //   Pointer (possibly NULL) to optimisation info objects
+// G4double smartless
+//   Quality for optimisation, average number of voxels to be spent per content 
 // G4FastSimulationManager *fFastSimulationManager
 //   Pointer (possibly NULL) to G4FastSimulationManager object
 // G4bool fIsEnvelope
@@ -159,6 +166,7 @@
 //   weight used in the event biasing technique
 //
 // History:
+// 12.02.99 S.Giani: Added user defined optimisation quality
 // 09.11.98 J. Apostolakis:  Changed G4MagneticField to G4FieldManager
 // 09.11.98 M. Verderi & JA. : added  BiasWeight member and Get/Set methods
 // 10.20.97 P. MoraDeFreitas : added pointer to a FastSimulation
@@ -223,6 +231,9 @@ public:
     G4SmartVoxelHeader* GetVoxelHeader() const;
     void SetVoxelHeader(G4SmartVoxelHeader *pVoxel);
 
+    G4double GetSmartless();
+    void SetSmartless(G4double s);
+    
     G4bool operator == ( const G4LogicalVolume& lv) const;
 
     const G4VisAttributes* GetVisAttributes () const;
@@ -252,6 +263,7 @@ private:
     G4VSolid *fSolid;
     G4UserLimits *fUserLimits;
     G4SmartVoxelHeader *fVoxel;
+    G4double fSmartless;
     const G4VisAttributes* fVisAttributes;
     G4FastSimulationManager *fFastSimulationManager;
     G4bool fIsEnvelope;

source/geometry/management/include/G4LogicalVolume.icc

@@ -5,15 +5,16 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LogicalVolume.icc,v 2.1 1998/11/18 13:58:59 japost Exp $
-// GEANT4 tag $Name: geant4-00 $
+// $Id: G4LogicalVolume.icc,v 1.2 1999/02/15 10:58:13 japost Exp $
+// GEANT4 tag $Name: geommng-01-00-02 $
 //
 // 
 // class G4LogicalVolume Inline Implementation file
 //
 // 10.20.97 - P. MoraDeFreitas : Added SetFastSimulation method.
 // 05.11.98 - M. Verderi: Add Get/Set methods for fBiasWeight
 // 09.11.98 - J. Apostolakis:  Changed MagneticField to FieldManager
+// 12.02.99 - S.Giani: Added set/get methods for voxelization quality
 
 inline G4String G4LogicalVolume::GetName() const
     {
@@ -149,6 +150,16 @@ inline void G4LogicalVolume::SetVoxelHeader(G4SmartVoxelHeader *pVoxel)
     {
 	fVoxel=pVoxel;
     }
+
+inline G4double G4LogicalVolume::GetSmartless()
+    {
+        return fSmartless;
+    }
+
+inline void G4LogicalVolume::SetSmartless(G4double s)
+    {
+        fSmartless=s;
+    }
 
 inline G4bool G4LogicalVolume::operator == ( const G4LogicalVolume& lv) const
     {

source/geometry/management/include/voxeldefs.hh

@@ -5,14 +5,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: voxeldefs.hh,v 2.0 1998/07/02 16:57:19 gunter Exp $
-// GEANT4 tag $Name: geant4-00 $
+// $Id: voxeldefs.hh,v 1.2 1999/02/15 11:14:01 japost Exp $
+// GEANT4 tag $Name: geommng-01-00-02 $
 //
 
 //
 // Voxel Optimisation Constants
 //
 // History:
+// 12.02.99 S.Giani made numerical values consistent with Geant3.21
 // 13.08.95 P.Kent Created separate file
 
 #ifndef VOXELDEFS_HH
@@ -21,7 +22,7 @@
 #include "globals.hh"
 
 // Hard limit on no. voxel nodes per given header
-const G4int kMaxVoxelNodes=2000;// Geant 3.21 uses 1000
+const G4int kMaxVoxelNodes=1000;  // PK chose 2000, Geant 3.21 used 1000
 
 const G4int kMinVoxelVolumesLevel1=2; // Only begin to make voxels if >=
 				      // this no of daughters

source/geometry/management/src/G4LogicalVolume.cc

@@ -5,13 +5,14 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LogicalVolume.cc,v 2.1 1998/11/11 11:38:21 japost Exp $
-// GEANT4 tag $Name: geant4-00 $
+// $Id: G4LogicalVolume.cc,v 1.2 1999/02/15 10:58:17 japost Exp $
+// GEANT4 tag $Name: geommng-01-00-02 $
 //
 // 
 // class G4LogicalVolume Implementation
 //
 // History:
+// 12.02.99 S.Giani: Deafult initialization of voxelization quality.
 // 10.20.97 - P. MoraDeFreitas : "Fast" replaces "Parameterisation" in
 //            class/method names. (release B.00 for parameterisation).
 // 04.08.97 P.MoraDeFreitas/J.A. Added methods for ParameterisedSimulation 
@@ -28,7 +29,7 @@ G4LogicalVolume::G4LogicalVolume( G4VSolid *pSolid,  G4Material *pMaterial,
 				  G4FieldManager *pFieldMgr,
 				  G4VSensitiveDetector *pSDetector,
 				  G4UserLimits *pULimits) : 
-   fDaughters(0), fVoxel(0), fVisAttributes (0) , fFastSimulationManager (0),
+   fDaughters(0), fVoxel(0), fSmartless(2.), fVisAttributes (0) , fFastSimulationManager (0),
    fIsEnvelope(FALSE), fFieldManager(pFieldMgr)
 {
     SetSolid(pSolid);

source/geometry/management/src/G4SmartVoxelHeader.cc

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SmartVoxelHeader.cc,v 2.1 1998/11/11 11:38:22 japost Exp $
-// GEANT4 tag $Name: geant4-00 $
+// $Id: G4SmartVoxelHeader.cc,v 1.3 1999/02/15 10:54:22 japost Exp $
+// GEANT4 tag $Name: geommng-01-00-02 $
 //
 // 
 // class G4SmartVoxelHeader
@@ -16,6 +16,8 @@
 // Define G4GEOMETRY_VOXELDEBUG for debugging information on G4cout
 //
 // History:
+// 12.02.99 Introduction of new quality/smartless: max for (slices/candid) S.G.
+// 11.02.99 Voxels at lower levels are now built for collapsed slices      S.G.
 // 21.07.95 Full implementation, supporting non divided physical volumes
 // 14.07.95 Initial version - stubb definitions only
 
@@ -409,7 +411,7 @@ void G4SmartVoxelHeader::BuildVoxelsWithinLimits(G4LogicalVolume* pVolume,
     BuildEquivalentSliceNos();
     CollectEquivalentNodes();	// Collect common nodes
     RefineNodes(pVolume,pLimits); // Refine nodes creating headers
-    CollectEquivalentHeaders();	// Collect any common headers
+// No common headers can exist because collapsed by construction
 }
 
 // Destructor - Delete all proxies and underlying objects
@@ -779,10 +781,23 @@ G4ProxyVector* G4SmartVoxelHeader::BuildNodes(G4LogicalVolume* pVolume,
 //
 //   mother width/half min daughter width +1
     G4double noNodesExactD=((motherMaxExtent-motherMinExtent)*2.0/minWidth)+1.0;
-    G4int noNodesExactI=G4int (noNodesExactD);
 
-    G4int noNodes=((noNodesExactD-noNodesExactI)>=0.5) ? noNodesExactI+1 : noNodesExactI;
+// Compare with "smartless quality", i.e. the average number of slices used per
+// contained volume:
 
+G4double smartlessComputed = noNodesExactD / nCandidates;
+
+G4double smartlessUser = pVolume->GetSmartless();
+
+G4double smartless = (smartlessComputed <= smartlessUser) ? 
+                      smartlessComputed :  smartlessUser  ;
+
+G4double noNodesSmart = smartless * nCandidates;
+
+G4int    noNodesExactI = G4int(noNodesSmart);
+
+G4int    noNodes = ((noNodesSmart-noNodesExactI)>=0.5) ?
+                     noNodesExactI + 1 : noNodesExactI ; 
 //
 //
 
@@ -1043,10 +1058,8 @@ void G4SmartVoxelHeader::RefineNodes(G4LogicalVolume* pVolume,
 			    delete targetNode;
 
 // Create new headers + proxies and replace in fslices
-			    for (replaceNo=minNo;replaceNo<=maxNo;replaceNo++)
-				{
 				    newLimits=pLimits;
-				    newLimits.AddLimit(faxis,fminExtent+sliceWidth*replaceNo,fminExtent+sliceWidth*(replaceNo+1));
+				    newLimits.AddLimit(faxis,fminExtent+sliceWidth*minNo,fminExtent+sliceWidth*(maxNo+1));
 				    replaceHeader=new G4SmartVoxelHeader(pVolume,newLimits,targetList,replaceNo);
 				    if (!replaceHeader)
 					{
@@ -1059,6 +1072,9 @@ void G4SmartVoxelHeader::RefineNodes(G4LogicalVolume* pVolume,
 					{
 					    G4Exception("G4SmartVoxelHeader::RefineNodes - Refined VoxelProxy new failed");
 					}
+			    for (replaceNo=minNo;replaceNo<=maxNo;replaceNo++)
+				{
+
 				    fslices(replaceNo)=replaceHeaderProxy;
 				}
 // Finished replacing current `equivalent' group

source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolidPCone.hh,v 1.2 1999/01/27 16:15:08 broglia Exp $
-// GEANT4 tag $Name: breps-01-00-01 $
+// GEANT4 tag $Name: geomsolids-01-00-01 $
 //
 //
 // The polyconical solid G4BREPSolidPCone is a shape defined by a set of 

source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolidPolyhedra.hh,v 1.2 1999/01/27 16:15:08 broglia Exp $
-// GEANT4 tag $Name: breps-01-00-01 $
+// GEANT4 tag $Name: geomsolids-01-00-01 $
 //
 // 
 // The polygonal solid G4BREPSolidPolyhedra is a shape defined by an inner 

source/geometry/solids/BREPS/include/G4BSplineCurve.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BSplineCurve.hh,v 1.3 1999/01/19 10:12:56 broglia Exp $
-// GEANT4 tag $Name: breps-01-00-01 $
+// GEANT4 tag $Name: geomsolids-01-00-01 $
 //
 #ifndef __BSPLINECURVE_H
 #define __BSPLINECURVE_H 

source/geometry/solids/BREPS/include/G4CircularCurve.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CircularCurve.hh,v 1.2 1999/01/14 15:59:57 broglia Exp $
-// GEANT4 tag $Name: breps-01-00-01 $
+// GEANT4 tag $Name: geomsolids-01-00-01 $
 //
 #ifndef __CIRCULARCURVE_H
 #define __CIRCULARCURVE_H 

source/geometry/solids/BREPS/include/G4Curve.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Curve.hh,v 1.2 1999/01/14 16:01:07 broglia Exp $
-// GEANT4 tag $Name: breps-01-00-01 $
+// GEANT4 tag $Name: geomsolids-01-00-01 $
 //
 #ifndef __CURVE_H
 #define __CURVE_H 

source/geometry/solids/BREPS/include/G4Ellipse.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Ellipse.hh,v 1.2 1999/01/14 16:01:08 broglia Exp $
-// GEANT4 tag $Name: breps-01-00-01 $
+// GEANT4 tag $Name: geomsolids-01-00-01 $
 //
 #ifndef __ELLIPTICCURVE_H
 #define __ELLIPTICCURVE_H 

source/geometry/solids/BREPS/include/G4FConicalSurface.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FConicalSurface.hh,v 1.2 1999/01/27 16:11:57 broglia Exp $
-// GEANT4 tag $Name: breps-01-00-01 $
+// GEANT4 tag $Name: geomsolids-01-00-01 $
 //
 #ifndef __FCONIC_H
 #define __FCONIC_H

source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FCylindricalSurface.hh,v 1.3 1999/01/27 16:11:58 broglia Exp $
-// GEANT4 tag $Name: breps-01-00-01 $
+// GEANT4 tag $Name: geomsolids-01-00-01 $
 //
 #ifndef __FCYLINDER_H
 #define __FCYLINDER_H

source/geometry/solids/BREPS/include/G4FPlane.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FPlane.hh,v 1.3 1999/01/27 16:13:09 broglia Exp $
-// GEANT4 tag $Name: breps-01-00-01 $
+// GEANT4 tag $Name: geomsolids-01-00-01 $
 //
 // L. Broglia
 // 

source/geometry/solids/BREPS/include/G4Hyperbola.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Hyperbola.hh,v 1.2 1999/01/14 16:01:08 broglia Exp $
-// GEANT4 tag $Name: breps-01-00-01 $
+// GEANT4 tag $Name: geomsolids-01-00-01 $
 //
 #ifndef __HYPERBOLICCURVE_H
 #define __HYPERBOLICCURVE_H 

source/geometry/solids/BREPS/include/G4Line.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Line.hh,v 1.2 1999/01/14 16:05:26 broglia Exp $
-// GEANT4 tag $Name: breps-01-00-01 $
+// GEANT4 tag $Name: geomsolids-01-00-01 $
 //
 #ifndef __LINE_H
 #define __LINE_H 

source/geometry/solids/BREPS/include/G4Parabola.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Parabola.hh,v 1.2 1999/01/14 16:01:38 broglia Exp $
-// GEANT4 tag $Name: breps-01-00-01 $
+// GEANT4 tag $Name: geomsolids-01-00-01 $
 //
 
 #ifndef __PARABOLICCURVE_H