+ +// -- Private parts : --------------------------------------------------------- + + private CruxTrackVertex _startVertex; + private CruxTrackVertex _endVertex; + private ArrayList<CruxTrackVertex> _interVertexes = new ArrayList<CruxTrackVertex>(0); + + private MCParticle _mcParticle; + + private ArrayList<ITrackAnchor> _anchors; + + private ArrayList<ITrackNode> _nodes; + private int _charge; + + private EnumMap<Point, FNode> _fNodes; + + private double _chi2; + private int _ndf; + private boolean _fitSuccess; +

- -// -- Private parts : --------------------------------------------------------- - - private CruxTrackVertex _startVertex; - private CruxTrackVertex _endVertex; - private ArrayList<CruxTrackVertex> _interVertexes = new ArrayList<CruxTrackVertex>(0); - - private MCParticle _mcParticle; - - private ArrayList<ITrackAnchor> _anchors; - - private ArrayList<ITrackNode> _nodes; - private int _charge; - - private EnumMap<Point, FNode> _fNodes; - - private double _chi2; - private int _ndf; - private boolean _fitSuccess;

lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/tracking

CheatTrackFinderDriver.java removed after 1.1.1.1

diff -N CheatTrackFinderDriver.java
--- CheatTrackFinderDriver.java	10 Dec 2008 22:03:06 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,286 +0,0 @@

