33 modified files
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/cluster/structural/likelihood
diff -u -r1.2 -r1.3
--- MiscUtilities.java 11 Apr 2012 15:49:35 -0000 1.2
+++ MiscUtilities.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -15,7 +15,7 @@
import org.lcsim.util.swim.Line;
import org.lcsim.recon.util.CalorimeterInformation;
import org.lcsim.geometry.Calorimeter.CalorimeterType;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
public class MiscUtilities
{
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/debug
diff -u -r1.2 -r1.3
--- DebugParticles.java 11 Apr 2012 15:49:35 -0000 1.2
+++ DebugParticles.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -5,7 +5,7 @@
import org.lcsim.event.*;
import org.lcsim.recon.cluster.util.*;
import org.lcsim.util.hitmap.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.shower.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.sharing.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.*;
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/debug
diff -u -r1.2 -r1.3
--- DebugPhotonDriver.java 11 Apr 2012 15:49:35 -0000 1.2
+++ DebugPhotonDriver.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -1,6 +1,6 @@
package org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.debug;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.*;
import java.util.*;
import java.io.IOException;
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/debug
diff -u -r1.2 -r1.3
--- DebugRegionalEoverP.java 11 Apr 2012 15:49:35 -0000 1.2
+++ DebugRegionalEoverP.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -10,7 +10,7 @@
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.shower.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.sharing.*;
import org.lcsim.recon.cluster.util.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
public class DebugRegionalEoverP {
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/debug
diff -u -r1.2 -r1.3
--- DebugShowersDriver.java 11 Apr 2012 15:49:35 -0000 1.2
+++ DebugShowersDriver.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -16,7 +16,7 @@
import org.lcsim.recon.cluster.util.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.cluster.clumpfinder.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.mc.fast.tracking.ReconTrack;
import org.lcsim.event.base.*;
import hep.physics.particle.Particle;
@@ -29,7 +29,7 @@
import org.lcsim.geometry.Calorimeter.CalorimeterType;
import org.lcsim.geometry.*;
import org.lcsim.util.swim.HelixSwimmer;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.recon.cluster.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.cluster.clumpfinder.kmean.*;
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/debug
diff -u -r1.2 -r1.3
--- DebugTrackSeedMatchingDriver.java 11 Apr 2012 15:49:35 -0000 1.2
+++ DebugTrackSeedMatchingDriver.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -2,7 +2,7 @@
import java.io.IOException;
import java.util.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.*;
import org.lcsim.util.*;
import org.lcsim.event.*;
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/debug
diff -u -r1.2 -r1.3
--- DebugTrackToClusterSpecialCases.java 11 Apr 2012 15:49:35 -0000 1.2
+++ DebugTrackToClusterSpecialCases.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -12,7 +12,7 @@
import org.lcsim.geometry.Calorimeter.CalorimeterType;
import org.lcsim.geometry.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import java.io.IOException;
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/debug
diff -u -r1.2 -r1.3
--- DebugUtils.java 11 Apr 2012 15:49:35 -0000 1.2
+++ DebugUtils.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -7,7 +7,7 @@
import org.lcsim.util.hitmap.*;
import org.lcsim.recon.cluster.util.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.sharing.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.mc.fast.tracking.*;
import org.lcsim.event.base.*;
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.3 -r1.4
--- BaselineShowerBuilder.java 11 Apr 2012 15:49:36 -0000 1.3
+++ BaselineShowerBuilder.java 19 Apr 2012 13:18:44 -0000 1.4
@@ -9,7 +9,7 @@
import org.lcsim.util.swim.*;
import org.lcsim.util.hitmap.*;
import org.lcsim.mc.fast.tracking.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.sharing.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.shower.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.debug.*;
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.3 -r1.4
--- CheckDisjoint.java 11 Apr 2012 15:49:36 -0000 1.3
+++ CheckDisjoint.java 19 Apr 2012 13:18:44 -0000 1.4
@@ -8,7 +8,7 @@
import org.lcsim.recon.cluster.directedtree.*;
import org.lcsim.util.hitmap.*;
import org.lcsim.util.decision.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
/**
* Validation driver to check that two collections/hitmaps are disjoint.
@@ -17,7 +17,7 @@
* 2) A Collection of Cluster objects
* 3) A HitMap
*
- * @version $Id: CheckDisjoint.java,v 1.3 2012/04/11 15:49:36 zaidan Exp $
+ * @version $Id: CheckDisjoint.java,v 1.4 2012/04/19 13:18:44 zaidan Exp $
* @author [log in to unmask]
*/
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.2 -r1.3
--- CheckSkeletonsForMultipleTracks.java 11 Apr 2012 15:49:36 -0000 1.2
+++ CheckSkeletonsForMultipleTracks.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -10,7 +10,7 @@
import org.lcsim.event.util.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.cluster.structural.likelihood.*;
import org.lcsim.recon.cluster.util.BasicCluster;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.TrackClusterMatcher;
+import org.lcsim.recon.pfa.identifier.TrackClusterMatcher;
public class CheckSkeletonsForMultipleTracks extends Driver {
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.2 -r1.3
--- ConeReassignmentAlgorithm.java 11 Apr 2012 15:49:36 -0000 1.2
+++ ConeReassignmentAlgorithm.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -5,7 +5,7 @@
import org.lcsim.event.util.*;
import org.lcsim.event.*;
import hep.physics.vec.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
public class ConeReassignmentAlgorithm implements ReassignClustersAlgorithm {
protected double m_limit;
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.3 -r1.4
--- HelixTangentMIPGeometryHandler.java 11 Apr 2012 15:49:36 -0000 1.3
+++ HelixTangentMIPGeometryHandler.java 19 Apr 2012 13:18:44 -0000 1.4
@@ -5,7 +5,7 @@
import org.lcsim.event.util.*;
import org.lcsim.event.*;
import hep.physics.vec.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.recon.cluster.util.BasicCluster;
import org.lcsim.geometry.*;
@@ -20,7 +20,7 @@
* The calculation is based on identifying the outermost hit
* and then checking the track helix near that point.
*
- * @version $Id: HelixTangentMIPGeometryHandler.java,v 1.3 2012/04/11 15:49:36 zaidan Exp $
+ * @version $Id: HelixTangentMIPGeometryHandler.java,v 1.4 2012/04/19 13:18:44 zaidan Exp $
*/
public class HelixTangentMIPGeometryHandler extends MIPGeometryHandler {
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.3 -r1.4
--- LayerBasedMIPGeometryHandler.java 11 Apr 2012 15:49:36 -0000 1.3
+++ LayerBasedMIPGeometryHandler.java 19 Apr 2012 13:18:44 -0000 1.4
@@ -3,7 +3,7 @@
import java.util.*;
import org.lcsim.event.*;
import hep.physics.vec.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.recon.cluster.util.BasicCluster;
import org.lcsim.geometry.*;
import org.lcsim.recon.util.CalorimeterInformation;
@@ -23,7 +23,7 @@
* from the IP, then finding the hits in the outermost layer
* of that subdetector.
*
- * @version $Id: LayerBasedMIPGeometryHandler.java,v 1.3 2012/04/11 15:49:36 zaidan Exp $
+ * @version $Id: LayerBasedMIPGeometryHandler.java,v 1.4 2012/04/19 13:18:44 zaidan Exp $
*/
public class LayerBasedMIPGeometryHandler extends MIPGeometryHandler {
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.2 -r1.3
--- NewShowerBuilder.java 11 Apr 2012 15:49:36 -0000 1.2
+++ NewShowerBuilder.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -11,7 +11,7 @@
import org.lcsim.geometry.Calorimeter.CalorimeterType;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.debug.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.util.*;
import org.lcsim.util.lcio.LCIOConstants;
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.3 -r1.4
--- NonTrivialPFA.java 11 Apr 2012 15:49:36 -0000 1.3
+++ NonTrivialPFA.java 19 Apr 2012 13:18:44 -0000 1.4
@@ -11,7 +11,7 @@
import org.lcsim.digisim.DigiSimDriver;
import org.lcsim.digisim.SimCalorimeterHitsDriver;
import org.lcsim.recon.pfa.cheat.PerfectIdentifier;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.recon.pfa.output.FlushReconstructedParticlesDriver;
import org.lcsim.recon.cluster.mst.*;
import org.lcsim.recon.cluster.mipfinder.*;
@@ -29,7 +29,7 @@
* a List<ReconstructedParticle>, written to the event as
* PFAReconstructedParticles.
*
- * @version $Id: NonTrivialPFA.java,v 1.3 2012/04/11 15:49:36 zaidan Exp $
+ * @version $Id: NonTrivialPFA.java,v 1.4 2012/04/19 13:18:44 zaidan Exp $
* @author Mat Charles <[log in to unmask]>
*/
@@ -341,8 +341,8 @@
{
LocalHelixExtrapolationTrackClusterMatcher extrapolate = new LocalHelixExtrapolationTrackClusterMatcher(new LocalHelixExtrapolator());
extrapolate.setCutSeparation(14.0); // about two cells
- org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.SimpleTrackClusterMatcher simpleExtrapolate = new org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.SimpleTrackClusterMatcher(14.0);
- org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.SimpleTrackClusterMatcher simpleCheatExtrapolate = new org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.CheatHelixTrackClusterMatcher(14.0);
+ org.lcsim.recon.pfa.identifier.SimpleTrackClusterMatcher simpleExtrapolate = new org.lcsim.recon.pfa.identifier.SimpleTrackClusterMatcher(14.0);
+ org.lcsim.recon.pfa.identifier.SimpleTrackClusterMatcher simpleCheatExtrapolate = new org.lcsim.recon.pfa.identifier.CheatHelixTrackClusterMatcher(14.0);
CheatTrackClusterMatcher cheater = new CheatTrackClusterMatcher(mcListName);
CheckSkeletonsForMultipleTracks separate = new CheckSkeletonsForMultipleTracks(evalWrapper, trackList, eventSkeletonClusters, eventSplitSkeletonClusters, eventMips, eventClumps, extrapolate); // LOCAL HELIX EXTRAPOLATION BASED ON SimTrackerHits
//CheckSkeletonsForMultipleTracks separate = new CheckSkeletonsForMultipleTracks(evalWrapper, trackList, eventSkeletonClusters, eventSplitSkeletonClusters, eventMips, eventClumps, cheater); // CHEATING
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.3 -r1.4
--- PFABookKeepingBroker.java 11 Apr 2012 15:49:36 -0000 1.3
+++ PFABookKeepingBroker.java 19 Apr 2012 13:18:44 -0000 1.4
@@ -5,7 +5,7 @@
import org.lcsim.event.*;
import org.lcsim.recon.cluster.util.*;
import org.lcsim.util.hitmap.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.recon.util.CalorimeterInformation;
import org.lcsim.geometry.Calorimeter.CalorimeterType;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.sharing.*;
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.2 -r1.3
--- PFAParticleMaker.java 11 Apr 2012 15:49:36 -0000 1.2
+++ PFAParticleMaker.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -6,7 +6,7 @@
import org.lcsim.event.*;
import org.lcsim.event.base.*;
import org.lcsim.recon.cluster.util.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.util.decision.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.sharing.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.shower.*;
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.3 -r1.4
--- PFAUtil.java 11 Apr 2012 15:49:36 -0000 1.3
+++ PFAUtil.java 19 Apr 2012 13:18:44 -0000 1.4
@@ -7,7 +7,7 @@
import org.lcsim.recon.util.CalorimeterInformation;
import org.lcsim.geometry.Calorimeter.CalorimeterType;
import org.lcsim.geometry.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.shower.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.sharing.*;
import org.lcsim.event.base.*;
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.2 -r1.3
--- PhotonVetoDecision.java 11 Apr 2012 15:49:36 -0000 1.2
+++ PhotonVetoDecision.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -5,7 +5,7 @@
import org.lcsim.event.*;
import org.lcsim.recon.cluster.util.*;
import org.lcsim.util.hitmap.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.recon.util.CalorimeterInformation;
import org.lcsim.geometry.Calorimeter.CalorimeterType;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.sharing.*;
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.2 -r1.3
--- PhotonVetoDriver.java 11 Apr 2012 15:49:36 -0000 1.2
+++ PhotonVetoDriver.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -6,7 +6,7 @@
import org.lcsim.recon.cluster.util.*;
import org.lcsim.util.hitmap.*;
import org.lcsim.util.lcio.LCIOConstants;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.recon.util.CalorimeterInformation;
import org.lcsim.geometry.Calorimeter.CalorimeterType;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.sharing.*;
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.2 -r1.3
--- PreShowerMIPReassignmentAlgorithm.java 11 Apr 2012 15:49:36 -0000 1.2
+++ PreShowerMIPReassignmentAlgorithm.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -6,7 +6,7 @@
import org.lcsim.event.*;
import hep.physics.vec.*;
import org.lcsim.geometry.Subdetector;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.recon.cluster.util.BasicCluster;
import org.lcsim.recon.util.CalorimeterInformation;
import org.lcsim.geometry.Calorimeter.CalorimeterType;
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.3 -r1.4
--- ReclusterDTreeDriver.java 11 Apr 2012 15:49:36 -0000 1.3
+++ ReclusterDTreeDriver.java 19 Apr 2012 13:18:44 -0000 1.4
@@ -7,7 +7,7 @@
import org.lcsim.util.hitmap.*;
import org.lcsim.event.*;
import org.lcsim.recon.cluster.util.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.event.base.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.cluster.structural.likelihood.*;
import org.lcsim.util.decision.*;
@@ -27,7 +27,7 @@
* in this package, which uses the implementation in
* org.lcsim.recon.cluster.directedtree developed by NIU).
*
- * @version $Id: ReclusterDTreeDriver.java,v 1.3 2012/04/11 15:49:36 zaidan Exp $
+ * @version $Id: ReclusterDTreeDriver.java,v 1.4 2012/04/19 13:18:44 zaidan Exp $
* @author Mat Charles <[log in to unmask]>
*/
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.3 -r1.4
--- ReclusterDriver.java 11 Apr 2012 15:49:36 -0000 1.3
+++ ReclusterDriver.java 19 Apr 2012 13:18:44 -0000 1.4
@@ -15,7 +15,7 @@
import org.lcsim.recon.cluster.mipfinder.*;
import org.lcsim.recon.cluster.util.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.cluster.clumpfinder.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.mc.fast.tracking.ReconTrack;
import org.lcsim.event.base.*;
import hep.physics.particle.Particle;
@@ -42,7 +42,7 @@
* This version is superseeded by ReclusterDTreeDriver,
* which derives from it.
*
- * @version $Id: ReclusterDriver.java,v 1.3 2012/04/11 15:49:36 zaidan Exp $
+ * @version $Id: ReclusterDriver.java,v 1.4 2012/04/19 13:18:44 zaidan Exp $
* @author Mat Charles <[log in to unmask]>
*/
@@ -125,7 +125,7 @@
m_inputClumps = clumps;
m_inputSplitSkeletonClusters = splitSkeletonClusters;
- initTrackMatch(new org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.TrackHelixPlusHitExtrapolator());
+ initTrackMatch(new org.lcsim.recon.pfa.identifier.TrackHelixPlusHitExtrapolator());
initCalibration();
if (m_debug) { initPlots(); }
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.4 -r1.5
--- SetUpDTreeForReclustering.java 11 Apr 2012 15:49:36 -0000 1.4
+++ SetUpDTreeForReclustering.java 19 Apr 2012 13:18:44 -0000 1.5
@@ -14,17 +14,15 @@
import org.lcsim.recon.cluster.mipfinder.trackxtrap.*;
import org.lcsim.recon.cluster.muonfinder.MuonFinderWrapper;
import org.lcsim.recon.cluster.muonfinder.MuonFinderWrapper3;
-//import org.lcsim.recon.cluster.myclusterer.*;
import org.lcsim.recon.cluster.util.HitNearBarrelEndcapBoundaryDecision;
import org.lcsim.recon.cluster.util.RemoveHitsFromClusters;
import org.lcsim.recon.cluster.util.VetoHitsFromClusters;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.AmbiguousTrackToClusterMapMaker;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.HelixExtrapolator;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.TrackToElectronMapMaker;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.TrackToGenericClusterMapMaker;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.TrackToMipClusterMapMaker;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.TrackToPreShowerMipMapMaker;
-//import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.TrackToClusterSpecialCasesMapMaker;
+import org.lcsim.recon.pfa.identifier.AmbiguousTrackToClusterMapMaker;
+import org.lcsim.recon.pfa.identifier.HelixExtrapolator;
+import org.lcsim.recon.pfa.identifier.TrackToElectronMapMaker;
+import org.lcsim.recon.pfa.identifier.TrackToGenericClusterMapMaker;
+import org.lcsim.recon.pfa.identifier.TrackToMipClusterMapMaker;
+import org.lcsim.recon.pfa.identifier.TrackToPreShowerMipMapMaker;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.debug.DebugTrackToClusterSpecialCases;
import org.lcsim.util.Driver;
import org.lcsim.util.ListAddDriver;
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.3 -r1.4
--- SetUpPFA.java 11 Apr 2012 15:49:36 -0000 1.3
+++ SetUpPFA.java 19 Apr 2012 13:18:44 -0000 1.4
@@ -5,7 +5,7 @@
import org.lcsim.event.*;
import org.lcsim.event.util.*;
import org.lcsim.util.decision.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.recon.cluster.util.CalorimeterHitTimeCutDecision;
import org.lcsim.recon.cluster.util.UpperSubLayerDecision;
import org.lcsim.recon.util.CalorimeterInformation;
@@ -17,7 +17,7 @@
UnphysicalTrackDecision dec = new UnphysicalTrackDecision();
//default input realistic tracks
ListFilterDriver fil = new ListFilterDriver(dec,"Tracks", "FilteredTrackList", Track.class);
- HelixExtrapolator findCluster = new org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.TrackHelixPlusHitExtrapolator();
+ HelixExtrapolator findCluster = new org.lcsim.recon.pfa.identifier.TrackHelixPlusHitExtrapolator();
ReclusterDTreeDriver reclusTree = null;
public void setFilterInputTrack(String x){ fil.setInputList(x); }
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.1 -r1.2
--- SlicedShowerBuilder.java 11 Apr 2012 15:49:36 -0000 1.1
+++ SlicedShowerBuilder.java 19 Apr 2012 13:18:44 -0000 1.2
@@ -10,7 +10,7 @@
import org.lcsim.contrib.uiowa.uiowapfa.recon.cluster.clumpfinder.kmean.*;
import org.lcsim.recon.util.CalorimeterInformation;
import org.lcsim.geometry.Calorimeter.CalorimeterType;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.shower.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.sharing.*;
import org.lcsim.math.probability.Erf;
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.2 -r1.3
--- TrackToClusterCosAngle.java 11 Apr 2012 15:49:36 -0000 1.2
+++ TrackToClusterCosAngle.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -4,7 +4,7 @@
import hep.physics.vec.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.cluster.structural.likelihood.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
public class TrackToClusterCosAngle extends TrackToClusterLikelihoodQuantity
{
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.2 -r1.3
--- TrackToClusterDistance.java 11 Apr 2012 15:49:36 -0000 1.2
+++ TrackToClusterDistance.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -4,7 +4,7 @@
import hep.physics.vec.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.cluster.structural.likelihood.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
public class TrackToClusterDistance extends TrackToClusterLikelihoodQuantity
{
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.2 -r1.3
--- TrackToClusterForce.java 11 Apr 2012 15:49:36 -0000 1.2
+++ TrackToClusterForce.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -4,7 +4,7 @@
import hep.physics.vec.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.cluster.structural.likelihood.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
public class TrackToClusterForce extends TrackToClusterLikelihoodQuantity
{
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.2 -r1.3
--- TrackToClusterLikelihoodQuantity.java 11 Apr 2012 15:49:36 -0000 1.2
+++ TrackToClusterLikelihoodQuantity.java 19 Apr 2012 13:18:44 -0000 1.3
@@ -2,7 +2,7 @@
import org.lcsim.event.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.cluster.structural.likelihood.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.HelixExtrapolator;
+import org.lcsim.recon.pfa.identifier.HelixExtrapolator;
/**
* Extends the StructuralLikelihoodQuantity and foces arguments of type Shower
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural
diff -u -r1.4 -r1.5
--- TrackToClusterSpecialCasesMapMaker.java 11 Apr 2012 15:49:36 -0000 1.4
+++ TrackToClusterSpecialCasesMapMaker.java 19 Apr 2012 13:18:44 -0000 1.5
@@ -9,7 +9,7 @@
import org.lcsim.recon.cluster.util.*;
import org.lcsim.recon.cluster.mipfinder.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.cluster.structural.likelihood.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.geometry.Calorimeter.CalorimeterType;
import org.lcsim.geometry.*;
@@ -35,11 +35,14 @@
HelixExtrapolator m_extrapolator;
boolean m_init;
+ String m_myInputTrackListName;
+
public TrackToClusterSpecialCasesMapMaker(String inputTrackList, String outputMap, String outputUnmatchedTrackList,
HelixExtrapolator extrapolator) {
super(inputTrackList, outputMap, outputUnmatchedTrackList);
+ m_myInputTrackListName = inputTrackList;
m_trackToClusterMapNames = new Vector<String>();
m_mipListNames = new Vector<String>();
@@ -116,7 +119,7 @@
if(m_properties.getFlag("considerMipsInLinkableClusters")) linkableClustersForExtrapolation.addAll(mips);
linkableClustersForExtrapolation.addAll(clumps);
linkableClustersForExtrapolation.addAll(blocks);
- trackList = event.get(Track.class, m_inputTrackListName);
+ trackList = event.get(Track.class, m_myInputTrackListName);
// input track-seed matching
trackToClusterMap = new HashMap<Track,Cluster>();
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa/uiowapfa/recon/pfa/structural/shower
diff -u -r1.3 -r1.4
--- Shower.java 11 Apr 2012 15:49:37 -0000 1.3
+++ Shower.java 19 Apr 2012 13:18:45 -0000 1.4
@@ -6,7 +6,7 @@
import org.lcsim.recon.cluster.util.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.sharing.*;
import org.lcsim.event.base.*;
-import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.identifier.*;
+import org.lcsim.recon.pfa.identifier.*;
import org.lcsim.util.swim.*;
import org.lcsim.contrib.uiowa.uiowapfa.recon.pfa.structural.*;
CVSspam 0.2.12