Print

Print


Commit in lcsim/src/org/lcsim/util/loop on MAIN
StdhepEventSource.java+2-11.7 -> 1.8
LCIOEventSource.java+2-41.4 -> 1.5
+4-5
2 modified files
Make input file available in event

lcsim/src/org/lcsim/util/loop
StdhepEventSource.java 1.7 -> 1.8
diff -u -r1.7 -r1.8
--- StdhepEventSource.java	23 May 2008 03:12:10 -0000	1.7
+++ StdhepEventSource.java	17 Nov 2009 16:53:49 -0000	1.8
@@ -19,7 +19,7 @@
 /**
  * Convert an LCIOReader to a SequentialRecordSource
  * @author tonyj
- * @version $Id: StdhepEventSource.java,v 1.7 2008/05/23 03:12:10 jeremy Exp $
+ * @version $Id: StdhepEventSource.java,v 1.8 2009/11/17 16:53:49 tonyj Exp $
  */
 public class StdhepEventSource implements RandomAccessRecordSource
 {
@@ -88,6 +88,7 @@
                if (record instanceof StdhepEvent)
                {
                   currentEvent = (EventHeader) converter.convert((StdhepEvent) record);
+                  currentEvent.put("INPUT_FILE", files.get(currentFile));
                   currentEventNumber++;
                   break;
                }

lcsim/src/org/lcsim/util/loop
LCIOEventSource.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- LCIOEventSource.java	15 Mar 2007 05:24:30 -0000	1.4
+++ LCIOEventSource.java	17 Nov 2009 16:53:49 -0000	1.5
@@ -1,12 +1,9 @@
 package org.lcsim.util.loop;
 
-import java.io.BufferedReader;
 import java.io.EOFException;
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import org.freehep.record.source.EndOfSourceException;
@@ -18,7 +15,7 @@
 /**
  * Convert an LCIOReader to a SequentialRecordSource
  * @author tonyj
- * @version $Id: LCIOEventSource.java,v 1.4 2007/03/15 05:24:30 tonyj Exp $
+ * @version $Id: LCIOEventSource.java,v 1.5 2009/11/17 16:53:49 tonyj Exp $
  */
 public class LCIOEventSource implements SequentialRecordSource
 {
@@ -92,6 +89,7 @@
          try
          {
             currentEvent = reader.read();
+            currentEvent.put("INPUT_FILE",files.get(currentFile));
          }
          catch (EOFException x)
          {
CVSspam 0.2.8