--- DarthVader/TrackerLevel2/inc/F77/calib.f	2006/10/02 13:12:39	1.3
+++ DarthVader/TrackerLevel2/inc/F77/calib.f	2006/11/23 18:51:44	1.4
@@ -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
 
@@ -37,14 +33,37 @@
       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,7 +72,7 @@
 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