diff -u -r1.2 -r1.3
--- MokkaTest.java	18 Jan 2006 18:23:46 -0000	1.2
+++ MokkaTest.java	18 Jan 2006 22:00:29 -0000	1.3
@@ -1,10 +1,13 @@

 import java.io.File;
 import java.net.URL;

+import java.util.List;

 
 import org.lcsim.util.Driver;
 import org.lcsim.util.cache.FileCache;
 import org.lcsim.util.loop.LCSimLoop;
 import org.lcsim.event.EventHeader;

+import org.lcsim.event.EventHeader.LCMetaData;
+import org.lcsim.event.CalorimeterHit;

 import org.lcsim.geometry.Detector;
 import org.lcsim.geometry.Subdetector;
 import org.lcsim.geometry.IDDecoder;

@@ -14,44 +17,63 @@

 import junit.framework.TestSuite;
 
 /**

- *

+ * 

  * @author jeremym

- * @version $Id: MokkaTest.java,v 1.2 2006/01/18 18:23:46 jeremy Exp $

+ * @version $Id: MokkaTest.java,v 1.3 2006/01/18 22:00:29 jeremy Exp $

  */
 public class MokkaTest extends TestCase
 {

-    public MokkaTest(String testName)
-    {
-        super(testName);
-    }
-
-    public static Test suite()
-    {
-        return new TestSuite(MokkaTest.class);
-    }
-
-    public void testMokka() throws Exception
-    {
-	    //        URL url = new URL("http://www.lcsim.org/test/lcio/D12_mokka_muons.slcio");
-	    URL url = new URL("http://www.lcsim.org/test/lcio/hcalFeRPC1_Mokka_muons.slcio");
-        FileCache cache = new FileCache();
-        File file = cache.getCachedFile(url);
-
-        LCSimLoop loop = new LCSimLoop();
-        loop.setLCIORecordSource(file);
-        loop.add(new MokkaDriver());
-        loop.loop(-1);
-        loop.dispose();
-    }
-
-    private class MokkaDriver extends Driver
-    {
-        protected void process(EventHeader event)
-        {
- 	    for ( Subdetector sub : event.getDetector().getSubdetectors().values() )
-            {
-		IDDecoder decoder = sub.getIDDecoder();
-	    }
-        }
-    }

+
+	public MokkaTest(String testName)
+	{
+		super(testName);
+	}
+
+	public static Test suite()
+	{
+		return new TestSuite(MokkaTest.class);
+	}
+
+	public void testMokka() throws Exception
+	{
+		// URL url = new
+		// URL("http://www.lcsim.org/test/lcio/D12_mokka_muons.slcio");
+		URL url = new URL(
+				"http://www.lcsim.org/test/lcio/hcalFeRPC1_Mokka_muons.slcio");
+		FileCache cache = new FileCache();
+		File file = cache.getCachedFile(url);
+
+		LCSimLoop loop = new LCSimLoop();
+		loop.setLCIORecordSource(file);
+		loop.add(new MokkaDriver());
+		loop.loop(-1);
+		loop.dispose();
+	}
+
+	private class MokkaDriver extends Driver
+	{
+		protected void process(EventHeader event)
+		{		
+			List<List<CalorimeterHit>> calHitColls = event.get(CalorimeterHit.class);
+			for ( List<CalorimeterHit> calHits : calHitColls )
+			{
+				LCMetaData meta = event.getMetaData(calHits);									
+				IDDecoder decoder = meta.getIDDecoder();
+				
+				for ( CalorimeterHit hit : calHits )
+				{
+					decoder.setID(hit.getCellID());
+					
+					int M = decoder.getValue("M");
+					int S = decoder.getValue("S");
+					int I = decoder.getValue("I");
+					int J = decoder.getValue("J");
+					int layer = decoder.getValue("layer");
+					
+//					System.out.println("M S I J layer = " 
+//							+ M + " " + S + " " + I + " " + J + " " + layer);
+				}
+			}
+		}
+	}

 }