Changeset 1010 for trunk/source/geometry/divisions/include

Timestamp:

Apr 22, 2009, 11:58:58 AM (17 years ago)

Author:

garnier

Message:

update

Location:

trunk/source/geometry/divisions/include

Files:

• G4PVDivision.hh (modified) (2 diffs)
• G4PVDivisionFactory.hh (modified) (1 diff)
• G4ParameterisationBox.hh (modified) (1 diff)
• G4ParameterisationCons.hh (modified) (1 diff)
• G4ParameterisationPara.hh (modified) (1 diff)
• G4ParameterisationPolycone.hh (modified) (1 diff)
• G4ParameterisationPolyhedra.hh (modified) (1 diff)
• G4ParameterisationTrd.hh (modified) (6 diffs)
• G4ParameterisationTubs.hh (modified) (1 diff)
• G4VDivisionParameterisation.hh (modified) (1 diff)
• G4VDivisionParameterisation.icc (modified) (1 diff)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4PVDivision.hh,v 1.13 2008/08/18 14:06:01 tnikitin Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4PVDivision.hh,v 1.14 2008/12/03 16:41:45 arce Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 // 
 // class G4PVDivision
@@ -145 +145 @@
 
     void CheckAndSetParameters( const EAxis pAxis,
+                                const G4int nDivs,
+                                const G4double width,
                                 const G4double offset, 
+                                      DivisionType divType,
                                 const G4LogicalVolume* pMotherLogical );
 

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

@@ -26 +26 @@
 //
 // $Id: G4PVDivisionFactory.hh,v 1.2 2006/06/29 18:18:09 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4ParameterisationBox.hh,v 1.6 2006/06/29 18:18:11 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // classes G4ParameterisationBoxX,

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

@@ -26 +26 @@
 //
 // $Id: G4ParameterisationCons.hh,v 1.6 2006/06/29 18:18:13 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // classes G4ParameterisationConsRho,

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

@@ -26 +26 @@
 //
 // $Id: G4ParameterisationPara.hh,v 1.7 2006/06/29 18:18:15 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 // 
 // classes G4ParameterisationParaX,

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

@@ -26 +26 @@
 //
 // $Id: G4ParameterisationPolycone.hh,v 1.7 2006/06/29 18:18:18 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 // 
 // classes G4ParameterisationPolyconeRho,

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

@@ -26 +26 @@
 //
 // $Id: G4ParameterisationPolyhedra.hh,v 1.8 2006/06/29 18:18:20 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 // 
 // classes G4ParameterisationPolyhedraRho,

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

@@ -25 +25 @@
 //
 //
-// $Id: G4ParameterisationTrd.hh,v 1.7 2006/06/29 18:18:22 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4ParameterisationTrd.hh,v 1.8 2008/12/03 16:48:48 arce Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // classes G4ParameterisationTrdX
@@ -61 +61 @@
 class G4Polycone;
 class G4Polyhedra;
+#include <vector>
 
 class G4VParameterisationTrd : public G4VDivisionParameterisation
@@ -71 +72 @@
   
     virtual ~G4VParameterisationTrd();
+
+
+protected:
+  G4bool bDivInTrap;
 };
 
@@ -89 +94 @@
                                        G4VPhysicalVolume* physVol) const;
 
-    void ComputeDimensions(G4Trd& trd, const G4int copyNo,
-                           const G4VPhysicalVolume* pv) const;
+    virtual void ComputeDimensions(G4Trd& trd, const G4int copyNo,
+                           const G4VPhysicalVolume* pv) const;
+
+    virtual void ComputeDimensions(G4Trap& trd, const G4int copyNo,
+                           const G4VPhysicalVolume* pv) const;
+  
+    virtual G4VSolid*   ComputeSolid(const G4int, G4VPhysicalVolume *);
+
 
   private:  // Dummy declarations to get rid of warnings ...
@@ -106 +117 @@
     void ComputeDimensions (G4Para&,const G4int,
                             const G4VPhysicalVolume*) const {}
-    void ComputeDimensions (G4Trap&,const G4int,
-                            const G4VPhysicalVolume*) const {}
     void ComputeDimensions (G4Hype&,const G4int,
                             const G4VPhysicalVolume*) const {}
@@ -116 +125 @@
     void ComputeDimensions (G4Polyhedra&,const G4int,
                             const G4VPhysicalVolume*) const {}
+
+  void ComputeTrapParams();
+ G4Trap* theTrap;
 };
 

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

@@ -26 +26 @@
 //
 // $Id: G4ParameterisationTubs.hh,v 1.6 2006/06/29 18:18:24 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // classes G4ParameterisationTubsRho

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

@@ -26 +26 @@
 //
 // $Id: G4VDivisionParameterisation.hh,v 1.11 2007/05/11 13:26:26 gcosmo Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // class G4VDivisionParameterisation

trunk/source/geometry/divisions/include/G4VDivisionParameterisation.icc

@@ -26 +26 @@
 //
 // $Id: G4VDivisionParameterisation.icc,v 1.4 2006/06/29 18:18:29 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // class G4VDivisionParameterisation Inline Implementation file