hps-java/src/test/java/org/lcsim/hps/evio

diff -u -r1.4 -r1.5
--- TestRunReconToEvio_Test.java	29 Mar 2012 04:23:20 -0000	1.4
+++ TestRunReconToEvio_Test.java	31 Mar 2012 02:30:48 -0000	1.5
@@ -15,7 +15,7 @@

 import org.jlab.coda.jevio.EvioEvent;
 import org.jlab.coda.jevio.EvioException;
 import org.jlab.coda.jevio.EvioReader;

-import org.lcsim.hps.recon.tracking.HPSTrackerSample;

+import org.lcsim.hps.recon.tracking.HPSSVTData;

 import org.lcsim.job.JobControlManager;
 import org.lcsim.util.cache.FileCache;
 

@@ -76,17 +76,16 @@

 							sampleData[2] = intData[i+2];
 							sampleData[3] = intData[i+3];
 

-							HPSTrackerSample trackerSample = new HPSTrackerSample();
-							trackerSample.setData(sampleData);
-
-							int fpga = trackerSample.fpgaAddress();
-							int hybrid = trackerSample.hybrid();
-							int channel = trackerSample.channel();
-							int apv = trackerSample.apv();

+                                                        HPSSVTData svtData = new HPSSVTData(sampleData);
+                                                        
+                                                        int fpga = svtData.getFPGAAddress();
+                                                        int hybrid = svtData.getHybridNumber();
+                                                        int channel = svtData.getChannelNumber();
+                                                        int apv = svtData.getAPVNumber();

 
 							System.out.println("fpga=" + fpga + "; hybrid=" + hybrid + "; channel=" + channel + "; apv=" + apv);
 							for (int j=0; j<6; j++) {

-								int val = trackerSample.value(j);

+								int val = svtData.getSample(j);

 								System.out.println("  sample[" + j + "]="+val);
 							}										
 						}