lcd/hep/lcd/recon/tracking/ccd
diff -u -r1.1 -r1.2
--- VXDFindStrategy.java 11 Mar 2005 19:37:40 -0000 1.1
+++ VXDFindStrategy.java 20 Jul 2005 17:11:35 -0000 1.2
@@ -22,10 +22,10 @@
public VXDFindStrategy()
{
int[] Levels = {2,1};
- int[] Patterns = {2,2};
+ int[] Patterns = {3,3};
double[][] Radius = {{40.,15.},{6.,6.}};
int[][] pnts = {{90,20},{6,6}};
- int[][][] tri = {{{97,45,4},{25,11,3},{10,5,2}},{{4,2,0},{4,3,1},{3,2,1}}};
+ int[][][] tri = {{{97,45,4},{25,11,3},{10,5,2}},{{4,2,0},{4,3,1},{3,2,0}}};
rTol[1] = 0.5;
zTol[1] = 0.5;
for(int i=0; i<2; i++)
lcd/hep/lcd/recon/tracking/ccd
diff -u -r1.3 -r1.4
--- VXDPatFind.java 21 Mar 2005 17:29:31 -0000 1.3
+++ VXDPatFind.java 20 Jul 2005 17:11:35 -0000 1.4
@@ -255,8 +255,8 @@
ctrzres = 3.464 * smparm.getDouble("TPCZSmear");
vxterr = smparm.getDouble("CCDXYSmear");
System.out.println("ctrzres="+ctrzres+" vxdres="+vxterr);
-/*
- if(dohist)
+
+/* if(dohist)
{
String folder = "/Tracking/"+tracker.getType()+"/"+Finder;
HistogramFolder.setDefaultFolder(folder);
@@ -274,8 +274,8 @@
h022 = new Histogram("assign hits residual in lr2");
h023 = new Histogram("assign hits residual in lr3");
h024 = new Histogram("assign hits residual in lr4");
- }
- */
+ } */
+
}
}
@@ -637,7 +637,6 @@
isr[2] = iph+1;
if(isr[2] > 99) isr[2] = 0;
isr[1] = iph;
- bestdis = 25.;
for(int ns=0; ns<3; ns++)
{
int is = lrn*100+isr[ns];
@@ -710,8 +709,8 @@
{
double efomega = Math.abs(trkprms.omega);
if(efomega < 0.01) efomega = 0.01;
- /*
- if(dohist)
+
+/* if(dohist)
{
// h101.fill(1./efomega,trvxchsq/ndegfrvtx);
h010.fill(trvxchsq/ndegfrvtx);
@@ -730,8 +729,8 @@
if(om > 0.02) h014.fill(fcthndis);
}
- }
- */
+ } */
+
}
if((dotrace)&&(ntrat==ntra)) System.out.println("made track "+(ntra-1));
} // makeTrack success check
@@ -820,11 +819,12 @@
if(arg < 0.) arg = 0.04;
double anfact = 1./Math.sqrt(arg);
ecrersq = ecrer*ecrer;
+ double efomega = Math.abs(trkprms.omega);
+ if(efomega < 0.003) efomega = 0.003;
// ctrper = ctrpher*(rts-6.)/Math.sqrt(arg);
- ctrper = anfact * (0.02 + 1.5* Math.abs(trkprms.omega));
+ ctrper = 5.* anfact * (0.02 + 1.5*efomega);
// fcthedev = ctrper;
ctrpersq = ctrper * ctrper;
- ctrper*=5.;
ecpersq = ecper*ecper;
boolean ecap = false;
swmr.swim(rts,zts);
@@ -1058,7 +1058,9 @@
for(int i=0; i<ctlr; i++)
sclfct+=(2*i+1)*(2*i+1);
double efscln = Math.sqrt(689.*sclfct);
- ctrper = anfact * (0.005 + efscln * trkmsco * Math.abs(trkprms.omega));
+ efomega = Math.abs(trkprms.omega);
+ if(efomega < 0.003) efomega = 0.003;
+ ctrper = anfact * (0.02 + efscln * trkmsco * efomega);
int clhind = findclosestht();
double hisdis = mindistance * 10000.;
if(ncand==1)
@@ -1276,7 +1278,7 @@
int ii = ispin[ip];
double dph = MinDPhi(phpn,mainco[ii]);
double dsz = Math.abs(z[ii]-pnt[2]);
- if((dsz<ctrzres)&&(dph < minds))
+ if((dsz<2.*ctrzres)&&(dph < minds))
{
minds=dph;
minin=ii;
@@ -1430,10 +1432,10 @@
int nbrlr = lstbrlrr - nvxlrs +1;
int nsctr = nbrlr;
if(nsctr < 1) nsctr=1;
- double tomega = 0.00001;
- if(Math.abs(trkprms.omega) > 0.00001)
+ double tomega = 0.003;
+ if(Math.abs(trkprms.omega) > 0.003)
{
- tomega = trkprms.omega;
+ tomega = Math.abs(trkprms.omega);
}
double onovcol = Math.sqrt(1.+trkprms.s*trkprms.s);
double trlength = maxrreach * onovcol;
@@ -1454,18 +1456,22 @@
if(arg < 0.) arg = 0.04;
double anfact = 1./Math.sqrt(arg);
double efscln = 26.25;
- double ctrpernc = anfact * (0.005 + efscln * trkmsco * Math.abs(trkprms.omega));
+ double ctrpernc = anfact * (0.005 + efscln * trkmsco * efomega);
ctrper = 0.47*ctrpernc;
if(curswlr == 5) ctrper = 0.09*ctrpernc;
if(nancor==4)
{
- if(curswlr == 5) ctrper = ctrpernc * 0.16;
- if(curswlr == 7) ctrper = ctrpernc * 0.63;
- if(curswlr == 8) ctrper = ctrpernc * 0.51;
+ if(curswlr == 5) ctrper = ctrpernc * 0.32;
+// if(curswlr == 7) ctrper = ctrpernc * 0.83;
+// if(curswlr == 8) ctrper = ctrpernc * 0.61;
+ if(curswlr == 7) ctrper = ctrpernc * 0.95;
+ if(curswlr == 8) ctrper = ctrpernc * 0.75;
}
if(nancor==3)
- {
- if(curswlr == 7) ctrper = ctrpernc * 0.84 ;
+ {
+ if(curswlr == 5) ctrper = ctrpernc * 0.2;
+ if(curswlr == 7) ctrper = ctrpernc * 0.75;
+ if(curswlr == 9) ctrper = ctrpernc * 0.75;
}
if(dotrace) System.out.println("Assign hits: looking for hits in lr "+curswlr);
int clhind = findclosestht();