--- DarthVader/TrackerLevel2/src/F77/cncomp.f	2006/08/04 08:18:06	1.3
+++ DarthVader/TrackerLevel2/src/F77/cncomp.f	2006/10/26 16:22:37	1.6
@@ -10,6 +10,7 @@
       subroutine cncomp(i,j,errflag)    !(view, VA1)
 
       include 'commontracker.f'
+      include 'level1.f'
       include 'common_reduction.f'
       include 'calib.f'
 
@@ -50,17 +51,16 @@
       
       do k=1,nstrips_va1
          nstr = nstr + strange(i,j,k) !uses only
-         if(mod(i,2).eq.1) then !odd strip ---> Y view
+         if(mod(i,2).eq.1) then ! ---> Y view
             signal(k) = - (DBLE(adc(i,j,k)) - pedestal(i,j,k)) !negative signal
-         else                   !even strip ---> X view
+         else                   ! ---> X view
             signal(k) =    DBLE(adc(i,j,k)) - pedestal(i,j,k) !positive signal
          endif
          smean = smean + signal(k)*strange(i,j,k)
          ssigma = ssigma + (signal(k)**2)*strange(i,j,k)
       enddo
       
-      smean=smean/nstr          !strips value distribution mean
-      
+      smean=smean/nstr          !strips value distribution mean      
       ssigma=SQRT((ssigma/nstr)-smean**2) !strips value distribution sigma
       
       cut=scut*ssigma           !exclusion cut
@@ -146,6 +146,8 @@
       subroutine cnoise(i,j,gulp) !(view, VA1)
 
       include 'commontracker.f'
+      include 'level0.f'
+      include 'level1.f'
       include 'common_reduction.f'
       include 'calib.f'
       
@@ -154,12 +156,16 @@
       
       ncn=0                     !number of strips in cn computation
       cn(i,j)=0                 !initializes cn variable
-      cnflag(i,j)=0            !initialize cn flag OK
+      cnrms(i,j)=0              !initializes cn rms
+      cnn(i,j)=0                !initialize cn flag 
 
       do k=1,nstrips_va1        !loops on strips
 *        tags strange, bad or signal-affected strips
          iok = strange(i,j,k)*bad(i,j,k)*clstr(i,j,k) 
          cn(i,j) = cn(i,j) + (DBLE(adc(i,j,k)) - pedestal(i,j,k))*iok 
+         cnrms(i,j) = cnrms(i,j) 
+     $        + (DBLE(adc(i,j,k)) - pedestal(i,j,k))
+     $        *(DBLE(adc(i,j,k)) - pedestal(i,j,k))*iok 
          ncn = ncn + iok            !counts number of strips in cn computation
       enddo
       
@@ -175,17 +181,15 @@
      $        ', VIEW ',i,'  >>> FAILED '
          endif
          gulp=1
-         cnflag(i,j) = -1
+         cnn(i,j) = 0
       else
          cn(i,j)=cn(i,j)/DBLE(ncn) !<<<< computes common noise
-         if(ncn.lt.NSTRIPWARNING) then 
-            if(debug)print*,' WARNING - cnoise: ',
-     $        'less than ',NSTRIPWARNING
-     $           ,' strips for CN computation on VA1 ',j,
-     $        ', VIEW ',i            
-            cnflag(i,j) = 1
-         endif
+         cnrms(i,j)= SQRT( cnrms(i,j)/DBLE(ncn) - cn(i,j)**2 ) 
+         cnn(i,j) = ncn
          gulp=0                 
+         if(debug.and.ABS(cn(i,j)).gt.1000)
+     $        print*,'Event ',eventn(1)
+     $        ,': cn(',i,',',j,')= ',cn(i,j),' ncn ',ncn
       endif
 
       return
@@ -212,6 +216,7 @@
       subroutine cutcn(i,j)     !(view, VA1)
 
       include 'commontracker.f'
+      include 'level1.f'
       include 'common_reduction.f'
       include 'calib.f'