From b768fe61866fbc4f9b285a033113167bea7516a3 Mon Sep 17 00:00:00 2001 From: darksnake Date: Wed, 30 Mar 2016 16:01:28 +0300 Subject: [PATCH] minor fixes. Updated libraries --- pom.xml | 10 +++++----- src/main/java/hep/dataforge/trapping/Trapping.java | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 8ce882d..eab8dda 100644 --- a/pom.xml +++ b/pom.xml @@ -20,16 +20,16 @@ org.apache.maven.plugins maven-resources-plugin - 2.6 + 2.7 org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + 2.5.1 - 1.7 - 1.7 + 1.8 + 1.8 true @@ -46,7 +46,7 @@ org.apache.commons commons-math3 - 3.2 + 3.5 net.java.dev.jna diff --git a/src/main/java/hep/dataforge/trapping/Trapping.java b/src/main/java/hep/dataforge/trapping/Trapping.java index f56813a..dea0a16 100644 --- a/src/main/java/hep/dataforge/trapping/Trapping.java +++ b/src/main/java/hep/dataforge/trapping/Trapping.java @@ -14,9 +14,11 @@ public class Trapping { public static void main(String[] args) throws FileNotFoundException { PrintWriter out = null; - if ((args != null) && (args[0] != null)) { + if ((args.length > 0) && (args[0] != null)) { File file = new File(args[0]); out = new PrintWriter(file); + } else { + } double E = 18000d; @@ -31,7 +33,7 @@ public class Trapping { int rejected = 0; int lowE = 0; - ArrayList results = simulator.simulateAll(E, 500000); + ArrayList results = simulator.simulateAll(E, 50000); for (Iterator it = results.iterator(); it.hasNext();) { ElectronTrappingSimulator.SimulaionResult res = it.next(); @@ -86,7 +88,6 @@ public class Trapping { out.printf("The total number of LOWENERGY events is %d.%n%n", lowE); out.close(); } - } }