Changeset 1228 for trunk/source/persistency/ascii/src

Timestamp:

Jan 8, 2010, 11:56:51 AM (16 years ago)

Author:

garnier

Message:

update geant4.9.3 tag

Location:

trunk/source/persistency/ascii/src

Files:

• G4tgbDetectorBuilder.cc (modified) (1 diff)
• G4tgbDetectorConstruction.cc (modified) (1 diff)
• G4tgbElement.cc (modified) (1 diff)
• G4tgbGeometryDumper.cc (modified) (2 diffs)
• G4tgbIsotope.cc (modified) (1 diff)
• G4tgbMaterial.cc (modified) (1 diff)
• G4tgbMaterialMgr.cc (modified) (1 diff)
• G4tgbMaterialMixture.cc (modified) (1 diff)
• G4tgbMaterialMixtureByNoAtoms.cc (modified) (1 diff)
• G4tgbMaterialMixtureByVolume.cc (modified) (1 diff)
• G4tgbMaterialMixtureByWeight.cc (modified) (1 diff)
• G4tgbMaterialSimple.cc (modified) (1 diff)
• G4tgbPlaceParamCircle.cc (modified) (1 diff)
• G4tgbPlaceParamLinear.cc (modified) (1 diff)
• G4tgbPlaceParamSquare.cc (modified) (1 diff)
• G4tgbPlaceParameterisation.cc (modified) (1 diff)
• G4tgbRotationMatrix.cc (modified) (1 diff)
• G4tgbRotationMatrixMgr.cc (modified) (1 diff)
• G4tgbVolume.cc (modified) (2 diffs)
• G4tgbVolumeMgr.cc (modified) (1 diff)
• G4tgrElement.cc (modified) (1 diff)
• G4tgrElementFromIsotopes.cc (modified) (1 diff)
• G4tgrElementSimple.cc (modified) (1 diff)
• G4tgrEvaluator.cc (modified) (1 diff)
• G4tgrFileIn.cc (modified) (1 diff)
• G4tgrFileReader.cc (modified) (1 diff)
• G4tgrIsotope.cc (modified) (1 diff)
• G4tgrMaterial.cc (modified) (1 diff)
• G4tgrMaterialFactory.cc (modified) (1 diff)
• G4tgrMaterialMixture.cc (modified) (1 diff)
• G4tgrMaterialSimple.cc (modified) (1 diff)
• G4tgrMessenger.cc (modified) (1 diff)
• G4tgrParameterMgr.cc (modified) (1 diff)
• G4tgrPlace.cc (modified) (1 diff)
• G4tgrPlaceDivRep.cc (modified) (1 diff)
• G4tgrPlaceParameterisation.cc (modified) (1 diff)
• G4tgrPlaceSimple.cc (modified) (1 diff)
• G4tgrRotationMatrix.cc (modified) (1 diff)
• G4tgrRotationMatrixFactory.cc (modified) (1 diff)
• G4tgrSolid.cc (modified) (1 diff)
• G4tgrSolidBoolean.cc (modified) (1 diff)
• G4tgrVolume.cc (modified) (2 diffs)
• G4tgrVolumeAssembly.cc (modified) (1 diff)
• G4tgrVolumeDivision.cc (modified) (1 diff)
• G4tgrVolumeMgr.cc (modified) (1 diff)

trunk/source/persistency/ascii/src/G4tgbDetectorBuilder.cc

@@ -26 +26 @@
 //
 // $Id: G4tgbDetectorBuilder.cc,v 1.4 2008/12/18 12:59:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgbDetectorConstruction.cc

@@ -26 +26 @@
 //
 // $Id: G4tgbDetectorConstruction.cc,v 1.4 2008/12/18 12:59:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgbElement.cc

