 |
 |
| Commit in hps-java/src on MAIN | |||
| main/java/org/lcsim/hps/evio/EvioFileProducer.java | +3 | -4 | 1.2 -> 1.3 |
| test/java/org/lcsim/hps/evio/RawTrackerHitToEvio4Converter.java | +11 | -3 | 1.4 -> 1.5 |
| +14 | -7 | ||
check in work from today
diff -u -r1.2 -r1.3 --- EvioFileProducer.java 9 Mar 2012 02:50:16 -0000 1.2 +++ EvioFileProducer.java 9 Mar 2012 23:33:51 -0000 1.3 @@ -1,9 +1,6 @@
package org.lcsim.hps.evio;
-import java.io.File;
import java.nio.ByteBuffer;
-import java.util.ArrayList; -import java.util.List;
import org.jlab.coda.et.EtAttachment; import org.jlab.coda.et.EtConstants;
@@ -42,9 +39,11 @@
// Get the next byte buffer and also set the class variable byteBuffer to the same.
private ByteBuffer nextByteBuffer() {
EvioEvent nextEvent = nextEvent();
+ System.out.println("read next event: tag="+nextEvent.getHeader().getTag() + "; num="+nextEvent.getHeader().getNumber()+"; len="+nextEvent.getHeader().getLength());
if (nextEvent == null)
return null;
byteBuffer = ByteBuffer.allocate(nextEvent.getTotalBytes());
+ byteBuffer.put(nextEvent.getRawBytes());
return byteBuffer;
}
@@ -173,8 +172,8 @@
1, // number of events
size, // size of event but overwritten later
group); // group number; default value is arbitrary
- mevs[0].getDataBuffer().put(byteBuffer); // Set raw bytes of EtEvent.
mevs[0].setLength(buf.position()); // Set actual length from buffer position.
+ mevs[0].getDataBuffer().put(byteBuffer); // Set raw bytes of EtEvent.
sys.putEvents(att, mevs); // Put events back into ET system.
System.out.println("put event of size " + mevs[0].getLength());
++eventCount;
diff -u -r1.4 -r1.5 --- RawTrackerHitToEvio4Converter.java 9 Mar 2012 02:50:32 -0000 1.4 +++ RawTrackerHitToEvio4Converter.java 9 Mar 2012 23:33:51 -0000 1.5 @@ -5,6 +5,7 @@
import java.net.URL; import java.util.List;
+import org.jlab.coda.jevio.BaseStructureHeader;
import org.jlab.coda.jevio.CompositeData; import org.jlab.coda.jevio.DataType; import org.jlab.coda.jevio.EventWriter;
@@ -23,14 +24,15 @@
* and compares the two to make sure they match. * * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: RawTrackerHitToEvio4Converter.java,v 1.4 2012/03/09 02:50:32 jeremy Exp $
+ * @version $Id: RawTrackerHitToEvio4Converter.java,v 1.5 2012/03/09 23:33:51 jeremy Exp $
*/
public class RawTrackerHitToEvio4Converter extends Driver {
private final String format = "N(L,I,I)";
private String rawHitCollectionName = "RawTrackerHitMaker_RawTrackerHits";
private static String lcioFileName = "ap2.2gev050mevsel_SLIC-v2r11p1_geant4-v9r3p2_QGSP_BERT_HPS-Test-JLAB-v4pt0_trackRecon.slcio";
- private static String lcioFileUrl = "http://www.lcsim.org/test/hps/" + lcioFileName;
+ //private static String lcioFileUrl = "http://www.lcsim.org/test/hps/" + lcioFileName;
+ private static String lcioFileUrl = "file:///u1/hps/trackerTest/" + lcioFileName;
private static String evioFileName = "compositeDataTest.evio";
private EventWriter writer;
@@ -67,6 +69,7 @@
}
event = reader.parseNextEvent();
}
+ reader.close();
}
private CompositeData convertToCompositeData(List<RawTrackerHit> hits) {
@@ -116,9 +119,14 @@
System.out.println("event " + event.getEventNumber() + " has " + hits.size() + " RawTrackerHits");
CompositeData cdata = this.convertToCompositeData(hits);
CompositeTester.printCompositeDataObject(cdata);
- EvioEvent ev = new EvioEvent(0, DataType.COMPOSITE, 0);
+ EvioEvent ev = new EvioEvent(0, DataType.COMPOSITE, 0); + BaseStructureHeader header = ev.getHeader(); + header.setTag(0xF); // composite flag (right???) + header.setNumber(1); + header.setDataType(DataType.COMPOSITE); // redundant???
try {
ev.appendCompositeData(cdata);
+ ev.setAllHeaderLengths();
writer.writeEvent(ev);
}
catch (Exception 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