GeomConverter/src/org/lcsim/material
diff -u -r1.2 -r1.3
--- MaterialElement.java 30 Jun 2005 00:53:16 -0000 1.2
+++ MaterialElement.java 1 Jul 2005 00:08:39 -0000 1.3
@@ -11,9 +11,7 @@
private double _density; // Density in g/cm^3 at 25 degrees C or at boiling point for liquids
private double _meltingPoint; // Melting point (K)
private double _boilingPoint; // Boiling point (K)
- private double _ionizationPotential; // Ionization potential (eV)
-
- private static Map<String, MaterialElement> _elements = new TreeMap<String, MaterialElement>();
+ private double _ionizationPotential; // Ionization potential (eV)
/*
private static String[] ElementNotes = {
@@ -37,7 +35,7 @@
double bp,
double ip)
{
- System.out.println("MaterialElement ctor: " + name);
+ //System.out.println("MaterialElement ctor: " + name);
_name = name;
_fullName = fullName;
@@ -58,13 +56,8 @@
_Z = Z;
_A = A;
MaterialManager.addElement(this);
- }
-
- public static Map elements()
- {
- return _elements;
- }
-
+ }
+
public String name()
{
return _name;
@@ -98,12 +91,14 @@
return _ionizationPotential;
}
+ /*
public String toString()
{
StringBuffer sb = new StringBuffer("ElementData: \n");
sb.append(_fullName+" : "+_name+" Z= "+_Z+" A= "+_A+" density= "+_density+" MP= "+_meltingPoint+" BP= "+_boilingPoint+" IP= "+ _ionizationPotential+"\n");
return sb.toString();
- }
+ }
+ */
public String getName()
{