@@ -26 +26 @@
 //
 // $Id: G4tgbElement.cc,v 1.4 2008/12/18 12:59:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgbGeometryDumper.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4tgbGeometryDumper.cc,v 1.11 2008/12/18 12:59:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4tgbGeometryDumper.cc,v 1.12 2009/11/19 13:29:04 arce Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -642 +642 @@
 
   } else if (solidType == "SUBTRACTIONSOLID")  {
-    DumpBooleanVolume( "SUBS", solid );
+    DumpBooleanVolume( "SUBTRACTION", solid );
 
   } else if (solidType == "INTERSECTIONSOLID") {
-    DumpBooleanVolume( "INTERS", solid );
+    DumpBooleanVolume( "INTERSECTION", solid );
 
   } else if (solidType == "REFLECTEDSOLID") {

trunk/source/persistency/ascii/src/G4tgbIsotope.cc

@@ -26 +26 @@
 //
 // $Id: G4tgbIsotope.cc,v 1.4 2008/12/18 12:59:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgbMaterial.cc

@@ -26 +26 @@
 //
 // $Id: G4tgbMaterial.cc,v 1.2 2008/12/18 12:59:26 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgbMaterialMgr.cc

@@ -26 +26 @@
 //
 // $Id: G4tgbMaterialMgr.cc,v 1.5 2008/12/18 12:59:28 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgbMaterialMixture.cc

@@ -26 +26 @@
 //
 // $Id: G4tgbMaterialMixture.cc,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgbMaterialMixtureByNoAtoms.cc

@@ -26 +26 @@
 //
 // $Id: G4tgbMaterialMixtureByNoAtoms.cc,v 1.6 2008/12/18 12:59:30 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgbMaterialMixtureByVolume.cc

@@ -26 +26 @@
 //
 // $Id: G4tgbMaterialMixtureByVolume.cc,v 1.8 2008/12/18 12:59:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgbMaterialMixtureByWeight.cc

@@ -26 +26 @@
 //
 // $Id: G4tgbMaterialMixtureByWeight.cc,v 1.4 2008/12/18 12:59:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgbMaterialSimple.cc

@@ -26 +26 @@
 //
 // $Id: G4tgbMaterialSimple.cc,v 1.5 2008/12/18 12:59:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgbPlaceParamCircle.cc

@@ -26 +26 @@
 //
 // $Id: G4tgbPlaceParamCircle.cc,v 1.5 2008/12/03 16:16:01 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgbPlaceParamLinear.cc

@@ -26 +26 @@
 //
 // $Id: G4tgbPlaceParamLinear.cc,v 1.5 2008/12/03 16:16:01 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgbPlaceParamSquare.cc

@@ -26 +26 @@
 //
 // $Id: G4tgbPlaceParamSquare.cc,v 1.6 2008/12/03 16:16:01 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgbPlaceParameterisation.cc

@@ -26 +26 @@
 //
 // $Id: G4tgbPlaceParameterisation.cc,v 1.4 2008/11/21 15:37:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4tgbPlaceParameterisation

trunk/source/persistency/ascii/src/G4tgbRotationMatrix.cc

@@ -26 +26 @@
 //
 // $Id: G4tgbRotationMatrix.cc,v 1.8 2008/12/18 12:59:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgbRotationMatrixMgr.cc

@@ -26 +26 @@
 //
 // $Id: G4tgbRotationMatrixMgr.cc,v 1.2 2008/12/18 12:59:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgbVolume.cc

@@ -92 +92 @@
 #include "G4BREPSolidPolyhedra.hh"
 #include "G4BREPSolidOpenPCone.hh"
+#include "G4TessellatedSolid.hh"
+#include "G4TriangularFacet.hh"
+#include "G4QuadrangularFacet.hh"
+#include "G4ExtrudedSolid.hh"
+
 #include "G4VisExtent.hh"
-
 #include "G4Material.hh"
 #include "G4RotationMatrix.hh"
@@ -633 +637 @@
                                       &((*z_p)[0]), &((*rmin_p)[0]),
                                       &((*rmax_p)[0]));
