diff -u -r1.2 -r1.3
--- CalorimeterHitsDriver.java	26 Jul 2005 23:57:12 -0000	1.2
+++ CalorimeterHitsDriver.java	25 Aug 2005 23:59:40 -0000	1.3
@@ -4,6 +4,7 @@

 import java.util.ArrayList;
 import org.lcsim.util.Driver;
 import org.lcsim.event.EventHeader;

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

 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.RawCalorimeterHit;
 import org.lcsim.util.lcio.LCIOConstants;

@@ -13,7 +14,7 @@

  * A driver to build calorimeter hit collections from raw hit collections.
  *
  * @author Guilherme Lima

- * @version $Id: CalorimeterHitsDriver.java,v 1.2 2005/07/26 23:57:12 lima Exp $

+ * @version $Id: CalorimeterHitsDriver.java,v 1.3 2005/08/25 23:59:40 lima Exp $

  */
 public class CalorimeterHitsDriver extends Driver {
 

@@ -39,17 +40,21 @@

 	  = event.get(RawCalorimeterHit.class);
 
       for( List<RawCalorimeterHit> collection : rawHitCollections ) {

+	// get metadata from simHits collection
+	String rawName = event.getMetaData(collection).getName();
+	String simName = rawName.replace("Raw", "");
+	String newName = rawName.replace("Raw", "Digi");
+
+// 	List<SimCalorimeterHit> simdata = event.getSimCalorimeterHits(simName);
+// 	LCMetaData simMetaData = event.getMetaData( simdata );
+

 	List<CalorimeterHit> calhitColl = new ArrayList<CalorimeterHit>();
 	for( RawCalorimeterHit rawhit : collection ) {

-	  CalorimeterHit calhit = new MyCalorimeterHit(rawhit);

+	  CalorimeterHit calhit = new MyCalorimeterHit( rawhit );//, simMetaData );

 	  calhitColl.add(calhit);
 	}
 
 	// append collection to event

-	String rawName = event.getMetaData(collection).getName();
-	String simName = rawName.replace("Raw", "");
-	String newName = rawName.replace("Raw", "Digi");
-	IDDecoder decoder = event.getMetaData( event.getSimCalorimeterHits(simName) ).getIDDecoder();

 	int flag = 1 << LCIOConstants.RCHBIT_ID1;
 	flag |= 1 << LCIOConstants.RCHBIT_TIME;
 	flag |= 1 << LCIOConstants.RCHBIT_NO_PTR;

diff -u -r1.10 -r1.11
--- DigiSimMain.java	10 Aug 2005 20:54:07 -0000	1.10
+++ DigiSimMain.java	25 Aug 2005 23:59:41 -0000	1.11
@@ -21,7 +21,7 @@

  * The main driver for standalone digitization simulation
  *
  * @author Guilherme Lima

- * @version $Id: DigiSimMain.java,v 1.10 2005/08/10 20:54:07 lima Exp $

+ * @version $Id: DigiSimMain.java,v 1.11 2005/08/25 23:59:41 lima Exp $

  */
 public class DigiSimMain extends Driver {
 

@@ -78,7 +78,7 @@

 //     System.out.println("# hits retrieved:"
 // 		       +" EM="+emhits.size()+", HAD="+hadhits.size());
 

-    //.. test digisim works

+    //.. Use LCRelations: check an "identity" transform

     try {
       // using fixed factors, compare sim and raw hits
       List<LCRelation> raw2simLinks

@@ -86,7 +86,7 @@

       for( LCRelation rel : raw2simLinks ) {
 	RawCalorimeterHit rawhit = (RawCalorimeterHit)rel.getFrom();
 	SimCalorimeterHit simhit = (SimCalorimeterHit)rel.getTo();

-	int simE = (int)(simhit.getRawEnergy()*100000000.0);

+	int simE = (int)(simhit.getRawEnergy()*1.0e+8);

 	assert simE == rawhit.getAmplitude()
 	    : "Discrepancy on EcalBarr: simE=" + simE
 	    + ", rawE=" + rawhit.getAmplitude() ;

@@ -130,7 +130,7 @@

       digimain.setDebug();
 
       // event loop

-      loop.loop(-1); // -1 for all

+      loop.loop(10); // -1 for all

       loop.dispose();
 
       org.lcsim.util.aida.AIDA.defaultInstance().saveAs("myhistos.aida");

diff -u -r1.3 -r1.4
--- MyCalorimeterHit.java	2 Aug 2005 17:18:02 -0000	1.3
+++ MyCalorimeterHit.java	25 Aug 2005 23:59:41 -0000	1.4
@@ -1,20 +1,25 @@

 package org.lcsim.digisim;
 import org.lcsim.event.RawCalorimeterHit;
 import org.lcsim.util.event.BaseCalorimeterHit;

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

 
 /**
  * Implements a calorimeter hit, to be created from unpacking DigiSim output.
  *
  * @author Guilherme Lima

- * @version $Id: MyCalorimeterHit.java,v 1.3 2005/08/02 17:18:02 tonyj Exp $

+ * @version $Id: MyCalorimeterHit.java,v 1.4 2005/08/25 23:59:41 lima Exp $

  */
 public class MyCalorimeterHit extends BaseCalorimeterHit
 {
    /** Full constructor */

-   MyCalorimeterHit(RawCalorimeterHit rawhit)

+   MyCalorimeterHit(RawCalorimeterHit rawhit
+		    //, LCMetaData meta
+		    )

    {

-      id = rawhit.getCellID();
-      rawEnergy = ((double)rawhit.getAmplitude())/100000000;
-      time = (double)rawhit.getTimeStamp()/1000000;

+//        this.data = meta;
+       this.id = rawhit.getCellID();
+       this.rawEnergy = ((double)rawhit.getAmplitude()) * 1.0e-8;
+       this.time = (double)rawhit.getTimeStamp() * 1.0e-6;
+       this.position = null;

    }

-}

\ No newline at end of file

+}