Ignore:
Timestamp:
Jan 8, 2010, 11:56:51 AM (14 years ago)
Author:
garnier
Message:

update geant4.9.3 tag

Location:
trunk/source/geometry/management
Files:
74 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/geometry/management/History

    r921 r1228  
    1 $Id: History,v 1.131 2008/09/23 13:10:55 gcosmo Exp $
     1$Id: History,v 1.138 2009/11/27 16:34:53 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
     19
     20November 27, 2009  G.Cosmo                 geommng-V09-02-05
     21- G4Region: added pointer to field-manager and associated accessor/modifier.
     22
     23November 6, 2009  G.Cosmo                  geommng-V09-02-04
     24- G4VTouchable: moved inline vitual methods, constructor and destructor to
     25  source, to avoid problem of memory alignment in allocation of derived objects.
     26
     27October 30, 2009  G.Cosmo                  geommng-V09-02-03
     28- Clear possible excess capacity in node vectors in G4SmartVoxelHeader
     29  BuildNodes() method. May reduce excess memory allocated in optimisation
     30  in large detector setups, with slight time increase in initialisation for
     31  geometry voxelisation.
     32
     33September 24, 2009  G.Cosmo                geommng-V09-02-02
     34- Fixed implementation of G4LogicalVolume::TotalVolumeEntities() to become
     35  invariant to call sequence.
     36
     37May 25, 2009  G.Cosmo                      geommng-V09-02-01
     38- Fixed initialisation of min/max extent in method BuildReplicaVoxels() in
     39  G4SmartVoxelHeader.
     40
     41April 16, 2009  G.Cosmo                    geommng-V09-02-00
     42- Adopt 'const' references for strings as arguments/return-values in
     43  G4LogicalSurface. Some minor cleanup...
    1944
    2045September 23, 2008  G. Cosmo               geommng-V09-01-08

  • trunk/source/geometry/management/include/G4AffineTransform.hh

    r1058 r1228  
    2626//
    2727// $Id: G4AffineTransform.hh,v 1.6 2006/06/29 18:30:37 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4AffineTransform.icc

    r1058 r1228  
    2626//
    2727// $Id: G4AffineTransform.icc,v 1.8 2006/06/29 18:30:39 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4BlockingList.hh

    r1058 r1228  
    2626//
    2727// $Id: G4BlockingList.hh,v 1.4 2006/06/29 18:30:41 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4BlockingList

  • trunk/source/geometry/management/include/G4BlockingList.icc

    r1058 r1228  
    2626//
    2727// $Id: G4BlockingList.icc,v 1.3 2006/06/29 18:30:43 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4ErrorCylSurfaceTarget.hh

    r1058 r1228  
    2626//
    2727// $Id: G4ErrorCylSurfaceTarget.hh,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4ErrorPlaneSurfaceTarget.hh

    r1058 r1228  
    2626//
    2727// $Id: G4ErrorPlaneSurfaceTarget.hh,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4ErrorSurfaceTarget.hh

    r1058 r1228  
    2626//
    2727// $Id: G4ErrorSurfaceTarget.hh,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4ErrorTanPlaneTarget.hh

    r1058 r1228  
    2626//
    2727// $Id: G4ErrorTanPlaneTarget.hh,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4ErrorTarget.hh

    r1058 r1228  
    2626//
    2727// $Id: G4ErrorTarget.hh,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4GeometryManager.hh

    r1058 r1228  
    2626//
    2727// $Id: G4GeometryManager.hh,v 1.12 2007/05/11 13:30:12 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4GeometryManager

  • trunk/source/geometry/management/include/G4IdentityTrajectoryFilter.hh

    r1058 r1228  
    2626//
    2727// $Id: G4IdentityTrajectoryFilter.hh,v 1.3 2006/06/29 18:30:48 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4LogicalSurface.hh

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4LogicalSurface.hh,v 1.10 2006/06/29 18:30:50 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4LogicalSurface.hh,v 1.11 2009/04/21 15:18:15 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030////////////////////////////////////////////////////////////////////////
    … …  
    8686   void     SetSurfaceProperty(G4SurfaceProperty* ptrSurfaceProperty);
    8787
    88    G4String GetName() const;
     88   const G4String& GetName() const;
    8989   void     SetName(const G4String& name);
    9090
    9191   G4TransitionRadiationSurface*  GetTransitionRadiationSurface() const;
    92    void SetTransitionRadiationSurface(G4TransitionRadiationSurface* transRadSurf);
     92   void SetTransitionRadiationSurface(G4TransitionRadiationSurface* tRadSurf);
     93
     94 public:  // without description
     95
     96   virtual ~G4LogicalSurface();
     97
     98   G4int operator==(const G4LogicalSurface &right) const;
     99   G4int operator!=(const G4LogicalSurface &right) const;
    93100
    94101 protected:
    95102
    96         // There should be no instances of this class
     103   // There should be no instances of this class
    97104
    98    G4LogicalSurface(const G4String&         name,
    99                     G4SurfaceProperty* surfaceProperty);
    100         // Is the name more meaningful for the properties or the logical
    101         // surface ? 
    102 
    103  public:
    104    virtual ~G4LogicalSurface();
    105 
    106  public:
    107    G4int operator==(const G4LogicalSurface &right) const;
    108    G4int operator!=(const G4LogicalSurface &right) const;
     105   G4LogicalSurface(const G4String& name, G4SurfaceProperty* surfaceProperty);
     106     // Is the name more meaningful for the properties or the logical surface ?
    109107
    110108 private:
    … …  
    117115   G4String theName;              // Surface name
    118116
    119    G4SurfaceProperty*              theSurfaceProperty;
     117   G4SurfaceProperty*             theSurfaceProperty;
    120118   G4TransitionRadiationSurface*  theTransRadSurface;
    121119};

  • trunk/source/geometry/management/include/G4LogicalSurface.icc

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4LogicalSurface.icc,v 1.9 2006/06/29 18:30:52 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4LogicalSurface.icc,v 1.10 2009/04/21 15:18:15 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030////////////////////////////////////////////////////////////////////////
    … …  
    5151}
    5252
    53 inline G4String
     53inline const G4String&
    5454G4LogicalSurface::GetName() const
    5555{
    … …  
    110110inline G4LogicalSurface::G4LogicalSurface(const G4String&         name,
    111111                                         G4SurfaceProperty* surfaceProperty)
    112                 : theName(name),
    113                   theSurfaceProperty(surfaceProperty)
     112  : theName(name), theSurfaceProperty(surfaceProperty)
    114113{
    115114}

  • trunk/source/geometry/management/include/G4LogicalVolume.hh

    r1058 r1228  
    2626//
    2727// $Id: G4LogicalVolume.hh,v 1.27 2008/07/10 09:40:08 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4LogicalVolume.icc

    r1058 r1228  
    2626//
    2727// $Id: G4LogicalVolume.icc,v 1.25 2008/07/10 09:40:08 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4LogicalVolumeStore.hh

    r1058 r1228  
    2626//
    2727// $Id: G4LogicalVolumeStore.hh,v 1.13 2007/04/10 10:13:50 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4LogicalVolumeStore

  • trunk/source/geometry/management/include/G4PhysicalVolumeStore.hh

    r1058 r1228  
    2626//
    2727// $Id: G4PhysicalVolumeStore.hh,v 1.16 2008/07/10 09:41:20 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4PhysicalVolume

  • trunk/source/geometry/management/include/G4ReflectedSolid.hh

    r1058 r1228  
    2626//
    2727// $Id: G4ReflectedSolid.hh,v 1.5 2006/06/29 18:31:03 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4Region.hh

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4Region.hh,v 1.20 2008/07/10 09:46:01 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4Region.hh,v 1.21 2009/11/27 16:34:37 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4Region
    … …  
    4848class G4MaterialCutsCouple;
    4949class G4UserLimits;
     50class G4FieldManager;
    5051class G4FastSimulationManager;
    5152class G4VPhysicalVolume;
    … …  
    144145      // if it exists. Otherwise set to null.
    145146
     147    inline void SetFieldManager(G4FieldManager* fm);
     148    inline G4FieldManager* GetFieldManager() const;
     149      // Set and Get methods for G4FieldManager.
     150      // The region with assigned field-manager sets the field to the
     151      // geometrical area associated with it; priority is anyhow given
     152      // to local fields eventually set to logical volumes.
     153
    146154    inline G4VPhysicalVolume* GetWorldPhysical() const;
    147155      // Get method for the world physical volume which this region
    … …  
    199207    G4VUserRegionInformation* fUserInfo;
    200208    G4UserLimits* fUserLimits;
     209    G4FieldManager* fFieldManager;
    201210
    202211    G4FastSimulationManager* fFastSimulationManager;

  • trunk/source/geometry/management/include/G4Region.icc

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4Region.icc,v 1.15 2007/04/28 01:48:29 asaim Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4Region.icc,v 1.16 2009/11/27 16:34:37 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
    … …  
    247247{
    248248  return fFastSimulationManager;
     249}
     250
     251// ********************************************************************
     252// GetFieldManager
     253// ********************************************************************
     254//
     255inline
     256G4FieldManager* G4Region::GetFieldManager() const
     257{
     258  return fFieldManager;
     259}
     260
     261// ********************************************************************
     262// SetFieldManager
     263// ********************************************************************
     264//
     265inline
     266void G4Region::SetFieldManager(G4FieldManager* fm)
     267{
     268  fFieldManager = fm;
    249269}
    250270

  • trunk/source/geometry/management/include/G4RegionStore.hh

    r1058 r1228  
    2626//
    2727// $Id: G4RegionStore.hh,v 1.10 2006/11/30 10:39:28 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4RegionStore

  • trunk/source/geometry/management/include/G4SmartVoxelHeader.hh

    r1058 r1228  
    2626//
    2727// $Id: G4SmartVoxelHeader.hh,v 1.10 2006/06/29 18:32:06 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4SmartVoxelHeader

  • trunk/source/geometry/management/include/G4SmartVoxelHeader.icc

    r1058 r1228  
    2626//
    2727// $Id: G4SmartVoxelHeader.icc,v 1.6 2006/06/29 18:32:09 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4SmartVoxelNode.hh

    r1058 r1228  
    2626//
    2727// $Id: G4SmartVoxelNode.hh,v 1.12 2008/01/24 15:47:23 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4SmartVoxelNode

  • trunk/source/geometry/management/include/G4SmartVoxelNode.icc

    r1058 r1228  
    2626//
    2727// $Id: G4SmartVoxelNode.icc,v 1.7 2008/01/24 15:47:23 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4SmartVoxelProxy.hh

    r1058 r1228  
    2626//
    2727// $Id: G4SmartVoxelProxy.hh,v 1.8 2006/06/29 18:32:17 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4SmartVoxelProxy

  • trunk/source/geometry/management/include/G4SmartVoxelProxy.icc

    r1058 r1228  
    2626//
    2727// $Id: G4SmartVoxelProxy.icc,v 1.4 2006/06/29 18:32:19 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4SmartVoxelStat.hh

    r1058 r1228  
    2525//
    2626// $Id: G4SmartVoxelStat.hh,v 1.4 2006/06/29 18:32:21 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929// --------------------------------------------------------------------

  • trunk/source/geometry/management/include/G4SolidStore.hh

    r1058 r1228  
    2626//
    2727// $Id: G4SolidStore.hh,v 1.13 2007/04/10 10:13:50 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4SolidStore

  • trunk/source/geometry/management/include/G4TouchableHandle.hh

    r1058 r1228  
    2626//
    2727// $Id: G4TouchableHandle.hh,v 1.6 2006/06/29 18:32:25 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// Class G4TouchableHandle

  • trunk/source/geometry/management/include/G4VCurvedTrajectoryFilter.hh

    r1058 r1228  
    2626//
    2727// $Id: G4VCurvedTrajectoryFilter.hh,v 1.3 2006/06/29 18:32:27 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4VNestedParameterisation.hh

    r1058 r1228  
    2626//
    2727// $Id: G4VNestedParameterisation.hh,v 1.6 2006/06/29 18:32:29 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4VNestedParameterisation

  • trunk/source/geometry/management/include/G4VPVDivisionFactory.hh

    r1058 r1228  
    2626//
    2727// $Id: G4VPVDivisionFactory.hh,v 1.2 2006/06/29 18:32:31 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4VPVParameterisation.hh

    r1058 r1228  
    2626//
    2727// $Id: G4VPVParameterisation.hh,v 1.13 2007/07/16 08:40:13 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4VPVParamterisation

  • trunk/source/geometry/management/include/G4VPhysicalVolume.hh

    r1058 r1228  
    2626//
    2727// $Id: G4VPhysicalVolume.hh,v 1.17 2007/04/11 08:00:12 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4VPhysicalVolume.icc

    r1058 r1228  
    2626//
    2727// $Id: G4VPhysicalVolume.icc,v 1.10 2006/06/29 18:32:37 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4VSolid.hh

    r1058 r1228  
    2626//
    2727// $Id: G4VSolid.hh,v 1.29 2008/09/10 13:18:42 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4VSolid.icc

    r1058 r1228  
    2626//
    2727// $Id: G4VSolid.icc,v 1.9 2007/05/11 13:30:12 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4VStoreNotifier.hh

    r1058 r1228  
    2626//
    2727// $Id: G4VStoreNotifier.hh,v 1.3 2006/06/29 18:33:02 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4VStoreNotifier

  • trunk/source/geometry/management/include/G4VTouchable.hh

    r1058 r1228  
    2626//
    2727// $Id: G4VTouchable.hh,v 1.9 2006/06/29 18:33:05 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4VTouchable.icc

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4VTouchable.icc,v 1.9 2006/06/29 18:33:07 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4VTouchable.icc,v 1.10 2009/11/06 10:36:00 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
    … …  
    3434
    3535inline
    36 G4VTouchable::G4VTouchable()
    37 {
    38 }
    39 
    40 inline
    41 G4VTouchable::~G4VTouchable()
    42 {
    43 }
    44 
    45 inline
    46 G4VPhysicalVolume* G4VTouchable::GetVolume(G4int) const
    47 {
    48   G4Exception("G4VTouchable::GetVolume()", "NotApplicable",
    49               FatalException, "Undefined call to base class.");
    50   return 0;
    51 }
    52 
    53 inline
    54 G4VSolid* G4VTouchable::GetSolid(G4int) const
    55 {
    56   G4Exception("G4VTouchable::GetSolid()", "NotApplicable",
    57               FatalException, "Undefined call to base class.");
    58   return 0;
    59 }
    60 
    61 inline
    62 G4int G4VTouchable::GetReplicaNumber(G4int) const
    63 {
    64   G4Exception("G4VTouchable::GetReplicaNumber()", "NotApplicable",
    65               FatalException, "Undefined call to base class.");
    66   return 0;
    67 }
    68 
    69 inline
    7036G4int G4VTouchable::GetCopyNumber(G4int depth) const
    7137{
    7238  return GetReplicaNumber(depth);
    7339}
    74 
    75 inline
    76 G4int G4VTouchable::MoveUpHistory(G4int)
    77 {
    78   G4Exception("G4VTouchable::MoveUpHistory()", "NotApplicable",
    79               FatalException, "Undefined call to base class.");
    80   return 0;
    81 }
    82 
    83 inline
    84 void G4VTouchable::UpdateYourself(G4VPhysicalVolume*,
    85                                   const G4NavigationHistory* )
    86 {
    87   G4Exception("G4VTouchable::UpdateYourself()", "NotApplicable",
    88               FatalException, "Undefined call to base class.");
    89 }
    90 
    91 inline
    92 G4int G4VTouchable::GetHistoryDepth() const
    93 {
    94   G4Exception("G4VTouchable::GetHistoryDepth()", "NotApplicable",
    95               FatalException, "Undefined call to base class.");
    96   return  0;
    97 }
    98 
    99 inline
    100 const G4NavigationHistory* G4VTouchable::GetHistory() const
    101 {
    102   G4Exception("G4VTouchable::GetHistory()", "NotApplicable",
    103               FatalException, "Undefined call to base class.");
    104   return 0;
    105 }

  • trunk/source/geometry/management/include/G4VUserRegionInformation.hh

    r1058 r1228  
    2626//
    2727// $Id: G4VUserRegionInformation.hh,v 1.4 2006/06/29 18:33:09 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/G4VVolumeMaterialScanner.hh

    r1058 r1228  
    2626//
    2727// $Id: G4VVolumeMaterialScanner.hh,v 1.4 2006/06/29 18:33:11 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4VVolumeMaterialScanner

  • trunk/source/geometry/management/include/G4VoxelLimits.hh

    r1058 r1228  
    2626//
    2727// $Id: G4VoxelLimits.hh,v 1.9 2006/06/29 18:33:13 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4VoxelLimits

  • trunk/source/geometry/management/include/G4VoxelLimits.icc

    r1058 r1228  
    2626//
    2727// $Id: G4VoxelLimits.icc,v 1.4 2006/06/29 18:33:15 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/meshdefs.hh

    r1058 r1228  
    2626//
    2727// $Id: meshdefs.hh,v 1.7 2006/06/29 18:33:17 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/include/voxeldefs.hh

    r1058 r1228  
    2626//
    2727// $Id: voxeldefs.hh,v 1.7 2006/06/29 18:33:19 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/src/G4BlockingList.cc

    r1058 r1228  
    2626//
    2727// $Id: G4BlockingList.cc,v 1.3 2006/06/29 18:33:21 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/src/G4ErrorCylSurfaceTarget.cc

    r1058 r1228  
    2626//
    2727// $Id: G4ErrorCylSurfaceTarget.cc,v 1.4 2007/06/20 12:50:48 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/src/G4ErrorPlaneSurfaceTarget.cc

    r1058 r1228  
    2626//
    2727// $Id: G4ErrorPlaneSurfaceTarget.cc,v 1.2 2007/06/19 11:28:39 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/src/G4ErrorSurfaceTarget.cc

    r1058 r1228  
    2626//
    2727// $Id: G4ErrorSurfaceTarget.cc,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/src/G4ErrorTanPlaneTarget.cc

    r1058 r1228  
    2626//
    2727// $Id: G4ErrorTanPlaneTarget.cc,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/src/G4ErrorTarget.cc

    r1058 r1228  
    2626//
    2727// $Id: G4ErrorTarget.cc,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/src/G4GeometryManager.cc

    r1058 r1228  
    2626//
    2727// $Id: G4GeometryManager.cc,v 1.22 2008/05/16 13:46:48 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4GeometryManager

  • trunk/source/geometry/management/src/G4IdentityTrajectoryFilter.cc

    r1058 r1228  
    2626//
    2727// $Id: G4IdentityTrajectoryFilter.cc,v 1.4 2006/10/02 10:09:24 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// ------------------------------------------------------------------------

  • trunk/source/geometry/management/src/G4LogicalVolume.cc

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4LogicalVolume.cc,v 1.33 2008/07/10 09:40:09 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4LogicalVolume.cc,v 1.34 2009/09/24 13:22:57 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
    … …  
    162162G4int G4LogicalVolume::TotalVolumeEntities() const
    163163{
    164   static G4int vols = 0;
    165 
    166   vols++;
     164  G4int vols = 1;
    167165  for (G4PhysicalVolumeList::const_iterator itDau = fDaughters.begin();
    168166       itDau != fDaughters.end(); itDau++)
    169167  {
    170168    G4VPhysicalVolume* physDaughter = (*itDau);
    171     for (G4int i=0; i<physDaughter->GetMultiplicity(); i++)
    172     {
    173       physDaughter->GetLogicalVolume()->TotalVolumeEntities();
    174     }
     169    vols += physDaughter->GetMultiplicity()
     170           *physDaughter->GetLogicalVolume()->TotalVolumeEntities();
    175171  }
    176172  return vols;

  • trunk/source/geometry/management/src/G4LogicalVolumeStore.cc

    r1058 r1228  
    2626//
    2727// $Id: G4LogicalVolumeStore.cc,v 1.19 2008/07/10 09:40:09 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// G4LogicalVolumeStore

  • trunk/source/geometry/management/src/G4PhysicalVolumeStore.cc

    r1058 r1228  
    2626//
    2727// $Id: G4PhysicalVolumeStore.cc,v 1.20 2008/07/10 09:41:20 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// G4PhysicalVolumeStore

  • trunk/source/geometry/management/src/G4ReflectedSolid.cc

    r1058 r1228  
    2727// $Id: G4ReflectedSolid.cc,v 1.11 2006/11/08 09:56:33 gcosmo Exp $
    2828//
    29 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     29// GEANT4 tag $Name: geant4-09-03 $
    3030//
    3131// Implementation for G4ReflectedSolid class for boolean

  • trunk/source/geometry/management/src/G4Region.cc

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4Region.cc,v 1.26 2008/07/15 10:27:36 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4Region.cc,v 1.27 2009/11/27 16:34:37 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
    … …  
    4848G4Region::G4Region(const G4String& pName)
    4949  : fName(pName), fRegionMod(true), fCut(0), fUserInfo(0), fUserLimits(0),
    50     fFastSimulationManager(0), fWorldPhys(0), fRegionalSteppingAction(0)
     50    fFieldManager(0), fFastSimulationManager(0), fWorldPhys(0),
     51    fRegionalSteppingAction(0)
    5152{
    5253  G4RegionStore* rStore = G4RegionStore::GetInstance();
    … …  
    7273G4Region::G4Region( __void__& )
    7374  : fName(""), fRegionMod(true), fCut(0), fUserInfo(0), fUserLimits(0),
    74     fFastSimulationManager(0), fWorldPhys(0), fRegionalSteppingAction(0)
     75    fFieldManager(0), fFastSimulationManager(0), fWorldPhys(0),
     76    fRegionalSteppingAction(0)
    7577{
    7678  // Register to store

  • trunk/source/geometry/management/src/G4RegionStore.cc

    r1058 r1228  
    2626//
    2727// $Id: G4RegionStore.cc,v 1.14 2008/07/10 09:46:01 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// G4RegionStore

  • trunk/source/geometry/management/src/G4SmartVoxelHeader.cc

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4SmartVoxelHeader.cc,v 1.31 2008/01/24 15:46:47 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4SmartVoxelHeader.cc,v 1.34 2009/10/30 14:05:47 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
    … …  
    366366        // Sanity check on extent
    367367        //
    368         G4double min, max;
     368        G4double emin = kInfinity, emax = -kInfinity;
    369369        G4VoxelLimits limits;
    370370        G4AffineTransform origin;
    371         pVolume->GetSolid()->CalculateExtent(axis, limits, origin, min, max);
    372         if ( (std::fabs((min-fminExtent)/fminExtent) +
    373               std::fabs((max-fmaxExtent)/fmaxExtent)) > 0.05)
     371        pVolume->GetSolid()->CalculateExtent(axis, limits, origin, emin, emax);
     372        if ( (std::fabs((emin-fminExtent)/fminExtent) +
     373              std::fabs((emax-fmaxExtent)/fmaxExtent)) > 0.05)
    374374        {
    375375          G4cerr << "ERROR - G4SmartVoxelHeader::BuildReplicaVoxels()"
    … …  
    10381038  for (nNode=0; nNode<noNodes; nNode++)
    10391039  {
     1040    // Get rid of possible excess capacity in the internal node vector
     1041    //
     1042    ((*nodeList)[nNode])->Shrink();
    10401043    G4SmartVoxelProxy* pProxyNode = new G4SmartVoxelProxy((*nodeList)[nNode]);
    10411044    if (!pProxyNode)

  • trunk/source/geometry/management/src/G4SmartVoxelNode.cc

    r1058 r1228  
    2626//
    2727// $Id: G4SmartVoxelNode.cc,v 1.6 2006/06/29 18:33:45 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// Class G4SmartVoxelNode

  • trunk/source/geometry/management/src/G4SmartVoxelProxy.cc

    r1058 r1228  
    2626//
    2727// $Id: G4SmartVoxelProxy.cc,v 1.3 2006/06/29 18:33:48 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// Class G4SmartVoxelProxy

  • trunk/source/geometry/management/src/G4SmartVoxelStat.cc

    r1058 r1228  
    2626//
    2727// $Id: G4SmartVoxelStat.cc,v 1.3 2006/06/29 18:33:50 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/management/src/G4SolidStore.cc

    r1058 r1228  
    2626//
    2727// $Id: G4SolidStore.cc,v 1.17 2007/04/10 10:13:50 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// G4SolidStore

  • trunk/source/geometry/management/src/G4VCurvedTrajectoryFilter.cc

    r1058 r1228  
    2626//
    2727// $Id: G4VCurvedTrajectoryFilter.cc,v 1.3 2006/06/29 18:33:56 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929// --------------------------------------------------------------------
    3030

  • trunk/source/geometry/management/src/G4VNestedParameterisation.cc

    r1058 r1228  
    2626//
    2727// $Id: G4VNestedParameterisation.cc,v 1.6 2006/06/29 18:33:59 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4VNestedParameterisation implementation

  • trunk/source/geometry/management/src/G4VPVDivisionFactory.cc

    r1058 r1228  
    2626//
    2727// $Id: G4VPVDivisionFactory.cc,v 1.2 2006/06/29 18:34:02 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4VPVDivisionFactory Implementation file

  • trunk/source/geometry/management/src/G4VPVParameterisation.cc

    r1058 r1228  
    2626//
    2727// $Id: G4VPVParameterisation.cc,v 1.8 2007/07/16 08:40:13 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// Default implementations for Parameterisations that do not

  • trunk/source/geometry/management/src/G4VPhysicalVolume.cc

    r1058 r1228  
    2626//
    2727// $Id: G4VPhysicalVolume.cc,v 1.14 2007/04/11 08:00:12 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/management/src/G4VSolid.cc

    r1058 r1228  
    2626//
    2727// $Id: G4VSolid.cc,v 1.39 2008/09/23 13:07:41 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4VSolid

  • trunk/source/geometry/management/src/G4VoxelLimits.cc

    r1058 r1228  
    2626//
    2727// $Id: G4VoxelLimits.cc,v 1.11 2006/06/29 18:34:11 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4VoxelLimits
Note: See TracChangeset for help on using the changeset viewer.