diff -u -r1.7 -r1.8
--- MuonReco.java	27 Dec 2005 16:10:26 -0000	1.7
+++ MuonReco.java	29 Dec 2005 17:25:16 -0000	1.8
@@ -20,7 +20,7 @@

 {
     public MuonReco()
     {

-        this(0,0, 1);	// renew

+        this(0,1, 1);	// renew

     }
     
     public MuonReco(int ecalHitsCut, int hcalHitsCut, int muHitsCut)

@@ -60,27 +60,27 @@

 //         for (Enumeration e = event.getTrackList().getTracks();
 //         e.hasMoreElements();)
 

-//	for( Track t : event.getTracks() )

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

         // Dec-25-05

-        List<Track> recoTracks = event.get(Track.class, "CombinedTracks");
-	System.out.println("TrackingCheater: # parts="+recoTracks.size());
-	for( Track trk : recoTracks)
-        {
-	   
-	    double[] vtx = trk.getReferencePoint() ;
-            double[] pvec =  trk.getMomentum()  ;
-	    int icharge =trk.getCharge();
-	    double massMR = ((CheatTrack)trk).getMCParticle().getMass()  ;

+       // List<Track> recoTracks = event.get(Track.class, "CombinedTracks");
+       //	System.out.println("TrackingCheater: # parts="+recoTracks.size());
+     //	for( Track trk : recoTracks)
+        { 
+	    //double[] vtx = trk.getReferencePoint() ;
+            //double[] pvec =  trk.getMomentum()  ;
+	    //int icharge =trk.getCharge();
+	    //double massMR = ((CheatTrack)trk).getMCParticle().getMass()  ;

              	     
 	   // Instantiate TrkParams object for this track
             double [] params = trk.getTrackParameters();
 	   System.out.println("MR new trkParms: "+params[0]+" "+params[1]+" "+params[2]+" "+params[3]);

-           // TrkParams trkParams = new TrkParams(
-           // params[0], params[1], params[2], params[3], params[4]);

+           TrkParams trkParams = new TrkParams(
+            params[0], params[1], params[2], params[3], params[4]);

            // Dec 25-05 -C.M.  
             TrackStepper stpr     = new TrackStepper(); //C.M.- Stepper for dE/dx Calculation
             double []rpVMR = new double[8];

-            double mMuon = 0.106;	      	       

+            double massMR = 0.105658369; 
+	    /*	      	       

 	    for(int i=0; i<3;i++)
 	    {
 	        rpVMR [i]=vtx[i] ; rpVMR[i+3]=pvec[i];

@@ -88,8 +88,9 @@

 	      
 	     rpVMR[7]=icharge; rpVMR[6]= massMR;
 	     stpr.setNewRp(rpVMR); // update phase space point -Dec-25-05-C.M.

-	   //End -Dec 25-05 
-           // rpVMR          = stpr.rpFromTrkParams(trkParams);

+	   //End -Dec 25-05
+	   */ 
+            rpVMR          = stpr.rpFromTrkParams(trkParams);

             System.out.println("MR: Before EMCal");
 	    System.out.println("MR: from Tkparams xyz="+ rpVMR[0]+" "+rpVMR[1]+" "+rpVMR[2]);
 	    System.out.println("MR: from Tkparams Pxyz="+rpVMR[3]+" "+rpVMR[4]+" "+rpVMR[5]);

@@ -102,7 +103,10 @@

             System.out.println("MR:Before HCAL");
             if(!stpr.getStopTkELow())
                 hcalSegmentFinder.findSegment(event,stpr);

-            

+            rpVMR=stpr.getNewRp();
+            double thetMR=Math.atan2(stpr.partR(),rpVMR[2]);
+            System.out.println("swimOnly: Pabs="+stpr.partPabs()+", theta="+(thetMR*180/Math.PI)+", trk="+trk);
+

             System.out.println("MR:Before MUDET");
             // Find muon hits