--- DarthVader/TrackerLevel2/inc/F77/common_momanhough.f 2006/11/02 11:21:36 1.5 +++ DarthVader/TrackerLevel2/inc/F77/common_momanhough.f 2014/01/16 15:29:41 1.13 @@ -19,22 +19,26 @@ c c------------------------------------------------------------------------ -* maximum (total) number of stored clusters - parameter (nclstrmax_level2 = nclstrmax) -c parameter (nclstrmax_level2=10*nplanes) -c parameter (nclstrmax_level2=5*nplanes) +* maximum (total) number of STORED clusters + parameter (nclstrmax_level2 = nclstrmax) ! same as level1 * ----------------------------------------------------------- * maximum number of cluster (per view) required to perform * track serching with full Hough transform - parameter (nclustermax=6) +* (singlets recovered during track refinement) + parameter (nclusterlimit=6) +* ----------------------------------------------------------- +* maximum number of couples (per plane) required to perform +* track serching with full Hough transform +* (couples recovered during track refinement) + parameter (ncouplelimit=8) * ----------------------------------------------------------- -* maximum number of couples per plane and total -* (only to dimension the vectors) +* maximum number of STORED couples, per plane and total +* (to dimension the vectors) c parameter (ncouplemax=2*(nclstrmax_level2/nplanes)**2) c parameter (ncouplemaxtot=ncouplemax*nplanes) - parameter (ncouplemax = nclustermax*nclustermax) + parameter (ncouplemax = nclusterlimit*nclusterlimit) parameter (ncouplemaxtot = ncouplemax*nplanes) * ----------------------------------------------------------- * maximum number of STORED couples @@ -50,7 +54,8 @@ * ----------------------------------------------------------- * mask of views * 0 = ok -* 1 = n.clusters > nclustermax +* 1 = n.clusters > nclusterlimit +* 8 = n.couples > ncouplelimit * 2 = n.couples > ncouplemax * 3 = n.doublets > ndblt_max * 4 = n.triplets > ntrpt_max @@ -77,8 +82,9 @@ * 0 = not used integer cl_used(nclstrmax_level2) integer ncl_view(nviews) !n.clusters per plane + real dedx_x_min,dedx_y_min * ----------------------------------------------------------- - common/clusters/cl_good,cl_used,ncl_view + common/clusters/cl_good,cl_used,ncl_view,dedx_x_min,dedx_y_min * ----------------------------------------------------------- * --- COUPLES ----------------------------------------------- @@ -131,6 +137,9 @@ common/singlets/ncls,cls,cl_single + logical RECOVER_SINGLETS,RECOVER_NUCLEI,SECOND_SEARCH + common/recover/RECOVER_SINGLETS,RECOVER_NUCLEI,SECOND_SEARCH + c+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + c + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + c------------------------------------------------------------------------ @@ -258,7 +267,8 @@ c------------------------------------------------------------------------ * track candidates - PARAMETER (NTRACKSMAX=ncloyz_max*ncloxz_max) +cc PARAMETER (NTRACKSMAX=ncloyz_max*ncloxz_max) + PARAMETER (NTRACKSMAX=10000) INTEGER NTRACKS !number of track candidates REAL AL_STORE(5,NTRACKSMAX) REAL XM_STORE(NPLANES,NTRACKSMAX) @@ -275,14 +285,21 @@ REAL YGOOD_STORE(NPLANES,NTRACKSMAX) INTEGER CP_STORE(NPLANES,NTRACKSMAX) INTEGER CLS_STORE(NPLANES,NTRACKSMAX) + INTEGER SENSOR_STORE(NPLANES,NTRACKSMAX) + INTEGER LADDER_STORE(NPLANES,NTRACKSMAX) + REAL BX_STORE(NPLANES,NTRACKSMAX) + REAL BY_STORE(NPLANES,NTRACKSMAX) REAL RCHI2_STORE(NTRACKSMAX) - common/track_candidates/NTRACKS,AL_STORE + common/trackcandidates/NTRACKS,AL_STORE $ ,XV_STORE,YV_STORE,ZV_STORE $ ,XM_STORE,YM_STORE,ZM_STORE $ ,RESX_STORE,RESY_STORE $ ,AXV_STORE,AYV_STORE $ ,XGOOD_STORE,YGOOD_STORE - $ ,CP_STORE,CLS_STORE,RCHI2_STORE + $ ,CP_STORE,CLS_STORE + $ ,SENSOR_STORE,LADDER_STORE + $ ,BX_STORE,BY_STORE + $ ,RCHI2_STORE * best-candidate selection @@ -295,10 +312,15 @@ c------------------------------------------------------------------------ PARAMETER (PIGR=3.14) !159265359)!(1) * ----------------------------------------------------- -* cuts on cluster signal +* cuts on cluster signal (MIP) * ----------------------------------------------------- - parameter (dedx_x_min=0.) - parameter (dedx_y_min=0.) + parameter (dedx_x_min_mip=0.) + parameter (dedx_y_min_mip=0.) + parameter (dedx_x_min_nuclei=5.) + parameter (dedx_y_min_nuclei=5.) + parameter (dedx_min_nuclei=9.1) !cut to apply nuclei recovery + parameter (ddedx_min_nuclei=0.35)!cut to identify bad tracked nuclei + * ----------------------------------------------------- * number of GOOD strips around MAXS * (NB this cut has been removed in track fitting but @@ -344,26 +366,55 @@ * Parameter normalization constants, needed to evaluate * distances in parameter space * ----------------------------------------------------- - parameter (Dalfaxz3=1.) - parameter (Dalfayz1=0.8864e-1) - parameter (Dalfayz2=0.6204e-3) - parameter (Dalfaxz1=0.2909e-1) - parameter (Dalfaxz2=0.2759e-2) + +* --- David ground +c$$$ parameter (Dalfayz1=0.8864e-1) +c$$$ parameter (Dalfayz2=0.6204e-3) +c$$$ parameter (Dalfaxz1=0.2909e-1) +c$$$ parameter (Dalfaxz2=0.2759e-2) +* --- David flight + parameter (Dalfayz1=0.64e-3) + parameter (Dalfayz2=0.54e-3) + parameter (Dalfaxz1=0.50e-3) + parameter (Dalfaxz2=0.12e-3) + parameter (Dalfaxz3=0.86e-5) + + * ----------------------------------------------------- * Cut on normalized distances in parameter space. * Doublets/triplets are recursively included in a cloud * if the distance from any of the points already included * is less than this cut. * ----------------------------------------------------- - parameter(cutystart=0.3) - parameter(cutystep=0.3) - parameter(cutxstart=1.) - parameter(cutxstep=1.) - parameter(maxcuty=100.) - parameter(maxcutx=150.) +* --- David ground +c$$$ parameter(cutystart=0.3) +c$$$ parameter(cutystep=0.3) +c$$$ parameter(cutxstart=1.) +c$$$ parameter(cutxstep=1.) +c$$$ parameter(maxcuty=100.) +c$$$ parameter(maxcutx=150.) +c$$$ parameter(nstepx=50) !inclusion-cut increasing steps +c$$$ parameter(nstepy=50) +* --- David flight (preliminary) +c$$$ parameter(cutystart=7.) +c$$$ parameter(cutystep=5.) +c$$$ parameter(cutxstart=5.) +c$$$ parameter(cutxstep=2.) +c$$$ parameter(maxcuty=200.) +c$$$ parameter(maxcutx=150.) +c$$$ parameter(nstepx=5) !inclusion-cut increasing steps +c$$$ parameter(nstepy=5) +* --- David flight + real maxcuty, maxcutx ! EM GCC4.7 + parameter(cutystart=30.) + parameter(cutystep=10.) !buoni??? + parameter(cutxstart=5.) + parameter(cutxstep=2.) + parameter(maxcuty=1000.) + parameter(maxcutx=1000.) + parameter(nstepx=10) !inclusion-cut increasing steps + parameter(nstepy=30) - parameter(nstepx=50) !inclusion-cut increasing steps - parameter(nstepy=50) real cutdistyz !y0 / tg theta_yz space real cutdistxz !x0 / tg theta_xz space @@ -372,6 +423,7 @@ * -------------------------------------------------- * cloud selection * -------------------------------------------------- + integer x_min_start,x_min_step ! EM GCC4.7 parameter(x_min_start=4) parameter(x_min_step=1) @@ -381,6 +433,7 @@ common/cutxclouds/ncpxz_min,nptxz_min,nplxz_min + integer y_min_start ! EM GCC4.7 parameter(y_min_start=3) integer ncpyz_min @@ -399,13 +452,15 @@ * maximum value of deflection from Hough transform * accepted in order to perform the track fit * ----------------------------------------------------- - parameter (defmax=10000.) !GV-1 +c parameter (defmax=10000.) !GV-1 + parameter (defmax=100.) !GV-1 * ----------------------------------------------------- * cut to include new couple or single clusters in the * track fitting, after the first fit * ----------------------------------------------------- - parameter (clinc=10) +c parameter (clinc=3) + parameter (clinc=7)