Commit in lcsim/src/org/lcsim/contrib/SODTracker on MAIN
History+111.4 -> 1.5
SODFittedHel.java+1-11.1 -> 1.2
SODTrackFinder.java+4-11.4 -> 1.5
+16-2
3 modified files
improve performance when loopers are present in an event

lcsim/src/org/lcsim/contrib/SODTracker
History 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- History	13 Dec 2006 22:47:32 -0000	1.4
+++ History	3 Jan 2007 21:45:09 -0000	1.5
@@ -3,6 +3,17 @@
 ## Please summarize changes to the SODTracker code here.
 ## Most recent first please.
 
+03 January 2007 Fred Blanc
+
+   - SODFittedHel.java: commented out message about failing matrix inversion.
+
+   - SODTrackFinder.java: added break statements to exit 'for' loops after
+     hits in different layers have been found to originate from the same
+     MCParticle. This only affects the search for seed tracks ("cheater") in
+     the Vertex Detector, and prevents the code to go into very long loops
+     for track loopers. This part of the code will be unused after the track
+     seeds are provided by a track finder.
+
 13 December 2006 Fred Blanc
    Replace use of SymmetricMatrix with double[][] in SODTrack
 

lcsim/src/org/lcsim/contrib/SODTracker
SODFittedHel.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- SODFittedHel.java	28 Jul 2006 20:21:41 -0000	1.1
+++ SODFittedHel.java	3 Jan 2007 21:45:09 -0000	1.2
@@ -212,7 +212,7 @@
          (Math.abs(I[0][4]    )<epsilon)&&(Math.abs(I[1][2]    )<epsilon)&&(Math.abs(I[1][3]    )<epsilon)&&
          (Math.abs(I[1][4]    )<epsilon)&&(Math.abs(I[2][3]    )<epsilon)&&(Math.abs(I[2][4]    )<epsilon)&&
          (Math.abs(I[3][4]    )<epsilon))rtflg=true;
-     if (!rtflg)System.out.println("MATRIX INVERSION FAILED!!!!!");
+//     if (!rtflg)System.out.println("MATRIX INVERSION FAILED!!!!!");
      prtflg=0;
      if (prtflg!=0){      
       for (int ii=0; ii<norder; ii++){

lcsim/src/org/lcsim/contrib/SODTracker
SODTrackFinder.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- SODTrackFinder.java	28 Jul 2006 20:21:41 -0000	1.4
+++ SODTrackFinder.java	3 Jan 2007 21:45:09 -0000	1.5
@@ -63,17 +63,20 @@
 						    sh1.SetUsedOnHel(1);sh2.SetUsedOnHel(1);sh3.SetUsedOnHel(1);
 						    sh4.SetUsedOnHel(1);sh5.SetUsedOnHel(1);
 						}
+						break;
 					    } // if(mcp4==mcp5) {
 					} // for l5
+					break;
 				    } // if(mcp3==mcp4) {
 				} // for l4
+				break;
 			    }  // if(mcp2==mcp3) {
 			} // for l3
+			break;
 		    }// if(mcp1==mcp2) {
 		} // for l2
 	    } // for l1
 	} // if lists not empty
-
        } else { // if(useMCTruth) {
     
 //	System.out.println("find seed track from combinatorics")
CVSspam 0.2.8