Changeset 1347 for trunk/source/geometry/divisions/include/G4ParameterisationPolyhedra.hh

Timestamp:

Dec 22, 2010, 3:52:27 PM (13 years ago)

Author:

garnier

Message:

geant4 tag 9.4

File:

• trunk/source/geometry/divisions/include/G4ParameterisationPolyhedra.hh (modified) (5 diffs)

trunk/source/geometry/divisions/include/G4ParameterisationPolyhedra.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4ParameterisationPolyhedra.hh,v 1.9 2009/05/14 14:19:32 ivana Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4ParameterisationPolyhedra.hh,v 1.10 2010/07/02 10:46:27 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 // 
 // classes G4ParameterisationPolyhedraRho,
@@ -51 +51 @@
 
 // Dummy declarations to get rid of warnings ...
+//
 class G4Trd;
 class G4Trap;
@@ -91 +92 @@
                                     G4VSolid* motherSolid,
                                     DivisionType divType );
-    virtual ~G4ParameterisationPolyhedraRho();
-
-    virtual void CheckParametersValidity();
-
-    virtual G4double GetMaxParameter() const;
-
-    virtual void ComputeTransformation( const G4int copyNo,
-                                        G4VPhysicalVolume* physVol ) const;
+   ~G4ParameterisationPolyhedraRho();
+
+    void CheckParametersValidity();
+
+    G4double GetMaxParameter() const;
+
+    void ComputeTransformation( const G4int copyNo,
+                                      G4VPhysicalVolume* physVol ) const;
     void ComputeDimensions( G4Polyhedra& phedra, const G4int copyNo,
                             const G4VPhysicalVolume* physVol ) const;
@@ -140 +141 @@
                                    G4VSolid* motherSolid,
                                    DivisionType divType );
-    virtual ~G4ParameterisationPolyhedraPhi();
-
-    virtual void CheckParametersValidity();
-
-    virtual G4double GetMaxParameter() const;
-
-    virtual void ComputeTransformation( const G4int copyNo,
-                                        G4VPhysicalVolume* physVol ) const;
+   ~G4ParameterisationPolyhedraPhi();
+
+    void CheckParametersValidity();
+
+    G4double GetMaxParameter() const;
+
+    void ComputeTransformation( const G4int copyNo,
+                                      G4VPhysicalVolume* physVol ) const;
     void ComputeDimensions( G4Polyhedra& phedra, const G4int copyNo,
                             const G4VPhysicalVolume* physVol ) const;
@@ -189 +190 @@
                                   G4VSolid* motherSolid,
                                   DivisionType divType );
-    virtual ~G4ParameterisationPolyhedraZ();
-
-    virtual void CheckParametersValidity();
-
-    virtual G4double GetMaxParameter() const;
-
-    virtual void ComputeTransformation( const G4int copyNo,
-                                        G4VPhysicalVolume* physVol ) const;
+   ~G4ParameterisationPolyhedraZ();
+
+    void CheckParametersValidity();
+
+    G4double GetMaxParameter() const;
+
+    void ComputeTransformation( const G4int copyNo,
+                                      G4VPhysicalVolume* physVol ) const;
     void ComputeDimensions( G4Polyhedra& phedra, const G4int copyNo,
                             const G4VPhysicalVolume* physVol ) const;
 
-  private: 
-    G4double GetR(G4double z, G4double z1, G4double r1, G4double z2, G4double r2) const;
+  private:
+
+    G4double GetR(G4double z, G4double z1, G4double r1,
+                  G4double z2, G4double r2) const;
     G4double GetRmin(G4double z, G4int nsegment) const;
     G4double GetRmax(G4double z, G4int nsegment) const;
 
+    // Dummy declarations to get rid of warnings ...
+    void ComputeDimensions (G4Trd&,const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Trap&,const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Box&,const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Sphere&,const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Orb&,const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Torus&,const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Para&,const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Hype&,const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Tubs&,const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Cons&,const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Polycone&,const G4int,
+                            const G4VPhysicalVolume*) const {}
+  private:
+
     G4int fNSegment;
     G4PolyhedraHistorical* fOrigParamMother;
-
-    // Dummy declarations to get rid of warnings ...
-    void ComputeDimensions (G4Trd&,const G4int,
-                            const G4VPhysicalVolume*) const {}
-    void ComputeDimensions (G4Trap&,const G4int,
-                            const G4VPhysicalVolume*) const {}
-    void ComputeDimensions (G4Box&,const G4int,
-                            const G4VPhysicalVolume*) const {}
-    void ComputeDimensions (G4Sphere&,const G4int,
-                            const G4VPhysicalVolume*) const {}
-    void ComputeDimensions (G4Orb&,const G4int,
-                            const G4VPhysicalVolume*) const {}
-    void ComputeDimensions (G4Torus&,const G4int,
-                            const G4VPhysicalVolume*) const {}
-    void ComputeDimensions (G4Para&,const G4int,
-                            const G4VPhysicalVolume*) const {}
-    void ComputeDimensions (G4Hype&,const G4int,
-                            const G4VPhysicalVolume*) const {}
-    void ComputeDimensions (G4Tubs&,const G4int,
-                            const G4VPhysicalVolume*) const {}
-    void ComputeDimensions (G4Cons&,const G4int,
-                            const G4VPhysicalVolume*) const {}
-    void ComputeDimensions (G4Polycone&,const G4int,
-                            const G4VPhysicalVolume*) const {}
 };