Changeset 1340 for trunk/source/geometry/management/include

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

Location:

trunk/source/geometry/management/include

Files:

• G4LogicalSurface.hh (modified) (5 diffs)
• G4LogicalSurface.icc (modified) (10 diffs)
• G4ReflectedSolid.hh (modified) (4 diffs)
• G4VSolid.hh (modified) (2 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4LogicalSurface.hh,v 1.11 2009/04/21 15:18:15 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4LogicalSurface.hh,v 1.12 2010/07/05 09:22:58 gcosmo Exp $
+// GEANT4 tag $Name: geommng-V09-03-05 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -53 +53 @@
 // Data members:
 //   G4String                       theName
-//   G4SurfaceProperty*              theSurfaceProperty
+//   G4SurfaceProperty*             theSurfaceProperty
 //   G4TransitionRadiationSurface*  theTransRadSurface
 
@@ -83 +83 @@
  public:  // with description
 
-   G4SurfaceProperty*  GetSurfaceProperty() const;
-   void     SetSurfaceProperty(G4SurfaceProperty* ptrSurfaceProperty);
+   inline G4SurfaceProperty*  GetSurfaceProperty() const;
+   inline void SetSurfaceProperty(G4SurfaceProperty* ptrSurfaceProperty);
 
-   const G4String& GetName() const;
-   void     SetName(const G4String& name);
+   inline const G4String& GetName() const;
+   inline void SetName(const G4String& name);
 
-   G4TransitionRadiationSurface*  GetTransitionRadiationSurface() const;
-   void SetTransitionRadiationSurface(G4TransitionRadiationSurface* tRadSurf);
+   inline G4TransitionRadiationSurface* GetTransitionRadiationSurface() const;
+   inline void SetTransitionRadiationSurface(G4TransitionRadiationSurface* tRadSurf);
 
  public:  // without description
@@ -96 +96 @@
    virtual ~G4LogicalSurface();
 
-   G4int operator==(const G4LogicalSurface &right) const;
-   G4int operator!=(const G4LogicalSurface &right) const;
+   inline G4int operator==(const G4LogicalSurface &right) const;
+   inline G4int operator!=(const G4LogicalSurface &right) const;
 
  protected:
@@ -103 +103 @@
    // There should be no instances of this class
 
-   G4LogicalSurface(const G4String& name, G4SurfaceProperty* surfaceProperty); 
+   G4LogicalSurface(const G4String& name, G4SurfaceProperty* prop); 
      // Is the name more meaningful for the properties or the logical surface ?
 
- private:
+ private:  // Copying restricted
 
-   G4LogicalSurface(const G4LogicalSurface &right); // Copying restricted
-   const G4LogicalSurface& operator=(const G4LogicalSurface& right);
+   G4LogicalSurface(const G4LogicalSurface &right);
+   inline const G4LogicalSurface& operator=(const G4LogicalSurface& right);
 
  private:

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

@@ -25 +25 @@
 //
 //
-// $Id: G4LogicalSurface.icc,v 1.10 2009/04/21 15:18:15 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4LogicalSurface.icc,v 1.11 2010/07/05 09:22:58 gcosmo Exp $
+// GEANT4 tag $Name: geommng-V09-03-05 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -42 +42 @@
 G4LogicalSurface::GetSurfaceProperty() const
 {
-        return theSurfaceProperty;
+  return theSurfaceProperty;
 } 
 
@@ -48 +48 @@
 G4LogicalSurface::SetSurfaceProperty(G4SurfaceProperty* ptrSurfaceProperty) 
 {
-        theSurfaceProperty = ptrSurfaceProperty;
+  theSurfaceProperty = ptrSurfaceProperty;
 } 
 
@@ -54 +54 @@
 G4LogicalSurface::GetName() const
 {
-        return theName;
+  return theName;
 }
 
@@ -60 +60 @@
 G4LogicalSurface::SetName(const G4String& name)
 {
-        theName = name;
+  theName = name;
 }
 
@@ -66 +66 @@
 G4LogicalSurface::GetTransitionRadiationSurface() const
 {
-        return theTransRadSurface;
+  return theTransRadSurface;
 } 
 
@@ -73 +73 @@
                                                 transRadSurf )
 {
-        theTransRadSurface= transRadSurf;
+  theTransRadSurface= transRadSurf;
 } 
