1 removed + 22 modified, total 23 files
lcsim/src/org/lcsim/contrib/onoprien/crux
diff -u -r1.1 -r1.2
--- CruxConfig.java 25 Nov 2008 21:17:00 -0000 1.1
+++ CruxConfig.java 2 Dec 2008 23:56:07 -0000 1.2
@@ -22,6 +22,8 @@
import org.lcsim.contrib.onoprien.util.swim.ZDisk;
import org.lcsim.contrib.onoprien.util.swim.ZCylinder;
+import org.lcsim.contrib.onoprien.crux.geom.CalGeometryConfig;
+
import static org.lcsim.contrib.onoprien.crux.geom.CalModule.Attribute.*;
/**
@@ -43,9 +45,9 @@
* </ul>
*
* @author D. Onoprienko
- * @version $Id: CruxConfig.java,v 1.1 2008/11/25 21:17:00 onoprien Exp $
+ * @version $Id: CruxConfig.java,v 1.2 2008/12/02 23:56:07 onoprien Exp $
*/
-public class CruxConfig implements JobEventListener {
+public class CruxConfig implements JobEventListener, CalGeometryConfig {
// -- Constructors : ----------------------------------------------------------
@@ -181,7 +183,7 @@
}
}
}
-
+
/** Returns a list of all modules. */
public List<CalModule> getModules() {
return Collections.unmodifiableList(_modules);
lcsim/src/org/lcsim/contrib/onoprien/crux
diff -u -r1.1 -r1.2
--- CruxManager.java 25 Nov 2008 21:17:00 -0000 1.1
+++ CruxManager.java 2 Dec 2008 23:56:07 -0000 1.2
@@ -12,7 +12,8 @@
import org.lcsim.geometry.Detector;
import org.lcsim.util.aida.AIDA;
-import org.lcsim.contrib.onoprien.util.Driver;
+import org.lcsim.contrib.onoprien.util.job.Driver;
+import org.lcsim.contrib.onoprien.util.job.JobManager;
import org.lcsim.contrib.onoprien.crux.geom.CalGeometry;
import org.lcsim.contrib.onoprien.crux.infrastructure.*;
@@ -29,7 +30,7 @@
*
*
* @author D. Onoprienko
- * @version $Id: CruxManager.java,v 1.1 2008/11/25 21:17:00 onoprien Exp $
+ * @version $Id: CruxManager.java,v 1.2 2008/12/02 23:56:07 onoprien Exp $
*/
public class CruxManager extends Driver {
@@ -37,7 +38,8 @@
private CruxManager() {
_config = new CruxConfig(this);
- _geom = new CalGeometry(this);
+ _geom = new CalGeometry(_config);
+ JobManager.defaultInstance().put(this, CruxManager.class);
}
lcsim/src/org/lcsim/contrib/onoprien/crux/algorithms
diff -u -r1.6 -r1.7
--- ClusteringDriver.java 25 Nov 2008 21:02:55 -0000 1.6
+++ ClusteringDriver.java 2 Dec 2008 23:56:08 -0000 1.7
@@ -9,7 +9,7 @@
import org.lcsim.event.EventHeader;
import org.lcsim.recon.cluster.util.Clusterer;
-import org.lcsim.contrib.onoprien.util.Driver;
+import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.crux.auxdrivers.HitMapFilterDriver;
import org.lcsim.contrib.onoprien.crux.infrastructure.*;
@@ -22,7 +22,7 @@
* input hit map from the event,
*
* @author D. Onoprienko
- * @version $Id: ClusteringDriver.java,v 1.6 2008/11/25 21:02:55 onoprien Exp $
+ * @version $Id: ClusteringDriver.java,v 1.7 2008/12/02 23:56:08 onoprien Exp $
*/
public class ClusteringDriver extends Driver {
lcsim/src/org/lcsim/contrib/onoprien/crux/algorithms
diff -u -r1.3 -r1.4
--- TrackedParticleFinderDriver.java 25 Nov 2008 21:02:55 -0000 1.3
+++ TrackedParticleFinderDriver.java 2 Dec 2008 23:56:08 -0000 1.4
@@ -10,7 +10,7 @@
import org.lcsim.units.clhep.SystemOfUnits;
import org.lcsim.contrib.onoprien.util.NoSuchParameterException;
-import org.lcsim.contrib.onoprien.util.Driver;
+import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.crux.infrastructure.*;
@@ -18,7 +18,7 @@
*
*
* @author D. Onoprienko
- * @version $Id: TrackedParticleFinderDriver.java,v 1.3 2008/11/25 21:02:55 onoprien Exp $
+ * @version $Id: TrackedParticleFinderDriver.java,v 1.4 2008/12/02 23:56:08 onoprien Exp $
*/
public class TrackedParticleFinderDriver extends Driver {
lcsim/src/org/lcsim/contrib/onoprien/crux/algorithms
diff -u -r1.3 -r1.4
--- ValidationDriver.java 5 Nov 2008 03:32:39 -0000 1.3
+++ ValidationDriver.java 2 Dec 2008 23:56:08 -0000 1.4
@@ -7,7 +7,7 @@
import hep.physics.vec.VecOp;
import org.lcsim.event.EventHeader;
-import org.lcsim.contrib.onoprien.util.Driver;
+import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.crux.infrastructure.*;
import org.lcsim.contrib.onoprien.crux.mctruth.MCTruthCrux;
@@ -37,7 +37,7 @@
* is called for a vertex after its daughter particles have been validated.
*
* @author D. Onoprienko
- * @version $Id: ValidationDriver.java,v 1.3 2008/11/05 03:32:39 onoprien Exp $
+ * @version $Id: ValidationDriver.java,v 1.4 2008/12/02 23:56:08 onoprien Exp $
*/
public class ValidationDriver extends Driver {
lcsim/src/org/lcsim/contrib/onoprien/crux/algorithms/rosary
diff -u -r1.5 -r1.6
--- RosaryClusterer.java 25 Nov 2008 21:02:55 -0000 1.5
+++ RosaryClusterer.java 2 Dec 2008 23:56:08 -0000 1.6
@@ -15,7 +15,7 @@
import org.lcsim.geometry.IDDecoder;
import org.lcsim.recon.cluster.util.Clusterer;
-import org.lcsim.contrib.onoprien.util.Driver;
+import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.util.job.JobEvent;
import org.lcsim.contrib.onoprien.util.job.JobEventListener;
import org.lcsim.contrib.onoprien.util.job.JobManager;
@@ -29,7 +29,7 @@
*
*
* @author D. Onoprienko
- * @version $Id: RosaryClusterer.java,v 1.5 2008/11/25 21:02:55 onoprien Exp $
+ * @version $Id: RosaryClusterer.java,v 1.6 2008/12/02 23:56:08 onoprien Exp $
*/
public class RosaryClusterer extends Driver implements Clusterer, JobEventListener {
lcsim/src/org/lcsim/contrib/onoprien/crux/auxdrivers
diff -u -r1.2 -r1.3
--- HitMapFilterDriver.java 5 Nov 2008 03:32:39 -0000 1.2
+++ HitMapFilterDriver.java 2 Dec 2008 23:56:08 -0000 1.3
@@ -6,7 +6,7 @@
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
-import org.lcsim.contrib.onoprien.util.Driver;
+import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.crux.infrastructure.*;
@@ -25,7 +25,7 @@
* used by the filter to look up hits by their <tt>CellID</tt>.
*
* @author D. Onoprienko
- * @version $Id: HitMapFilterDriver.java,v 1.2 2008/11/05 03:32:39 onoprien Exp $
+ * @version $Id: HitMapFilterDriver.java,v 1.3 2008/12/02 23:56:08 onoprien Exp $
*/
public class HitMapFilterDriver extends Driver {
@@ -69,7 +69,7 @@
* @param name Name of parameter to be set. Case is ignored.
* @param values List of values to be used for setting the parameter.
* @throws NoSuchParameterException Thrown if the supplied parameter name is unknown.
- * @throws IllegalArgumentException Thrown if incorrect nunber of values, or a value
+ * @throws IllegalArgumentException Thrown if incorrect number of values, or a value
* of incorrect type is supplied.
*/
public void set(String name, Object... values) {
lcsim/src/org/lcsim/contrib/onoprien/crux/diagnostics
diff -u -r1.6 -r1.7
--- ClusteringTest.java 25 Nov 2008 21:02:55 -0000 1.6
+++ ClusteringTest.java 2 Dec 2008 23:56:08 -0000 1.7
@@ -13,7 +13,7 @@
import org.lcsim.geometry.IDDecoder;
import org.lcsim.util.aida.AIDA;
-import org.lcsim.contrib.onoprien.util.Driver;
+import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.util.job.JobEvent;
import org.lcsim.contrib.onoprien.util.job.JobEventListener;
import org.lcsim.contrib.onoprien.util.job.JobManager;
@@ -25,7 +25,7 @@
*
*
* @author D. Onoprienko
- * @version $Id: ClusteringTest.java,v 1.6 2008/11/25 21:02:55 onoprien Exp $
+ * @version $Id: ClusteringTest.java,v 1.7 2008/12/02 23:56:08 onoprien Exp $
*/
public class ClusteringTest extends Driver implements JobEventListener {
@@ -65,7 +65,7 @@
* @param name Name of parameter to be set. Case is ignored.
* @param values List of values to be used for setting the parameter.
* @throws NoSuchParameterException Thrown if the supplied parameter name is unknown.
- * @throws IllegalArgumentException Thrown if incorrect nunber of values, or a value
+ * @throws IllegalArgumentException Thrown if incorrect number of values, or a value
* of incorrect type is supplied.
*/
public void set(String name, Object... values) {
lcsim/src/org/lcsim/contrib/onoprien/crux/diagnostics
diff -u -r1.4 -r1.5
--- TrackingTest.java 5 Nov 2008 03:32:39 -0000 1.4
+++ TrackingTest.java 2 Dec 2008 23:56:08 -0000 1.5
@@ -5,7 +5,7 @@
import org.lcsim.event.EventHeader;
-import org.lcsim.contrib.onoprien.util.Driver;
+import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.crux.infrastructure.*;
import org.lcsim.contrib.onoprien.crux.mctruth.MCTruthCrux;
@@ -16,7 +16,7 @@
* fetching it from the event record.
*
* @author D. Onoprienko
- * @version $Id: TrackingTest.java,v 1.4 2008/11/05 03:32:39 onoprien Exp $
+ * @version $Id: TrackingTest.java,v 1.5 2008/12/02 23:56:08 onoprien Exp $
*/
public class TrackingTest extends Driver {
lcsim/src/org/lcsim/contrib/onoprien/crux/geom
diff -u -r1.1 -r1.2
--- CalGeometry.java 25 Nov 2008 21:17:00 -0000 1.1
+++ CalGeometry.java 2 Dec 2008 23:56:08 -0000 1.2
@@ -3,9 +3,6 @@
import java.util.*;
import hep.physics.vec.Hep3Vector;
-import org.lcsim.contrib.onoprien.crux.CruxConfig;
-import org.lcsim.contrib.onoprien.crux.CruxManager;
-import org.lcsim.contrib.onoprien.crux.infrastructure.*;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.Subdetector;
@@ -20,19 +17,20 @@
* detector geometry related services to other classes.
*
* @author D. Onoprienko
- * @version $Id: CalGeometry.java,v 1.1 2008/11/25 21:17:00 onoprien Exp $
+ * @version $Id: CalGeometry.java,v 1.2 2008/12/02 23:56:08 onoprien Exp $
*/
public class CalGeometry implements JobEventListener {
// -- Constructors and initialization : ---------------------------------------
- public CalGeometry(CruxManager cruxManager) {
- _cruxMan = cruxManager;
- JobManager.defaultInstance().addListener(this, cruxManager.getConfig());
+ public CalGeometry(CalGeometryConfig config) {
+ _config = config;
+ JobManager jobManager = JobManager.defaultInstance();
+ jobManager.addListener(this, config);
+ jobManager.put(this, CalGeometry.class);
}
public void detectorChanged(JobEvent jEvent) {
- _config = _cruxMan.getConfig();
_detector = jEvent.getDetector();
_modules = new ArrayList(_config.getModules());
}
@@ -125,8 +123,7 @@
// -- Private parts : ---------------------------------------------------------
- private CruxManager _cruxMan;
- private CruxConfig _config;
+ private CalGeometryConfig _config;
private Detector _detector;
private ArrayList<CalModule> _modules;
lcsim/src/org/lcsim/contrib/onoprien/crux/infrastructure
diff -u -r1.4 -r1.5
--- CruxHitMap.java 25 Nov 2008 21:02:55 -0000 1.4
+++ CruxHitMap.java 2 Dec 2008 23:56:08 -0000 1.5
@@ -9,10 +9,11 @@
import org.lcsim.event.CalorimeterHit;
/**
- *
+ * Mapping of CellID to CalorimeterHits.
+ * // FIXME: need to structure by module to speed up access
*
* @author D. Onoprienko
- * @version $Id: CruxHitMap.java,v 1.4 2008/11/25 21:02:55 onoprien Exp $
+ * @version $Id: CruxHitMap.java,v 1.5 2008/12/02 23:56:08 onoprien Exp $
*/
public class CruxHitMap extends org.lcsim.util.hitmap.HitMap {
@@ -146,7 +147,4 @@
private CalGeometry _geom;
-// -- Filter class : ----------------------------------------------------------
-
-
}
lcsim/src/org/lcsim/contrib/onoprien/crux/mctruth
diff -u -r1.2 -r1.3
--- MCTruthDriverCrux.java 5 Nov 2008 03:32:39 -0000 1.2
+++ MCTruthDriverCrux.java 2 Dec 2008 23:56:08 -0000 1.3
@@ -2,14 +2,14 @@
import org.lcsim.event.EventHeader;
-import org.lcsim.contrib.onoprien.util.Driver;
+import org.lcsim.contrib.onoprien.util.job.Driver;
/**
* Driver that creates {@link MCTruthCrux} object, and saves it into the event record.
*
*
* @author D. Onoprienko
- * @version $Id: MCTruthDriverCrux.java,v 1.2 2008/11/05 03:32:39 onoprien Exp $
+ * @version $Id: MCTruthDriverCrux.java,v 1.3 2008/12/02 23:56:08 onoprien Exp $
*/
public class MCTruthDriverCrux extends Driver {
lcsim/src/org/lcsim/contrib/onoprien/crux/tests
diff -u -r1.4 -r1.5
--- TestDriver.java 25 Nov 2008 21:02:56 -0000 1.4
+++ TestDriver.java 2 Dec 2008 23:56:08 -0000 1.5
@@ -8,7 +8,7 @@
import org.lcsim.event.EventHeader;
import org.lcsim.recon.cluster.util.CalHitMapDriver;
-import org.lcsim.contrib.onoprien.util.Driver;
+import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.crux.algorithms.TrackedParticleFinderDriver;
import org.lcsim.contrib.onoprien.crux.algorithms.ValidationDriver;
@@ -23,7 +23,7 @@
* Main driver for testing PFA code.
*
* @author D. Onoprienko
- * @version $Id: TestDriver.java,v 1.4 2008/11/25 21:02:56 onoprien Exp $
+ * @version $Id: TestDriver.java,v 1.5 2008/12/02 23:56:08 onoprien Exp $
*/
public class TestDriver extends Driver {
lcsim/src/org/lcsim/contrib/onoprien/crux/tests
diff -u -r1.5 -r1.6
--- TestDriverClustering.java 25 Nov 2008 21:02:56 -0000 1.5
+++ TestDriverClustering.java 2 Dec 2008 23:56:08 -0000 1.6
@@ -12,7 +12,7 @@
import org.lcsim.recon.cluster.util.CalHitMapDriver;
import org.lcsim.recon.cluster.util.Clusterer;
-import org.lcsim.contrib.onoprien.util.Driver;
+import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.crux.algorithms.ClusteringDriver;
import org.lcsim.contrib.onoprien.crux.auxdrivers.HitMapFilterDriver;
@@ -24,7 +24,7 @@
*
*
* @author D. Onoprienko
- * @version $Id: TestDriverClustering.java,v 1.5 2008/11/25 21:02:56 onoprien Exp $
+ * @version $Id: TestDriverClustering.java,v 1.6 2008/12/02 23:56:08 onoprien Exp $
*/
public class TestDriverClustering extends Driver {
lcsim/src/org/lcsim/contrib/onoprien/crux/tests
diff -u -r1.3 -r1.4
--- TestDriverMCTruth.java 5 Nov 2008 03:32:39 -0000 1.3
+++ TestDriverMCTruth.java 2 Dec 2008 23:56:08 -0000 1.4
@@ -7,7 +7,7 @@
import org.lcsim.event.MCParticle;
import org.lcsim.event.SimTrackerHit;
-import org.lcsim.contrib.onoprien.util.Driver;
+import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.crux.mctruth.MCTruthCrux;
import org.lcsim.contrib.onoprien.crux.mctruth.MCTruthDriverCrux;
@@ -16,7 +16,7 @@
*
*
* @author D. Onoprienko
- * @version $Id: TestDriverMCTruth.java,v 1.3 2008/11/05 03:32:39 onoprien Exp $
+ * @version $Id: TestDriverMCTruth.java,v 1.4 2008/12/02 23:56:08 onoprien Exp $
*/
public class TestDriverMCTruth extends Driver {
lcsim/src/org/lcsim/contrib/onoprien/crux/tests
diff -u -r1.5 -r1.6
--- TestDriverRosary.java 25 Nov 2008 21:02:56 -0000 1.5
+++ TestDriverRosary.java 2 Dec 2008 23:56:08 -0000 1.6
@@ -15,7 +15,7 @@
import org.lcsim.event.EventHeader;
import org.lcsim.recon.cluster.util.CalHitMapDriver;
-import org.lcsim.contrib.onoprien.util.Driver;
+import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.crux.algorithms.TrackedParticleFinderDriver;
import org.lcsim.contrib.onoprien.crux.algorithms.ValidationDriver;
@@ -31,7 +31,7 @@
*
*
* @author D. Onoprienko
- * @version $Id: TestDriverRosary.java,v 1.5 2008/11/25 21:02:56 onoprien Exp $
+ * @version $Id: TestDriverRosary.java,v 1.6 2008/12/02 23:56:08 onoprien Exp $
*/
public class TestDriverRosary extends Driver {
lcsim/src/org/lcsim/contrib/onoprien/crux/tracking
diff -u -r1.6 -r1.7
--- CheatTrackFinderDriver.java 27 Nov 2008 23:57:00 -0000 1.6
+++ CheatTrackFinderDriver.java 2 Dec 2008 23:56:08 -0000 1.7
@@ -9,7 +9,7 @@
import org.lcsim.event.SimTrackerHit;
import org.lcsim.contrib.onoprien.util.ConstHep3Vector;
-import org.lcsim.contrib.onoprien.util.Driver;
+import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.util.ListMap;
import org.lcsim.contrib.onoprien.util.NoSuchParameterException;
import org.lcsim.contrib.onoprien.util.swim.BField;
@@ -31,7 +31,7 @@
* creation of the {@link CruxTrack} object for the given {@link MCParticle}.
*
* @author D. Onoprienko
- * @version $Id: CheatTrackFinderDriver.java,v 1.6 2008/11/27 23:57:00 onoprien Exp $
+ * @version $Id: CheatTrackFinderDriver.java,v 1.7 2008/12/02 23:56:08 onoprien Exp $
*/
public class CheatTrackFinderDriver extends Driver {
lcsim/src/org/lcsim/contrib/onoprien/crux/tracking
diff -u -r1.4 -r1.5
--- CheatVertexFinderDriver.java 5 Nov 2008 03:32:39 -0000 1.4
+++ CheatVertexFinderDriver.java 2 Dec 2008 23:56:08 -0000 1.5
@@ -9,7 +9,7 @@
import org.lcsim.units.clhep.SystemOfUnits;
import org.lcsim.contrib.onoprien.util.NoSuchParameterException;
-import org.lcsim.contrib.onoprien.util.Driver;
+import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.crux.infrastructure.*;
import org.lcsim.contrib.onoprien.crux.mctruth.MCTruthCrux;
@@ -22,7 +22,7 @@
* or flies by it.
*
* @author D. Onoprienko
- * @version $Id: CheatVertexFinderDriver.java,v 1.4 2008/11/05 03:32:39 onoprien Exp $
+ * @version $Id: CheatVertexFinderDriver.java,v 1.5 2008/12/02 23:56:08 onoprien Exp $
*/
public class CheatVertexFinderDriver extends Driver {
lcsim/src/org/lcsim/contrib/onoprien/util
diff -u -r1.1 -r1.2
--- RemoveObjectDriver.java 5 Nov 2008 03:32:48 -0000 1.1
+++ RemoveObjectDriver.java 2 Dec 2008 23:56:08 -0000 1.2
@@ -4,11 +4,13 @@
import org.lcsim.event.EventHeader;
+import org.lcsim.contrib.onoprien.util.job.Driver;
+
/**
* Driver that removes specified objects from the event record.
*
* @author D. Onoprienko
- * @version $Id: RemoveObjectDriver.java,v 1.1 2008/11/05 03:32:48 onoprien Exp $
+ * @version $Id: RemoveObjectDriver.java,v 1.2 2008/12/02 23:56:08 onoprien Exp $
*/
public class RemoveObjectDriver extends Driver {
@@ -28,7 +30,7 @@
* @param name Name of parameter to be set. Case is ignored.
* @param values List of values to be used for setting the parameter.
* @throws NoSuchParameterException Thrown if the supplied parameter name is unknown.
- * @throws IllegalArgumentException Thrown if incorrect nunber of values, or a value
+ * @throws IllegalArgumentException Thrown if incorrect number of values, or a value
* of incorrect type is supplied.
*/
public void set(String name, Object... values) {
lcsim/src/org/lcsim/contrib/onoprien/util
diff -N Driver.java
--- Driver.java 25 Nov 2008 21:02:58 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,172 +0,0 @@
-package org.lcsim.contrib.onoprien.util;
-
-import java.util.logging.Level;
-
-import org.lcsim.event.EventHeader;
-
-/**
- * Base class for drivers. Adds functionality to {@link org.lcsim.util.Driver}.
- * <p>
- * Logging facility included in this class simply prints messages to standard output
- * when the {@link #log log(String, Level)} method is called with the level greater
- * or equal to the logging level set for this driver.
- * <p>
- * Typically, logging levels are set according to the following guidelines:
- * <dl>
- * <dt>SEVERE</dt><dd>Error messages.</dd>
- * <dt>WARNING</dt><dd>Messages about suspected errors.</dd>
- * <dt>INFO (default)</dt><dd>Very little output - things the user would like to see
- * when running interactively but not debugging or testing.</dd>
- * <dt>CONFIG</dt><dd>In addition, print out configuration information.</dd>
- * <dt>FINE</dt><dd>Print most important statistics for each major step in event processing.</dd>
- * <dt>FINER</dt><dd>Output for debugging</dd>
- * <dt>FINEST</dt><dd>Detailed diagnostic output - something only the developer would
- * like to see, and only when debugging a particular class or method.</dd>
- * </dl>
- *
- *
- * @author D. Onoprienko
- * @version $Id: Driver.java,v 1.2 2008/11/25 21:02:58 onoprien Exp $
- */
-public class Driver extends org.lcsim.util.Driver {
-
-// -- Constructors : ----------------------------------------------------------
-
- public Driver() {
- }
-
-// -- Setters : ---------------------------------------------------------------
-
- /**
- * Set any parameter.
- * The following parameters can be set with this method:
- * <p><dl>
- * <dt>"LOG_LEVEL"</dt> <dd>Logging level. See {@link Level} for possible values.
- * <br>Default: INFO.</dd>
- * <dt>"LOG_DEFAULT_LEVEL"</dt> <dd>Default logging level. Calling {@link #log(String)}
- * will log at this level. This is intended to be set only in the driver's
- * own constructor - if a particular driver logs many messages at a particular level,
- * the code can be made more concise by making it the default level.
- * <br>Default: INFO.</dd>
- * <dt>"LOG_LEVEL_GLOBAL"</dt> <dd>Logging level for this driver and all its known sub-drivers.
- * <br>Default: INFO.</dd>
- * <dt>"LOG_PREFIX"</dt> <dd>Logging prefix.
- * <br>Default: <tt>null</tt> (driver name will be used as a prefix).</dd></dl>
- *
- * @param name Name of parameter to be set. Case is ignored.
- * @param values List of values to be used for setting the parameter.
- * @throws NoSuchParameterException Thrown if the supplied parameter name is unknown.
- * @throws IllegalArgumentException Thrown if incorrect number of values, or a value
- * of incorrect type is supplied.
- */
- public void set(String name, Object... values) {
- Object value = values.length == 0 ? null : values[0];
- try {
- if (name.equalsIgnoreCase("LOG_LEVEL")) {
- try {
- _logLevel = ((Level)value).intValue();
- } catch (ClassCastException xx) {
- try {
- _logLevel = Level.parse((String)value).intValue();
- } catch (IllegalArgumentException xxx) {
- throw new IllegalArgumentException("Unknown logging level: "+(String)value);
- }
- }
- } else if (name.equalsIgnoreCase("LOG_DEFAULT_LEVEL")) {
- try {
- _defLevel = ((Level)value);
- } catch (ClassCastException xx) {
- try {
- _defLevel = Level.parse((String)value);
- } catch (IllegalArgumentException xxx) {
- throw new IllegalArgumentException("Unknown logging level: "+(String)value);
- }
- }
- } else if (name.equalsIgnoreCase("LOG_LEVEL_GLOBAL")) {
- try {
- _logLevel = ((Level)value).intValue();
- } catch (ClassCastException xx) {
- try {
- _logLevel = Level.parse((String)value).intValue();
- } catch (IllegalArgumentException xxx) {
- throw new IllegalArgumentException("Unknown logging level: "+(String)value);
- }
- }
- for (org.lcsim.util.Driver daughter : drivers()) {
- try {
- ((Driver)daughter).set(name, value);
- } catch (ClassCastException xx) {}
- }
- } else if (name.equalsIgnoreCase("LOG_PREFIX")) {
- if (value == null) {
- _logPrefix = getName() + " : ";
- } else {
- _logPrefix = (String) value;
- if (_logPrefix.length() == 0) _logPrefix = null;
- }
- } else {
- throw new NoSuchParameterException(name, this.getClass());
- }
- } catch (ClassCastException x) {
- throw new IllegalArgumentException(ERR_VIT, x);
- }
- }
-
-// -- Logging : ---------------------------------------------------------------
-
- /** Log a message at the given level. */
- public void log(String message, Level level) {
- if (level.intValue() >= _logLevel) {
- if (_logPrefix != null) message = _logPrefix + message;
- System.out.println(message);
- }
- }
-
- /**
- * Log a message at the level set by a call to <tt>set("LOG_DEFAULT_LEVEL", level)</tt>.
- */
- public void log(String message) {
- log(message, _defLevel);
- }
-
- /**
- * Returns <tt>true</tt> if messages at the given level are being printed out.
- * That is, when the current logging level set for this driver is at or below
- * the given <tt>Level</tt>.
- */
- public boolean isLogging(Level level) {
- return level.intValue() >= _logLevel;
- }
-
- /**
- * Add a driver that will log the message at the given level.
- */
- public void addLog(final String message, final Level level) {
- add(new Driver() {
- public void process(EventHeader event) {
- Driver.this.log(message, level);
- }
- });
- }
-
- /**
- * Add a driver that will log the message at the level set by a call to <tt>set("LOG_DEFAULT_LEVEL", level)</tt>.
- */
- public void addLog(String message) {
- addLog(message, _defLevel);
- }
-
-
-// -- Private parts : ---------------------------------------------------------
-
- /** Setter error message: "Value of incompatible type " */
- static public final String ERR_VIT = "Value of incompatible type ";
- /** Setter error message: "Illegal number of values for name " */
- static public final String ERR_INV = "Illegal number of values for name ";
- /** Setter error message: "Illegal value for name " */
- static public final String ERR_IV = "Illegal value for name ";
-
- private int _logLevel = Level.INFO.intValue();
- private Level _defLevel = Level.INFO;
- private String _logPrefix = getName() + " : ";
-}
lcsim/src/org/lcsim/contrib/onoprien/vsegment
diff -u -r1.5 -r1.6
--- ExampleDriverSiD01.java 25 Nov 2008 21:02:58 -0000 1.5
+++ ExampleDriverSiD01.java 2 Dec 2008 23:56:08 -0000 1.6
@@ -4,7 +4,7 @@
import org.lcsim.units.clhep.SystemOfUnits;
-import org.lcsim.contrib.onoprien.util.Driver;
+import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.vsegment.algorithm.ChargeCollectorDemo;
import org.lcsim.contrib.onoprien.vsegment.algorithm.ClustererNearestNeighbor;
@@ -33,7 +33,7 @@
* An example driver that runs tracker hit processing.
*
* @author D. Onoprienko
- * @version $Id: ExampleDriverSiD01.java,v 1.5 2008/11/25 21:02:58 onoprien Exp $
+ * @version $Id: ExampleDriverSiD01.java,v 1.6 2008/12/02 23:56:08 onoprien Exp $
*/
public class ExampleDriverSiD01 extends Driver {
lcsim/src/org/lcsim/contrib/onoprien/vsegment
diff -u -r1.4 -r1.5
--- ExampleDriverSiD02.java 25 Nov 2008 21:02:58 -0000 1.4
+++ ExampleDriverSiD02.java 2 Dec 2008 23:56:08 -0000 1.5
@@ -4,7 +4,7 @@
import org.lcsim.units.clhep.SystemOfUnits;
-import org.lcsim.contrib.onoprien.util.Driver;
+import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.vsegment.algorithm.ChargeCollectorDemo;
import org.lcsim.contrib.onoprien.vsegment.algorithm.ClustererNearestNeighbor;
@@ -30,7 +30,7 @@
* An example driver that runs tracker hit processing.
*
* @author D. Onoprienko
- * @version $Id: ExampleDriverSiD02.java,v 1.4 2008/11/25 21:02:58 onoprien Exp $
+ * @version $Id: ExampleDriverSiD02.java,v 1.5 2008/12/02 23:56:08 onoprien Exp $
*/
public class ExampleDriverSiD02 extends Driver {
lcsim/src/org/lcsim/contrib/onoprien/vsegment
diff -u -r1.3 -r1.4
--- ExampleTrackingDriver.java 25 Nov 2008 21:02:58 -0000 1.3
+++ ExampleTrackingDriver.java 2 Dec 2008 23:56:08 -0000 1.4
@@ -7,7 +7,7 @@
import org.lcsim.recon.tracking.seedtracker.SeedTracker;
import org.lcsim.recon.tracking.seedtracker.StrategyXMLUtils;
-import org.lcsim.contrib.onoprien.util.Driver;
+import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.vsegment.process.HelicalTrackHitConverter;
@@ -17,7 +17,7 @@
* track finder.
*
* @author D. Onoprienko
- * @version $Id: ExampleTrackingDriver.java,v 1.3 2008/11/25 21:02:58 onoprien Exp $
+ * @version $Id: ExampleTrackingDriver.java,v 1.4 2008/12/02 23:56:08 onoprien Exp $
*/
public class ExampleTrackingDriver extends Driver {
CVSspam 0.2.8