--- DarthVader/TrackerLevel2/inc/F77/common_momanhough.f	2006/11/02 11:21:36	1.5
+++ DarthVader/TrackerLevel2/inc/F77/common_momanhough.f	2007/05/14 11:03:05	1.10
@@ -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
@@ -275,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
@@ -282,7 +291,10 @@
      $     ,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 
@@ -344,26 +356,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   
@@ -399,13 +439,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)