diff -u -r1.4 -r1.5
--- Main.java	2 Aug 2005 00:25:09 -0000	1.4
+++ Main.java	2 Sep 2005 23:33:17 -0000	1.5
@@ -466,7 +466,7 @@

                     String type = "hadcal";
                     if (name.startsWith("EM") || name.startsWith("LUM")) type = "emcal";
                     line(p, "   type(\"" + type + "\"),");

-                    line(p, "   idCode(code(" + rname + "),");

+                    line(p, "   idCode(name(\"" + rname + "\"), code(" + rname + "),");

                     line(p, "          data(\"system\", " + sysid + "),");
                     line(p, "          data(\"barrel\", 0)");
                     line(p, "   )");

@@ -506,7 +506,7 @@

                     String type = "hadcal";
                     if (name.startsWith("EM") || name.startsWith("LUM")) type = "emcal";
                     line(p, "   type(\"" + type + "\"),");

-                    line(p, "   idCode(code(" + rname + "),");

+                    line(p, "   idCode(name(\"" + rname + "\"), code(" + rname + "),");

                     line(p, "          data(\"system\", " + sysid + "),");
                     line(p, "          data(\"barrel\", 1)");
                     line(p, "   )");

@@ -552,7 +552,7 @@

                     line(p, "   outerRadius(" + outerR[i] + " mm)" + comma);
                     if (sensitive) {
                         line(p, "   type(\"tracker\"),");

-                        line(p, "   idCode(code(" + rname + "),");

+                        line(p, "   idCode(name(\"" + rname + "\"), code(" + rname + "),");

                         line(p, "          data(\"layer\", " + i + "),");
                         line(p, "          data(\"system\", " + sysid + "),");
                         line(p, "          data(\"barrel\", 1)");

@@ -598,7 +598,7 @@

                     line(p, "   outerRadius(" + (innerR[i] + thickness) + " mm)" + comma);
                     if (sensitive) {
                         line(p, "   type(\"tracker\"),");

-                        line(p, "   idCode(code(" + rname + "),");

+                        line(p, "   idCode(name(\"" + rname + "\"), code(" + rname + "),");

                         line(p, "          data(\"layer\", " + i + "),");
                         line(p, "          data(\"system\", " + sysid + "),");
                         line(p, "          data(\"barrel\", 0)");