3 modified files
lcsim/src/org/lcsim/recon/cluster/directedtree
diff -u -r1.1 -r1.2
--- MyTools.java 8 Jan 2006 14:28:22 -0000 1.1
+++ MyTools.java 9 Feb 2006 21:18:04 -0000 1.2
@@ -15,7 +15,7 @@
public class MyTools
{
// 1=sidaug05; 2=sidaug05_tcmt; 3=sdnphoct04
- static int detector = 2;
+ static int detector = 3;
// // This returns the index of object obj in collection col
// public static int indexOf( LCObject obj, LCCollection col )
@@ -73,9 +73,12 @@
}
if(detector==3) {
int max = 1<<16; // for 16 bits
- thetabin = (int)((cellid>>32) & 0xffff);
+ thetabin = (int)((cellid>>48) & 0xffff);
// sign bit
if( thetabin > max/2-1 ) thetabin = thetabin - max;
+
+// // temporary - for comparison with Vishnu's IDs
+// if(MyTools.getSystemBarrel(cellid)==3) thetabin += 287;
}
return thetabin;
}
@@ -88,7 +91,7 @@
if( phibin > max/2-1 ) phibin = phibin - max;
}
if(detector==2) phibin = (int)((cellid>>32) & 0xffff);
- if(detector==3) phibin = (int)((cellid>>48) & 0xffff);
+ if(detector==3) phibin = (int)((cellid>>32) & 0xffff);
return phibin;
}
@@ -107,8 +110,8 @@
}
public static String printID(long id) {
- return new String("<"+Long.toHexString(id)
- +": "+Integer.toString( getSystemBarrel(id) )
+ return new String("<"+Long.toHexString(id)+": "
+ +Integer.toString( getSystemBarrel(id) )
+" "+Integer.toString( getLayer(id) )
+" "+Integer.toString( getThetaBin(id))
+" "+Integer.toString( getPhiBin(id) )
lcsim/src/org/lcsim/recon/cluster/directedtree
diff -u -r1.1 -r1.2
--- TrackHitMatcher.java 8 Jan 2006 14:28:22 -0000 1.1
+++ TrackHitMatcher.java 9 Feb 2006 21:18:04 -0000 1.2
@@ -22,7 +22,7 @@
* A helper class for track-hit matching in a single calorimeter component
*
* @author Guilherme Lima
- * @version $Id: TrackHitMatcher.java,v 1.1 2006/01/08 14:28:22 lima Exp $
+ * @version $Id: TrackHitMatcher.java,v 1.2 2006/02/09 21:18:04 lima Exp $
*/
public class TrackHitMatcher {
@@ -139,7 +139,7 @@
private Subdetector _subdet = null;
private SegmentationBase _segm = null;
private Map<Long,CalorimeterHit> _hitmap = null;
-// private LoadMyCalorimeterHit _loader = LoadMyCalorimeterHit.getInstance();
+
private CalHitMapMgr _expert = CalHitMapMgr.getInstance();
private int _dU, _dV;
// private AIDA _aida = AIDA.defaultInstance();
lcsim/src/org/lcsim/recon/cluster/directedtree
diff -u -r1.1 -r1.2
--- TrackMatchingDriver.java 8 Jan 2006 14:28:22 -0000 1.1
+++ TrackMatchingDriver.java 9 Feb 2006 21:18:04 -0000 1.2
@@ -19,7 +19,6 @@
import org.lcsim.geometry.subdetector.CylindricalCalorimeter;
import org.lcsim.geometry.layer.Layering;
import org.lcsim.util.swim.HelixSwimmer;
-import org.lcsim.util.swim.HelixSwim;
import org.lcsim.geometry.IDDecoder;
import org.lcsim.event.ReconstructedParticle;
import org.lcsim.recon.cluster.util.CalHitMapMgr;
@@ -28,7 +27,7 @@
* A driver for track matching using the swimmer.
*
* @author Guilherme Lima
- * @version $Id: TrackMatchingDriver.java,v 1.1 2006/01/08 14:28:22 lima Exp $
+ * @version $Id: TrackMatchingDriver.java,v 1.2 2006/02/09 21:18:04 lima Exp $
*/
public class TrackMatchingDriver extends Driver {
@@ -219,10 +218,10 @@
private double _rhoMinEM;
private double _rhoMinHAD;
- private String _embName = "EcalBarrHits";
- private String _hdbName = "HcalBarrHits";
- private String _emeName = "EcalEndcapHits";
- private String _hdeName = "HcalEndcapHits";
+ private String _embName = "EcalBarrDigiHits";
+ private String _hdbName = "HcalBarrDigiHits";
+ private String _emeName = "EcalEndcapDigiHits";
+ private String _hdeName = "HcalEndcapDigiHits";
private double[] _layersEMB;
private double[] _layersEME;
private double[] _layersHDB;
@@ -233,5 +232,4 @@
private TrackHitMatcher _hdeMatcher;
private HelixSwimmer _swimmer;
- private LoadMyCalorimeterHit _loader = LoadMyCalorimeterHit.getInstance();
}
CVSspam 0.2.8