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

update geant4.9.3 tag

Location:
trunk/source/geometry/volumes/include
Files:
27 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/geometry/volumes/include/G4AssemblyTriplet.hh

    r1058 r1228  
    2626//
    2727// $Id: G4AssemblyTriplet.hh,v 1.3 2007/11/16 16:20:25 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/volumes/include/G4AssemblyTriplet.icc

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

  • trunk/source/geometry/volumes/include/G4AssemblyVolume.hh

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

  • trunk/source/geometry/volumes/include/G4AssemblyVolume.icc

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

  • trunk/source/geometry/volumes/include/G4GRSSolid.hh

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

  • trunk/source/geometry/volumes/include/G4GRSSolid.icc

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

  • trunk/source/geometry/volumes/include/G4GRSSolidHandle.hh

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

  • trunk/source/geometry/volumes/include/G4GRSVolume.hh

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

  • trunk/source/geometry/volumes/include/G4GRSVolume.icc

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

  • trunk/source/geometry/volumes/include/G4GRSVolumeHandle.hh

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

  • trunk/source/geometry/volumes/include/G4LogicalBorderSurface.hh

    r1058 r1228  
    2626//
    2727// $Id: G4LogicalBorderSurface.hh,v 1.17 2008/08/19 15:31:52 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4LogicalBorderSurface

  • trunk/source/geometry/volumes/include/G4LogicalBorderSurface.icc

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

  • trunk/source/geometry/volumes/include/G4LogicalSkinSurface.hh

    r1058 r1228  
    2626//
    2727// $Id: G4LogicalSkinSurface.hh,v 1.17 2008/08/19 15:31:52 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4LogicalSkinSurface

  • trunk/source/geometry/volumes/include/G4LogicalSkinSurface.icc

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

  • trunk/source/geometry/volumes/include/G4NavigationHistory.hh

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4NavigationHistory.hh,v 1.13 2006/06/29 18:57:18 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4NavigationHistory.hh,v 1.14 2009/11/03 09:15:51 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4NavigationHistory
    … …  
    4747#include "geomdefs.hh"
    4848
     49//#include "G4Allocator.hh"
    4950#include "G4AffineTransform.hh"
    5051#include "G4VPhysicalVolume.hh"
    … …  
    141142 private:
    142143
    143   std::vector<G4NavigationLevel>  fNavHistory;
     144  std::vector<G4NavigationLevel> fNavHistory;
     145  //std::vector<G4NavigationLevel, G4Allocator<G4NavigationLevel> > fNavHistory;
    144146
    145147  G4int fStackDepth;

  • trunk/source/geometry/volumes/include/G4NavigationHistory.icc

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4NavigationHistory.icc,v 1.12 2006/06/29 18:57:20 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4NavigationHistory.icc,v 1.14 2009/08/04 08:27:20 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
    … …  
    3737G4NavigationHistory::operator=(const G4NavigationHistory &h)
    3838{
    39   if (&h == this) return *this;
     39  if (&h == this)  { return *this; }
    4040
    4141  // fNavHistory=h.fNavHistory;   // This works, but is very slow.

  • trunk/source/geometry/volumes/include/G4NavigationLevel.hh

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4NavigationLevel.hh,v 1.16 2006/06/29 18:57:22 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4NavigationLevel.hh,v 1.18 2009/08/04 08:27:20 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4NavigationLevel

  • trunk/source/geometry/volumes/include/G4NavigationLevel.icc

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4NavigationLevel.icc,v 1.20 2006/06/29 18:57:25 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4NavigationLevel.icc,v 1.22 2009/08/04 08:27:20 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// 30.09.97 J.Apostolakis Initial version.

  • trunk/source/geometry/volumes/include/G4NavigationLevelRep.hh

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

  • trunk/source/geometry/volumes/include/G4NavigationLevelRep.icc

    r1058 r1228  
    2626//
    2727// $Id: G4NavigationLevelRep.icc,v 1.14 2006/06/29 18:57:29 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//  1 October 1997 J.Apostolakis Initial version.

  • trunk/source/geometry/volumes/include/G4PVParameterised.hh

    r1058 r1228  
    2626//
    2727// $Id: G4PVParameterised.hh,v 1.8 2007/04/11 07:56:38 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/volumes/include/G4PVPlacement.hh

    r1058 r1228  
    2626//
    2727// $Id: G4PVPlacement.hh,v 1.8 2007/04/11 07:56:38 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/volumes/include/G4PVReplica.hh

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

  • trunk/source/geometry/volumes/include/G4ReflectionFactory.hh

    r1058 r1228  
    2626//
    2727// $Id: G4ReflectionFactory.hh,v 1.4 2008/11/13 09:33:20 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/volumes/include/G4TouchableHistory.hh

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4TouchableHistory.hh,v 1.8 2006/06/29 18:57:42 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4TouchableHistory.hh,v 1.11 2009/11/06 11:10:35 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
    … …  
    3434//
    3535// Object representing a touchable detector element, and its history in the
    36 // geomtrical hierarchy, including its net resultant local->global transform.
     36// geometrical hierarchy, including its net resultant local->global transform.
    3737
    3838// History:
    … …  
    4545
    4646#include "G4NavigationHistory.hh"
     47#include "G4Allocator.hh"
    4748#include "G4LogicalVolume.hh"
    4849#include "G4ThreeVector.hh"
    … …  
    6061    // It is for initialisation only. 
    6162
    62   virtual ~G4TouchableHistory();
     63 ~G4TouchableHistory();
    6364
    6465  inline G4VPhysicalVolume* GetVolume( G4int depth=0 ) const;
    … …  
    7273    // Access methods for touchables with history
    7374
    74   virtual void  UpdateYourself( G4VPhysicalVolume*   pPhysVol,
    75                           const G4NavigationHistory* history=0 );
     75  void  UpdateYourself( G4VPhysicalVolume*   pPhysVol,
     76                        const G4NavigationHistory* history=0 );
    7677    // Update methods for touchables with history
    7778
    … …  
    8182    // Should this method be "deprecated" ?
    8283    // it is used now in G4Navigator::LocateGlobalPointAndSetup
     84
     85  inline void *operator new(size_t);
     86  inline void operator delete(void *aTH);
     87    // Override "new" and "delete" to use "G4Allocator".
    8388
    8489 private:

  • trunk/source/geometry/volumes/include/G4TouchableHistory.icc

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4TouchableHistory.icc,v 1.10 2006/12/07 14:26:28 japost Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4TouchableHistory.icc,v 1.13 2009/11/06 11:10:35 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
    … …  
    3232// ----------------------------------------------------------------------
    3333
    34 inline
    35 G4TouchableHistory::G4TouchableHistory()
    36   : frot(G4RotationMatrix()),
    37     ftlate(G4ThreeVector(0.,0.,0.)),
    38     fhistory()
    39 {
    40    G4VPhysicalVolume* pPhysVol=0;
    41    fhistory.SetFirstEntry(pPhysVol);
    42 }
    43 
    44 inline
    45 G4TouchableHistory::G4TouchableHistory( const G4NavigationHistory &history )
    46   : fhistory(history)
    47 {
    48   G4AffineTransform tf(fhistory.GetTopTransform().Inverse());
    49   ftlate = tf.NetTranslation();
    50   frot = tf.NetRotation();
    51 }
     34#if defined G4GEOM_ALLOC_EXPORT
     35  extern G4DLLEXPORT G4Allocator<G4TouchableHistory> aTouchableHistoryAllocator;
     36#else
     37  extern G4DLLIMPORT G4Allocator<G4TouchableHistory> aTouchableHistoryAllocator;
     38#endif
    5239
    5340inline
    … …  
    10390G4int G4TouchableHistory::MoveUpHistory( G4int num_levels )
    10491{
    105   G4NavigationHistory* nHistory= &fhistory;
    106   G4int maxLevelsMove = nHistory->GetDepth();
     92  G4int maxLevelsMove = fhistory.GetDepth();
    10793  G4int minLevelsMove = 0;              // Cannot redescend today!
    10894                                        // Soon it will be possible
    … …  
    117103    num_levels = minLevelsMove;
    118104  }
    119   nHistory->BackLevel( num_levels );
     105  fhistory.BackLevel( num_levels );
    120106
    121107  return num_levels;
    … …  
    127113  return &fhistory;
    128114}
     115
     116// There is no provision in case this class is subclassed.
     117// If it is subclassed, this will fail and may not give errors!
     118//
     119inline
     120void* G4TouchableHistory::operator new(size_t)
     121{
     122  return (void *) aTouchableHistoryAllocator.MallocSingle();
     123}
     124
     125inline
     126void G4TouchableHistory::operator delete(void *aTH)
     127{
     128  aTouchableHistoryAllocator.FreeSingle((G4TouchableHistory *) aTH);
     129}
     130

  • trunk/source/geometry/volumes/include/G4TouchableHistoryHandle.hh

    r1058 r1228  
    2626//
    2727// $Id: G4TouchableHistoryHandle.hh,v 1.6 2006/06/29 18:57:48 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// Class G4TouchableHistoryHandle
Note: See TracChangeset for help on using the changeset viewer.