lcsim/src/org/lcsim/recon/muon

diff -u -r1.12 -r1.13
--- MuonCalSegmentFinder.java	14 Jul 2006 15:54:39 -0000	1.12
+++ MuonCalSegmentFinder.java	13 Sep 2006 21:47:12 -0000	1.13
@@ -36,8 +36,8 @@

         super(det, subdetectorName);
 
         // Set the nearest neighbor cuts to default values

-        setPhiNNCut(2);//2
-        setThetaNNCut(2);//2

+        setPhiNNCut(3);//2
+        setThetaNNCut(3);//2

 
 	// getting info from the coil
         coilSlices = new Vector<CoilSubLayer>();

@@ -83,7 +83,7 @@

 
 	   BField = field[2];
         double dist= Math.abs(r-stpr.partR(rpVect));

-        stpr.tkSteps(r,zmax,det, materialName);                 //goes up to the coil

+        stpr.tkSteps(r,zmax,det, materialName);          //goes up to the coil

         rpVect =stpr.getNewRp();                         // get coordinates
         // From the COIL on
 

@@ -99,7 +99,7 @@

 	    System.out.println("*** Aborting at the coil");
             return;    // does not hit the coil
         }

-      System.out.println("TAKING CARE OF THE COIL");

+        System.out.println("TAKING CARE OF THE COIL");

         // In the COIL
 	    int islice = 0;
             double dt_r;

@@ -126,10 +126,7 @@

  			       +", dr="+dr
  			       +", totalDedx="+totalDedx
  			       +", field="+field[2]

- 			       +", rad="+radius+", z="+rpVect[2] );
-
-	    //stepConditions = steprConditions(dr, field[2], totalDedx,dt_r);
-            

+ 			       +", rad="+radius+", z="+rpVect[2] );            

 	    stpr.tkSteps(r,zmaxSlice,det, ii);
 	    rpVect   = stpr.getNewRp();
 	    ++islice;

@@ -171,13 +168,13 @@

         rpVect          = stpr.getNewRp();
         // Get intersections with succesive layers as long as track is
         // within the detector

-        //int activLayers=32;

 	    if(debug)System.out.println("Problem: rpVect2="+rpVect[2]+", zmax="+zmax+", nr="+nr);
         while (Math.abs(rpVect[2]) < zmax && nr < nLayers )
         {
            Hep3Vector v = new BasicHep3Vector(rpVect[0],rpVect[1],rpVect[2]);
            hitPos.add(v);

-

+           long virtualID = segm.findCellContainingXYZ( rpVect );
+           cellList.add(virtualID);

 	    if(stpr.getStopTkELow())break; // C.M.
 	    // Go on to the next layer
 	    if(nr!=(nLayers-1)) r = r + dr;

@@ -198,11 +195,10 @@

         {
            Hep3Vector v = new BasicHep3Vector(rpVect[0],rpVect[1],rpVect[2]);
            hitPos.add(v);

+           long virtualID = segm.findCellContainingXYZ( rpVect );
+           cellList.add(virtualID);

         }
         // Now match the cells on this list to calorimeter hits

-
-
-

         Map<Long,CalorimeterHit> muhits = dataMgr.getCollHitMap(muonName);
 	    if(debug)System.out.println("# muon hits: "+muhits.size());
         matchHitsFast( segm, dataMgr.getCollHitMap(muonName), true );