Print

---

Author: [log in to unmask]
Date: Tue Oct  6 19:54:20 2015
New Revision: 3781

Log:
Convert print outs to use logging.

Modified:
    java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2014GeometryDefinition.java
    java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRunningPedestalDriver.java
    java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackerReconDriver.java

Modified: java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2014GeometryDefinition.java
 =============================================================================
--- java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2014GeometryDefinition.java	(original)
+++ java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2014GeometryDefinition.java	Tue Oct  6 19:54:20 2015
@@ -6,6 +6,8 @@
 import hep.physics.vec.BasicHep3Vector;
 import hep.physics.vec.Hep3Vector;
 import hep.physics.vec.VecOp;
+
+import java.util.logging.Logger;
 
 import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.math3.geometry.euclidean.threed.Rotation;
@@ -26,7 +28,7 @@
  */
  public class HPSTracker2014GeometryDefinition extends HPSTrackerGeometryDefinition {
 
-
+     private static final Logger LOGGER = Logger.getLogger(HPSTracker2014GeometryDefinition.class.getPackage().getName());
 
     public HPSTracker2014GeometryDefinition(boolean debug, Element node) {
         super(debug, node);
@@ -117,8 +119,8 @@
             }
         }       
 
-        System.out.printf("%s: Constructed %d geometry objects\n", this.getClass().getSimpleName(), surveyVolumes.size());
-        System.out.printf("%s: Constructed %d module bundles\n", this.getClass().getSimpleName(),modules.size());        
+        LOGGER.info(String.format("%s: Constructed %d geometry objects\n", this.getClass().getSimpleName(), surveyVolumes.size()));
+        LOGGER.info(String.format("%s: Constructed %d module bundles\n", this.getClass().getSimpleName(),modules.size()));
 
         if(isDebug()) {
             System.out.printf("%s: DONE constructing the geometry objects\n", this.getClass().getSimpleName());

Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRunningPedestalDriver.java
 =============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRunningPedestalDriver.java	(original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRunningPedestalDriver.java	Tue Oct  6 19:54:20 2015
@@ -4,6 +4,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Logger;
 
 import org.hps.conditions.database.DatabaseConditionsManager;
 import org.hps.conditions.ecal.EcalChannel;
@@ -33,6 +34,8 @@
  */
 public class EcalRunningPedestalDriver extends Driver {
 
+    private static final Logger LOGGER = Logger.getLogger(EcalRunningPedestalDriver.class.getPackage().getName());
+    
     // limit array lengths:
     private final int limitLookbackEvents = 1000;
 
@@ -74,12 +77,9 @@
 
     @Override
     protected void startOfData() {
-        System.out.println("ECalRunningPedestalDriver.minLookbackEvents = "
-                + minLookbackEvents);
-        System.out.println("ECalRunningPedestalDriver.maxLookbackEvents = "
-                + maxLookbackEvents);
-        System.out.println("ECalRunningPedestalDriver.maxLookbackTime   = "
-                + maxLookbackTime);
+        LOGGER.config("minLookbackEvents: " + minLookbackEvents);
+        LOGGER.config("maxLookbackEvents: " + maxLookbackEvents);
+        LOGGER.config("maxLookbackTime:" + maxLookbackTime);
     }
 
     @Override

Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackerReconDriver.java
 =============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackerReconDriver.java	(original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackerReconDriver.java	Tue Oct  6 19:54:20 2015
@@ -3,12 +3,15 @@
 import hep.physics.vec.BasicHep3Vector;
 import hep.physics.vec.Hep3Vector;
 import hep.physics.vec.VecOp;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Logger;
+
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.LCRelation;
 import org.lcsim.event.RelationalTable;
@@ -30,8 +33,11 @@
  *
  * @author Matt Graham
  */
+// FIXME: Printing to System.out should be converted to use logger.
 public final class TrackerReconDriver extends Driver {
 
+    private static final Logger LOGGER = Logger.getLogger(TrackerReconDriver.class.getPackage().getName());
+    
     // Debug flag.
     private boolean debug = false;
     // Tracks found across all events.
@@ -142,9 +148,9 @@
 //        this.bfield = Math.abs((detector.getFieldMap().getField(new BasicHep3Vector(0, 0, 0)).y()));
         double zvalInTracker=500.0;//50cm...about the middle
         Hep3Vector fieldInTracker=detector.getFieldMap().getField(new BasicHep3Vector(0, 0, zvalInTracker));
-        System.out.println("fieldInTracker at "+zvalInTracker+": Bx = "+fieldInTracker.x()+"; By = "+fieldInTracker.y()+"; Bz = "+fieldInTracker.z());      
+        LOGGER.config("fieldInTracker at "+zvalInTracker+": Bx = "+fieldInTracker.x()+"; By = "+fieldInTracker.y()+"; Bz = "+fieldInTracker.z());      
         this.bfield = Math.abs(fieldInTracker.y());
-        System.out.printf("%s: Set B-field to %.6f\n", this.getClass().getSimpleName(), this.bfield);
+        LOGGER.config(String.format("%s: Set B-field to %.6f\n", this.getClass().getSimpleName(), this.bfield));
 
         initialize();