lcsim/src/org/lcsim/contrib/SteveKuhlmann
diff -u -r1.2 -r1.3
--- BTrMipClusH.java 16 Aug 2005 17:25:13 -0000 1.2
+++ BTrMipClusH.java 17 Aug 2005 03:10:50 -0000 1.3
@@ -752,8 +752,15 @@
{
boolean badphoton = true;
// Get theta, phi for cluster
- double ebclth=ebcluster.getITheta();
- double ebclph=ebcluster.getIPhi();
+ double ecp[] = ebcluster.getPosition();
+ double ecpx = ecp[0];
+ double ecpy = ecp[1];
+ double ecpz = ecp[2];
+ double ecR = Math.sqrt(ecpx*ecpx+ecpy*ecpy);
+ double ebclth = Math.atan(ecR/ecpz);
+ if (ebclth<0) ebclth+=Math.PI;
+ double ebclph = Math.atan2(ecpy,ecpx);
+ if (ebclph<0) ebclph+=2*Math.PI;
// Now, check Track-NNCluster distance for match at track swim layer 8 (shower max?)
double trcldelth=0; double trcldelph=0; double trcldist=0;
@@ -804,11 +811,8 @@
if(phohist) aida.cloud1D("ChisqD Probability").fill(chiprobD);
double logchiprobD = Math.log(chiprobD)*_log10inv;
if(phohist) aida.cloud1D("Log ChisqD Probability").fill(logchiprobD);
-
- //System.out.println("chisqD "+chisqD+" prob "+ChisqProb.gammq(_nmeas,chisqD));
-
- double chisqND = chisq - chisqD;
- if(phohist) aida.cloud1D("ChisqND").fill(chisqND);
+ double chisqND = chisq - chisqD;
+ if(phohist) aida.cloud1D("ChisqND").fill(chisqND);
if (logchiprobD > -9.5)
{
phoclusters.add(ebcluster);