--- DarthVader/TrackerLevel2/src/F77/cncomp.f 2006/08/04 08:18:06 1.3 +++ DarthVader/TrackerLevel2/src/F77/cncomp.f 2006/09/05 12:52:20 1.4 @@ -10,6 +10,7 @@ subroutine cncomp(i,j,errflag) !(view, VA1) include 'commontracker.f' + include 'level1.f' include 'common_reduction.f' include 'calib.f' @@ -146,6 +147,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,7 +157,7 @@ ncn=0 !number of strips in cn computation cn(i,j)=0 !initializes cn variable - cnflag(i,j)=0 !initialize cn flag OK + cnn(i,j)=0 !initialize cn flag do k=1,nstrips_va1 !loops on strips * tags strange, bad or signal-affected strips @@ -175,17 +178,14 @@ $ ', 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 + cnn(i,j) = ncn gulp=0 + if(verbose.and.ABS(cn(i,j)).gt.1000) + $ print*,'Event ',eventn(1) + $ ,': cn(',i,',',j,')= ',cn(i,j),' ncn ',ncn endif return @@ -212,6 +212,7 @@ subroutine cutcn(i,j) !(view, VA1) include 'commontracker.f' + include 'level1.f' include 'common_reduction.f' include 'calib.f'