Author: [log in to unmask]
Date: Mon Jan  5 15:34:17 2015
New Revision: 3474

Log:
By default, do not use a prepended marker in EventMarkerDriver.  

Modified:
    projects/lcsim/trunk/job-manager/src/main/java/org/lcsim/job/EventMarkerDriver.java

Modified: projects/lcsim/trunk/job-manager/src/main/java/org/lcsim/job/EventMarkerDriver.java
 =============================================================================
--- projects/lcsim/trunk/job-manager/src/main/java/org/lcsim/job/EventMarkerDriver.java	(original)
+++ projects/lcsim/trunk/job-manager/src/main/java/org/lcsim/job/EventMarkerDriver.java	Mon Jan  5 15:34:17 2015
@@ -1,38 +1,64 @@
 package org.lcsim.job;
 
+import java.util.logging.Logger;
+
 import org.lcsim.event.EventHeader;
+import org.lcsim.geometry.compact.Detector;
 import org.lcsim.util.Driver;
+import org.lcsim.util.log.BasicFormatter;
+import org.lcsim.util.log.LogUtil;
 
 /**
- * Driver to print a marker at the beginning of an event.
- * @author jeremym
- * @version $id: $
+ * Driver to print markers during event processing.
+ * @author Jeremy McCormick <[log in to unmask]>
  */
 public class EventMarkerDriver extends Driver
 {
-	public int interval = -1;
-	public int eventNumber = 0;
-	public String marker = ">>";
+	int interval = 1;
+	int eventNumber = 0;
+	String marker = "";
 	
-	public EventMarkerDriver()
-	{}
+	static Logger logger = 
+	        LogUtil.create(EventMarkerDriver.class, new BasicFormatter(EventMarkerDriver.class.getSimpleName()));
 	
-	public void setMarker(String marker)
-	{
+	public EventMarkerDriver() {
+	    logger.fine("init");
+	}
+	
+	public EventMarkerDriver(int interval) {
+	    this.interval = interval;
+	}
+	
+	public void detectorChanged(Detector detector) {
+	    logger.info("detectorChanged - " + detector.getDetectorName());
+	}
+	
+	protected void startOfData() {
+	    logger.info("startOfData");
+	}
+		
+	public void setMarker(String marker) {
 		this.marker = marker;
 	}
 	
-	public void setEventInterval(int interval)
-	{
+	public void setEventInterval(int interval) {
 		this.interval = interval;
 	}
 	
-	public void process(EventHeader event)
-	{
-		if (interval == -1 || eventNumber % interval == 0)
-		{
-			System.out.println(marker + " Event " + eventNumber);
+	protected void process(EventHeader event) {
+		if (eventNumber % interval == 0) {
+			logger.info(marker + "Event #" + eventNumber);
+			logger.getHandlers()[0].flush();
 		}
 		++eventNumber;
 	}	
-}
+	
+	protected void endOfData() {
+	    logger.info("endOfData - " + eventNumber + " events processed in job");
+	    logger.getHandlers()[0].flush();
+	}
+	
+	public Logger getLogger() {
+	    return logger;
+	}
+}

########################################################################
Use REPLY-ALL to reply to list

To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1