Print

Print


Commit in lcsim/src/org/lcsim on MAIN
plugin/browser/RawTrackerHitTableModel.java+18added 1.1
              /LCSimEventBrowser.java+21.8 -> 1.9
util/lcio/SIORawTrackerHit.java+6-21.3 -> 1.4
+26-2
1 added + 2 modified, total 3 files
Bug fix for reading/writing RawTrackerHits
Initial (incomplete) support for displaying RawTrackerHit in event browser

lcsim/src/org/lcsim/plugin/browser
RawTrackerHitTableModel.java added at 1.1
diff -N RawTrackerHitTableModel.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ RawTrackerHitTableModel.java	30 May 2007 19:34:26 -0000	1.1
@@ -0,0 +1,18 @@
+package org.lcsim.plugin.browser;
+import org.lcsim.event.RawTrackerHit;
+
+
+/**
+ *
+ * @author tonyj
+ */
+class RawTrackerHitTableModel extends GenericTableModel
+{
+   private static final String[] columns = {"Time","CellID","ADCValues"};
+   private static Class klass = RawTrackerHit.class;
+
+   RawTrackerHitTableModel()
+   {
+      super(klass,columns);
+   }
+}

lcsim/src/org/lcsim/plugin/browser
LCSimEventBrowser.java 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- LCSimEventBrowser.java	9 Aug 2005 01:34:00 -0000	1.8
+++ LCSimEventBrowser.java	30 May 2007 19:34:26 -0000	1.9
@@ -66,10 +66,12 @@
       lookup.add(new MCParticleTableModel());
       lookup.add(new SimTrackerHitTableModel());
       lookup.add(new RawCalorimeterHitTableModel());
+      lookup.add(new RawTrackerHitTableModel());
       lookup.add(new LCRelationTableModel());
       lookup.add(new TrackTableModel());
       lookup.add(new ReconstructedParticleTableModel());
       lookup.add(new LCGenericObjectTableModel());
+      lookup.add(new Hep3VectorTableModel());
    }
    
    public LCSimEventBrowser(Studio app, SequentialRecordLoop loop)

lcsim/src/org/lcsim/util/lcio
SIORawTrackerHit.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- SIORawTrackerHit.java	25 May 2007 00:23:12 -0000	1.3
+++ SIORawTrackerHit.java	30 May 2007 19:34:26 -0000	1.4
@@ -13,7 +13,7 @@
 /**
  * 
  * @author Tony Johnson
- * @version $Id: SIORawTrackerHit.java,v 1.3 2007/05/25 00:23:12 tonyj Exp $
+ * @version $Id: SIORawTrackerHit.java,v 1.4 2007/05/30 19:34:26 tonyj Exp $
  */
 class SIORawTrackerHit extends BaseRawTrackerHit
 {  
@@ -23,6 +23,7 @@
       int cellid0 = in.readInt();
       int cellid1 = LCIOUtil.bitTest(flags,31) ? in.readInt() : 0;
       cellId = ((long) cellid1)<<32 | cellid0;
+      identifier = new Identifier(cellId);
       time = in.readInt();
       int nAdc = in.readInt();
       adcValues = new short[nAdc];
@@ -30,7 +31,8 @@
       {
          adcValues[i] = in.readShort();
       }
-      identifier = new Identifier(cellId);
+      in.pad();
+      in.readPTag(this);
    }
    
    static void write(RawTrackerHit hit, SIOOutputStream out, int flags) throws IOException
@@ -42,5 +44,7 @@
       short[] adcValues = hit.getADCValues();
       out.writeInt(adcValues.length);
       for (short s : adcValues) out.writeShort(s);
+      out.pad();
+      out.writePTag(hit);
    }
 }
\ No newline at end of file
CVSspam 0.2.8