Print

Print


Commit in java/trunk/evio on MAIN
pom.xml+2-8629 -> 630
src/main/java/org/hps/evio/TestRunEvioToLcio.java+5-1629 -> 630
                          /TestRunReconToEvio.java+1-7629 -> 630
                          /TestRunTriggeredReconToEvio.java+1-7629 -> 630
+9-23
4 modified files
Move to JEVIO 4.3.1 release from CODA and move copied older version to sandbox.  Minor modifications to EVIO module to fix compilation errors.

java/trunk/evio
pom.xml 629 -> 630
--- java/trunk/evio/pom.xml	2014-05-23 05:05:02 UTC (rev 629)
+++ java/trunk/evio/pom.xml	2014-05-23 21:49:28 UTC (rev 630)
@@ -1,42 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
     <modelVersion>4.0.0</modelVersion>
     <artifactId>hps-evio</artifactId>
     <name>evio</name>
     <description>HPS EVIO utilities package</description>
-    
     <parent>
         <groupId>org.hps</groupId>
         <artifactId>hps-parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>
         <version>3.0.2-SNAPSHOT</version>
     </parent>
-    
     <scm>
         <url>http://java.freehep.org/svn/repos/hps/list/java/trunk/evio/</url>
         <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/evio/</connection>
         <developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/evio/</developerConnection>
     </scm>
-    
     <dependencies>
+<!--    
         <dependency>
             <groupId>org.hps</groupId>
             <artifactId>hps-jevio</artifactId>
         </dependency>
-<!--        
+-->        
         <dependency>
             <groupId>org.jlab.coda</groupId>
             <artifactId>jevio</artifactId>
             <version>4.3.1</version>
         </dependency>
--->        
         <dependency>
             <groupId>org.hps</groupId>
             <artifactId>hps-tracking</artifactId>
         </dependency>
     </dependencies>
-    
     <build>
         <plugins>
             <plugin>
@@ -117,5 +112,4 @@
             </plugin>
         </plugins>
     </build>
-        
 </project>

java/trunk/evio/src/main/java/org/hps/evio
TestRunEvioToLcio.java 629 -> 630
--- java/trunk/evio/src/main/java/org/hps/evio/TestRunEvioToLcio.java	2014-05-23 05:05:02 UTC (rev 629)
+++ java/trunk/evio/src/main/java/org/hps/evio/TestRunEvioToLcio.java	2014-05-23 21:49:28 UTC (rev 630)
@@ -282,7 +282,11 @@
                 nEvents++;
             }
             System.out.println("Last physics event time: " + time / 1000 + " - " + new Date(time));
-            reader.close();
+            try {
+                reader.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
         System.out.println("No more data");
 

java/trunk/evio/src/main/java/org/hps/evio
TestRunReconToEvio.java 629 -> 630
--- java/trunk/evio/src/main/java/org/hps/evio/TestRunReconToEvio.java	2014-05-23 05:05:02 UTC (rev 629)
+++ java/trunk/evio/src/main/java/org/hps/evio/TestRunReconToEvio.java	2014-05-23 21:49:28 UTC (rev 630)
@@ -56,13 +56,7 @@
 
 	protected void endOfData() {
 		System.out.println(this.getClass().getSimpleName() + " - wrote " + eventsWritten + " EVIO events in job.");
-		try {
-			writer.close();
-		} catch (EvioException e) {
-			throw new RuntimeException(e);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
+		writer.close();		
 	}
 
 	protected void process(EventHeader event) {

java/trunk/evio/src/main/java/org/hps/evio
TestRunTriggeredReconToEvio.java 629 -> 630
--- java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToEvio.java	2014-05-23 05:05:02 UTC (rev 629)
+++ java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToEvio.java	2014-05-23 21:49:28 UTC (rev 630)
@@ -92,13 +92,7 @@
     @Override
     protected void endOfData() {
         System.out.println(this.getClass().getSimpleName() + " - wrote " + eventsWritten + " EVIO events in job; " + builderQueue.size() + " incomplete events in queue.");
-        try {
-            writer.close();
-        } catch (EvioException e) {
-            throw new RuntimeException(e);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+        writer.close();        
     }
 
     @Override
SVNspam 0.1