Changeset 1347 for trunk/source/persistency/ascii/src/G4tgbVolumeMgr.cc
- Timestamp:
- Dec 22, 2010, 3:52:27 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/persistency/ascii/src/G4tgbVolumeMgr.cc
r1337 r1347 25 25 // 26 26 // 27 // $Id: G4tgbVolumeMgr.cc,v 1. 5 2008/12/18 12:59:44 gunterExp $28 // GEANT4 tag $Name: geant4-09-04- beta-01$27 // $Id: G4tgbVolumeMgr.cc,v 1.10 2010/12/15 11:29:54 arce Exp $ 28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // … … 185 185 186 186 G4VSolid* oldSolid = 0; 187 G4mmssol::const_iterator mmsscite;188 187 std::pair<G4mmssol::iterator, G4mmssol::iterator> mmssdi; 189 188 mmssdi = theSolids.equal_range( name ); 190 189 191 for( mmsscite = mmssdi.first; mmsscite != mmssdi.second; mmsscite++ ) 192 { 193 #ifdef G4VERBOSE 194 if( G4tgrMessenger::GetVerboseLevel() >= 2 ) 195 { 196 G4cout << " G4tgbVolumeMgr::FindG4Solid() - Solid finding " 197 << name << G4endl; 198 } 190 if( mmssdi.first != mmssdi.second ) { // check there is a solid found 191 G4mmssol::const_iterator mmsscite = mmssdi.first; 192 193 #ifdef G4VERBOSE 194 if( G4tgrMessenger::GetVerboseLevel() >= 2 ) 195 { 196 G4cout << " G4tgbVolumeMgr::FindG4Solid() - Solid finding " 197 << name << G4endl; 198 } 199 199 #endif 200 200 /* … … 214 214 oldSolid = (*mmsscite).second; 215 215 #ifdef G4VERBOSE 216 if( G4tgrMessenger::GetVerboseLevel() >= 1 ) 217 { 218 G4cout << " G4tgbVolumeMgr::FindG4Solid() - Solid already found " 219 << name << G4endl; 220 } 221 #endif 222 break; 216 if( G4tgrMessenger::GetVerboseLevel() >= 1 ) 217 { 218 G4cout << " G4tgbVolumeMgr::FindG4Solid() - Solid already found " 219 << name << G4endl; 220 } 221 #endif 223 222 } 224 223 … … 226 225 if( G4tgrMessenger::GetVerboseLevel() >= 2 ) 227 226 { 228 G4cout << " G4tgbVolumeMgr::FindG4Solid() - Old solid: " 229 << oldSolid << G4endl; 230 } 231 #endif 227 G4cout << " G4tgbVolumeMgr::FindG4Solid() - Old solid: " 228 << oldSolid << G4endl; 229 } 230 #endif 231 232 232 return oldSolid; 233 233 }
Note: See TracChangeset
for help on using the changeset viewer.