- public IMaterial createMaterialElement( - String name, - double Z, - double A, - double density) - { - return new MaterialElement(name,Z,A,density); - } - - public IMaterial createMaterialElement( - String name, - int Z, - int A, - double density, - double ionizationPotential, - State state, - double temperature, - double pressure, - double meltingPoint, - double boilingPoint)

+ public IMaterial createMaterialElement( + String name, + double Z, + double A, + double density, + State state, + double temperature, + double pressure)

for ( Object obj : element.getChildren("composite")) { Element composite = (Element)obj; IMaterial matlkp = MaterialStore.getInstance().get(composite.getAttributeValue("ref"));

+ MaterialStore.getInstance().get(fraction.getAttributeValue("ref")); +

- public double getMeltingPoint(); - public double getBoilingPoint(); - public double getTemperature(); - public double getPressure(); - public double getMolecularWeight(); - public double getEffectiveNumberOfNucleons();

+ + /** + * Get the temperature of the material in Kelvin. + * @return The temperature in Kelvin. + */ + public double getTemperature(); + + /** + * Get the pressure of the material in atmospheres. + * @return The pressure of the material in atmospheres. + */ + public double getPressure(); + + /** + * Get the state of this material, either liquid, gas, solid, or unknown. + * @return The state of this material. + */

+/** + * A material mixture that is defined by a list of sub-materials. + * The sub-materials are added by mass fraction or atom count. + * Mixing mass fractions and atom counts is not allowed and + * will cause a fatal error. + * + * @author jeremym + * + */

- /** Construct a material with a number of components. */ - public MaterialMixture( - String name, - int nComponents, - double density, - State state) - { - super(name,0,0,density,0.0,state,defaultTemperature,defaultPressure,0,0); - - if ( nComponents <= 0 ) - { - throw new IllegalArgumentException("nComponents must be >= 0."); - } - - this.nComponentsMax = nComponents; - } -

+ sb.append("numberOfComponents = " + nComponentsAdded + "; "); + sb.append("maxNumberOfComponents = " + nComponentsMax + "; "); + sb.append("numberOfElements = " + nElements);

GeomConverter/src/org/lcsim/detector/material

MaterialElement.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- MaterialElement.java	6 Mar 2007 20:22:17 -0000	1.3
+++ MaterialElement.java	9 Nov 2007 23:47:49 -0000	1.4
@@ -2,7 +2,6 @@

 
 import static java.lang.Math.log;
 import static java.lang.Math.pow;

-import static org.lcsim.units.clhep.PhysicalConstants.Avogadro;

 import static org.lcsim.units.clhep.PhysicalConstants.fine_structure_const;
 
 /**

@@ -21,85 +20,103 @@

 implements IMaterial
 {	
 	// From constructor.

-	private String name;
-	private double Z;
-	private double A;
-	private double density;

+    protected String name;
+    protected double Z;
+    protected double A;
+    protected double density;
+    protected double temperature;
+    protected double pressure;

 	
 	// Set by the detailed constructor.  Otherwise, use defaults.

-	private double ionizationPotential=defaultIonizationPotential;
-	private double temperature=defaultTemperature;
-	private double pressure=defaultPressure;
-	private double meltingPoint=defaultMeltingPoint;
-	private double boilingPoint=defaultBoilingPoint;
-	private State state=defaultState;

+    protected State state=defaultState;

 	
 	// Derived quantities.
 	protected double N;

-	protected double molecularWeight;

 	protected double nuclearInteractionLength;
 	protected double nuclearInteractionLengthWithDensity;
 	protected double radiationLength;
 	protected double radiationLengthWithDensity;
 	protected double criticalEnergy;
 	protected double moliereRadius;

-	
-	public MaterialElement(
-			String name,
-			double Z,
-			double A,
-			double density)
-	{
-		// Basic parameters.
-		this.name = name;
-		this.Z = Z;
-		this.A = A;
-		this.density = density;		
-		
-		// Compute derived.
-		computeDerivedQuantities();
-		
-		MaterialStore.getInstance().add(this);
-	}	
-

+    
+    /**
+     * Constructor for sub-classes.
+     */
+    protected MaterialElement()
+    {
+        MaterialStore.getInstance().add(this);
+    }
+		   
+    /**
+     * Construct a MaterialElement.
+     * 
+     * @param name The name of the material, which must be globally unique.
+     * @param Z The atomic mass.
+     * @param A The atomic number.
+     * @param density The density in g/cm3.
+     * @param state The material's state.
+     * @param temperature The temperature in Kelvin.
+     * @param pressure The pressure in atmospheres.
+     */

 	public MaterialElement(
 			String name,

-			int Z, 
-			int A, 
-			double density, 
-			double ionizationPotential,

+			double Z, 
+			double A, 
+			double density,

 			State state,

-			double temperature,
-			double pressure,
-			double meltingPoint,
-			double boilingPoint)

+            double temperature,
+            double pressure)