-package org.lcsim.contrib.onoprien.crux.tracking;
-
-import java.util.*;
-
-import hep.physics.vec.Hep3Vector;
-import org.lcsim.detector.identifier.Identifiable;
-import org.lcsim.event.EventHeader;
-import org.lcsim.event.MCParticle;
-import org.lcsim.event.SimTrackerHit;
-
-import org.lcsim.contrib.onoprien.util.ConstHep3Vector;
-import org.lcsim.contrib.onoprien.util.job.Driver;
-import org.lcsim.contrib.onoprien.util.ListMap;
-import org.lcsim.contrib.onoprien.util.NoSuchParameterException;
-import org.lcsim.contrib.onoprien.util.swim.BField;
-import org.lcsim.contrib.onoprien.util.swim.Helix;
-
-import org.lcsim.contrib.onoprien.vsegment.hit.ITrackerHit;
-import org.lcsim.contrib.onoprien.vsegment.mctruth.MCTruthVS;
-
-import org.lcsim.contrib.onoprien.crux.infrastructure.*;
-
-/**
- * Driver that uses MC truth info to produce a list of reconstructable tracks in the event.
- * <p>
- * The list of tracks created by this driver is saved into the event record under
- * the name set through a call to <tt>set("TRACK_LIST", name)</tt>.
- * <p>
- * Subclasses can override {@link #isTracked(MCParticle)} and {@link #makeTrack(MCParticle)}
- * methods to change the definition of "reconstructable" particle and to control 
- * creation of the {@link CruxTrack} object for the given {@link MCParticle}.
- *
- * @author D. Onoprienko
- * @version $Id: CheatTrackFinderDriver.java,v 1.1.1.1 2008/12/10 22:03:06 jeremy Exp $
- */
-public class CheatTrackFinderDriver extends Driver {
-  
-// -- Constructors :  ----------------------------------------------------------
-  
-  public CheatTrackFinderDriver() {
-    _bField = BField.defaultInstance();
-  }
-  
-// -- Setters :  ---------------------------------------------------------------
-
-  /**
-   * Set any parameter. 
-   * The following parameters can be set with this method:
-   * <p><dl>
-   * <dt>"HIT_MAP_NAMES"</dt> <dd>One or more names of input <tt>TrackerHitMaps</tt>.
-   *             <tt>ITrackerHits</tt> from these maps will be attached to created tracks.
-   *             <br>No default, must be set explicitly if this class is to be used as a driver.</dd>
-   * <dt>"TRACK_LIST_NAME"</dt> <dd>Name of output list of <tt>Tracks</tt>.
-   *             If the list with this name already exists in the event record, newly created
-   *             tracks will be appended to it.
-   *             <br>No default, must be set explicitly if this class is to be used as a driver.</dd>
-   * <dt>"CUT_MinLayers"</dt> <dd>Minimal effective number of layers with hits for the track to be reconstructed.
-   *             Hits in two layers that constitute a stereo pair add 1 to the effective number of layers.
-   *             <br>Default: 3.</dd>
-   * <dt>"CUT_Pt"</dt> <dd>Minimal transverse momentum for the track to be reconstructed.
-   *             <br>Default: 0.</dd></dl>
-   * 
-   * @param name   Name of parameter to be set. Case is ignored.
-   * @param values  List of values to be used for setting the parameter.
-   * @throws NoSuchParameterException Thrown if the supplied parameter name is unknown.
-   * @throws IllegalArgumentException Thrown if incorrect nunber of values, or a value
-   *                                  of incorrect type is supplied.
-   */
-  public void set(String name, Object... values) {
-    Object value = (values.length == 0) ? null : values[0];
-    try {
-      if (name.equalsIgnoreCase("HIT_MAP_NAMES")) {
-        _hitMapNames = new ArrayList<String>(values.length);
-        for (Object o : values) _hitMapNames.add((String)o);
-      } else if (name.equalsIgnoreCase("TRACK_LIST_NAME")) {
-        _trackListName = (String) value;
-      } else if (name.equalsIgnoreCase("CUT_MinLayers")) {
-        _cutMinLayers = (Integer) value;
-      } else if (name.equalsIgnoreCase("CUT_Pt")) {
-        _cutPt2 = (Double) value;
-        _cutPt2 *= _cutPt2;
-      } else {
-        super.set(name, values);
-      }
-    } catch (ClassCastException x) {
-      throw new IllegalArgumentException(ERR_VIT, x);
-    }
-  }
-  
-// -- Event processing :  ------------------------------------------------------
-  
-  /** Called by the framework to process an event. */
-  public void process(EventHeader event) {
-    
-    super.process(event);
-    
-    // Fetch MCTruth and list of MCParticles
-    
-    _mcTruth = (MCTruthVS) event.get(MCTruthVS.KEY);
-    
-    // Fetch or create list of tracks
-    
-    List<CruxTrack> trackList;
-    try {
-      trackList = (ArrayList<CruxTrack>) event.get(CruxTrack.class, _trackListName);
-    } catch (IllegalArgumentException x) {
-      trackList = new ArrayList<CruxTrack>(100);
-      event.put(_trackListName, trackList, CruxTrack.class, 0);
-    }
-
-    // Compile set of hits
-    
-    HashSet<ITrackerHit> hitSet = new HashSet<ITrackerHit>();
-    for (String name : _hitMapNames) {
-      try {
-        ListMap<Identifiable, ITrackerHit> hitMap = (ListMap<Identifiable, ITrackerHit>) event.get(name);
-        hitSet.addAll(hitMap);
-      } catch (IllegalArgumentException x) {
-        continue;
-      }
-    }
-    
-    // Associate hits to MCParticles :
-    
-    HashMap<MCParticle,List<ITrackerHit>> mc2hit = new HashMap<MCParticle,List<ITrackerHit>>();
-    for (ITrackerHit hit : hitSet) {
-      List<MCParticle> mcList = _mcTruth.getMCParticles(hit);
-      for (MCParticle mc : mcList) {
-        List<ITrackerHit> hits = mc2hit.get(mc);
-        if (hits == null) {
-          hits = new ArrayList<ITrackerHit>();
-          mc2hit.put(mc, hits);
-        }
-        hits.add(hit);
-      }
-    }
-
-    // Loop over MCParticle, creating Tracks for those deemed reconstructable
-            
-    for (Map.Entry<MCParticle, List<ITrackerHit>> entry : mc2hit.entrySet()) {
-      MCParticle mc = entry.getKey();
-      List<ITrackerHit> hits = entry.getValue();
-      if (isTracked(mc,hits)) {
-        CruxTrack track = makeTrack(mc,hits);
-        trackList.add(track);
-      }
-    }
-    
-    // Cleanup
-    
-    try {
-      ((ArrayList<CruxTrack>)trackList).trimToSize();
-    } catch (ClassCastException x) {}
-    _mcTruth = null;
-  }
-  
-  /**
-   * Returns <tt>true</tt> if a track should be created for the given particle.
-   * Default: returns <tt>true</tt> for charged particles that pass number of layers
-   * with hits and Pt cuts (see {@link #set}).
-   * Subclasses can override and implement their own definitions of "reconstructable" track.
-   */
-  protected boolean isTracked(MCParticle mcParticle, List<ITrackerHit> hits) {
-    
-    // Charged particles only
-    
-    if (Math.abs(mcParticle.getCharge()) < 0.9) return false;
-    
-    // Cut on effective number of layers with hits
-    
-    if (hits.size() < _cutMinLayers) return false;
-    HashSet<Integer> layers = new HashSet<Integer>();
-    int nEffLayers = 0;
-    for (ITrackerHit hit : hits) {
-      boolean newLayer = ! layers.add(hit.getSubdetector().getSystemID() * 1000 + hit.getLayer());
-      if (newLayer) {
-        if (hit.getType().nUnmeasured() == 0) {
-          nEffLayers += 2;
-        } else {
-          if (hit.getBarrelEndcapFlag().isBarrel()) {
-            nEffLayers += 2;
-          } else {
-            nEffLayers += 1;
-          }
-        }
-      }
-    }
-    if (nEffLayers < _cutMinLayers * 2) return false;
-    
-    // Cut on Pt
-    
-    if (_cutPt2 > 0.) {
-      double px = mcParticle.getPX();
-      double py = mcParticle.getPY();
-      if (px*px+py*py < _cutPt2) return false;
-    }
-    
-    return  true;
-  }
-  
-  /**
-   * Create <tt>CruxTrack</tt> object for the given <tt>MCParticle</tt>, and set its parameters.
-   * Default implementation only sets <tt>MCParticle</tt> associated with the track - 
-   * subclasses can override.
-   */
-  protected CruxTrack makeTrack(MCParticle mcParticle, List<ITrackerHit> hits) {
-    
-    // Sort hits by time :
-    
-    _mc = mcParticle;
-    Collections.sort(hits, _hitTimeComparator);
-    _mc = null;
-    
-    // Wrap hits into anchors :
-    
-    ArrayList<ITrackAnchor> anchors = new ArrayList<ITrackAnchor>(hits.size());
-    for (ITrackerHit hit : hits) {
-      anchors.add(new CruxTrackAnchorHit(hit));
-    }
-    
-    // Create track node at the particle origin :
-    
-    Hep3Vector pos = mcParticle.getOrigin();
-    Hep3Vector momentum = mcParticle.getMomentum();
-    int charge = (int) mcParticle.getCharge();
-    Helix helix = _bField.makeHelix(pos, momentum, charge);
-    CruxTrackNode startNode = new CruxTrackNode(helix);
-
-    ArrayList<ITrackNode> nodes = new ArrayList<ITrackNode>(2);
-    nodes.add(startNode);
-    
-    // Create node at last hit position :
-    
-    SimTrackerHit simHit = _mcTruth.getSimTrackerHits(hits.get(hits.size()-1)).get(0);
-    pos = new ConstHep3Vector(simHit.getPoint());
-    momentum = new ConstHep3Vector(simHit.getMomentum());
-    helix = _bField.makeHelix(pos, momentum, charge);
-    CruxTrackNode lastHitNode = new CruxTrackNode(helix);
-    
-    nodes.add(lastHitNode);
-    
-    // Create track
-    
-    CruxTrack track = new CruxTrack(anchors, nodes, charge);
-    track.setMCParticle(mcParticle);
-    track.setFunctionalPoint(ITrack.Point.START, startNode, 0.);
-    track.setFunctionalPoint(ITrack.Point.LAST_HIT, lastHitNode, 0.);
-    
-    return track;
-  }
-  
-// -- Private parts :  ---------------------------------------------------------
-  
-  protected ArrayList<String> _hitMapNames;
-  protected String _trackListName;
-  
-  protected MCTruthVS _mcTruth;
-  protected BField _bField;
-  
-  protected int _cutMinLayers = 3;
-  protected double _cutPt2 = 0.;
-  
-  protected Comparator<ITrackerHit> _hitTimeComparator = new Comparator<ITrackerHit>() {
-    public int compare(ITrackerHit hit1, ITrackerHit hit2) {
-      SimTrackerHit sHit1 = null;
-      SimTrackerHit sHit2 = null;
-      List<SimTrackerHit> simList = _mcTruth.getSimTrackerHits(hit1);
-      for (SimTrackerHit sHit : simList) {
-        if (sHit.getMCParticle() == _mc) {
-          sHit1 = sHit;
-          break;
-        }
-      }
-      simList = _mcTruth.getSimTrackerHits(hit2);
-      for (SimTrackerHit sHit : simList) {
-        if (sHit.getMCParticle() == _mc) {
-          sHit2 = sHit;
-          break;
-        }
-      }
-      return (int) Math.signum(sHit1.getTime() - sHit2.getTime());
-    }
-  };
-  private MCParticle _mc;
-  
-}

