LISTSERV 16.5 - LCD-CVS Archives

- // Check if there are enough unchecked layers to meet the minimum number of hits - int possiblehits = lyrsleft + seed.getHits().size(); - if (possiblehits < minhits) continue; -

+ // Check that this hit is potentially viable + if (!checker.CheckHitSeed(hit, seed)) { + if (_diag != null) _diag.fireCheckHitFailed(hit, test); + continue; + } + +

// Add the seed to the LIFO queue of seed candidates seedlist.addFirst(test); chisqbest = Math.min(chisqbest, _fitter.getHelix().chisqtot()); } else {

// Stop checking hits in this layer if circle chisq increase is too big if (_fitter.getFitStatus() != FitStatus.CircleFitFailed) { double circlechisq = _fitter.getCircleFit().chisq();

- if (chisqbest - oldchisq > strategy.getBadHitChisq()) { - seedlist.addFirst(seed); - -// if (diag != null) { -// diag.fireConfirmerExtenderAllHitsPotentiallyBad(task, seedin, hitlist, chisqbest, oldchisq); -// } - } -

- private boolean CheckMC(HelicalTrackHit hit1, HelicalTrackHit hit2) { - List<MCParticle> mclist1 = hit1.getMCParticles(); - List<MCParticle> mclist2 = hit2.getMCParticles(); - for (MCParticle mc1 : mclist1) { - HelixParamCalculator helix = new HelixParamCalculator(mc1, 5.0); - if (helix.getMCTransverseMomentum() < 0.2) continue; - if (Math.abs(helix.getDCA()) > 10.) continue; - if (Math.abs(helix.getZ0()) > 10.) continue; - if (mclist2.contains(mc1)) { - System.out.println("pt: "+helix.getMCTransverseMomentum()+" p: "+helix.getMCMomentum()); - System.out.println(" MC z0 origin: "+mc1.getOriginZ()+" p: "+mc1.getMomentum().magnitude()); - double s1 = (hit1.getPosition()[2] - helix.getZ0()) / helix.getSlopeSZPlane(); - double s2 = (hit2.getPosition()[2] - helix.getZ0()) / helix.getSlopeSZPlane(); - System.out.println("s1: "+s1+" s2: "+s2); - return true; - } - } - return false; - }

+ + // Create a list of duplicates that are inferior + List<SeedCandidate> duplist = new ArrayList<SeedCandidate>(); + + // Loop over all existing seeds + for (SeedCandidate seed : seedlist) { + + // See if the new seed is considered a duplicate of the current seed

lcsim/src/org/lcsim/recon/tracking/seedtracker

SeedCandidate.java 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- SeedCandidate.java	24 Jul 2009 14:37:41 -0000	1.4
+++ SeedCandidate.java	19 Aug 2009 22:12:27 -0000	1.5
@@ -10,12 +10,17 @@

 package org.lcsim.recon.tracking.seedtracker;
 
 import java.util.HashMap;

+import java.util.HashSet;
+import java.util.Iterator;

 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;

+import java.util.Set;
+import org.lcsim.event.MCParticle;

 import org.lcsim.fit.helicaltrack.HelicalTrackFit;
 import org.lcsim.fit.helicaltrack.HelicalTrackHit;

+import org.lcsim.fit.helicaltrack.HelixParamCalculator;

 import org.lcsim.fit.helicaltrack.MultipleScatter;
 
 /**

@@ -28,18 +33,22 @@

     
     private List<HelicalTrackHit> _hits;
     private HelicalTrackFit _helix;

+    private double _bfield;

     private SeedStrategy _strategy;
     private Map<HelicalTrackHit, MultipleScatter> _msmap;
     private List<ScatterAngle> _scatters;
     private LinkedList<SeedLayer> _unchecked;

+    private Set<MCParticle> _mcpset;

     
     /**
      * Create an empty SeedCandidate.
      */

-    public SeedCandidate(SeedStrategy strategy) {

+    public SeedCandidate(SeedStrategy strategy, double bfield) {

         _strategy = strategy;

+        _bfield = bfield;

         _hits = new LinkedList<HelicalTrackHit>();
         _msmap = new HashMap<HelicalTrackHit, MultipleScatter>();

+        _mcpset = new HashSet<MCParticle>();

      }
     
     /**

@@ -47,9 +56,10 @@

      * @param hits list of hits for this SeedCandidate
      * @param strategy strategy used for this SeedCandidate
      */

-    public SeedCandidate(List<HelicalTrackHit> hits, SeedStrategy strategy) {
-        this(strategy);

+    public SeedCandidate(List<HelicalTrackHit> hits, SeedStrategy strategy, double bfield) {
+        this(strategy, bfield);

         _hits.addAll(hits);

+        FindMCParticles();

     }
     
     /**

@@ -58,20 +68,27 @@

      * @param strategy strategy used for this SeedCandidate
      * @param helix HelicalTrackFit associated with the SeedCandidate
      */

-    public SeedCandidate(List<HelicalTrackHit> hits, SeedStrategy strategy, HelicalTrackFit helix) {
-        this(hits, strategy);

+    public SeedCandidate(List<HelicalTrackHit> hits, SeedStrategy strategy, HelicalTrackFit helix, double bfield) {
+        this(hits, strategy, bfield);

         _helix = helix;
     }

+
+    public SeedCandidate(List<HelicalTrackHit> hits, SeedStrategy strategy) {
+        this(hits, strategy, 0.);
+    }
+

     /**
      * Creates a clone of an existing instance of SeedCandidate.
      * @param seed existing SeedCandidate to be cloned
      */
     public SeedCandidate(SeedCandidate seed) {

-        this(seed.getHits(), seed.getSeedStrategy(), seed.getHelix());

+        this(seed._strategy, seed._bfield);
+        _hits.addAll(seed.getHits());
+        _helix = seed.getHelix();

         _msmap.putAll(seed.getMSMap());
         _scatters = seed.getScatterAngles();
         _unchecked = seed.getUncheckedLayers();

+        _mcpset.addAll(seed.getMCParticles());

     }
     
     /**

@@ -81,6 +98,7 @@

     public void setHits(List<HelicalTrackHit> hits) {
         _hits.clear();
         _hits.addAll(hits);

+        FindMCParticles();

         return;
     }

@@ -93,7 +111,15 @@

         if (!_hits.contains(hit)) {
             _hits.add(hit);
             UpdateMSMap(hit);

+
+            //  If this is the first hit, find the associated MC
+            if (_hits.size() == 1) {
+                FindMCParticles();
+            } else {
+                CheckHit(hit);
+            }

         return;
     }

@@ -179,11 +205,75 @@

         return _unchecked.poll();
     }

+    public Set<MCParticle> getMCParticles() {
+        return _mcpset;
+    }
+
+    public boolean isTrueSeed() {
+        return _mcpset.size() > 0;
+    }
+

     private void UpdateMSMap(HelicalTrackHit hit) {
         if (_helix == null) return;
         if (_scatters == null) return;
         _msmap.put(hit, MultipleScattering.CalculateScatter(hit, _helix, _scatters));
         return;
     }

+
+    private void FindMCParticles() {
+
+        if (_hits.size() == 0) return;
+        for (MCParticle mcp : _hits.get(0).getMCParticles()) {
+            boolean good = true;
+            for (HelicalTrackHit hit : _hits) {
+                if (!hit.getMCParticles().contains(mcp)) {
+                    good = false;
+                    break;
+                }
+            }
+            if (!good) continue;
+            if (CheckMCParticle(mcp)) _mcpset.add(mcp);
+        }
+
+        return;
+    }
+
+    private boolean CheckMCParticle(MCParticle mcp) {
+
+        //  Check that we have a strategy defined
+        if (_strategy == null) return false;
+
+        //  Get the helix parameters for this MC Particle
+        HelixParamCalculator mchelix = new HelixParamCalculator(mcp, _bfield);
+
+        //  Check that the momentum of the MC particle is above the cut
+        if (mchelix.getMCTransverseMomentum() < _strategy.getMinPT()) return false;
+
+        //  Check the x-y impact parameter
+        if (Math.abs(mchelix.getDCA()) > _strategy.getMaxDCA()) return false;
+
+        //  Check the s-z impact parameter
+        if (Math.abs(mchelix.getZ0()) > _strategy.getMaxZ0()) return false;
+
+        return true;
+    }
+
+    private void CheckHit(HelicalTrackHit hit) {
+        
+        //  First check if we have any true MCParticles
+        if (_mcpset.size() == 0) return;
+        
+        //  Get an iterator for the set so we can remove mcp's that don't match
+        Iterator<MCParticle> iter = _mcpset.iterator();
+        
+        //  Loop over the MCParticles that make this a "true seed"
+        while (iter.hasNext()) {
+            MCParticle mcp = iter.next();
+            
+            //  Remove MCParticles from the true seed list if they aren't associated with this hit
+            if (!hit.getMCParticles().contains(mcp)) iter.remove();
+        }
+        
+        return;
+    }

\ No newline at end of file

// Find the valid sector combinations SeedSectoring ss = new SeedSectoring(_hitmanager, strategy, bfield, seedlayerlist); List<List<Sector>> sslist = ss.SeedSectors();

- // Initialize counters - int nfit = 0; - int nseed = 0; - int nconfirm = 0; - int nextend = 0; - int nhit0 = _hitmanager.getTrackerHits(seedlayerlist.get(0)).size(); - int nhit1 = _hitmanager.getTrackerHits(seedlayerlist.get(1)).size(); - int nhit2 = _hitmanager.getTrackerHits(seedlayerlist.get(2)).size(); - int maxseeds = nhit0 * nhit1 * nhit2; - -// if (maxseeds>0) System.out.println("Number of seed sectors: "+sslist.size()+" Max Seeds: "+maxseeds); - - int npairs = 0; - int ngdpairs = 0; - int ntrip = 0; - int nconseeds = 0; - int nextseeds = 0; -

+ + // Construct a new seed adding in the hit from the second seed layer + SeedCandidate seed1 = new SeedCandidate(seed0); + seed1.addHit(hit2); + + // Check if the pair of hits is consistent with current strategy + if (!checker.CheckHitPair(hit1, hit2)) { + if (_diag != null) _diag.fireCheckHitPairFailed(hit1, hit2, seed1); + continue; + }

- ntrip++; - if (!checker.CheckHitPair(hit1, hit3)) continue; - if (!checker.CheckHitPair(hit2, hit3)) continue; - -// System.out.println("Found a new seed candidate"); - // Create a seed candidate from this 3-hit seed - SeedCandidate seed = new SeedCandidate(strategy); - seed.addHit(hit1); - seed.addHit(hit2);

+ + // Check if the new hit is consistent with the other hits + if (!checker.CheckHitPair(hit1, hit3)) { + if (_diag != null) _diag.fireCheckHitPairFailed(hit1, hit3, seed); + continue; + } + if (!checker.CheckHitPair(hit2, hit3)) { + if (_diag != null) _diag.fireCheckHitPairFailed(hit2, hit3, seed); + continue; + } + + if (_diag != null) { + if (seed.isTrueSeed()) mcp_seeds.addAll(seed.getMCParticles()); + }

// See if we can fit a helix to this seed candidate boolean success = _helixfitter.FitCandidate(seed, strategy); if (!success) continue;

for (SeedCandidate confirmedseed : confirmedlist) { // See if we can extend this seed candidate _confirmer.Extend(confirmedseed, strategy, bfield, _trackseeds); }

-// System.out.println("npair: " + npairs + " Good Pairs: " + ngdpairs + -// " ntrip: " + ntrip + " nseed: " + nseed); -// System.out.println("confirmed: " + nconfirm + " con seeds: " + nconseeds + -// " extended: " + nextend + " ext seeds: " + nextseeds);

Commit in `lcsim/src/org/lcsim/recon/tracking/seedtracker` on MAIN
`ConfirmerExtender.java`	+23	-32	1.11 -> 1.12
`FastCheck.java`	+6	-20	1.6 -> 1.7
`HelixFitter.java`	+4	-3	1.5 -> 1.6
`MergeSeedLists.java`	+32	-14	1.5 -> 1.6
`SeedCandidate.java`	+98	-8	1.4 -> 1.5
`SeedTrackFinder.java`	+40	-43	1.11 -> 1.12
`SeedTracker.java`	+4	-2	1.9 -> 1.10
	+207	-122