Changeset 1347 for trunk/source/persistency/ascii/src/G4tgbVolumeMgr.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/G4tgbVolumeMgr.cc (modified) (4 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4tgbVolumeMgr.cc,v 1.5 2008/12/18 12:59:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4tgbVolumeMgr.cc,v 1.10 2010/12/15 11:29:54 arce Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 //
@@ -185 +185 @@
 
   G4VSolid* oldSolid = 0;
-  G4mmssol::const_iterator mmsscite;
   std::pair<G4mmssol::iterator, G4mmssol::iterator> mmssdi;
   mmssdi = theSolids.equal_range( name );
 
-  for( mmsscite = mmssdi.first; mmsscite != mmssdi.second; mmsscite++ )
-  {
-#ifdef G4VERBOSE
-  if( G4tgrMessenger::GetVerboseLevel() >= 2 )
-  {
-    G4cout << " G4tgbVolumeMgr::FindG4Solid() - Solid finding "
-           << name << G4endl; 
-  }
+  if( mmssdi.first != mmssdi.second ) { // check there is a solid found
+    G4mmssol::const_iterator mmsscite = mmssdi.first;
+
+#ifdef G4VERBOSE
+    if( G4tgrMessenger::GetVerboseLevel() >= 2 )
+    {
+      G4cout << " G4tgbVolumeMgr::FindG4Solid() - Solid finding "
+             << name << G4endl; 
+    }
 #endif
     /*
@@ -214 +214 @@
     oldSolid = (*mmsscite).second;
 #ifdef G4VERBOSE
-  if( G4tgrMessenger::GetVerboseLevel() >= 1 )
-  {
-    G4cout << " G4tgbVolumeMgr::FindG4Solid() - Solid already found "
-           << name << G4endl; 
-  }
-#endif
-    break;
+    if( G4tgrMessenger::GetVerboseLevel() >= 1 )
+    {
+      G4cout << " G4tgbVolumeMgr::FindG4Solid() - Solid already found "
+             << name << G4endl; 
+    }
+#endif
   }
  
@@ -226 +225 @@
   if( G4tgrMessenger::GetVerboseLevel() >= 2 )
   {
-    G4cout << " G4tgbVolumeMgr::FindG4Solid() - Old solid: "
-           << oldSolid << G4endl;
-  }
-#endif
+      G4cout << " G4tgbVolumeMgr::FindG4Solid() - Old solid: "
+             << oldSolid << G4endl;
+  }
+#endif
+
   return oldSolid;
 }