Print

Print


Commit in lcsim/src/org/lcsim/recon/muon on MAIN
MuonReco.java+11-71.3 -> 1.4
CM: Changes to the new geometry

lcsim/src/org/lcsim/recon/muon
MuonReco.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- MuonReco.java	18 Jul 2005 19:18:28 -0000	1.3
+++ MuonReco.java	31 Oct 2005 22:30:22 -0000	1.4
@@ -52,7 +52,7 @@
         BarrelCalSegmentFinder hcalSegmentFinder = new BarrelCalSegmentFinder(
         event.getDetector(), "HADBarrel");
         MuonCalSegmentFinder muSegmentFinder = new MuonCalSegmentFinder(
-        event.getDetector(), "MUON_BARREL");
+        event.getDetector(), "MuonBarrel");
         
         // Loop through all tracks in this event
 //         for (Enumeration e = event.getTrackList().getTracks();
@@ -63,26 +63,29 @@
             // Instantiate TrkParams object for this track
             
             double [] params = t.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]);
             
             
             TrackStepper stpr     = new TrackStepper(); //C.M.- Stepper for dE/dx Calculation
-            double []rpVect = new double[8];
+            double []rpVMR = new double[8];
             double mMuon = 0.106;
-            rpVect          = stpr.rpFromTrkParams(trkParams);
-            
+            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]);
             // Find em calorimeter hits
             boolean stoppedTk= stpr.getStopTkELow();
             if(!stpr.getStopTkELow())
                 ecalSegmentFinder.findSegment(event,stpr);
             
             // Find had calorimeter hits
-            
+            System.out.println("MR:Before HCAL");
             if(!stpr.getStopTkELow())
                 hcalSegmentFinder.findSegment(event,stpr);
             
-            
+            System.out.println("MR:Before MUDET");
             // Find muon hits
             
             if(!stpr.getStopTkELow())
@@ -90,7 +93,7 @@
             
             // 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)
@@ -108,6 +111,7 @@
             ecalSegmentFinder.reset();		// C.M.- Include the Ecal inthe code
             hcalSegmentFinder.reset();
             muSegmentFinder.reset();
+	    stpr.clear();                      // reset track in stepper/phasspace
         }
         
         // Close the muon list (this will sort muon candidates by Pt)
CVSspam 0.2.8