-
 
   //////////////
@@ -84 +83 @@
 G4LogicalSurface::operator=(const G4LogicalSurface &right)
 {
-        if (&right == this) return *this;
-        theName = right.theName;
-        theSurfaceProperty = right.theSurfaceProperty;
-        theTransRadSurface = right.theTransRadSurface;
+  if (&right == this)  { return *this; }
+  theName = right.theName;
+  theSurfaceProperty = right.theSurfaceProperty;
+  theTransRadSurface = right.theTransRadSurface;
         
-        return *this;
+  return *this;
 }
 
@@ -95 +94 @@
 G4LogicalSurface::operator==(const G4LogicalSurface &right) const
 {
-        return (this == (G4LogicalSurface *) &right);
+  return (this == (G4LogicalSurface *) &right);
 }
 
@@ -101 +100 @@
 G4LogicalSurface::operator!=(const G4LogicalSurface &right) const
 {
-        return (this != (G4LogicalSurface *) &right);
+  return (this != (G4LogicalSurface *) &right);
 }
-
-  /////////////////
-  // Constructors 
-  /////////////////
-
-inline G4LogicalSurface::G4LogicalSurface(const G4String&         name,
-                                         G4SurfaceProperty* surfaceProperty) 
-  : theName(name), theSurfaceProperty(surfaceProperty)
-{
-}
-
-inline G4LogicalSurface::G4LogicalSurface(const G4LogicalSurface &right)
-{
-        *this = right;
-}
-
-inline G4LogicalSurface::~G4LogicalSurface()
-{
-}

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

@@ -25 +25 @@
 //
 //
-// $Id: G4ReflectedSolid.hh,v 1.5 2006/06/29 18:31:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4ReflectedSolid.hh,v 1.6 2010/10/19 15:20:18 gcosmo Exp $
+// GEANT4 tag $Name: geommng-V09-03-05 $
 //
 //
@@ -94 +94 @@
     G4ThreeVector GetPointOnSurface() const;
 
+    G4VSolid* Clone() const;
+
   public:  // with description 
 
@@ -114 +116 @@
 
   public:  // without description
+
+    G4ReflectedSolid(const G4ReflectedSolid& rhs);
+    G4ReflectedSolid& operator=(const G4ReflectedSolid& rhs);
+      // Copy constructor and assignment operator.
 
     void DescribeYourselfTo ( G4VGraphicsScene& scene ) const ;
@@ -149 +155 @@
     mutable G4Polyhedron* fpPolyhedron;  // Caches reflected G4Polyhedron.
 
-  private:
-
-    G4ReflectedSolid(const G4ReflectedSolid&);
-    G4ReflectedSolid& operator=(const G4ReflectedSolid&);
-      // Private copy constructor and assignment operator.
 } ;
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4VSolid.hh,v 1.29 2008/09/10 13:18:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4VSolid.hh,v 1.30 2010/10/19 15:19:37 gcosmo Exp $
+// GEANT4 tag $Name: geommng-V09-03-05 $
 //
 // 
@@ -193 +193 @@
       // Returns a random point located on the surface of the solid.
 
+    virtual G4VSolid* Clone() const;
+      // Returns a pointer of a dynamically allocated copy of the solid.
+      // Returns NULL pointer with warning in case the concrete solid does not
+      // implement this method. The caller has responsibility for ownership.
+
     virtual std::ostream& StreamInfo(std::ostream& os) const = 0;
       // Dumps contents of the solid to a stream.