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/src
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/geometry/volumes/src/G4AssemblyVolume.cc

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4AssemblyVolume.cc,v 1.11 2008/02/03 09:12:50 ivana Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4AssemblyVolume.cc,v 1.12 2009/09/22 13:58:48 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
    … …  
    4848//
    4949G4AssemblyVolume::G4AssemblyVolume()
    50 : fAssemblyID( 0 )
     50  : fAssemblyID( 0 )
    5151{
    5252  InstanceCountPlus();
    5353  SetAssemblyID( GetInstanceCount() );
    5454  SetImprintsCount( 0 );
     55}
     56
     57// Composing constructor
     58//
     59G4AssemblyVolume::G4AssemblyVolume( G4LogicalVolume* volume,
     60                                    G4ThreeVector& translation,
     61                                    G4RotationMatrix* rotation )
     62  : fAssemblyID( 0 )
     63{
     64  InstanceCountPlus();
     65  SetAssemblyID( GetInstanceCount() );
     66  SetImprintsCount( 0 );
     67  AddPlacedVolume(volume, translation, rotation);
    5568}
    5669

  • trunk/source/geometry/volumes/src/G4GRSSolid.cc

    r1058 r1228  
    2626//
    2727// $Id: G4GRSSolid.cc,v 1.8 2006/06/29 18:57: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/src/G4GRSVolume.cc

    r1058 r1228  
    2626//
    2727// $Id: G4GRSVolume.cc,v 1.8 2006/06/29 18:57: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/src/G4LogicalBorderSurface.cc

    r1058 r1228  
    2626//
    2727// $Id: G4LogicalBorderSurface.cc,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// --------------------------------------------------------------------

  • trunk/source/geometry/volumes/src/G4LogicalSkinSurface.cc

    r1058 r1228  
    2626//
    2727// $Id: G4LogicalSkinSurface.cc,v 1.16 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// --------------------------------------------------------------------

  • trunk/source/geometry/volumes/src/G4NavigationHistory.cc

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4NavigationHistory.cc,v 1.10 2006/06/29 18:58:02 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4NavigationHistory.cc,v 1.11 2009/08/03 16:27:37 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
    … …  
    5151G4NavigationHistory::~G4NavigationHistory()
    5252{
    53   Reset();  // To delete all but one current entries!
    5453}
    5554

  • trunk/source/geometry/volumes/src/G4NavigationLevel.cc

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4NavigationLevel.cc,v 1.4 2006/06/29 18:58:04 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4NavigationLevel.cc,v 1.5 2009/08/03 16:13:19 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// 30.09.97 J.Apostolakis Initial version.
    … …  
    7070G4NavigationLevel::~G4NavigationLevel()
    7171{
    72   if( fLevelRep->RemoveAReference() )
    73     delete fLevelRep;
     72  if( fLevelRep->RemoveAReference() )  { delete fLevelRep; }
    7473}
    7574
    … …  
    7978  {
    8079    right.fLevelRep->AddAReference();
    81     if( fLevelRep->RemoveAReference() )
    82       delete fLevelRep;
     80    if( fLevelRep->RemoveAReference() )  { delete fLevelRep; }
    8381    fLevelRep = right.fLevelRep;
    8482  }

  • trunk/source/geometry/volumes/src/G4NavigationLevelRep.cc

    r1058 r1228  
    2626//
    2727// $Id: G4NavigationLevelRep.cc,v 1.2 2006/06/29 18:58:06 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/src/G4PVParameterised.cc

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4PVParameterised.cc,v 1.10 2007/04/11 07:56:38 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4PVParameterised.cc,v 1.11 2009/09/21 10:27:05 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
    … …  
    226226        // Transform each point according to daughter's frame
    227227        //
    228         G4ThreeVector md = Td.Invert().TransformPoint(*pos);
     228        G4ThreeVector md = Td.Inverse().TransformPoint(*pos);
    229229
    230230        if (solidB->Inside(md)==kInside)

  • trunk/source/geometry/volumes/src/G4PVPlacement.cc

    r1058 r1228  
    2626//
    2727// $Id: G4PVPlacement.cc,v 1.16 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/src/G4PVReplica.cc

    r1058 r1228  
    2626//
    2727// $Id: G4PVReplica.cc,v 1.7 2006/06/29 18:58:14 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/volumes/src/G4ReflectionFactory.cc

    r1058 r1228  
    2626//
    2727// $Id: G4ReflectionFactory.cc,v 1.9 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/src/G4TouchableHistory.cc

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4TouchableHistory.cc,v 1.12 2006/06/29 18:58:20 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4TouchableHistory.cc,v 1.15 2009/11/06 11:10:35 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
    … …  
    3434
    3535#include "G4TouchableHistory.hh"
     36
     37G4Allocator<G4TouchableHistory> aTouchableHistoryAllocator;
     38
     39G4TouchableHistory::G4TouchableHistory()
     40  : frot(G4RotationMatrix()),
     41    ftlate(G4ThreeVector(0.,0.,0.)),
     42    fhistory()
     43{
     44   G4VPhysicalVolume* pPhysVol=0;
     45   fhistory.SetFirstEntry(pPhysVol);
     46}
     47
     48G4TouchableHistory::G4TouchableHistory( const G4NavigationHistory &history )
     49  : fhistory(history)
     50{
     51  G4AffineTransform tf(fhistory.GetTopTransform().Inverse());
     52  ftlate = tf.NetTranslation();
     53  frot = tf.NetRotation();
     54}
    3655
    3756G4TouchableHistory::~G4TouchableHistory()
Note: See TracChangeset for help on using the changeset viewer.