Commit in lcsim/src/org/lcsim on MAIN
event/EventHeader.java+2-21.22 -> 1.23
event/base/BaseLCSimEvent.java+4-41.8 -> 1.9
util/loop/LCIOEventSource.java+2-21.6 -> 1.7
         /StdhepEventSource.java+3-31.9 -> 1.10
+11-11
4 modified files
take out setting of input_file; causes problems in the lcsim browser

lcsim/src/org/lcsim/event
EventHeader.java 1.22 -> 1.23
diff -u -r1.22 -r1.23
--- EventHeader.java	17 Nov 2009 20:10:31 -0000	1.22
+++ EventHeader.java	2 Jul 2012 21:50:17 -0000	1.23
@@ -14,14 +14,14 @@
  * The event header from which information about the rest of the event
  * can be obtained.
  * @author Tony Johnson
- * @version $Id: EventHeader.java,v 1.22 2009/11/17 20:10:31 jeremy Exp $
+ * @version $Id: EventHeader.java,v 1.23 2012/07/02 21:50:17 jeremy Exp $
  */
 public interface EventHeader extends MCEvent
 {
     /**
      * Get the path to the file source for this event.
      */
-    String getInputFile();
+    //String getInputFile();
 
     /**
      * Get the list of MC particles associated with this event.

lcsim/src/org/lcsim/event/base
BaseLCSimEvent.java 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- BaseLCSimEvent.java	17 Apr 2012 23:28:11 -0000	1.8
+++ BaseLCSimEvent.java	2 Jul 2012 21:50:17 -0000	1.9
@@ -60,10 +60,10 @@
         }
     }
     
-    public String getInputFile()
-    {
-        return (String)get("INPUT_FILE");
-    }
+    //public String getInputFile()
+    //{
+    //    return (String)get("INPUT_FILE");
+    //}
     
     public String toString()
     {

lcsim/src/org/lcsim/util/loop
LCIOEventSource.java 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- LCIOEventSource.java	15 Jun 2012 05:24:20 -0000	1.6
+++ LCIOEventSource.java	2 Jul 2012 21:50:17 -0000	1.7
@@ -16,7 +16,7 @@
 /**
  * Convert an LCIOReader to a SequentialRecordSource
  * @author tonyj
- * @version $Id: LCIOEventSource.java,v 1.6 2012/06/15 05:24:20 onoprien Exp $
+ * @version $Id: LCIOEventSource.java,v 1.7 2012/07/02 21:50:17 jeremy Exp $
  */
 public class LCIOEventSource extends AbstractRecordSource {
 
@@ -127,7 +127,7 @@
     for (;;) {
       try {
         currentEvent = reader.read();
-        currentEvent.put("INPUT_FILE", files.get(currentFile));
+        //currentEvent.put("INPUT_FILE", files.get(currentFile));
         _index++;
       } catch (EOFException x) {
         _size[currentFile] = _index;

lcsim/src/org/lcsim/util/loop
StdhepEventSource.java 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- StdhepEventSource.java	15 Jun 2012 05:24:20 -0000	1.9
+++ StdhepEventSource.java	2 Jul 2012 21:50:17 -0000	1.10
@@ -21,7 +21,7 @@
  * {@link RecordSource} implementation that wraps {@link StdhepReader}.
  * 
  * @author tonyj
- * @version $Id: StdhepEventSource.java,v 1.9 2012/06/15 05:24:20 onoprien Exp $
+ * @version $Id: StdhepEventSource.java,v 1.10 2012/07/02 21:50:17 jeremy Exp $
  */
 public class StdhepEventSource extends AbstractRecordSource {
 
@@ -83,7 +83,7 @@
           StdhepRecord record = reader.nextRecord();
           if (record instanceof StdhepEvent) {
             currentEvent = (EventHeader) converter.convert((StdhepEvent) record);
-            currentEvent.put("INPUT_FILE", files.get(currentFile));
+            //currentEvent.put("INPUT_FILE", files.get(currentFile));
             currentEventNumber++;
             break;
           }
@@ -168,7 +168,7 @@
               currentEventNumber++;
               if (currentEventNumber == index) {
                 currentEvent = (EventHeader) converter.convert((StdhepEvent) record);
-                currentEvent.put("INPUT_FILE", files.get(currentFile));
+                //currentEvent.put("INPUT_FILE", files.get(currentFile));
                 return;
               }
             }
CVSspam 0.2.12


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