lcsim/src/org/lcsim/recon/tracking/trfxyp
diff -u -r1.2 -r1.3
--- PropXYXYBX.java 7 Mar 2005 06:11:13 -0000 1.2
+++ PropXYXYBX.java 25 Jul 2007 05:21:17 -0000 1.3
@@ -44,6 +44,9 @@
private static final int IDZDU = SurfXYPlane.IDZDU;
private static final int IQP = SurfXYPlane.IQP;
+
+ private boolean debug;
+
// static methods
/**
@@ -279,7 +282,7 @@
if( (f_start - x_start)<=0 )
{
double dphi = next1(phi,b,w);
- System.out.println("dphi= "+dphi);
+ if(debug) System.out.println("dphi= "+dphi);
if(dphi ==-1.) return -1.*flag_forward; //no solution
x_var = x_start + dphi/w;
f_var = b*Math.cos((x_var-x_start)*w+phi);
@@ -297,7 +300,7 @@
else
{
double dphi = next1(phi,b,w);
- System.out.println("dphi= "+dphi);
+ if(debug) System.out.println("dphi= "+dphi);
if(dphi == -1.)
{
x_var = x_start + nextMax(phi)/w;
@@ -313,8 +316,8 @@
f_fix = f_start;
// if((f_deriv >= 1)||(f_fix - x_fix)*(f_var-x_var)>0) //cng 01/11/01
double tol = f_deriv-1;
- System.out.println("tol= "+tol);
- System.out.println((f_fix - x_fix)*(f_var-x_var));
+ if(debug) System.out.println("tol= "+tol);
+ if(debug) System.out.println((f_fix - x_fix)*(f_var-x_var));
if( (tol>-1e-10)||(f_fix - x_fix)*(f_var-x_var)>0)
{
dphi += next1(phi+dphi,b,w);
@@ -330,7 +333,7 @@
f_var = b*Math.cos((x_var-x_start)*w+phi);
}
} // end of case where f_deriv > 1 sometimes
- System.out.println("f_fx "+(f_fix - x_fix)*(f_var-x_var));
+ if(debug) System.out.println("f_fx "+(f_fix - x_fix)*(f_var-x_var));
Assert.assertTrue( (f_fix - x_fix)*(f_var-x_var)<=0 ); //no solution
} // end of second case
int n = 0;
@@ -395,19 +398,19 @@
{
int n,si;
if(Math.abs(amp*w)<1.) return -1.;
- System.out.println("amp= "+amp+", w= "+w);
+ if(debug) System.out.println("amp= "+amp+", w= "+w);
double phi1 = -Math.asin(1/(amp*w));
Assert.assertTrue(phi1>= -Math.PI/2. && phi1 <= Math.PI/2.);
double delta = phi1-phi;
- System.out.println("phi1= "+phi1+", phi= "+phi+", delta= "+delta);
+ if(debug) System.out.println("phi1= "+phi1+", phi= "+phi+", delta= "+delta);
/* si = -1;
// for(n=1,si=-1; delta <= 0;n++,si *=-1)
for(n = 1; delta<=0; n++)
{
Assert.assertTrue(n<10);
delta = n*Math.PI + si*phi1 - phi;
- System.out.println("n= "+n+", si= "+si+", delta= "+delta);
+ if(debug) System.out.println("n= "+n+", si= "+si+", delta= "+delta);
si *= -1;
}
@@ -418,14 +421,14 @@
{
Assert.assertTrue(n<10);
delta = n*Math.PI + si*phi1 - phi;
- System.out.println("n= "+n+", si= "+si+", delta= "+delta);
+ if(debug) System.out.println("n= "+n+", si= "+si+", delta= "+delta);
n++;
si *= -1;
}
- System.out.println("delta= "+delta);
- System.out.println( "in next_1 "+Math.abs(-amp*Math.sin(phi+delta)*w ));
- System.out.println( "in next_1 "+Math.abs(-amp*Math.sin(phi+delta)*w - 1));
+ if(debug) System.out.println("delta= "+delta);
+ if(debug) System.out.println( "in next_1 "+Math.abs(-amp*Math.sin(phi+delta)*w ));
+ if(debug) System.out.println( "in next_1 "+Math.abs(-amp*Math.sin(phi+delta)*w - 1));
Assert.assertTrue( Math.abs(-amp*Math.sin(phi+delta)*w - 1) < 1.e-8);
return delta;
}