lcsim/src/org/lcsim/recon/muon

diff -u -r1.13 -r1.14
--- MuonReco.java	14 Jul 2006 19:10:58 -0000	1.13
+++ MuonReco.java	9 Aug 2006 21:01:53 -0000	1.14
@@ -54,7 +54,6 @@

 
         BarrelCalSegmentFinder ecalSegmentFinder = new BarrelCalSegmentFinder(		// new
         event.getDetector(), "EMBarrel");

-

         BarrelCalSegmentFinder hcalSegmentFinder = new BarrelCalSegmentFinder(
         event.getDetector(), "HADBarrel");
         MuonCalSegmentFinder muSegmentFinder = new MuonCalSegmentFinder(

@@ -89,15 +88,15 @@

             double thetMR=Math.atan2(stpr.partR(rpVMR),rpVMR[2]);
             System.out.println("MR:Before MUDET");
             // Find muon hits

-            if(!stpr.getStopTkELow())
-                muSegmentFinder.findSegment(event,stpr);

+           if(!stpr.getStopTkELow())   
+               muSegmentFinder.findSegment(event,stpr); 

             rpVMR = stpr.getNewRp();
             // If segments pass cuts, then create a MuonCandidate object
             // and add it to the list
             System.out.println("MR:MuonCandidate");
             if (ecalSegmentFinder.getNHits() >= minECalHits &&

-            hcalSegmentFinder.getNHits() >= minHCalHits &&
-            muSegmentFinder.getNHits()   >= minMuHits)

+            hcalSegmentFinder.getNHits() >= minHCalHits && 
+            muSegmentFinder.getNHits()   >= minMuHits) 

             {
                 MuonCandidate muon = new MuonCandidate(trk,
                 ecalSegmentFinder.getNHits(), ecalSegmentFinder.getNLayersHit(), // C.M. Include ECal

@@ -106,8 +105,9 @@

                 hcalSegmentFinder.getHits(),
                 muSegmentFinder.getNHits(), muSegmentFinder.getNLayersHit(),
                 muSegmentFinder.getHits());

+                muonList.add(muon);

                 double rho = Math.sqrt(rpVMR[0]*rpVMR[0]+rpVMR[1]*rpVMR[1]);

-		        double theta = Math.atan2(rho,rpVMR[2])*180/Math.PI;

+	        double theta = Math.atan2(rho,rpVMR[2])*180/Math.PI;                        

 		        System.out.println("MuonReco: #muons="+muonList.getNMuons()
  	               +", #hits: Ecal="+ecalSegmentFinder.getNHits()
 		           +", Hcal="+hcalSegmentFinder.getNHits()

@@ -116,6 +116,7 @@

 				   +", z="+rpVMR[2]
 				   +", rho="+rho
 				   +", theta="+theta  );

+                        

             }
             Vector vtrack = ecalSegmentFinder.getHitPos();
             if (debug) System.out.println("ECAL-vtrack="+vtrack+" "+ (vtrack == null ? 0 : vtrack.size()));