Print

Print


Commit in hps-java/src/main/java/org/lcsim/hps/recon/tracking on MAIN
SeedTracker.java+35-91.1 -> 1.2
Added possibility to include check for correct z-bin for sectors.

hps-java/src/main/java/org/lcsim/hps/recon/tracking
SeedTracker.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- SeedTracker.java	26 Nov 2012 18:12:01 -0000	1.1
+++ SeedTracker.java	12 Jul 2013 20:55:17 -0000	1.2
@@ -5,7 +5,6 @@
 package org.lcsim.hps.recon.tracking;
 
 import java.util.List;
-import org.lcsim.recon.tracking.seedtracker.HelixFitter;
 import org.lcsim.recon.tracking.seedtracker.SeedStrategy;
 import org.lcsim.recon.tracking.seedtracker.SeedTrackFinder;
 
@@ -21,25 +20,52 @@
         super(strategylist);
     }
 
-    public SeedTracker(List<SeedStrategy> strategylist, boolean includeMS) {
+    public SeedTracker(List<SeedStrategy> strategylist,boolean useHPSMaterialManager, boolean includeMS) {
             
             // use base class constructor 
         
             super(strategylist);
             
-            // Explicitly only replace the objects that might change
+            // Explicitly only replace the objects that might change to avoid getting the lcsim versions
             
-            //  Instantiate the material manager
-            _materialmanager = new MaterialManager(includeMS);
-
-            //  Instantiate the helix finder since it depends on the material manager
-            _helixfitter = new HelixFitter(_materialmanager);
-
+            //  Instantiate the material manager for HPS,  the helix fitter and seed track finder as tey depends on the material manager
+            if(useHPSMaterialManager) {
+                MaterialSupervisor materialSupervisor = new MaterialSupervisor(includeMS);
+                _materialmanager = materialSupervisor;
+                _helixfitter = new HelixFitter(materialSupervisor);
+            } else {
+                MaterialManager materialmanager = new MaterialManager(includeMS);
+                _materialmanager = materialmanager; //mess around with types here...
+                _helixfitter = new HelixFitter(materialmanager);
+            }
             //  Instantiate the helix finder since it depends on the material manager
             _finder = new SeedTrackFinder(_hitmanager, _helixfitter);
+            
 
         }
 
+     /**
+     * Set to enable debug output
+     * 
+     * @param debug switch
+     */
+    @Override
+    public void setDebug(boolean debug) {
+        super.setDebug(debug);
+        _materialmanager.setDebug(debug);
+        _helixfitter.setDebug(debug);
+    }
+
+     /**
+     * Set to enable the sectoring to use the sector bins in checking for consistent hits.
+     *
+     * @param applySectorBinning apply sector binning switch
+     */
+    public void setApplySectorBinning(boolean applySectorBinning) {
+        _finder.setApplySectorBinning(applySectorBinning);
+        _finder.getConfirmer().setApplySectorBinning(applySectorBinning);
+        
+    }
 
 
 }
CVSspam 0.2.12


Use REPLY-ALL to reply to list

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