GeomConverter/src/org/lcsim/geometry/compact

diff -u -r1.16 -r1.17
--- Subdetector.java	23 Mar 2007 00:45:21 -0000	1.16
+++ Subdetector.java	9 Apr 2007 21:05:30 -0000	1.17
@@ -65,7 +65,7 @@

         _parameters = parameters;
     }
     

-    public ParameterSet getParameters()

+    public ParameterSet getParameterSet()

     {
         return _parameters;
     }

GeomConverter/src/org/lcsim/geometry/subdetector

diff -u -r1.5 -r1.6
--- AbstractCalorimeter.java	7 Feb 2006 16:54:35 -0000	1.5
+++ AbstractCalorimeter.java	9 Apr 2007 21:05:30 -0000	1.6
@@ -25,9 +25,9 @@

     {
         super(node);                
         

-        if ( getParameters().exists(_typeParamStr) )

+        if ( getParameterSet().exists(_typeParamStr) )

         {

-            String str = getParameters().getString(_typeParamStr);

+            String str = getParameterSet().getString(_typeParamStr);

             _calType = CalorimeterType.convertStringToCalorimeterType(str);            
         }
         else {