Print

Print


Commit in lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/util on MAIN
ListMap.java+2-11.1.1.1 -> 1.2
NoSuchParameterException.java+5-71.1.1.1 -> 1.2
job/Driver.java+2-21.2 -> 1.3
   /JobManager.java+15-21.4 -> 1.5
swim/BField.java+1-21.4 -> 1.5
+25-14
5 modified files
Bug fix in ListMap, miscellaneous minor changes

lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/util
ListMap.java 1.1.1.1 -> 1.2
diff -u -r1.1.1.1 -r1.2
--- ListMap.java	10 Dec 2008 22:03:06 -0000	1.1.1.1
+++ ListMap.java	1 Feb 2009 19:40:41 -0000	1.2
@@ -6,7 +6,7 @@
  * Map of keys to lists of values.
  * 
  * @author D. Onoprienko
- * @version $Id: ListMap.java,v 1.1.1.1 2008/12/10 22:03:06 jeremy Exp $
+ * @version $Id: ListMap.java,v 1.2 2009/02/01 19:40:41 onoprien Exp $
  */
 public class ListMap<K,V> implements List<V> {
   
@@ -167,6 +167,7 @@
    * Adds the specified hits to the list mapped to the given key.
    */
   public void add(K key, List<? extends V> values) {
+    if (values.isEmpty()) return;
     ArrayList<V> list = _map.get(key);
     if (list == null) {
       list = new ArrayList<V>(values);

lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/util
NoSuchParameterException.java 1.1.1.1 -> 1.2
diff -u -r1.1.1.1 -r1.2
--- NoSuchParameterException.java	10 Dec 2008 22:03:06 -0000	1.1.1.1
+++ NoSuchParameterException.java	1 Feb 2009 19:40:41 -0000	1.2
@@ -4,22 +4,20 @@
  * Exception to be thrown by <tt>set(name,value)</tt> methods of various classes.
  *
  * @author D. Onoprienko
- * @version $Id: NoSuchParameterException.java,v 1.1.1.1 2008/12/10 22:03:06 jeremy Exp $
+ * @version $Id: NoSuchParameterException.java,v 1.2 2009/02/01 19:40:41 onoprien Exp $
  */
 public class NoSuchParameterException extends RuntimeException {
+
+  static private String _err = "No such parameter name";
   
 // -- Constructors :  ----------------------------------------------------------
   
   public NoSuchParameterException() {
-    super("No such parameter name\n Method: set(name,value)");
+    super(_err);
   }
   
   public NoSuchParameterException(String parName) {
-    super("No such parameter name: " + parName + "\n Method: set(name,value)");
-  }
-  
-  public NoSuchParameterException(String parName, Class cl) {
-    super("No such parameter name: " + parName + "\n Method: set(name,value)\n Class: " + cl.getName());
+    super(_err + ": " + parName);
   }
   
 }

lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/util/job
Driver.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- Driver.java	17 Dec 2008 01:21:22 -0000	1.2
+++ Driver.java	1 Feb 2009 19:40:41 -0000	1.3
@@ -28,7 +28,7 @@
  * 
  * 
  * @author D. Onoprienko
- * @version $Id: Driver.java,v 1.2 2008/12/17 01:21:22 onoprien Exp $
+ * @version $Id: Driver.java,v 1.3 2009/02/01 19:40:41 onoprien Exp $
  */
 public class Driver extends org.lcsim.util.Driver {
   
@@ -108,7 +108,7 @@
           if (_logPrefix.length() == 0) _logPrefix = null;
         }
       } else {
-        throw new NoSuchParameterException(name, this.getClass());
+        throw new NoSuchParameterException(name);
       }
     } catch (ClassCastException x) {
       throw new IllegalArgumentException(ERR_VIT, x);

lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/util/job
JobManager.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- JobManager.java	26 Jan 2009 20:50:35 -0000	1.4
+++ JobManager.java	1 Feb 2009 19:40:41 -0000	1.5
@@ -27,7 +27,7 @@
  * </ul>
  * 
  * @author D. Onoprienko
- * @version $Id: JobManager.java,v 1.4 2009/01/26 20:50:35 onoprien Exp $
+ * @version $Id: JobManager.java,v 1.5 2009/02/01 19:40:41 onoprien Exp $
  */
 public class JobManager extends org.lcsim.util.Driver implements ConditionsListener {
   
@@ -40,7 +40,9 @@
   
   private HashMap<Class, Object> _singletons;
   
-  private AIDA _aida;  
+  private AIDA _aida;
+
+  private int _nEvents;
 
   
 // -- Constructors and initialization :  ---------------------------------------
@@ -68,6 +70,10 @@
   
   /** Called by the framework to process event. */
   public void process(EventHeader event) {
+    if (_nEvents > 0) {
+      int i = event.getEventNumber();
+      if (i % _nEvents == 0 && i > 0) System.out.println(i +" events processed");
+    }
     if (_lastEvent == null) {
       _lastEvent = new JobEvent(this, event.getDetector());
       fireJobEvent(_lastEvent);
@@ -296,4 +302,11 @@
       }
     }
   }
+
+// -- Printing statistics :  ---------------------------------------------------
+
+  /** Tells <tt>JonManager</tt> to print a message every <tt>nEvents</tt>. */
+  public void printProgress(int nEvents) {
+    _nEvents = nEvents;
+  }
 }

lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/util/swim
BField.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- BField.java	29 Jan 2009 20:35:41 -0000	1.4
+++ BField.java	1 Feb 2009 19:40:41 -0000	1.5
@@ -3,7 +3,6 @@
 import hep.physics.vec.Hep3Vector;
 
 import org.lcsim.contrib.onoprien.util.ConstHep3Vector;
-import org.lcsim.contrib.onoprien.util.constants.Units;
 import org.lcsim.contrib.onoprien.util.job.JobEvent;
 import org.lcsim.contrib.onoprien.util.job.JobEventListener;
 import org.lcsim.contrib.onoprien.util.job.JobManager;
@@ -13,7 +12,7 @@
  * geometrical trajectory parameters into particle momentum.
  *
  * @author D. Onoprienko
- * @version $Id: BField.java,v 1.4 2009/01/29 20:35:41 onoprien Exp $
+ * @version $Id: BField.java,v 1.5 2009/02/01 19:40:41 onoprien Exp $
  */
 public class BField implements JobEventListener {
   
CVSspam 0.2.8