-package org.lcsim.contrib.onoprien.crux.tracking; - -import java.util.*; - -import hep.physics.vec.Hep3Vector; -import hep.physics.vec.VecOp; -import org.lcsim.event.EventHeader; -import org.lcsim.event.MCParticle; -import org.lcsim.units.clhep.SystemOfUnits; - -import org.lcsim.contrib.onoprien.util.NoSuchParameterException; -import org.lcsim.contrib.onoprien.util.job.Driver; - -import org.lcsim.contrib.onoprien.crux.infrastructure.*; -import org.lcsim.contrib.onoprien.crux.mctruth.MCTruthCrux; - -/** - * Driver that uses MC truth info to produce a list of reconstructable vertices in the - * event, and to associate them with previously reconstructed tracks. - * - * A vertex is created if more than one track from the given list originates, terminates, - * or flies by it. - * - * @author D. Onoprienko - * @version $Id: CheatVertexFinderDriver.java,v 1.1.1.1 2008/12/10 22:03:06 jeremy Exp $ - */ -public class CheatVertexFinderDriver extends Driver { - -// -- Constructors : ---------------------------------------------------------- - - public CheatVertexFinderDriver() { - } - -// -- Setters : --------------------------------------------------------------- - - /** - * Set any parameter. - * The following parameters can be set with this method: - * <dl> - * <dt>"TRACK_LIST"</dt> <dd>Name of input list of <tt>Tracks</tt> - * No default, must be set explicitly if this class is to be used as a driver.</dd> - * <dt>"VERTEX_LIST"</dt> <dd>Name of output list of found <tt>Vertexes</tt> - * Default: <tt>null</tt> (vertices will be associated with tracks but the list will not - * be explicitly saved into the event record.</dd> - * <dt>"MERGE_DISTANCE"</dt> <dd>Double value defining the minimal distance between vertices - - * closer vertices will be merged. - * Default: 1 micrometer.</dd></dl> - * - * @param name Name of parameter to be set. Case is ignored. - * @param values List of values to be used for setting the parameter. - * @throws NoSuchParameterException Thrown if the supplied parameter name is unknown. - * @throws IllegalArgumentException Thrown if incorrect nunber of values, or a value - * of incorrect type is supplied. - */ - public void set(String name, Object... values) { - Object value = (values.length == 0) ? null : values[0]; - try { - if (name.equalsIgnoreCase("TRACK_LIST")) { - _trackListName = (String) value; - } else if (name.equalsIgnoreCase("VERTEX_LIST")) { - _vertexListName = (String) value; - } else if (name.equalsIgnoreCase("MERGE_DISTANCE")) { - _mergeDist2 = (Double) value; - _mergeDist2 *= _mergeDist2; - } else { - super.set(name, values); - } - } catch (ClassCastException x) { - throw new IllegalArgumentException("Value of incompatible type", x); - } - } - -// -- Event processing : ------------------------------------------------------ - - /** Called by the framework to process an event. */ - public void process(EventHeader event) { - - super.process(event); - - _mcTruth = (MCTruthCrux) event.get("CruxMCTruth"); - List<MCParticle> mcList = event.getMCParticles(); - List<CruxTrack> trackList = event.get(CruxTrack.class, _trackListName); - - ArrayList<CruxTrackVertex> vertexList = new ArrayList<CruxTrackVertex>(); - - // Create vertexes for start and end points of each track, merging those less than _mergeDist apart - - for (CruxTrack track : trackList) { - MCParticle mc = track.getMCParticle(); - Hep3Vector endPoint = mc.getEndPoint(); - Hep3Vector startPoint = mc.getOrigin(); - boolean start = true; - boolean end = true; - for (CruxTrackVertex vertex : vertexList) { - Hep3Vector pos = vertex.getPosition(); - if ( start && (VecOp.sub(pos, startPoint).magnitudeSquared() < _mergeDist2) ) { - vertex.getDaughterTracks().add(track); - start = false; - } else if ( end && (VecOp.sub(pos, endPoint).magnitudeSquared() < _mergeDist2) ) { - vertex.setParentTrack(track); - end = false; - } - } - if (start) { - CruxTrackVertex vertex = new CruxTrackVertex(); - vertex.setPosition(startPoint); - vertex.getDaughterTracks().add(track); - vertexList.add(vertex); - } - if (end) { - CruxTrackVertex vertex = new CruxTrackVertex(); - vertex.setPosition(endPoint); - vertex.setParentTrack(track); - vertexList.add(vertex); - } - } - - // Save vertexes with more than one track - - ArrayList<CruxTrackVertex> finalList = new ArrayList<CruxTrackVertex>(); - for (CruxTrackVertex vertex : vertexList) { - boolean isIntermediate = false; - List<CruxTrack> daughters = vertex.getDaughterTracks(); - int nTracks = daughters.size(); - if (vertex.getParentTrack() == null) { - for (CruxTrack track : daughters) { - MCParticle mc = track.getMCParticle(); - CruxTrack parentTrack = getFlyByParent(mc); - if (parentTrack != null) { - vertex.setParentTrack(parentTrack); - isIntermediate = true; - nTracks++; - break; - } - } - } else { - nTracks++; - } - if (nTracks > 1) { - finalList.add(vertex); - for (CruxTrack track : daughters) { - track.setStartVertex(vertex); - } - CruxTrack parent = vertex.getParentTrack(); - if (parent != null) { - if (isIntermediate) { - parent.getIntermediateVertexes().add(vertex); - } else { - parent.setEndVertex(vertex); - } - } - } - } - - // Put list of vertexes into event record - - if (_vertexListName != null) { - finalList.trimToSize(); - event.put(_vertexListName, finalList, CruxTrackVertex.class, 0); - } - - // Clean up - - _mcTruth = null; - } - - /** - * Try to find a track whose intermediate vertex the given MCParticle was produced at. - */ - private CruxTrack getFlyByParent(MCParticle mcParticle) { - boolean bornInFlight = mcParticle.getSimulatorStatus().vertexIsNotEndpointOfParent(); - List<MCParticle> pList = mcParticle.getParents(); - for (MCParticle mc : pList) { - CruxTrack track = _mcTruth.getTrack(mc); - if (bornInFlight && track != null) { - return track; - } else if (VecOp.sub(mc.getOrigin(), mc.getEndPoint()).magnitudeSquared() < _mergeDist2) { - track = getFlyByParent(mc); - if (track != null) return track; - } - } - return null; - } - -// -- Private parts : --------------------------------------------------------- - - protected String _trackListName; - protected String _vertexListName; - protected double _mergeDist2 = (1.*SystemOfUnits.micrometer) * (1.*SystemOfUnits.micrometer); - - protected MCTruthCrux _mcTruth; -}

Commit in `lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux` on MAIN
`CruxConfig.java`	+2	-2	1.1.1.1 -> 1.2
`algorithms/rosary/RosaryClusterer.java`	+3	-3	1.1.1.1 -> 1.2
`diagnostics/ClusteringTest.java`	+1	-2	1.1.1.1 -> 1.2
`infrastructure/CruxHitMap.java`	+1	-2	1.1.1.1 -> 1.2
`/CruxTrack.java`	+23	-22	1.1.1.1 -> 1.2
`/ITrack.java`	+2	-2	1.1.1.1 -> 1.2
`tests/TestDriver.java`	+3	-3	1.1.1.1 -> 1.2
`/TestDriverRosary.java`	+3	-3	1.1.1.1 -> 1.2
`tracking/CheatTrackFinderDriver.java`		-286	1.1.1.1 removed
`/CheatVertexFinderDriver.java`		-192	1.1.1.1 removed
	+38	-517