Print

Print


Commit in lcsim/src/org/lcsim/recon/tracking/seedtracker/diagnostic on MAIN
EmptySeedTrackerDiagnostics.java+2-11.2 -> 1.3
ISeedTrackerDiagnostics.java+3-11.3 -> 1.4
SeedTrackerDiagnostics.java+24-61.7 -> 1.8
+29-8
3 modified files
Update diagnostics to reflect new fast check code

lcsim/src/org/lcsim/recon/tracking/seedtracker/diagnostic
EmptySeedTrackerDiagnostics.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- EmptySeedTrackerDiagnostics.java	19 Aug 2009 22:11:32 -0000	1.2
+++ EmptySeedTrackerDiagnostics.java	6 Nov 2009 00:25:18 -0000	1.3
@@ -21,7 +21,8 @@
  */
 public class EmptySeedTrackerDiagnostics extends AbstractSeedTrackerDiagnostics implements ISeedTrackerDiagnostics {
 
-    public void fireCheckHitPairFailed(HelicalTrackHit hit1, HelicalTrackHit hit2, SeedCandidate seed) {return;}
+    public void fireCheckHitPairFailed(HelicalTrackHit hit1, HelicalTrackHit hit2) {return;}
+    public void fireCheckHitTripletFailed(HelicalTrackHit hit1, HelicalTrackHit hit2, HelicalTrackHit hit3) {return;}
     public void fireCheckHitFailed(HelicalTrackHit hit, SeedCandidate seed) {return;}
     public void fireFinderDone(List<SeedCandidate> trkseeds, Set<MCParticle> mcp_seeds) {return;}
     public void fireFailedChisqCut(SeedCandidate seed) {return;}

lcsim/src/org/lcsim/recon/tracking/seedtracker/diagnostic
ISeedTrackerDiagnostics.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- ISeedTrackerDiagnostics.java	19 Aug 2009 22:11:32 -0000	1.3
+++ ISeedTrackerDiagnostics.java	6 Nov 2009 00:25:18 -0000	1.4
@@ -52,7 +52,9 @@
      */
     public void fireStrategyChanged(SeedStrategy strategy);
 
-    public void fireCheckHitPairFailed(HelicalTrackHit hit1, HelicalTrackHit hit2, SeedCandidate seed);
+    public void fireCheckHitPairFailed(HelicalTrackHit hit1, HelicalTrackHit hit2);
+
+    public void fireCheckHitTripletFailed(HelicalTrackHit hit1, HelicalTrackHit hit2, HelicalTrackHit hit3);
     
     public void fireCheckHitFailed(HelicalTrackHit hit, SeedCandidate seed);
 

lcsim/src/org/lcsim/recon/tracking/seedtracker/diagnostic
SeedTrackerDiagnostics.java 1.7 -> 1.8
diff -u -r1.7 -r1.8
--- SeedTrackerDiagnostics.java	3 Sep 2009 17:53:18 -0000	1.7
+++ SeedTrackerDiagnostics.java	6 Nov 2009 00:25:18 -0000	1.8
@@ -25,16 +25,34 @@
     }
 
     @Override
-    public void fireCheckHitPairFailed(HelicalTrackHit hit1, HelicalTrackHit hit2, SeedCandidate seed) {
-        printmsg(seed, "True seed failed hit pair check");
-        if (seed.isTrueSeed()) {
-            System.out.println("Number of hits in seed: "+seed.getHits().size());
-            System.out.println("Hit 1 position: "+hit1.getCorrectedPosition().toString());
-            System.out.println("Hit 2 position: "+hit2.getCorrectedPosition().toString());
+    public void fireCheckHitPairFailed(HelicalTrackHit hit1, HelicalTrackHit hit2) {
+        for (MCParticle mcp : hit1.getMCParticles()) {
+            if (hit2.getMCParticles().contains(mcp)) {
+                System.out.println("Hits from same MC particle failed hit pair check");
+                System.out.println("MC momentum: "+mcp.getMomentum().toString());
+                System.out.println("Hit 1 position: "+hit1.getCorrectedPosition().toString());
+                System.out.println("Hit 2 position: "+hit2.getCorrectedPosition().toString());
+            }
         }
     }
 
     @Override
+    public void fireCheckHitTripletFailed(HelicalTrackHit hit1, HelicalTrackHit hit2, HelicalTrackHit hit3) {
+        for (MCParticle mcp : hit1.getMCParticles()) {
+            if (hit2.getMCParticles().contains(mcp)) {
+                if (hit3.getMCParticles().contains(mcp)) {
+                    System.out.println("Hits from same MC particle failed hit triplet check");
+                    System.out.println("MC momentum: "+mcp.getMomentum().toString());
+                    System.out.println("Hit 1 position: "+hit1.getCorrectedPosition().toString());
+                    System.out.println("Hit 2 position: "+hit2.getCorrectedPosition().toString());
+                    System.out.println("Hit 3 position: "+hit3.getCorrectedPosition().toString());
+               }
+            }
+        }
+    }
+
+
+    @Override
     public void fireCheckHitFailed(HelicalTrackHit hit, SeedCandidate seed) {
         printmsg(seed, "True seed failed hit and seed check");
     }
CVSspam 0.2.8