--- DarthVader/TrackerLevel2/inc/F77/common_momanhough.f 2006/11/21 14:00:40 1.7 +++ DarthVader/TrackerLevel2/inc/F77/common_momanhough.f 2007/04/27 10:39:57 1.9 @@ -280,6 +280,10 @@ 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 $ ,XV_STORE,YV_STORE,ZV_STORE @@ -287,7 +291,9 @@ $ ,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 @@ -349,26 +355,54 @@ * 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 + 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 @@ -411,7 +445,8 @@ * cut to include new couple or single clusters in the * track fitting, after the first fit * ----------------------------------------------------- - parameter (clinc=3) +c parameter (clinc=3) + parameter (clinc=7)