Changeset 1228 for trunk/source/materials/src/G4NistMaterialBuilder.cc

Timestamp:

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

Author:

garnier

Message:

update geant4.9.3 tag

File:

• trunk/source/materials/src/G4NistMaterialBuilder.cc (modified) (3 diffs)

trunk/source/materials/src/G4NistMaterialBuilder.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4NistMaterialBuilder.cc,v 1.22 2009/11/03 17:02:03 alechner Exp $
-// GEANT4 tag $Name: materials-V09-02-18 $
+// $Id: G4NistMaterialBuilder.cc,v 1.23 2009/11/24 17:19:10 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -83 +83 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4Material* G4NistMaterialBuilder::FindOrBuildMaterial(const G4String& name,
+G4Material* G4NistMaterialBuilder::FindOrBuildMaterial(const G4String& matname,
                                                        G4bool isotopes,
                                                        G4bool warning)
@@ -94 +94 @@
   }
 
-  if (verbose > 1)
+  G4String name = matname;
+  if("G4_NYLON-6/6" == matname)  name = "G4_NYLON-6-6";
+  if("G4_NYLON-6/10" == matname) name = "G4_NYLON-6-10";
+
+  if (verbose > 1) {
     G4cout << "G4NistMaterialBuilder::FindOrBuildMaterial " << name << G4endl;
-
+  }
   const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable();
   G4int nmat = theMaterialTable->size();