diff -u -r1.2 -r1.3
--- DirectedTreeClusterer.java	9 Feb 2006 21:17:59 -0000	1.2
+++ DirectedTreeClusterer.java	20 Feb 2006 22:48:12 -0000	1.3
@@ -26,8 +26,6 @@

 
     public DirectedTreeClusterer() {
         _rcp = RunControlParameters.getInstance();

-	_emEcut = _rcp.getEMmip() * _rcp.getEMthresh() / _rcp.getEMweight();
-	_hdEcut = _rcp.getHDmip() * _rcp.getHDthresh() / _rcp.getHDweight();

     }
 
     public void process(EventHeader event) {

@@ -41,20 +39,20 @@

         _roMap = event.getDetector().getReadouts();
 
 	// load hit maps

-	String embName = "EcalBarrDigiHits";
-	String emeName = "EcalEndcapDigiHits";
-	String hdbName = "HcalBarrDigiHits";
-	String hdeName = "HcalEndcapDigiHits";
-	embhitmap = _expert.getCollHitMap(embName, _emEcut);
-	emehitmap = _expert.getCollHitMap(emeName, _emEcut);
-	hdbhitmap = _expert.getCollHitMap(hdbName, _hdEcut);
-	hdehitmap = _expert.getCollHitMap(hdeName, _hdEcut);
-
-	// define densities
-	_loader.setDensities(embName, embhitmap);
-	_loader.setDensities(emeName, emehitmap);
-	_loader.setDensities(hdbName, hdbhitmap);
-	_loader.setDensities(hdeName, hdehitmap);

+ 	String embName = "EcalBarrDigiHits";
+ 	String emeName = "EcalEndcapDigiHits";
+ 	String hdbName = "HcalBarrDigiHits";
+ 	String hdeName = "HcalEndcapDigiHits";
+ 	embhitmap = _expert.getCollHitMap(embName);
+ 	emehitmap = _expert.getCollHitMap(emeName);
+ 	hdbhitmap = _expert.getCollHitMap(hdbName);
+ 	hdehitmap = _expert.getCollHitMap(hdeName);
+
+ 	// define densities
+ 	_loader.setDensities(embName, embhitmap);
+ 	_loader.setDensities(emeName, emehitmap);
+ 	_loader.setDensities(hdbName, hdbhitmap);
+ 	_loader.setDensities(hdeName, hdehitmap);

 
 	if(_debug>0) {
 	    System.out.println("DTree: #hits: EMB="+embhitmap.size()

@@ -403,7 +401,8 @@

 	  recoClusColl = clusBuilder.makeClusters( trees );
       if (recoClusColl.size() > 0) {
 	  String newName = new String(colName+"DTreeClusters");

-	  event.put( newName, recoClusColl, Cluster.class, (1<<31) );

+	  int flags = 1<<31;  // store hits in clusters
+	  event.put( newName, recoClusColl, Cluster.class, flags );

       }
 
 //       int nhits = hitmap.size();

@@ -425,7 +424,6 @@

     private int _nZ;
     private int _nPhi;
     private int _evtnum;

-    private double _emEcut, _hdEcut;

 
     private ClusterBuilder clusBuilder = new ClusterBuilder();
 }

diff -u -r1.2 -r1.3
--- MyTools.java	9 Feb 2006 21:18:04 -0000	1.2
+++ MyTools.java	20 Feb 2006 22:48:12 -0000	1.3
@@ -15,7 +15,7 @@

 public class MyTools
 {
     // 1=sidaug05;  2=sidaug05_tcmt;  3=sdnphoct04

-    static int detector = 3;

+    static int detector = 2;

 
 //     // This returns the index of object obj in collection col
 //     public static int indexOf( LCObject obj, LCCollection col )

diff -u -r1.2 -r1.3
--- RunControlParameters.java	9 Feb 2006 21:17:59 -0000	1.2
+++ RunControlParameters.java	20 Feb 2006 22:48:12 -0000	1.3
@@ -12,12 +12,13 @@

     private RunControlParameters() {
         if(_me==null) _me=this;
 

-	// sidaug05_tcmt

+	// sidaug05_tcmt (and SDNPHOct04 certification)

         _EMsampWt = 1.0/0.012366;
         _HDsampWt = 1.0/0.03136;
         _EMmip = 0.007439754;  // in GeV (corrected energy)
         _HDmip = 0.026147959;  // in GeV (corrected energy)

-// 	// SDNPHOct04

+
+// 	// SDNPHOct04 (as taken from Vishnu)

 //         _EMsampWt = 1.0/0.022;
 //         _HDsampWt = 1.0/0.03;
 //         _EMmip = 0.008;  // in GeV (corrected energy)

diff -u -r1.2 -r1.3
--- TrackHitMatcher.java	9 Feb 2006 21:18:04 -0000	1.2
+++ TrackHitMatcher.java	20 Feb 2006 22:48:12 -0000	1.3
@@ -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.2 2006/02/09 21:18:04 lima Exp $

+ * @version $Id: TrackHitMatcher.java,v 1.3 2006/02/20 22:48:12 lima Exp $

  */
 public class TrackHitMatcher {
 

@@ -58,7 +58,7 @@

       _hitmap = _expert.getCollHitMap(_colName);
 
       // loop over tracks

-      for( Track trk : event.get(Track.class,"CombinedTracks") ) {

+      for( Track trk : event.getTracks() ) {

 	_trk = trk;
 	_trkHitsMap = trkHitsMap;
 	_trkHits = trkHitsMap.get( trk );

@@ -70,6 +70,7 @@

 
 	for( Hep3Vector pos : trkIntercepts ) {
 	  // find cell containing track-cylinder intersection

+	  if(_debug>0) System.out.println("TkHitMatcher: "+pos.x()+" "+pos.y()+" "+pos.z());

 	  long cellid = _segm.findCellContainingXYZ( pos );
 	  if(cellid==0) continue;
 

@@ -106,7 +107,7 @@

 
     private void initialize(EventHeader event) {
       // layer info

-      CylindricalCalorimeter embSubdet = (CylindricalCalorimeter)_expert.getSubdetector(_colName);

+      CylindricalCalorimeter embSubdet = (CylindricalCalorimeter)_expert.getSubdetector(_colName.replace("Digi",""));

       Layering layers = embSubdet.getLayering();
       int nlayers = layers.getLayerCount();
       _layers = new double[nlayers];

diff -u -r1.2 -r1.3
--- TrackMatchingDriver.java	9 Feb 2006 21:18:04 -0000	1.2
+++ TrackMatchingDriver.java	20 Feb 2006 22:48:12 -0000	1.3
@@ -27,11 +27,11 @@

  * A driver for track matching using the swimmer.
  *
  * @author Guilherme Lima

- * @version $Id: TrackMatchingDriver.java,v 1.2 2006/02/09 21:18:04 lima Exp $

+ * @version $Id: TrackMatchingDriver.java,v 1.3 2006/02/20 22:48:12 lima Exp $

  */
 public class TrackMatchingDriver extends Driver {
 

-    int _debug = 2;  // debug level, 0 for no printout

+    int _debug = 0;  // debug level, 0 for no printout

 
     public TrackMatchingDriver() {
     }

@@ -49,7 +49,8 @@

       Map<Track,Vector<Hep3Vector>> hadInterceptsMap = new HashMap<Track,Vector<Hep3Vector>>();
 
       // loop over tracks

-      List<Track> recoTracks = event.get(Track.class, "CombinedTracks");

+//       List<Track> recoTracks = event.get(Track.class, "CombinedTracks");
+      List<Track> recoTracks = event.getTracks();

       System.out.println("TrackingCheater: # parts="+recoTracks.size());
       for( Track trk : recoTracks ) {
 	Hep3Vector vtx = new BasicHep3Vector( trk.getReferencePoint() );

@@ -67,7 +68,7 @@

 	double sParm1 = _swimmer.getDistanceToCylinder( 1270, 3000 );
 	Hep3Vector pos1 = _swimmer.getPointAtDistance( sParm1 );
 	double rho1 = Math.sqrt(pos1.x()*pos1.x()+pos1.y()*pos1.y());

-	System.out.println("Swimmer@EMentrance: ("+pos1.x()+"; "+pos1.y()+"; "+pos1.z()+", rho="+rho1);

+	if(_debug>0) System.out.println("Swimmer@EMentrance: ("+pos1.x()+"; "+pos1.y()+"; "+pos1.z()+", rho="+rho1);

 
 	// Swim the particle to each sensitive layer, saving intersections
 	boolean looping = false;

@@ -163,7 +164,7 @@

       CalHitMapMgr expert = CalHitMapMgr.getInstance();
 
       // face of EM calorimeter

-      CylindricalCalorimeter embSubdet = (CylindricalCalorimeter)expert.getSubdetector(_embName);

+      CylindricalCalorimeter embSubdet = (CylindricalCalorimeter)expert.getSubdetector(_embName.replace("Digi",""));

       _rhoMinEM = embSubdet.getInnerRadius();
       Layering layers = embSubdet.getLayering();
       int nlayers = layers.getLayerCount();

@@ -172,7 +173,7 @@

 	_layersEMB[i] = layers.getDistanceToLayerSensorMid(i);
       }
 

-      CylindricalCalorimeter emeSubdet = (CylindricalCalorimeter)expert.getSubdetector(_emeName);

+      CylindricalCalorimeter emeSubdet = (CylindricalCalorimeter)expert.getSubdetector(_emeName.replace("Digi",""));

       layers = emeSubdet.getLayering();
       nlayers = layers.getLayerCount();
       _layersEME = new double[nlayers];

@@ -181,7 +182,7 @@

       }
 
       // face of HAD calorimeter

-      CylindricalCalorimeter hdbSubdet = (CylindricalCalorimeter)expert.getSubdetector(_hdbName);

+      CylindricalCalorimeter hdbSubdet = (CylindricalCalorimeter)expert.getSubdetector(_hdbName.replace("Digi",""));

       _rhoMinHAD = hdbSubdet.getInnerRadius();
       layers = hdbSubdet.getLayering();
       nlayers = layers.getLayerCount();

@@ -190,7 +191,7 @@

 	  _layersHDB[i] = layers.getDistanceToLayerSensorMid(i);
       }
 

-      CylindricalCalorimeter hdeSubdet = (CylindricalCalorimeter)expert.getSubdetector(_hdeName);

+      CylindricalCalorimeter hdeSubdet = (CylindricalCalorimeter)expert.getSubdetector(_hdeName.replace("Digi",""));

       layers = hdeSubdet.getLayering();
       nlayers = layers.getLayerCount();
       _layersHDE = new double[nlayers];