-		// Basic parameters.

+        // Set parameters.

 		this.name = name;
 		this.Z = Z;
 		this.A = A;

-		this.density = density;
-		
-		// Detailed parameters.

+		this.density = density;

         this.density = density;

-        this.ionizationPotential = ionizationPotential;

         this.state = state;

-		this.temperature = temperature;
-		this.pressure = pressure;
-		this.meltingPoint = meltingPoint;
-		this.boilingPoint = boilingPoint;

+        this.temperature = temperature;
+        this.pressure = pressure;

-		// Compute derived.

+		// Compute derived quantities.

         computeDerivedQuantities();

+
+        // Add to global static materials store.

         MaterialStore.getInstance().add(this);
 	}

+    
+    /**
+     * Construct a MaterialElement.
+     * 
+     * @param name The name of the material, which must be globally unique.
+     * @param Z The atomic mass.
+     * @param A The atomic number.
+     * @param density The density in g/cm3.
+     */
+    public MaterialElement(
+            String name, 
+            double Z, 
+            double A, 
+            double density)
+    {
+        // Set parameters.
+        this.name = name;
+        this.Z = Z;
+        this.A = A;
+        this.density = density;     
+        this.density = density;
+        this.state = Unknown;
+        this.temperature = defaultTemperature;
+        this.pressure = defaultPressure;
+                
+        // Compute derived quantities.
+        computeDerivedQuantities();
+
+        // Add to global static materials store.
+        MaterialStore.getInstance().add(this);
+    }

 	
 	private void computeDerivedQuantities()
 	{

-		// Order is important!
-		computeEffectiveNumberOfNucleons();
-		computeMolecularWeigth();

 		computeRadiationLength();
 		computeNuclearInteractionLength();
 		computeCriticalEnergy();

@@ -115,18 +132,6 @@

 	{
 		moliereRadius = getRadiationLengthWithDensity() * 21.2052 / criticalEnergy;
 	}

-		
-	protected void computeEffectiveNumberOfNucleons()
-	{
-		N = A / Avogadro;	
-	}
-	
-	// FIXME: Wrong for isotopes.
-	protected void computeMolecularWeigth()
-	{
-		double natoms=1.0;
-		molecularWeight = A * natoms;
-	}

 	
 	protected void computeRadiationLength()
 	{

@@ -173,36 +178,6 @@

 		return Z;
 	}

-	public double getBoilingPoint() 
-	{
-		return boilingPoint;
-	}
-
-	public double getMeltingPoint() 
-	{
-		return meltingPoint;
-	}
-
-	public double getPressure() 
-	{
-		return pressure;
-	}
-
-	public double getTemperature() 
-	{
-		return temperature;
-	}
-	
-	public double getMolecularWeight()
-	{
-		return molecularWeight;
-	}
-	
-	public double getIonizationPotential()
-	{
-		return ionizationPotential;
-	}
-

 	public double getEffectiveNumberOfNucleons()
 	{
 		return N;

@@ -222,7 +197,6 @@

 	{
 		return radiationLengthWithDensity;
 	}

 	
 	public static double computeRadiationLengthTsai(double A, double Z)
     {

@@ -288,15 +262,31 @@

         return NIL;
     }

+    public double getTemperature()
+    {
+        return temperature;
+    }
+    
+    public double getPressure()
+    {
+        return pressure;
+    }    
+

     public String toString()
     {
     	StringBuffer sb = new StringBuffer();

-    	sb.append(getName() + "; ");
-    	sb.append(getDensity() + " g/cm3 ; ");
-    	sb.append("A="+getA() + "; ");
-    	sb.append("Z="+getZ() + "; ");
-    	sb.append("nucIntLen=" + getNuclearInteractionLength() + "; ");
-    	sb.append("radLen=" + getRadiationLength() + "; ");

+    	sb.append(getName() + '\n');
+    	sb.append("D = " + getDensity() + " {g/cm3} ; ");
+    	sb.append("A = " + getA() + "; ");
+    	sb.append("Z = " + getZ());
+        sb.append('\n');
+    	sb.append("LamdaT = " + getNuclearInteractionLength() + " {g/cm2}; ");
+        sb.append("LamdaT = " + getNuclearInteractionLengthWithDensity() + " {cm}; ");
+    	sb.append("X0 = " + getRadiationLength() + " {g/cm2}; ");
+        sb.append("X0 = " + getRadiationLengthWithDensity() + " {cm}; ");
+        sb.append("Rm = " + getMoliereRadius() + " {cm} ");
+        sb.append('\n');
+

     	return sb.toString();
     }
 }

\ No newline at end of file

// Test conversion of <element>. MaterialElementConverter cnv = new MaterialElementConverter(); for ( Object child : root.getChildren("element") ) { Element element = (Element)child;

} XMLMaterialManager xmlMat = XMLMaterialManager.create(XMLMaterialManager.materials() ); xmlMat.load("/org/lcsim/material/materials.xml"); xmlMat.makeMaterials(null);

