lcsim/src/org/lcsim/recon/muon

diff -u -r1.25 -r1.26
--- BarrelCalSegmentFinder.java	13 Sep 2006 21:46:44 -0000	1.25
+++ BarrelCalSegmentFinder.java	13 Sep 2006 23:07:57 -0000	1.26
@@ -80,11 +80,6 @@

       Subdetector subDet = aDet.getSubdetector(subdetName);
       int nLayers = ((Layered) subDet).getLayering().getLayerCount();
       SegmentationBase base = ((SegmentationBase) subDet.getIDDecoder());

-//      //The purpose of this statement is to specify the xml file the data should be read from
-//      String filename = "C:\\work\\LCDetectors\\detectors\\" + a_nam +"\\compact.xml";
-//        File f = new File(filename);
-//   	xmlReader.declarefile(f);
-//        xmlReader.SystemInfo(subdetName);

         String readoutseg = xmlReader.getReadoutID();
         System.out.println(" BCF: Readoutseg ===" + readoutseg);
        

@@ -95,15 +90,7 @@

 	catch(Exception e) {
 	  System.out.println("Some exception caught! "+e);
 	}

-	// Set system and barrel/endcap values
-	int sys = 0;
-	if(debug)System.out.println("BCSF constructor: subdetName="+subdetName);
-        sys = xmlReader.getSystemID();
-//        encoder.setValue("system", sys);
-//	encoder.setValue("barrel", 0);
-      // set system/barrel bits in Segmentation object
-//      segm.setID(encoder.getID());
-      

+	if(debug)System.out.println("BCSF constructor: subdetName="+subdetName);     

    }
    
    //----------------------------------!!!

@@ -132,8 +119,6 @@

       {
          // Then do the Tracker up to r=rmin
          double dTracker=(r-stpr.partR(rpVect));

-         //stepConditions = steprConditions(dTracker,BField,0.,dtTracker);
-         //stpr.tkSteps( r, zmax,stepConditions);

          materialName = "Air";
          stpr.tkSteps( r, zmax,det, materialName );
          if(debug)System.out.println("Tracker r=" +r+" zmax="+zmax+"Barrel:out of Tracker");

@@ -318,15 +303,6 @@

    {
       return(hitPos.size());
    }

-   //----------------------------------------------------------C.M. Step Conditions
-   public double[] steprConditions(double dthick,double theField,double theMeanDEdx,double DTOF0)
-   {
-      return(new double[]
-      {dthick, theField,theMeanDEdx,DTOF0});
-   }
-   //--------------------------------------------C.M.- Get DE/dx per Calorimeter Layer
-   
-   

    
    protected void matchHitsFast(SegmentationBase cell,
            Map<Long,CalorimeterHit> calHits)