lcsim/src/org/lcsim/recon/muon

diff -u -r1.5 -r1.6
--- MuonCalSegmentFinder.java	12 Dec 2005 22:35:39 -0000	1.5
+++ MuonCalSegmentFinder.java	27 Dec 2005 16:07:19 -0000	1.6
@@ -31,8 +31,8 @@

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

-        setPhiNNCut(3);
-        setThetaNNCut(2);

+        setPhiNNCut(0);
+        setThetaNNCut(0);

        
 	// getting info from the coil
 	MultiLayerTracker coilsub = (MultiLayerTracker)det.getSubdetectors().get("SolenoidCoilBarrel");

@@ -79,14 +79,12 @@

         
         numLayersHit = 0;
         double rr=0.;

-        double zmxField = 0.;

 	FieldMap fm = det.getFieldMap();
         if( fm instanceof Solenoid)
         {
            Solenoid sol = (Solenoid) fm;

-           zmxField = sol.getZMax();

            rr = Math.sqrt(sol.getOuterRadius2());

-	   System.out.println("MCSF: Coil outer_radius="+rr+" zmxCoil="+zmxField);

+	   System.out.println("MCSF: Coil outer_radius="+rr);

          }
 
         // Forms a muon segment by looking for calorimeter hits that match

@@ -187,9 +185,10 @@

         r= r + (rmin-rNow);
         stpr.tkSteps(r,zmax,stepConditions);
         rpVect=stpr.getNewRp();

-	System.out.println("spot 3: rpVect[2]="+rpVect[2]+", zmax="+zmax+", nr="+nr);

-        r = rmin + 0.5*dr;

+        r = rLayer0Mid;
+	System.out.println("spot 3: rpVect[2]="+rpVect[2]+", zmax="+zmax+", nr="+nr+", rLay0mid="+r);
+

         rNow=Math.sqrt(rpVect[0]*rpVect[0]+rpVect[1]*rpVect[1]);
         xNSteps = (r-rNow)*10.;
         double muFieldNorm = 0.;

@@ -227,7 +226,7 @@

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

-	    else                    {r=r+0.5*dr;}

+	    else              { r = rmin + nLayers*dr; }

 	    xNSteps=(r-Math.sqrt(rpVect[0]*rpVect[0]+rpVect[1]*rpVect[1]))*10.;
 	    stepConditions = steprConditions(xNSteps,muFieldNorm,meanDEdxPerLay(subdetName));
 	    stpr.tkSteps(r,zmax,stepConditions);