Print

Print


Author: [log in to unmask]
Date: Fri Aug 28 18:45:39 2015
New Revision: 3460

Log:
quiet, add to pass2 recon

Modified:
    java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullRecon_Pass2.lcsim
    java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/HpsGblRefitter.java
    java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/MakeGblTracks.java

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullRecon_Pass2.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullRecon_Pass2.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullRecon_Pass2.lcsim	Fri Aug 28 18:45:39 2015
@@ -52,6 +52,7 @@
          -->
         <driver name="TrackDataDriver" />
         <driver name="GBLOutputDriver" />
+        <driver name="GBLRefitterDriver" />
         <driver name="ReconParticleDriver" />   
         <driver name="LCIOWriter"/>
         <driver name="CleanupDriver"/>
@@ -129,6 +130,7 @@
         <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver" />
         <driver name="ReconParticleDriver" type="org.hps.recon.particle.HpsReconParticleDriver" />  
         <driver name="GBLOutputDriver" type="org.hps.recon.tracking.gbl.GBLOutputDriver"/>      
+        <driver name="GBLRefitterDriver" type="org.hps.recon.tracking.gbl.HpsGblRefitter"/>
         <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
             <outputFilePath>${outputFile}.slcio</outputFilePath>
         </driver>

Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/HpsGblRefitter.java
 =============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/HpsGblRefitter.java	(original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/HpsGblRefitter.java	Fri Aug 28 18:45:39 2015
@@ -53,11 +53,12 @@
     private String milleBinaryFileName = MilleBinary.DEFAULT_OUTPUT_FILE_NAME;
     private boolean writeMilleBinary = false;
     
-    private MakeGblTracks _makeTracks = null;
+    private final MakeGblTracks _makeTracks;
 
     public void setDebug(boolean debug)
     {
         _debug = debug;
+        _makeTracks.setDebug(debug);
     }
 
     public void setMilleBinaryFileName(String filename)
@@ -73,6 +74,7 @@
     public HpsGblRefitter()
     {
         _makeTracks = new MakeGblTracks();
+        _makeTracks.setDebug(_debug);
         logger.setLevel(Level.WARNING);
         System.out.println("level " + logger.getLevel().toString());
     }

Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/MakeGblTracks.java
 =============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/MakeGblTracks.java	(original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/MakeGblTracks.java	Fri Aug 28 18:45:39 2015
@@ -54,6 +54,14 @@
 
     }
 
+    public void setDebug(boolean debug) {
+        if (debug) {
+            logger.setLevel(Level.INFO);
+        } else {
+            logger.setLevel(Level.OFF);
+        }
+    }
+
     /**
      * Process a Gbl track and store it into the event
      *
@@ -103,7 +111,7 @@
 
             //  Set the SeedCandidate this track is based on
             trk.setSeedCandidate(trackseed);
-            
+
             // Set the track type.
             trk.setTrackType(seedTrack.getType());