--- DarthVader/TrackerLevel2/src/F77/analysisflight.f 2006/05/19 13:15:54 1.1 +++ DarthVader/TrackerLevel2/src/F77/analysisflight.f 2006/11/10 11:38:44 1.7 @@ -9,20 +9,14 @@ subroutine analysisflight include 'commontracker.f' + include 'level1.f' include 'common_momanhough.f' include 'common_mech.f' include 'common_xyzPAM.f' include 'common_mini_2.f' include 'calib.f' - include 'level1.f' include 'level2.f' -c include 'momanhough_init.f' - -* flag to set debug mode - logical DEBUG - common/dbg/DEBUG - * flag to chose PFA character*10 PFA common/FINALPFA/PFA @@ -33,7 +27,6 @@ external npl external acoordsi,coordsi,nld,coord,dcoord - DEBUG=.false.!.true.! ************************************************************ ************************************************************ ************************************************************ @@ -47,24 +40,20 @@ if(DEBUG)then print*,'----------------------------------' - print*,'START... ',good1,nclstr1,nclstrmax_level2 +c print*,'START... ',good1,nclstr1,nclstrmax_level2 endif *------------------------------------------------------ -* LEVEL2 N-TUPLE INITIALIZATIONS call init_level2 -c if(.not.good1)then - if(good1.eq.0)then - goto 8800 !fill nt-uple and go to next event - endif + call init_hough *------------------------------------------------------ *------------------------------------------------------ * cut on maximum number of clusters *------------------------------------------------------ - if(nclstr1.gt.nclstrmax_level2)then - goto 8800 !fill nt-uple and go to next event - endif +c$$$ if(nclstr1.gt.nclstrmax_level2)then +c$$$ goto 8800 !fill nt-uple and go to next event +c$$$ endif do i=1,nclstr1 cl_used(i)=0 !init mask of clusters associated to a track @@ -84,6 +73,8 @@ goto 880 !fill ntp and go to next event endif + call fill_hough + iflag=0 call track_fitting(iflag) if(iflag.eq.1)then !bad event @@ -111,6 +102,14 @@ print*,'' print*,'' endif + + ngood = 0 + do iv = 1,nviews + ngood = ngood + good1(iv) + enddo +c$$$ if(ngood.ne.0)print*,'* WARNING * Event ' +c$$$ $ ,':LEVEL2 event status: ' +c$$$ $ ,(good2(i),i=1,nviews) 8800 continue @@ -127,6 +126,3 @@ ************************************************************ -c# include "momanhough-subroutines.f" - -