--- DarthVader/TrackerLevel2/src/F77/reductionflight.f	2006/11/08 10:12:01	1.12
+++ DarthVader/TrackerLevel2/src/F77/reductionflight.f	2006/11/23 18:51:45	1.13
@@ -23,11 +23,6 @@
       integer ierror
       ierror = 0
 
-*     -------------------------------------------------------
-*     STRIP MASK
-*     -------------------------------------------------------
-
-c      call stripmask   !called later, after CN computation
       call init_level1
 
 c      good1 = good0
@@ -113,21 +108,25 @@
             cn(iv,ik)  = 0
             cnrms(iv,ik)  = 0
             cnn(iv,ik) = -1 
-            mask_vk_ev(iv,ik)=1
             iflag=0
-            if(mask_vk(iv,ik).eq.1)call cncomp(iv,ik,iflag)
+            mask_vk_ev(iv,ik)=1
+            call stripmask(iv,ik)      !compute mask(i,j,k), combining VA1-masks
+c     NBNBNBNBNB mask per la striscia 1 !!!!!!!!
+            if(mask(iv,ik,1).eq.1)call cncomp(iv,ik,iflag)
             if(iflag.ne.0)then 
                ima=ima+1
                mask_vk_ev(iv,ik)=0
                ierror = 220
             endif
+            call stripmask(iv,ik)      !compute mask(i,j,k), combining VA1-masks
+            
          enddo
  100     format(' * WARNING * Event ',i7,' view',i3,': VK MASK ',24i1)
          if(ima.ne.0.and.debug)write(*,100)eventn(1),iv
      $        ,(mask_vk_ev(iv,ik),ik=1,nva1_view)
       enddo
 
-      call stripmask !compute mask(i,j,k), combining mask_vk_ev and mask_vk
+cc      call stripmask !compute mask(i,j,k), combining mask_vk_ev and mask_vk
 
 c---------------------------------------------
 c     loops on views, VA1 and strips, 
@@ -578,7 +577,43 @@
 *---***---***---***---***---***---***---***---***
 
 
-      subroutine stripmask
+c$$$      subroutine stripmask
+c$$$
+c$$$*     this routine set va1 and single-strip masks,
+c$$$*     on the basis of the VA1 mask saved in the DB
+c$$$*
+c$$$*     mask(nviews,nva1_view,nstrips_va1) !strip mask
+c$$$*     mask_vk(nviews,nva1_view)          !VA1 mask
+c$$$*
+c$$$      include 'commontracker.f'
+c$$$      include 'level1.f'
+c$$$      include 'common_reduction.f'
+c$$$      include 'calib.f'
+c$$$
+c$$$*     init mask
+c$$$      do iv=1,nviews
+c$$$         do ivk=1,nva1_view
+c$$$            do is=1,nstrips_va1
+c$$$c               mask(iv,ivk,is) = mask_vk(iv,ivk) 
+c$$$               if( mask_vk(iv,ivk) .ne. -1)then
+c$$$                  mask(iv,ivk,is) = 1 
+c$$$     $                 * mask_vk(iv,ivk)     !from DB
+c$$$     $                 * mask_vk_ev(iv,ivk)  !from <SIG>
+c$$$     $                 * mask_vk_run(iv,ivk) !from CN
+c$$$               else
+c$$$                  mask(iv,ivk,is) = -1 
+c$$$     $                 * mask_vk(iv,ivk)     !from DB
+c$$$     $                 * mask_vk_ev(iv,ivk)  !from CN
+c$$$               endif
+c$$$            enddo
+c$$$         enddo
+c$$$      enddo
+c$$$
+c$$$
+c$$$      return
+c$$$      end 
+
+      subroutine stripmask(iv,ivk)
 
 *     this routine set va1 and single-strip masks,
 *     on the basis of the VA1 mask saved in the DB
@@ -592,16 +627,19 @@
       include 'calib.f'
 
 *     init mask
-      do iv=1,nviews
-         do ivk=1,nva1_view
-            do is=1,nstrips_va1
-c               mask(iv,ivk,is) = mask_vk(iv,ivk) 
-               mask(iv,ivk,is) = mask_vk(iv,ivk) * mask_vk_ev(iv,ivk)               
-            enddo
-         enddo
+      do is=1,nstrips_va1
+         if( mask_vk(iv,ivk) .ne. -1)then            
+            mask(iv,ivk,is) = 1 
+     $           * mask_vk(iv,ivk) !from DB
+     $           * mask_vk_ev(iv,ivk) !from <SIG>
+     $           * mask_vk_run(iv,ivk) !from CN
+         else
+            mask(iv,ivk,is) = -1 
+     $           * mask_vk(iv,ivk) !from DB
+     $           * mask_vk_ev(iv,ivk) !from CN
+         endif
       enddo
-
-
+      
+      
       return
       end 
-