3 modified files
lcsim/src/org/lcsim/util/step
diff -u -r1.5 -r1.6
--- CamKalmanStepper.java 20 Jul 2007 14:08:43 -0000 1.5
+++ CamKalmanStepper.java 11 Mar 2011 19:27:03 -0000 1.6
@@ -289,14 +289,12 @@
double [] p={gevTomev*kRp[3],gevTomev*kRp[4],gevTomev*kRp[5]};
//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);
+ org.lcsim.material.Material mat = manager.getMaterial(materialName);
double oneCm=1.;
dedx = MaterialCalculator.computeBetheBloch(mat, p,(1000*mass), kQ, oneCm);// dedx MeV/cm
//System.out.println("getDeDx !!! dedx(MeV/cm)="+dedx);
dedx*=mevTogev/cmTomm;
//System.out.println("getDeDx !!! dedx(GeV/mm)="+dedx);
- } catch (MaterialNotFoundException e){}
if(dedx<=0.) return 1e-10;
return dedx;
}
@@ -304,13 +302,11 @@
MaterialManager manager = MaterialManager.instance();
double radLength=1.E-14;
double density=1.E-13;
- try{
- org.lcsim.material.Material mat = manager.findMaterial(materialName);
+ 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){}
if(radLength<=0.) return 1.e-14;
return (radLength/density); // in cm
}
lcsim/src/org/lcsim/util/step
diff -u -r1.6 -r1.7
--- CamKalmanStepper2.java 15 Nov 2008 22:19:10 -0000 1.6
+++ CamKalmanStepper2.java 11 Mar 2011 19:27:03 -0000 1.7
@@ -674,8 +674,8 @@
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)
@@ -683,7 +683,7 @@
_dedx*=mevTogev/cmTomm;
if(Debug)
System.out.println("getDeDx !!! dedx(GeV/mm)="+_dedx);
- } catch (MaterialNotFoundException e){}
+ //} catch (MaterialNotFoundException e){}
if(_dedx<0.) _dedx=1.e-20;
}
}
@@ -703,14 +703,14 @@
MaterialManager manager = MaterialManager.instance();
double radLength=1.E-20;
_density=1.E-19;
- 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); // rad Length in g/cm^-2
_radLength= radLength/_density ; // rad Length in cm
- } catch (MaterialNotFoundException e){}
+ //} catch (MaterialNotFoundException e){}
}
/** set the radLength and density to a default value or for debug or for a mixture
*/
lcsim/src/org/lcsim/util/step
diff -u -r1.4 -r1.5
--- StepConditions.java 11 Oct 2006 00:56:09 -0000 1.4
+++ StepConditions.java 11 Mar 2011 19:27:03 -0000 1.5
@@ -181,39 +181,39 @@
System.out.println(" HERE in Stepcond ");
this.rNow = stpr.partR(rpVect);
this.distance = Math.abs(ToGoPos - rNow);
- try
- {
+ //try
+ //{
manager = MaterialManager.instance();
- material = manager.findMaterial(materialName);
+ material = manager.getMaterial(materialName);
matterDEdx = MaterialCalculator.computeBetheBloch(material, pp, mass, charge, distance);
//System.out.println("....... mass " + mass + " charge " + charge + " D " + distance);
//System.out.print("MATTER DEDX....." + matterDEdx + "MATERIAL .... " + materialName);
//System.out.println("Momentum ... ." + stpr.partPabs(rpVect));
- }
- catch (MaterialNotFoundException e)
- {
- System.out.println("Error: "+e);
+ //}
+ // catch (MaterialNotFoundException e)
+ //{
+ // System.out.println("Error: "+e);
- }
+ //}
}
else if (this.barrEndc.endsWith("Endcap"))
{
this.distance = Math.abs(ToGoPos - rpVect[2]);
- try
- {
+ //try
+ // {
manager = MaterialManager.instance();
- material = manager.findMaterial(materialName);
+ material = manager.getMaterial(materialName);
matterDEdx = MaterialCalculator.computeBetheBloch(material, pp, mass, charge, distance);
//System.out.println("....... mass " + mass + " charge " + charge + " D " + distance);
//System.out.print("MATTER DEDX....." + matterDEdx + "MATERIAL .... " + materialName);
//System.out.println("Momentum ... ." + stpr.partPabs(rpVect));
- }
- catch (MaterialNotFoundException e)
- {
- System.out.println("Error: "+e);
+ // }
+ // catch (MaterialNotFoundException e)
+ // {
+ // System.out.println("Error: "+e);
- }
+ // }
}
int i = 0; int j=3;//px = rpvect[3]
@@ -225,20 +225,20 @@
mass = rpVect[6];
charge = rpVect[7];
- try
- {
+ //try
+ // {
manager = MaterialManager.instance();
- material = manager.findMaterial(materialName);
+ material = manager.getMaterial(materialName);
matterDEdx = MaterialCalculator.computeBetheBloch(material, pp, mass, charge, distance);
//System.out.println("....... mass " + mass + " charge " + charge + " D " + distance);
//System.out.print("MATTER DEDX....." + matterDEdx + "MATERIAL .... " + materialName);
//System.out.println("Momentum ... ." + stpr.partPabs(rpVect));
- }
- catch (MaterialNotFoundException e)
- {
- System.out.println("Error: "+e);
+ //}
+ //catch (MaterialNotFoundException e)
+ //{
+ // System.out.println("Error: "+e);
- }
+ //}
}
/**
CVSspam 0.2.8