First update of the MIP Cluster Builder based on comments received on the first version. 1) The HitCollection 'Flash.java' was updated to use exclusively the towerID of a CalorimeterHit and not the pointer to the hit (required by the MST) 2) In the recursive MIP Clustering algorithm, MIPs that fork (most likely due to elastic scattering) are reconstructed as one MIP. A flag was introduced which can be read by the user to reject these MIPs. 3) An additional flag was introduced in the MIPClusterProcessor to provide the user with the probability to update the MIPClusterList after a second pass. The default was (and still is) that in a second pass a possibly existing list with the same name is replaced.

+ public boolean doesFork(){ + /** + Returns <tt>true</tt> or <tt>false</tt> depending on + whether the MIP track forks or not + */ + return lFork; + } + public void doesFork(boolean b){ + /** + Sets the <tt>Fork</tt> Flag + */ + lFork = b; + } +

lcd/hep/lcd/recon/cluster/MIP

MIPClusterBuilder.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- MIPClusterBuilder.java	25 Jul 2005 17:19:23 -0000	1.1
+++ MIPClusterBuilder.java	1 Aug 2005 23:48:49 -0000	1.2
@@ -1,4 +1,4 @@

-package hep.lcd.recon.cluster.MIP;

+package MIP;

 
 import java.io.*;
 import java.text.*;

@@ -106,13 +106,25 @@

 	    MIPCluster cluster = new MIPCluster(thisCell,
 						nSeedLayers,
 						direction);

+	    iSingleHitsInLayer = new int[50];

 
 	    if ( validate(hit) ){
 		cluster.addHit(hit); 
 		flash.remove(hit); 
 		
 		extend(cluster,hit,flash);

-		if ( cluster.isGoodMIP() ) vCluster.add(cluster);

+		if ( cluster.isGoodMIP() ) {
+//
+// See if MIP forks. Criteria is two SingeHits in the same Layer
+//
+		    boolean lFork = false; 
+		    for ( int i=0; i<thisCell.getNumEMLayers(); i++ ){
+			if ( iSingleHitsInLayer[i]>=2 ) lFork = true; 
+		    }
+
+		    cluster.doesFork(lFork); 
+		    vCluster.add(cluster); 
+		}

 	    }
 	}
 //

@@ -126,7 +138,9 @@

 		int i=0; 
 		for ( Enumeration e2 = cluster.getHits(); e2.hasMoreElements(); ){
 		    CalorimeterHit hit = (CalorimeterHit) e2.nextElement();

-		    System.out.println("  "+i+":"+hit);

+		    thisCell.setTowerID(hit.getTowerID()); 
+		    
+		    System.out.println("  "+i+":"+hit+" "+thisCell.getLayer()+" "+thisCell.getThetaBin()+" "+thisCell.getPhiBin());

 		    i++;
 		}
 	    }

@@ -135,7 +149,9 @@

 	return ((Vector) vCluster); 
     }

-    private void extend(MIPCluster c, CalorimeterHit h, HitCollection hc){

+    private void extend(MIPCluster c, 
+			CalorimeterHit h, 
+			HitCollection hc ) {

 	
 	thisCell.setTowerID(h.getTowerID()); 
 	thisCell.setThetaRange(1);

@@ -145,6 +161,7 @@

 	int[] neighbours = thisCell.getNeighbouringCells(); 
 	Vector vHits = new Vector();

+	int iNeighboursInNextLayer = 0;

 	for ( int i=0; i<neighbours.length; i++ ){
 	    CalorimeterHit hit = hc.find(neighbours[i]);

@@ -155,9 +172,10 @@

 		int jLayer = thisCell.getLayer() * direction; 
 
 		if ( jLayer == iLayer+1 ) {

+		    
+		    iNeighboursInNextLayer++; 
+		    if ( validate(hit) ) {

-//		    if ( validate(hit) ) vHits.add(hit); 
-		    if ( validate(hit) ){

 			c.addHit(hit); 
 			hc.remove(hit); 
 			extend(c,hit,hc);

@@ -174,10 +192,17 @@

 	Enumeration e = hitTypes.elements(); 
 	while ( e.hasMoreElements() && !lValidate ){
 	    AbstractHitType aType = (AbstractHitType) e.nextElement();

+	    //	    System.out.println("--------------aType"+aType+" "+(aType instanceof SingleHit)); 
+

 	    if ( isInSeedLayer(h) && !aType.useInSeeds() ) continue; 
 	    if ( aType.isValid(h,thisCell,flash) ){
 		lValidate = true; 
 	    }

+	    
+	    if ( lValidate && (aType instanceof SingleHit) ){
+		thisCell.setTowerID(h.getTowerID()); 
+		iSingleHitsInLayer[thisCell.getLayer()]++; 
+	    }

 	}
 	return lValidate; 
     }

@@ -258,11 +283,12 @@

     private int nSeedLayers = 4; 
     private int firstLayer = 0; 
     private int direction = 1;

+    private int[] iSingleHitsInLayer;

 
     private Vector vMIP = new Vector();  
     private int depth = 0;

-    private boolean lDebug = true;

+    private boolean lDebug = false;

 
     public void setDebugMode(boolean b){
 	lDebug = b;

+ public Vector getVList(){ + return this.vList; + } + public void addVList(Vector v){ + this.vList.addAll(v); + } + + public void appendList(Vector v){ + this.vList.addAll(v); + } +

+ event.put(clusterName,new MIPClusterList(clusterBuilder.getMIPClusterList())); + + boolean lKeyExists = false; + Enumeration eKey = (Enumeration) event.keys(); + while ( eKey.hasMoreElements() ){ + if ( ((String) eKey.nextElement()).equals(clusterName) ) lKeyExists=true; + } + + MIPClusterList newList = new MIPClusterList(clusterBuilder.getMIPClusterList()); + if ( lKeyExists && lAppend ){ + MIPClusterList existingList = (MIPClusterList) event.get(clusterName); + newList.addVList(existingList.getVList()); + } + event.put(clusterName, newList);

Commit in `lcd/hep/lcd/recon/cluster/MIP` on MAIN
`AbstractHitType.java`	+1	-1	1.1 -> 1.2
`DoubleHit.java`	+1	-1	1.1 -> 1.2
`Flash.java`	+23	-14	1.1 -> 1.2
`HitCollection.java`	+1	-1	1.1 -> 1.2
`MIPCluster.java`	+20	-1	1.1 -> 1.2
`MIPClusterBuilder.java`	+33	-7	1.1 -> 1.2
`MIPClusterList.java`	+12	-1	1.1 -> 1.2
`MIPClusterProcessor.java`	+24	-3	1.1 -> 1.2
`SingleHit.java`	+1	-1	1.1 -> 1.2
	+116	-30