diff -u -r1.14 -r1.15
--- BarrelCalSegmentFinder.java	27 Dec 2005 16:05:16 -0000	1.14
+++ BarrelCalSegmentFinder.java	27 Dec 2005 23:05:17 -0000	1.15
@@ -66,14 +66,6 @@

 
 	dataMgr = CalHitMapMgr.getInstance();
 	segm = (SegmentationBase)calsub.getReadout().getSegmentation();

-
-// 	if( segm instanceof ProjectiveCylinder ) {
-// 	  ProjectiveCylinder projCal = (ProjectiveCylinder)segm;
-// 	  nPhi = projCal.getPhiBins();
-// 	  nTheta = projCal.getThetaBins();
-// 	  phiBinSize = 2*Math.PI/nPhi;
-// 	  thetaBinSize = Math.PI/nTheta;
-// 	  System.out.println("MY NAME IS "+subdetName+" rin="+rmin+" rout="+rmax+" zmax="+zmax+", phiBinSize="+phiBinSize+", thetaBinSize="+thetaBinSize);

 	  // Set the nearest neighbor cuts to default values
 	if(subdetName.equals(ecalSubdetName)) {
             phiNNCut   = 0; // 2;

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

 	    phiNNCut   = 0; // 3;
 	    thetaNNCut = 0; // 2;
 	}

-// 	}

+

 
 	// FIXME: This code is specific to SDJan03 - it would be nice to code
 	// this up independent of detector geometry - to be read from

@@ -129,7 +121,7 @@

         r=rmin;
         // UPDATE Phase-Space
         rpVect  = stpr.getNewRp();

-	    System.out.println("findSegment: subd="+subdetName);

+	System.out.println("findSegment: subd="+subdetName);

         if(subdetName.equals(ecalSubdetName))
         {
         // Then do the Tracker up to r=rmin

@@ -144,7 +136,7 @@

 	    System.out.println("Tracker r=" +r+" zmax="+zmax);
 	    System.out.println("Barrel:out of Tracker");
 	    rpVect   = stpr.getNewRp();

-	    System.out.println("debug pos: ("+rpVect[0]+"; "+rpVect[1]+"; "+rpVect[2]+"), r="+stpr.partR());

+	    System.out.println("swimOnly -Stepper pos ENTRY of:("+subdetName+" "+rpVect[0]+"; "+rpVect[1]+"; "+rpVect[2]+"), r="+stpr.partR());

 	}
 
 

@@ -160,9 +152,11 @@

 	    stepConditions = steprConditions((10*d_EMHD),BField,0.0);
 	    stpr.tkSteps(r,zmax,stepConditions);
 	    rpVect  = stpr.getNewRp();

+	 System.out.println("swimOnly -Stepper pos ENTRY of:("+subdetName+" "+rpVect[0]+"; "+rpVect[1]+"; "+rpVect[2]+"), r="+stpr.partR());    
+	    

         }
 

-        xNumSteps = 10.;

+        xNumSteps = 20.*dr;

         stepConditions = steprConditions(xNumSteps,BField,meanDEdxPerLay(subdetName));
 	System.out.println("Barrel:MeanDEdxPerLay="+meanDEdxPerLay(subdetName));
         // Forms a muon segment by looking for calorimeter hits that match

@@ -181,13 +175,7 @@

         while ((Math.abs(rpVect[2]) < zmax )&& (nr < nLayers))
         {
 //-- replace with a more general way: findCellContainingXYZ.  GL051211

-// 	    int iphi = xyzToPhiBin(rpVect);int itheta = xyzToThetaBin(rpVect);
-// 	    encoder.setValue("layer", nr);encoder.setValue("theta", itheta); encoder.setValue("phi", iphi);
-// 	    long cellid = encoder.getID();
-//-------------------------------------------------------
-

             // Add cell to list

-

 //  	    System.out.println("BCSF.findSegment: ("+rpVect[0]+"; "+rpVect[1]+"; "+rpVect[2]+"), rho="+stpr.partR());
 
 //          System.out.println(" virtual cell: layer="+nr+", iphi="+iphi+", itheta="+itheta);

@@ -207,7 +195,6 @@

 	    if(stpr.getStopTkELow()) break;
 	    if(nr!=(nLayers-1)) r = r + dr;
 	    else {

-//               r=r+0.5*dr;

 	      r = rmin + nLayers * dr;
 	      System.out.println("Exit of "+subdetName+", r="+r);
 	    }	 // Go on to the next layer

@@ -217,8 +204,9 @@

         }
         // Save number of layers track passed through
         numLayersHit = nr;

+	 System.out.println("swimOnly -Stepper pos EXIT of:("+subdetName+" "+rpVect[0]+"; "+rpVect[1]+"; "+rpVect[2]+"), r="+stpr.partR());    

         rpVect= stpr.getNewRp();

-	    double rr=stpr.partR();

+	double rr=stpr.partR();

        // Now match the cells on this list to calorimeter hits
 // 	System.out.println("Names: subdetName=<"+subdetName+">"
 // 			   +", EcalSubdetName="+ecalSubdetName