- //MaterialManager matmgr = MaterialManager.instance(); - //System.out.println("Materials defined ..."); - //matmgr.printMaterials(); - - //for ( Map.Entry<String,org.lcsim.material.Material> entry : matmgr.getMaterials().entrySet() ) - //{ - // System.out.println("xml mgr has material <" + entry.getValue().getName() + ">"); - //}

// Compare to old materials database. for ( IMaterial material : MaterialStore.getInstance()) { if ( material instanceof MaterialMixture ) {

- //System.out.println("old material <" + oldmaterial.getName() + ">"); - //System.out.println(oldmaterial.toString()); - //System.out.println("--"); - //System.out.println("new material <" + material.getName() + ">"); - //System.out.println(material.toString()); - //System.out.println("----------------------------------"); - - assertTrue( - oldmaterial.getAeff() - material.getA() < tolerance );

+ assertEquals( + oldmaterial.getNuclearInteractionLength(), + material.getNuclearInteractionLength(), + 1e-8 ); + + assertEquals( + oldmaterial.getNuclearInteractionLengthWithDensity(), + material.getNuclearInteractionLengthWithDensity(), + 1e-8 );

+ material.getRadiationLength() <= + 1E-5 ); + + assertTrue( + oldmaterial.getRadiationLengthWithDensity() - + material.getRadiationLengthWithDensity() <= + 1E-5 ); + + assertTrue( + oldmaterial.getMoliereRadius() - + material.getMoliereRadius() <= + 1e-4 ); + + // Old material does not have this. + //assertTrue( + // material.getEffectiveNumberOfNucleons() != 0 + // ); + + if (material.getName().equals("Silicon")) + { + System.out.println("old material ..."); + System.out.println(oldmaterial.toString()); + System.out.println("----"); + System.out.println("new material ..."); + System.out.println(material.toString()); + }

Commit in `GeomConverter` on MAIN
`src/org/lcsim/detector/DetectorFactory.java`	+12	-27	1.7 -> 1.8
`/IDetectorFactory.java`	+4	-13	1.9 -> 1.10
`src/org/lcsim/detector/converter/lcdd/MaterialElementConverter.java`	+10	-3	1.2 -> 1.3
`/MaterialMixtureConverter.java`	+5	-6	1.2 -> 1.3
`src/org/lcsim/detector/material/IMaterial.java`	+61	-8	1.3 -> 1.4
`/IMaterialMixture.java`	+43		1.2 -> 1.3
`/MaterialMixture.java`	+25	-47	1.5 -> 1.6
`/MaterialElement.java`	+92	-102	1.3 -> 1.4
`test/org/lcsim/detector/material/MaterialConverterTest.java`	+41	-40	1.2 -> 1.3
`test/org/lcsim/material/XMLMaterialManagerTest.java`	+7	-1	1.6 -> 1.7
	+300	-247