Changeset 1347 for trunk/source/persistency/ascii/src/G4tgbVolume.cc

Timestamp:

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

Author:

garnier

Message:

geant4 tag 9.4

File:

• trunk/source/persistency/ascii/src/G4tgbVolume.cc (modified) (16 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
+//
+// $Id: G4tgbVolume.cc,v 1.23 2010/11/05 08:58:36 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 //
@@ -110 +113 @@
 //-------------------------------------------------------------------
 G4tgbVolume::G4tgbVolume()
+  : theTgrVolume(0), theG4AssemblyVolume(0)
 {
 }
@@ -155 +159 @@
         g4vmgr->RegisterMe( logvol );
         g4vmgr->RegisterChildParentLVs( logvol, parentLV ); 
-        
-      }
-    } 
+      }
+      else
+      {
+        return;
+      }
+    }
+    else
+    {
+      return;
+    }
   } 
   //--- Construct PhysVol
@@ -291 +302 @@
       G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
                   "InvalidSetup", FatalException, ErrMessage);
+      return 0;
     }
     
@@ -367 +379 @@
       G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
                   "InvalidSetup", FatalException, ErrMessage);
+      return 0;
     }
 
@@ -427 +440 @@
       G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
                   "InvalidSetup", FatalException, ErrMessage);
+      return 0;
     }
     
@@ -655 +669 @@
         G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
                     "InvalidSetup", FatalException, ErrMessage);
+        return 0;
       }
       
@@ -679 +694 @@
           G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
                       "InvalidSetup", FatalException, ErrMessage);
+          return 0;
         }
         facet = new G4TriangularFacet( pt0, vt1, vt2, vertexType );
@@ -705 +721 @@
           G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
                       "InvalidSetup", FatalException, ErrMessage);
+          return 0;
         }
         facet = new G4QuadrangularFacet( pt0, vt1, vt2, vt3, vertexType );
@@ -716 +733 @@
         G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
                     "InvalidSetup", FatalException, ErrMessage);
+        return 0;
       }
       
@@ -748 +766 @@
   {
     const G4tgrSolidBoolean* solb = dynamic_cast<const G4tgrSolidBoolean*>(sol);
+    if (!solb)
+    {
+      G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
+                  "InvalidSetup", FatalException, "Invalid Solid pointer");
+      return 0;
+    }
     G4VSolid* sol1 = FindOrConstructG4Solid( solb->GetSolid(0));
     G4VSolid* sol2 = FindOrConstructG4Solid( solb->GetSolid(1));
@@ -771 +795 @@
       G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
                   "InvalidSetup", FatalException, ErrMessage);
+      return 0;
     }
   }
@@ -779 +804 @@
     G4Exception("G4tgbVolume::FindOrConstructG4Solid()", "NotImplemented",
                 FatalException, ErrMessage);
+    return 0;
   } 
   
@@ -1069 +1095 @@
           G4Exception("G4tgbVolume::ConstructG4PhysVol", "WrongArgument",
                       FatalException, ErrMessage);
+          return 0;
         }
 #ifdef G4VERBOSE
@@ -1249 +1276 @@
           }
 #endif
-
         }
       }
@@ -1384 +1410 @@
     G4Exception("G4tgbVolume::BuildSolidForDivision()", "NotImplemented",
                 FatalException, ErrMessage);
+    return 0;
   }