Print

Print


Commit in lcsim on MAIN
pom.xml+3-31.184 -> 1.185
src/org/lcsim/util/loop/LCSimLoop.java+2-11.11 -> 1.12
+5-4
2 modified files
Switch to release version of freehep-record.
Make sure endOfData() is called on drivers at the end of any non-interactive loop.

lcsim
pom.xml 1.184 -> 1.185
diff -u -r1.184 -r1.185
--- pom.xml	15 Jun 2012 05:24:20 -0000	1.184
+++ pom.xml	20 Jun 2012 00:15:22 -0000	1.185
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>lcsim</artifactId>
     <name>org.lcsim</name>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0</version>
     <description>A Java reconstruction and analysis framework for LCD studies.</description>
     <scm>
         <connection>scm:cvs:pserver:[log in to unmask]:/cvs/lcd:lcsim</connection>
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.lcsim</groupId>
         <artifactId>lcsim-parent</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0</version>
     </parent>
     <distributionManagement>
         <site>
@@ -261,7 +261,7 @@
         <dependency>
             <groupId>org.lcsim</groupId>
             <artifactId>GeomConverter</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0</version>
         </dependency>
         <!-- FIXME: This dep is not actually used in lcsim. -->
         <dependency>

lcsim/src/org/lcsim/util/loop
LCSimLoop.java 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- LCSimLoop.java	15 Jun 2012 05:24:20 -0000	1.11
+++ LCSimLoop.java	20 Jun 2012 00:15:22 -0000	1.12
@@ -151,11 +151,12 @@
         execute(Command.GO, true);
       } else {
         execute(Command.GO_N, number, true);
+        execute(Command.STOP); // make sure endOfData() is called on drivers
       }
       Throwable t = getProgress().getException();
       if (t != null && t instanceof IOException) throw (IOException)t;
       if (out != null) printStatistics(out);
-      return getCountableConsumed();
+      return getSupplied();
     }
    
    /**
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