--- DarthVader/TrackerLevel2/inc/F77/calib.f	2006/05/19 13:15:52	1.1.1.1
+++ DarthVader/TrackerLevel2/inc/F77/calib.f	2012/05/15 14:31:38	1.12
@@ -7,15 +7,35 @@
 *     
 *************************************************************************
 
+      real incutx               !cut to include strips in cluster definition
+      real incuty
+      parameter (clcutx=7.)     !cluster seed cut 
+      parameter (clcuty=6.)
+      parameter (incutx=4.)     !cut to include strips in cluster definition
+      parameter (incuty=4.)
+
 c------------------------------------------------------------------------
 c     
-c     pedestal, sigma and badstrip variables
+c     some parameters to configure data reduction
 c     
 c------------------------------------------------------------------------
+c$$$      real clcutx               !cluster seed cut 
+c$$$      real clcuty
+c$$$      real incutx               !cut to include strips in cluster definition
+c$$$      real incuty
+      integer pfaid             !if of PFA 
+      common/sw/
+     $     pfaid
+c$$$     $     ,clcutx,clcuty
+c$$$     $     ,incutx,incuty
+
+      save/sw/
 
-      parameter (id_hi_bad=100) !badstrip histo identifier
-      parameter (id_hi_ped=200) !pedestal histo identifier
-      parameter (id_hi_sig=300) !sigma histo identifier
+c------------------------------------------------------------------------
+c     
+c     pedestal, sigma and badstrip variables
+c     
+c------------------------------------------------------------------------
 
       real pedestal(nviews,nva1_view,nstrips_va1) !pedestal value
       real pedestal_t(nviews,nva1_view,nstrips_va1) !pedestal truncated value
@@ -32,19 +52,38 @@
       save/pedsigbad/
 
 
-      parameter (clcutx=7.)     !cluster seed cut 
-      parameter (clcuty=7.)
-      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     
@@ -52,14 +91,11 @@
 c     
 c------------------------------------------------------------------------
 *     angular binning
-*     NB the angular binning is defined in common_preanalysis.f
-*     here are defined 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)
@@ -67,11 +103,39 @@
       real feta3(netavalmax,nviews,nladders_view,nangmax)
       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
+      real fcorr(nviews,nladders_view,nangmax)
+*     limit of application of pfa
+      real e2fax,e2tax,e3fax,e3tax,e4fax,e4tax
+      real e2fay,e2tay,e3fay,e3tay,e4fay,e4tay
+      
+
+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
+     $     ,fcorr
+     $     ,e2fax,e2tax,e3fax,e3tax,e4fax,e4tax
+     $     ,e2fay,e2tay,e3fay,e3tay,e4fay,e4tay
       save/pfa/
+
+c$$$*     limit of application of pfa
+c$$$      parameter (e2fax=0.)
+c$$$      parameter (e2tax=10.)
+c$$$      parameter (e3fax=10.)
+c$$$      parameter (e3tax=15.)
+c$$$      parameter (e4fax=90.)
+c$$$      parameter (e4tax=90.)
+c$$$
+c$$$      parameter (e2fay=0.)
+c$$$      parameter (e2tay=20.)
+c$$$      parameter (e3fay=90.)
+c$$$      parameter (e3tay=90.)
+c$$$      parameter (e4fay=90.)
+c$$$      parameter (e4tay=90.)
+
 c------------------------------------------------------------------------
 c     
 c     CHARGE CORRELATION
@@ -79,7 +143,13 @@
 c------------------------------------------------------------------------
 
 c      parameter (chcut=3.)      !cut to associate two clusters
-      parameter (chcut=4.)      !cut to associate two clusters
+c      parameter (chcut=4.)      !cut to associate two clusters
+      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
       real sch(nplanes,nladders_view) !sigma