+  }
+  else if( stype == "TESSELLATED" )
+  {
+    G4int nFacets = G4int(solParam[0]);
+    G4int jj = 0;
+    solid = new G4TessellatedSolid(sname);
+    G4TessellatedSolid* solidTS = (G4TessellatedSolid*)(solid);
+    G4VFacet* facet=0;
+    
+    for( G4int ii = 0; ii < nFacets; ii++){
+      G4int nPoints = G4int(solParam[jj+1]);
+      if( G4int(solParam.size()) < jj + nPoints*3 + 2 ) {
+        G4String Err1 = "Too small number of parameters in tesselated solid, it should be at least "  + G4UIcommand::ConvertToString(jj + nPoints*3 + 2 );
+        G4String Err2 = " facet number " + G4UIcommand::ConvertToString(ii);
+        G4String Err3 = " number of parameters is " + G4UIcommand::ConvertToString(G4int(solParam.size()));
+        G4String ErrMessage = Err1 + Err2 + Err3 + " !";
+        G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
+                    "InvalidSetup", FatalException, ErrMessage);
+      }
+      
+      if( nPoints == 3 ) 
+      {
+        G4ThreeVector pt0(solParam[jj+2],solParam[jj+3],solParam[jj+4]);
+        G4ThreeVector vt1(solParam[jj+5],solParam[jj+6],solParam[jj+7]);
+        G4ThreeVector vt2(solParam[jj+8],solParam[jj+9],solParam[jj+10]);
+        G4FacetVertexType vertexType = ABSOLUTE;
+        if( solParam[jj+11] == 0 ) 
+        {
+          vertexType = ABSOLUTE;
+        } 
+        else if( solParam[jj+11] == 0 ) 
+        {
+          vertexType = RELATIVE;
+        } 
+        else 
+        {
+          G4String Err1 = "Wrong number of vertex type in tesselated solid, it should be 0 =ABSOLUTE) or 1 (=RELATIVE)";
+          G4String Err2 = " facet number " + G4UIcommand::ConvertToString(G4int(ii));
+          G4String Err3 = " vertex type is " + G4UIcommand::ConvertToString(solParam[jj+11]);
+          G4String ErrMessage = Err1 + Err2 + Err3 + " !";
+          G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
+                      "InvalidSetup", FatalException, ErrMessage);
+        }
+        facet = new G4TriangularFacet( pt0, vt1, vt2, vertexType );
+      } 
+      else if( nPoints == 4 ) 
+      {
+        G4ThreeVector pt0(solParam[jj+2],solParam[jj+3],solParam[jj+4]);
+        G4ThreeVector vt1(solParam[jj+5],solParam[jj+6],solParam[jj+7]);
+        G4ThreeVector vt2(solParam[jj+8],solParam[jj+9],solParam[jj+10]);
+        G4ThreeVector vt3(solParam[jj+11],solParam[jj+12],solParam[jj+13]);
+        G4FacetVertexType vertexType = ABSOLUTE;
+        if( solParam[jj+14] == 0 ) 
+        {
+          vertexType = ABSOLUTE;
+        }
+        else if( solParam[jj+14] == 0 ) 
+        {
+          vertexType = RELATIVE;
+        } 
+        else 
+        {
+          G4String Err1 = "Wrong number of vertex type in tesselated solid, it should be 0 =ABSOLUTE) or 1 (=RELATIVE)";
+          G4String Err2 = " facet number " + G4UIcommand::ConvertToString(G4int(ii));
+          G4String Err3 = " vertex type is " + G4UIcommand::ConvertToString(solParam[jj+14]);
+          G4String ErrMessage = Err1 + Err2 + Err3 + " !";
+          G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
+                      "InvalidSetup", FatalException, ErrMessage);
+        }
+        facet = new G4QuadrangularFacet( pt0, vt1, vt2, vt3, vertexType );
+      } 
+      else 
+      {
+        G4String Err1 = "Wrong number of points in tesselated solid, it should be 3 or 4";
+        G4String Err2 = " facet number " + G4UIcommand::ConvertToString(G4int(ii));
+        G4String Err3 = " number of points is " + G4UIcommand::ConvertToString(G4int(nPoints));
+        G4String ErrMessage = Err1 + Err2 + Err3 + " !";
+        G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
+                    "InvalidSetup", FatalException, ErrMessage);
+      }
+      
+      solidTS->AddFacet( facet );
+      jj += nPoints*3 + 2;
+    }
+    
+  }  
+  else if( stype == "EXTRUDED" ) 
+  {
+    std::vector<G4TwoVector> polygonList;
+    std::vector<G4ExtrudedSolid::ZSection> zsectionList;
+    G4int nPolygons = G4int(solParam[0]);
+    G4int ii = 1;
+    G4int nMax = nPolygons*2+1;
+    for( ;ii < nMax; ii+=2 )
+    {
+      polygonList.push_back( G4TwoVector(solParam[ii],solParam[ii+1]) );
+    }
+    G4int nZSections = G4int(solParam[ii]);
+    nMax = nPolygons*2 + nZSections*4 + 2; 
+    ii++;
+    for( ; ii < nMax; ii+=4 )
+    {
+      G4TwoVector offset(solParam[ii+1],solParam[ii+2]);
+      zsectionList.push_back( G4ExtrudedSolid::ZSection(solParam[ii],offset,solParam[ii+3]) );
+    }
+    solid = new G4ExtrudedSolid( sname, polygonList, zsectionList );
+    
   }
   else if( stype.substr(0,7) == "Boolean" )

