lcsim-contrib/src/main/java/org/lcsim/contrib/FermiLab/Cam/CamKalman
diff -u -r1.1.1.1 -r1.2
--- CamKalmanStepper.java 10 Dec 2008 22:02:35 -0000 1.1.1.1
+++ CamKalmanStepper.java 10 Mar 2011 02:07:01 -0000 1.2
@@ -337,14 +337,14 @@
double [] p={gevTomev*kRp[3],gevTomev*kRp[4],gevTomev*kRp[5]};
if(Debug)System.out.println("MeV px="+p[0]+" py="+p[1]+" pz="+p[2]);
MaterialManager manager = MaterialManager.instance();
- try{
- org.lcsim.material.Material mat = manager.findMaterial(materialName);
+ //try{
+ org.lcsim.material.Material mat = manager.getMaterial(materialName);
double oneCm=1.;
dedx = MaterialCalculator.computeBetheBloch(mat, p,(1000*mass), kQ, oneCm);// dedx MeV/cm
if(Debug)System.out.println("getDeDx !!! dedx(MeV/cm)="+dedx);
dedx*=mevTogev/cmTomm;
if(Debug)System.out.println("getDeDx !!! dedx(GeV/mm)="+dedx);
- } catch (MaterialNotFoundException e){}
+ //} catch (MaterialNotFoundException e){}
if(dedx<=0.) return 1e-10;
return dedx;
}
@@ -353,13 +353,13 @@
MaterialManager manager = MaterialManager.instance();
double radLength=1.E-14;
double density=1.E-13;
- try{
- org.lcsim.material.Material mat = manager.findMaterial(materialName);
+ //try{
+ org.lcsim.material.Material mat = manager.getMaterial(materialName);
double zeff = mat.getZeff();
double aeff = mat.getAeff();
density= mat.getDensity();
radLength=MaterialCalculator.computeRadiationLengthTsai(aeff,zeff);
- } catch (MaterialNotFoundException e){}
+ //} catch (MaterialNotFoundException e){}
if(radLength<=0.) return 1.e-14;
return (radLength/density); // in cm
}