--- DarthVader/TrackerLevel2/inc/F77/calib.f	2006/09/28 14:04:39	1.2
+++ DarthVader/TrackerLevel2/inc/F77/calib.f	2007/02/16 14:56:01	1.6
@@ -13,10 +13,6 @@
 c     
 c------------------------------------------------------------------------
 
-      parameter (id_hi_bad=100) !badstrip histo identifier
-      parameter (id_hi_ped=200) !pedestal histo identifier
-      parameter (id_hi_sig=300) !sigma histo identifier
-
       real pedestal(nviews,nva1_view,nstrips_va1) !pedestal value
       real pedestal_t(nviews,nva1_view,nstrips_va1) !pedestal truncated value
 
@@ -33,18 +29,41 @@
 
 
       parameter (clcutx=7.)     !cluster seed cut 
-      parameter (clcuty=7.)
+      parameter (clcuty=6.)
       parameter (incutx=4.)     !cut to include strips in cluster definition
       parameter (incuty=4.)
 
+c------------------------------------------------------------------------
+c     
+c     VA1-mask
+c     
+c------------------------------------------------------------------------
+c     VA1 mask, from the DB
+c      0 = force mask
+c      1 = ---> run-by-run mask ---> event-by-event mask
+c     -1 = ---> event-by-event mask
+c     -------------------------------------
+      integer mask_vk(nviews,nva1_view)    
+c     -------------------------------------
+c     VA1 mask run-by-run (set to 0 if <SIG> < SIG_min)
+c      0 = force mask
+c      1 = ---> event-by-event mask
+c     -------------------------------------
+      integer mask_vk_run(nviews,nva1_view)
+c     -------------------------------------
+c     VA1 mask event-by-event (set to 0 if CN computation fails)
+c      0 = force mask
+c      1 = search clusters 
+c     -------------------------------------
+      integer mask_vk_ev(nviews,nva1_view) 
 
-      parameter (id_hi_mask=400) !mask histo identifier
-
-      integer mask(nviews,nva1_view,nstrips_va1) 
-      integer mask_vk(nviews,nva1_view) 
+      integer mask(nviews,nva1_view,nstrips_va1) !effective mask
 
-      common/mask/mask,mask_vk
+*     set from outside F77 routines
+      common/mask/mask_vk,mask_vk_run
       save/mask/
+*     set event-by-event
+      common/maskev/mask_vk_ev,mask
 
 c------------------------------------------------------------------------
 c     
@@ -53,13 +72,13 @@
 c------------------------------------------------------------------------
 *     angular binning
 *     NB the angular binning is defined in common_preanalysis.f
-*     here are defined variables to retrieve calibration info 
+*     here are defned variables to retrieve calibration info 
 *     (for processing levels next to 1)
       parameter (nangmax=21)    !maximum number of angular bins
       integer nangbin
       real angL(nangmax),angR(nangmax) !Left and Right bin limits
 
-      parameter (netavalmax=150)   !eta2 points 
+      parameter (netavalmax=500)   !eta2 points 
       integer netaval
       real eta2(netavalmax,nangmax)
       real feta2(netavalmax,nviews,nladders_view,nangmax)
@@ -68,9 +87,12 @@
       real eta4(netavalmax,nangmax)
       real feta4(netavalmax,nviews,nladders_view,nangmax)
 
-      common/angbinning/nangbin,angL,angR
-      save/angbinning/
-      common/pfa/netaval,eta2,feta2,eta3,feta3,eta4,feta4
+c$$$      common/angbinning/nangbin,angL,angR
+c$$$      save/angbinning/
+c$$$      common/pfa/netaval,eta2,feta2,eta3,feta3,eta4,feta4
+c$$$      save/pfa/
+      common/pfa/nangbin,angL,angR
+     $     ,netaval,eta2,feta2,eta3,feta3,eta4,feta4
       save/pfa/
 c------------------------------------------------------------------------
 c     
@@ -80,9 +102,11 @@
 
 c      parameter (chcut=3.)      !cut to associate two clusters
 c      parameter (chcut=4.)      !cut to associate two clusters
-      parameter (chcut=10.)      !cut to associate two clusters
-      parameter (chsatx=2500.)   !saturation limit 
+      parameter (chcut=50.)      !cut to associate two clusters
+      parameter (chsatx=1700.)   !saturation limit 
       parameter (chsaty=2500.)   !saturation limit 
+      parameter (chmipx=200.)   !mip limit 
+      parameter (chmipy=200.)   !mip limit 
 *     above saturation limit correlation conditions are not applied
       real kch(nplanes,nladders_view) !angular coeff
       real cch(nplanes,nladders_view) !const