trunk/source/persistency/ascii/src/G4tgbVolumeMgr.cc

@@ -26 +26 @@
 //
 // $Id: G4tgbVolumeMgr.cc,v 1.5 2008/12/18 12:59:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrElement.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrElement.cc,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrElementFromIsotopes.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrElementFromIsotopes.cc,v 1.5 2008/12/18 12:59:46 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrElementSimple.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrElementSimple.cc,v 1.5 2008/12/18 12:59:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrEvaluator.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrEvaluator.cc,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrFileIn.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrFileIn.cc,v 1.9 2008/12/18 12:59:50 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrFileReader.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrFileReader.cc,v 1.4 2008/11/12 08:44:07 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrIsotope.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrIsotope.cc,v 1.5 2008/12/18 12:59:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrMaterial.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrMaterial.cc,v 1.3 2008/11/21 15:37:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrMaterialFactory.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrMaterialFactory.cc,v 1.4 2008/12/18 12:59:54 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrMaterialMixture.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrMaterialMixture.cc,v 1.7 2008/12/18 12:59:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrMaterialSimple.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrMaterialSimple.cc,v 1.7 2008/12/18 12:59:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrMessenger.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrMessenger.cc,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrParameterMgr.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrParameterMgr.cc,v 1.6 2008/12/18 13:00:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrPlace.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrPlace.cc,v 1.3 2008/11/03 17:04:41 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrPlaceDivRep.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrPlaceDivRep.cc,v 1.4 2008/11/21 15:37:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrPlaceParameterisation.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrPlaceParameterisation.cc,v 1.6 2008/12/18 13:00:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrPlaceSimple.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrPlaceSimple.cc,v 1.5 2008/12/18 13:00:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrRotationMatrix.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrRotationMatrix.cc,v 1.5 2008/12/18 13:00:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrRotationMatrixFactory.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrRotationMatrixFactory.cc,v 1.2 2008/12/18 13:00:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrSolid.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrSolid.cc,v 1.6 2008/12/18 13:00:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrSolidBoolean.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrSolidBoolean.cc,v 1.4 2008/12/18 13:00:12 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrVolume.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4tgrVolume.cc,v 1.7 2008/12/18 13:00:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4tgrVolume.cc,v 1.10 2009/11/23 11:36:29 arce Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -109 +109 @@
 
 //-------------------------------------------------------------------------
+G4tgrVolume::G4tgrVolume( const G4tgrVolume& vol )
+{
+  theName = vol.GetName();   
+  theType = vol.GetType();
+  theMaterialName = vol.GetMaterialName();   
+  theSolid = const_cast<G4tgrSolid*>(vol.GetSolid());
+  thePlacements  = vol.GetPlacements();
+  theVisibility   = vol.GetVisibility();
+  theRGBColour   = vol.GetRGBColour();
+  theCheckOverlaps = vol.GetCheckOverlaps();
+}
+
+
+//-------------------------------------------------------------------------
 G4tgrVolume* G4tgrVolume::GetVolume( G4int ii ) const
 {

trunk/source/persistency/ascii/src/G4tgrVolumeAssembly.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrVolumeAssembly.cc,v 1.6 2008/12/18 13:00:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrVolumeDivision.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrVolumeDivision.cc,v 1.6 2008/12/18 13:00:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/persistency/ascii/src/G4tgrVolumeMgr.cc

@@ -26 +26 @@
 //
 // $Id: G4tgrVolumeMgr.cc,v 1.7 2008/12/18 13:00:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //