lcsim/src/org/lcsim/event/util

diff -u -r1.2 -r1.3
--- CalorimeterHitEsort.java	2 Aug 2005 17:18:03 -0000	1.2
+++ CalorimeterHitEsort.java	26 Jan 2006 00:00:46 -0000	1.3
@@ -10,7 +10,6 @@

     {
         CalorimeterHit v1 = (CalorimeterHit) obj1;
         CalorimeterHit v2 = (CalorimeterHit) obj2;

-        if(v1.getRawEnergy()-v2.getRawEnergy()>0.) return -1;
-        return 1;

+        return (int) Math.signum(v2.getRawEnergy() - v1.getRawEnergy());

     }
 }

\ No newline at end of file

lcsim/src/org/lcsim/plugin/browser

diff -N Hep3VectorTableModel.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Hep3VectorTableModel.java	26 Jan 2006 00:00:46 -0000	1.1
@@ -0,0 +1,35 @@

+package org.lcsim.plugin.browser;
+
+import hep.physics.vec.Hep3Vector;
+
+
+/**
+ *
+ * @author tonyj
+ */
+class Hep3VectorTableModel extends GenericTableModel
+{
+   private static final String[] columns = {"X","Y","Z"};
+   private static Class klass = Hep3Vector.class;
+
+   Hep3VectorTableModel()
+   {
+      super(klass,columns);
+   }
+   public Object getValueAt(int row, int column)
+   {
+      Hep3Vector vec = (Hep3Vector) getData(row);
+      switch (column) 
+      {
+         case 0: return vec.x();
+         case 1: return vec.y();
+         case 2: return vec.z();
+         default: return 0;
+      }
+   }
+   
+   public Class getColumnClass(int column)
+   {
+      return Double.class;
+   }
+}

lcsim/src/org/lcsim/plugin/browser

diff -u -r1.4 -r1.5
--- CollectionTable.java	26 Jul 2005 14:44:34 -0000	1.4
+++ CollectionTable.java	26 Jan 2006 00:00:46 -0000	1.5
@@ -21,6 +21,8 @@

 import javax.swing.table.TableModel;
 import org.freehep.application.Application;
 import org.freehep.application.studio.Studio;

+import org.freehep.swing.table.DefaultSortableTableModel;
+import org.freehep.swing.table.TableSorter;

 import org.freehep.util.ScientificFormat;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.EventHeader.LCMetaData;

@@ -30,12 +32,12 @@

 /**
  *
  * @author tonyj

- * @version $Id: CollectionTable.java,v 1.4 2005/07/26 14:44:34 tonyj Exp $

+ * @version $Id: CollectionTable.java,v 1.5 2006/01/26 00:00:46 tonyj Exp $

  */
 class CollectionTable extends JPanel implements ActionListener
 {
    private static final String noCollection = "No Collection";

-   private static final TableModel emptyTable = new DefaultTableModel();

+   private static final TableModel emptyTable = new DefaultSortableTableModel(new DefaultTableModel());

    private JTextArea m_tableLabel = new JTextArea(noCollection);
    private JTable m_table = new JTable();
    private JButton errorButton = new JButton("An error occured, click for details...");

@@ -138,7 +140,9 @@

                if (model.canDisplay(type))
                {
                   model.setData(meta,coll);

-                  m_table.setModel(model);

+                  DefaultSortableTableModel sm = new DefaultSortableTableModel(model);
+                  m_table.setModel(sm);
+                  TableSorter sorter = new TableSorter(m_table);

                   ok = true;
                   break;
                }

lcsim/src/org/lcsim/util/heprep

diff -N Hep3VectorConverter.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Hep3VectorConverter.java	26 Jan 2006 00:00:47 -0000	1.1
@@ -0,0 +1,46 @@

+package org.lcsim.util.heprep;
+
+import hep.graphics.heprep.HepRepFactory;
+import hep.graphics.heprep.HepRepInstance;
+import hep.graphics.heprep.HepRepPoint;
+import hep.graphics.heprep.HepRepType;
+import hep.graphics.heprep.HepRepTypeTree;
+import hep.graphics.heprep.HepRepInstanceTree;
+import hep.physics.vec.Hep3Vector;
+import java.awt.Color;
+import java.util.List;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.EventHeader.LCMetaData;
+
+/**
+ *
+ * @author tonyj
+ * @version $Id: Hep3VectorConverter.java,v 1.1 2006/01/26 00:00:47 tonyj Exp $
+ */
+class Hep3VectorConverter implements HepRepCollectionConverter
+{
+   public boolean canHandle(Class k)
+   {
+      return Hep3Vector.class.isAssignableFrom(k);
+   }
+   public void convert(EventHeader event, List collection, HepRepFactory factory, HepRepTypeTree typeTree, HepRepInstanceTree instanceTree)
+   {
+      LCMetaData meta = event.getMetaData(collection);
+      String name = meta.getName();
+      int flags = meta.getFlags();
+      
+      HepRepType typeX = factory.createHepRepType(typeTree, name);
+      typeX.addAttValue("layer",LCSimHepRepConverter.HITS_LAYER);
+      typeX.addAttValue("drawAs","Point");
+      typeX.addAttValue("color",Color.YELLOW);
+      typeX.addAttValue("fill",true);
+      typeX.addAttValue("fillColor",Color.RED);
+      typeX.addAttValue("MarkName","Box");      
+      
+      for (Hep3Vector hit : (List<Hep3Vector>) collection)
+      {
+         HepRepInstance instanceX = factory.createHepRepInstance(instanceTree, typeX);
+         HepRepPoint pp = factory.createHepRepPoint(instanceX,hit.x(),hit.y(),hit.z());
+      }
+   }
+}

lcsim/src/org/lcsim/util/heprep

diff -u -r1.8 -r1.9
--- LCSimHepRepConverter.java	9 Aug 2005 19:03:03 -0000	1.8
+++ LCSimHepRepConverter.java	26 Jan 2006 00:00:47 -0000	1.9
@@ -39,6 +39,7 @@

          register(new TrackConverter());
          register(new ReconstructedParticleConverter());
          register(new ZvVertexConverter());

+         register(new Hep3VectorConverter());

       }
       catch (Exception x)
       {

lcsim/src/org/lcsim/plugin/web/examples

diff -N ExtraHeprepExample.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ExtraHeprepExample.java	26 Jan 2006 00:00:47 -0000	1.1
@@ -0,0 +1,29 @@

+import hep.physics.vec.BasicHep3Vector;
+import hep.physics.vec.Hep3Vector;
+import java.util.ArrayList;
+import java.util.List;
+import org.lcsim.event.EventHeader;
+import org.lcsim.util.Driver;
+
+/**
+ *
+ * @author tonyj
+ */
+public class ExtraHeprepExample extends Driver
+{
+   public void process(EventHeader e) 
+   {
+      List<Hep3Vector> list = new ArrayList<Hep3Vector>();
+      // Make some (example) points and add to event
+      for (double p = 0; p < Math.PI*2; p += Math.PI/50)
+      {
+         double r = 1000;
+         double x = r*Math.sin(p);
+         double y = r*Math.cos(p);
+         double z = 0;
+         Hep3Vector v = new BasicHep3Vector(x,y,z);
+         list.add(v);
+      }
+      e.put("MyPoints",list);
+   }
+}