Changeset 1347 for trunk/source/geometry/divisions/src/G4PVDivision.cc

Timestamp:

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

Author:

garnier

Message:

geant4 tag 9.4

File:

• trunk/source/geometry/divisions/src/G4PVDivision.cc (modified) (4 diffs)

trunk/source/geometry/divisions/src/G4PVDivision.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4PVDivision.cc,v 1.22 2008/12/03 16:41:45 arce Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4PVDivision.cc,v 1.24 2010/09/06 09:28:24 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // class G4PVDivision Implementation file
@@ -62 +62 @@
     G4Exception("G4PVDivision::G4PVDivision()", "InvalidSetup",
                 FatalException, message_1);
+    return;
   }
   if (pLogical == pMotherLogical)
   {
-    G4String message_2 =
-      "Cannot place a volume inside itself! Volume: " + pName;
+    G4String message_2 = "Cannot place a volume inside itself! Volume: "+ pName;
     G4Exception("G4PVDivision::G4PVDivision()", "InvalidSetup",
                 FatalException, message_2);
@@ -90 +90 @@
   if (!pMotherLogical)
   {
-    G4String message_1 =
-      "NULL pointer specified as mother! Volume: " + pName;
+    G4String message_1 = "NULL pointer specified as mother! Volume: " + pName;
     G4Exception("G4PVDivision::G4PVDivision()", "InvalidSetup",
                 FatalException, message_1);
+    return;
   }
   if (pLogical == pMotherLogical)
   {
-    G4String message_2 =
-      "Cannot place a volume inside itself! Volume: " + pName;
+    G4String message_2 = "Cannot place a volume inside itself! Volume: "+ pName;
     G4Exception("G4PVDivision::G4PVDivision()", "InvalidSetup",
                 FatalException, message_2);
@@ -120 +119 @@
   if (!pMotherLogical)
   {
-    G4String message_1 =
-      "NULL pointer specified as mother! Volume: " + pName;
+    G4String message_1 = "NULL pointer specified as mother! Volume: " + pName;
     G4Exception("G4PVDivision::G4PVDivision()", "InvalidSetup",
                 FatalException, message_1);
+    return;
   }
   if (pLogical == pMotherLogical)
   {
-    G4String message_2 =
-      "Cannot place a volume inside itself! Volume: " + pName;
+    G4String message_2 = "Cannot place a volume inside itself! Volume: "+ pName;
     G4Exception("G4PVDivision::G4PVDivision()", "InvalidSetup",
                 FatalException, message_2);