Commit in GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd/util on MAIN
PhysVolID.java+17added 1.1
RZBData.java+19added 1.1
Author.java+1-11.1 -> 1.2
PhysVol.java+51.3 -> 1.4
Polycone.java+51.2 -> 1.3
RZFieldMap.java+51.3 -> 1.4
+52-1
2 added + 4 modified, total 6 files
JM: Some cleanup and additional elements for LCDDFactory.

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd/util
PhysVolID.java added at 1.1
diff -N PhysVolID.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ PhysVolID.java	19 Jan 2006 01:57:38 -0000	1.1
@@ -0,0 +1,17 @@
+package org.lcsim.geometry.compact.converter.lcdd.util;
+
+import org.jdom.Element;
+
+/**
+ *
+ * @author jeremym
+ */
+public class PhysVolID extends Element
+{   
+   public PhysVolID(String name, int value)
+   {
+	  super("physvolid");      
+	  setAttribute("field_name", name);
+	  setAttribute("value", Integer.toString(value));
+   }
+}

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd/util
RZBData.java added at 1.1
diff -N RZBData.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ RZBData.java	19 Jan 2006 01:57:38 -0000	1.1
@@ -0,0 +1,19 @@
+package org.lcsim.geometry.compact.converter.lcdd.util;
+
+import org.jdom.Element;
+
+/**
+ *
+ * @author jeremym
+ */
+public class RZBData extends Element
+{	
+	   public RZBData(double z, double r, double Bz, double Br)
+	   {       
+	       super("rzB");
+	       setAttribute("z", String.valueOf(z));
+	       setAttribute("r", String.valueOf(r));
+	       setAttribute("Bz", String.valueOf(Bz));
+	       setAttribute("Br", String.valueOf(Br));	       
+	   }          
+}
\ No newline at end of file

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd/util
Author.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- Author.java	28 Feb 2005 07:33:47 -0000	1.1
+++ Author.java	19 Jan 2006 01:57:38 -0000	1.2
@@ -21,7 +21,7 @@
       setAttribute("name",name);
    }
    
-   public void setAuthorEMail(String email)
+   public void setAuthorEmail(String email)
    {
       setAttribute("email",email);
    }  

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd/util
PhysVol.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- PhysVol.java	25 Aug 2005 07:53:48 -0000	1.3
+++ PhysVol.java	19 Jan 2006 01:57:38 -0000	1.4
@@ -65,4 +65,9 @@
       element.setAttribute("value",String.valueOf(value));
       addContent(element);
    }
+   
+   public void addPhysVolID(PhysVolID id)
+   {
+	   addContent(id);
+   }
 }

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd/util
Polycone.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- Polycone.java	6 May 2005 17:36:34 -0000	1.2
+++ Polycone.java	19 Jan 2006 01:57:38 -0000	1.3
@@ -21,6 +21,11 @@
     
     //private List<ZPlane> _zplanes;             
     
+	public Polycone(String name)
+	{
+		super("polycone", name);		
+	}
+	
     /** Creates a new instance of Polycone */
     public Polycone(String name, double startPhi, double deltaPhi, Element zplanesNode) throws JDOMException
     {

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd/util
RZFieldMap.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- RZFieldMap.java	2 Sep 2005 00:30:15 -0000	1.3
+++ RZFieldMap.java	19 Jan 2006 01:57:38 -0000	1.4
@@ -47,6 +47,11 @@
        addContent(rzb);
    }
    
+   public void addRZBData(RZBData rzb)
+   {
+	   addContent(rzb);
+   }
+   
    public void setLengthUnit(String lunit)
    {
        setAttribute("lunit", lunit);
CVSspam 0.2.8