Commit in hps-java/src/test/java/org/lcsim on MAIN | |||
DoEvioTest.java | +45 | -49 | 1.9 -> 1.10 |
fix test case compilation errors
diff -u -r1.9 -r1.10 --- DoEvioTest.java 18 Feb 2012 23:13:34 -0000 1.9 +++ DoEvioTest.java 1 Mar 2012 22:31:27 -0000 1.10 @@ -1,43 +1,39 @@
package org.lcsim;
+import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.IntBuffer; +import java.nio.MappedByteBuffer; +import java.nio.channels.FileChannel; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +
import junit.framework.TestCase;
+import org.jlab.coda.jevio.BaseStructureHeader; +import org.jlab.coda.jevio.EventParser; +import org.jlab.coda.jevio.EvioEvent; +import org.jlab.coda.jevio.EvioException;
import org.jlab.coda.jevio.EvioFile;
+import org.jlab.coda.jevio.IBlockHeader;
import org.jlab.coda.jevio.IEvioListener;
-import org.jlab.coda.jevio.EvioEvent; -import org.jlab.coda.jevio.BlockHeader; -import org.jlab.coda.jevio.EventParser; -//import org.lcsim.HPSTrackerSample; -//import org.lcsim.HPSTrackerEvent; -import org.lcsim.MapDAQCellID; -import org.lcsim.event.RawTrackerHit; -import org.lcsim.event.base.BaseRawTrackerHit;
+import org.jlab.coda.jevio.IEvioStructure;
import org.lcsim.detector.IDetectorElement;
+import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.SimTrackerHit;
-import java.nio.channels.FileChannel; - -import java.io.*; -import java.nio.*; -//import org.jlab.coda.jevio.ByteParser; -import org.jlab.coda.jevio.IEvioStructure; -import org.jlab.coda.jevio.BaseStructureHeader; -import org.jlab.coda.jevio.EvioException; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Iterator; -import org.lcsim.util.lcio.LCIOWriter;
import org.lcsim.event.base.BaseLCSimEvent;
- -import org.lcsim.HPSDetectorTag;
+import org.lcsim.event.base.BaseRawTrackerHit; +import org.lcsim.util.lcio.LCIOWriter;
/** * This is a test of using jevio routines to read EVIO files. * * @author homer
- * @version $Id: DoEvioTest.java,v 1.9 2012/02/18 23:13:34 homer Exp $
+ * @version $Id: DoEvioTest.java,v 1.10 2012/03/01 22:31:27 jeremy Exp $
*/ public class DoEvioTest extends TestCase {
@@ -57,24 +53,24 @@
public void testDoTestEvio() throws IOException { System.out.println("Test for EVIO.");
- int UNKNOWN32 = (0x0); - int UINT32 = (0x1); - int FLOAT32 = (0x2); - int CHARSTAR8 = (0x3); - int SHORT16 = (0x4); - int USHORT16 = (0x5); - int CHAR8 = (0x6); - int UCHAR8 = (0x7); - int DOUBLE64 = (0x8); - int LONG64 = (0x9); - int ULONG64 = (0xa);
+ final int UNKNOWN32 = (0x0); + final int UINT32 = (0x1); + final int FLOAT32 = (0x2); + final int CHARSTAR8 = (0x3); + final int SHORT16 = (0x4); + final int USHORT16 = (0x5); + final int CHAR8 = (0x6); + final int UCHAR8 = (0x7); + final int DOUBLE64 = (0x8); + final int LONG64 = (0x9); + final int ULONG64 = (0xa);
final int INT32 = (0xb);
- int TAGSEGMENT = (0xc); - int SEGMENT = (0xd); - int BANK = (0xe); - int ALSOBANK = (0x10); - int ALSOSEGMENT = (0x20); - int ALSOTAGSEGMENT = (0x40);
+ final int TAGSEGMENT = (0xc); + final int SEGMENT = (0xd); + final int BANK = (0xe); + final int ALSOBANK = (0x10); + final int ALSOSEGMENT = (0x20); + final int ALSOTAGSEGMENT = (0x40);
final int TRACKERTAG = (600); // load the DAQ to LCSim cell maps
@@ -121,7 +117,7 @@
switch (header.getTag()) { case TRACKERTAG: //Tracker (will be TRACKERTAG) // IReadout ro;
- if (header.getDataType()!=INT32) {
+ if (header.getDataType().getValue() != INT32) { // Is this right???
System.out.println("Non INT32 Tracker Data!!!"); break; }
@@ -219,7 +215,7 @@
System.out.println("this hit was created: cellID=" + rh.getCellID() + " adc[0]=" + (rh.getADCValues())[0]); } }
- switch (header.getDataTypeEnum()) {
+ switch (header.getDataType()) {
case FLOAT32: if (VERBOSE > 4) { System.out.println(" FLOAT VALS");
@@ -372,9 +368,9 @@
try { EvioFile evioFile = new EvioFile(fileName);
-// EventParser parser = new EventParser(); -// parser.addEvioListener(new myListener()); - EventParser.getInstance().addEvioListener(new myListener());
+ EventParser parser = new EventParser(); + parser.addEvioListener(new myListener()); + //EventParser.getInstance().addEvioListener(new myListener());
int stat = 1; while (stat != 0) { try {
@@ -386,7 +382,7 @@
System.out.println("reading event"); // int[] buftt = ev.getEvtArray(); System.out.println("events remaining =" + evioFile.getNumEventsRemaining());
- BlockHeader bh = evioFile.getCurrentBlockHeader();
+ IBlockHeader bh = evioFile.getCurrentBlockHeader();
System.out.println("nextEvent: BLOCK HEADER :\n" + bh.toString()); } catch (EvioException e) { System.out.println(e);
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1