--- DarthVader/TrackerLevel2/inc/F77/calib.f	2007/02/05 16:01:51	1.5
+++ DarthVader/TrackerLevel2/inc/F77/calib.f	2007/08/22 07:03:45	1.11
@@ -7,6 +7,28 @@
 *     
 *************************************************************************
 
+      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     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/
+
 c------------------------------------------------------------------------
 c     
 c     pedestal, sigma and badstrip variables
@@ -28,10 +50,6 @@
       save/pedsigbad/
 
 
-      parameter (clcutx=7.)     !cluster seed cut 
-      parameter (clcuty=6.)
-      parameter (incutx=4.)     !cut to include strips in cluster definition
-      parameter (incuty=4.)
 
 c------------------------------------------------------------------------
 c     
@@ -71,14 +89,11 @@
 c     
 c------------------------------------------------------------------------
 *     angular binning
-*     NB the angular binning is defined in common_preanalysis.f
-*     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)
@@ -86,14 +101,39 @@
       real feta3(netavalmax,nviews,nladders_view,nangmax)
       real eta4(netavalmax,nangmax)
       real feta4(netavalmax,nviews,nladders_view,nangmax)
+      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