diff -u -r1.19 -r1.20
--- BarrelCalSegmentFinder.java	27 Jan 2006 20:33:31 -0000	1.19
+++ BarrelCalSegmentFinder.java	30 Jan 2006 21:58:51 -0000	1.20
@@ -120,7 +120,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

@@ -151,8 +151,8 @@

 	    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());    
-	    

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

         }
 
         xNumSteps = 10.*dr;

@@ -206,14 +206,14 @@

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

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

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

         rpVect= stpr.getNewRp();
         if((nr==nLayers)|| (rpVect[2]>=zmax))
         {
            Hep3Vector v = new BasicHep3Vector(rpVect[0],rpVect[1],rpVect[2]);

-           hitPos.add(v);  

+           hitPos.add(v);

         }

-        

+

 	double rr=stpr.partR();
        // Now match the cells on this list to calorimeter hits
 // 	System.out.println("Names: subdetName=<"+subdetName+">"

@@ -234,7 +234,7 @@

             matchHitsFast(segm, dataMgr.getCollHitMap(ecalHitmapName) );
             //		HistogramFolder.setDefaultFolder("..");		// C.M.-27Jan03- Folder
         }

- */       

+ */

 
     }
 

@@ -243,7 +243,7 @@

         // Erase lists of hits and cells
         hitList.removeAllElements();
         cellList.removeAllElements();

-        

+

     }
 
     public void setPhiNNCut(int cut)

diff -u -r1.3 -r1.4
--- MuonCandidate.java	12 Dec 2005 05:44:51 -0000	1.3
+++ MuonCandidate.java	30 Jan 2006 21:58:51 -0000	1.4
@@ -10,21 +10,23 @@

 
 {
     public MuonCandidate(Track t,

-			 int nECalHits, int nECalLayers, Enumeration ecalHits,
-			 int nHCalHits, int nHCalLayers, Enumeration hcalHits,

+			 int nECalHits, int nECalLayers, Enumeration eCalHits, 
+			 int nHCalHits, int nHCalLayers, Enumeration hCalHits,

 			 int nMuHits, int nMuLayers, Enumeration muHits)

+                           

     {
         track = t;
         nECalorimeterHits = nECalHits;
         nECalorimeterLayersHit = nECalLayers;

-        ecalorimeterHits = ecalHits;

+        ecalorimeterHits = eCalHits;

         nHCalorimeterHits = nHCalHits;
         nHCalorimeterLayersHit = nHCalLayers;

-        hcalorimeterHits = hcalHits;

+        hcalorimeterHits = hCalHits;

         nMuonSystemHits = nMuHits;
         nMuonSystemLayersHit = nMuLayers;
         muonSystemHits = muHits;
         

+        

         // new
         int ijy = 0;
         Enumeration ee = ecalorimeterHits;

@@ -85,7 +87,6 @@

         
         return (nECalorimeterHits);
     }

-    

     public int getNECalorimeterLayersHit()
     {
         // Return number of em calorimeter layers hit by the track

@@ -101,7 +102,6 @@

         return (myecalhits.elements());  //C.M.- January 4,2003
     }
     

-    

     public int getNHCalorimeterHits()
     {
         // Return number of hits in hadronic calorimeter

@@ -123,14 +123,14 @@

         //return(calorimeterHits);
         return (myhcalhits.elements());  //C.M.- January 4,2003
     }

-    

+

     public int getNMuonSystemHits()
     {
         // Return number of hits in muon system
         
         return (nMuonSystemHits);
     }

-    

+

     public int getNMuonSystemLayersHit()
     {
         // Return number of muon system layers hit by the track

@@ -145,12 +145,17 @@

         //return(muonSystemHits);
         return(mymusyshits.elements()); //C.M.-January 4,2003
     }

+ 

     public void reset()
     {
         // Erase lists of hits
         myecalhits.removeAllElements();

+        

         myhcalhits.removeAllElements();

+       

         mymusyshits.removeAllElements();

+        
+        

     }
     
     public double getPT()

diff -u -r1.10 -r1.11
--- MuonReco.java	28 Jan 2006 01:14:08 -0000	1.10
+++ MuonReco.java	30 Jan 2006 21:58:51 -0000	1.11
@@ -143,8 +143,10 @@

 				   +", theta="+theta  );
             }
             Vector vtrack = ecalSegmentFinder.getHitPos();

-        System.out.println("vtrack="+vtrack+" "+ (vtrack == null ? 0 : vtrack.size()));

+         System.out.println("ECAL-vtrack="+vtrack+" "+ (vtrack == null ? 0 : vtrack.size()));

             // Reset for the next track

+         vtrack = hcalSegmentFinder.getHitPos();
+         System.out.println("HCAL-vtrack="+vtrack+" "+ (vtrack == null ? 0 : vtrack.size())); 

             ecalSegmentFinder.reset();		// C.M.- Include the Ecal inthe code
             hcalSegmentFinder.reset();
             muSegmentFinder.reset();

@@ -167,7 +169,10 @@

         
         Vector v = ecalSegmentFinder.getHitPos();
         System.out.println("v="+v+" "+ (v == null ? 0 : v.size()));

-        event.put("BarrelCalPoints",ecalSegmentFinder.getHitPos());

+        event.put("ecalBarrelPoints",ecalSegmentFinder.getHitPos());
+        v = hcalSegmentFinder.getHitPos();
+        System.out.println("v hcal"+v+" " +(v==null ? 0:v.size()));
+        event.put("hcalBarrelPoints",hcalSegmentFinder.getHitPos());

     }
     
     public int getMinECalHits()			// C.M.- Include Ecal in the code