lcsim/src/org/lcsim/util/step
diff -u -r1.15 -r1.16
--- TrackStepper.java 10 Oct 2006 02:01:45 -0000 1.15
+++ TrackStepper.java 10 Oct 2006 23:36:49 -0000 1.16
@@ -19,7 +19,7 @@
* Particle assumed is a Muon, but can be changed by setting rp[6] at input
* Units are Tesla, cm, GeV/c
* @author C. Milstene.
- * @version $Id: TrackStepper.java,v 1.15 2006/10/10 02:01:45 caroline Exp $
+ * @version $Id: TrackStepper.java,v 1.16 2006/10/10 23:36:49 caroline Exp $
*NEXT To BE DONE: get subdet/layer info diretly
*get materiel info from a util/step/stepperCondition.class
*
@@ -136,25 +136,16 @@
//for the material
public void tkSteps(double ToGoPos,double limitingVar,String BarrEndc,double magfild, String materialname)
{
- System.out.print("stpr:I am Here1");
double[]stpcd = new double[3];
rpn=trakPs.getRp(); // get phaseSpace at entry
- System.out.println("rpn-x="+rpn[0]+" y="+rpn[1]+" z="+rpn[2]);
condMat = new StepConditions(rpn,BarrEndc, materialname, ToGoPos);
- System.out.println("after stpcd:rpn-x="+rpn[0]+" y="+rpn[1]+" z="+rpn[2]);
-
+ System.out.println("after stpcd in Material:rpn-x="+rpn[0]+" y="+rpn[1]+" z="+rpn[2]);
dThick = stpcd[0] = condMat.getMaterialThickness();
- System.out.println("dThick="+condMat.getMaterialThickness());
- System.out.println("tkSteps:HELLO");
- double []b = new double[3];
- //b = condMat.getField(rpn);
- System.out.println("Material Field="+b[2]);
- //BField_i = stpcd[1] =b[2] ;
+ System.out.println("Material Field="+magfild);
BField_i = stpcd[1]=magfild;
stpcd[2]= condMat.getMatterDeDx();
- System.out.println("dThick="+dThick+" Field="+b[2]+"materialdEdx="+ stpcd[2]);
+ System.out.println("Material dThick="+dThick+" Field="+stpcd[1]+"materialdEdx="+ stpcd[2]);
Stepping(ToGoPos, limitingVar, stpcd);
-
}
//for the subdetector
public void tkSteps(double ToGoPos,double limitingVar, Detector det,String subdetName, int layerN)
@@ -164,7 +155,7 @@
rpn=trakPs.getRp(); // get phaseSpace at entry
cond = new StepConditions(ToGoPos, rpn, det, subdetName, layerN);
dThick = stpcd[0] = cond.getLayerThickness();
- double []b = new double[3];
+ double []b = new double[3];
b = cond.getField(rpn);
BField_i = stpcd[1] =b[2] ;
System.out.println(" LayerN Field="+b[2]);