--- DarthVader/TrackerLevel2/src/F77/reductionflight.f 2008/11/25 14:41:38 1.26 +++ DarthVader/TrackerLevel2/src/F77/reductionflight.f 2008/12/05 08:26:48 1.27 @@ -243,7 +243,7 @@ if(.not.flag_shower)then call savecluster(iv) -c$$$ if(debug.eq.1)print*,' view ',iv,' #clusters ', nclstr_view + if(debug.eq.1)print*,'view ',iv,' #clusters ', nclstr_view else fshower(iv) = 1 c GOOD1(DSPnumber(iv)) = 11 !AHAHAHAHA ORRORE!! @@ -393,9 +393,6 @@ c----------------------------------------- c possible SEED... c----------------------------------------- -c$$$ if(debug.eq.1)print*,'|||| ',value(is),' @',is -c$$$ $ ,' cut ',clseedcut(is) - itemp = is fsat = 0 ! first saturated strip lsat = 0 ! last saturated strip @@ -407,8 +404,6 @@ $ value(itemp).le.value(itemp+1) $ .and.value(itemp+1).gt.clseedcut(itemp+1)) itemp = itemp+1 -c$$$ if(debug.eq.1)print*,'|||| ',value(itemp),' @',is -c$$$ $ ,' cut ',clseedcut(itemp) if(itemp.eq.last) goto 230 !stops if reaches last strip if(sat(itemp).eq.1) goto 230 !stop if reaches a saturated strip enddo ! of the ladder @@ -420,10 +415,7 @@ fsat = itemp lsat = itemp if(itemp.eq.last) goto 231 !estremo... - do while( - $ sat(itemp+1).eq.1 .and. - $ value(itemp+1).gt.clseedcut(itemp+1) .and. - $ .true.) + do while( sat(itemp+1).eq.1 ) itemp = itemp+1 lsat = itemp if(itemp.eq.last) goto 231 !stops if reaches last strip @@ -438,18 +430,13 @@ iseed = itemp ! <<< SEED else iseed = int((lsat+fsat)/2) ! <<< SEED - if(debug.eq.1) - $ print*,'saturated strips (first,last) ',fsat,lsat +c$$$ print*,'saturated strips ',fsat,lsat,iseed c$$$ print*,'--> ',(value(ii),ii=fsat,lsat) endif c--------------------------------------------------------------- c after finding a cluster seed, checks also adjacent strips, C and tags the ones exceeding clinclcut c--------------------------------------------------------------- - - if(debug.eq.1)print*,'SEED ',value(iseed),' @',iseed - $ ,' cut ',clseedcut(iseed) - ir=iseed !indici destro il=iseed ! e sinistro @@ -571,9 +558,6 @@ $ mult_view(nclstr_view) = mult_view(nclstr_view)+1 enddo -c$$$ print*,(value(ii),ii=lmax,rmax) -c$$$ print*,(clinclcut(ii),ii=lmax,rmax) -c$$$ print*,(clseedcut(ii),ii=lmax,rmax) c$$$ if(rmax-lmax+1.gt.25) c$$$ $ print*,'view ',iv @@ -684,14 +668,10 @@ $ sgnl(nclstr1) = sgnl(nclstr1) + value(j) !cluster charge enddo - if(debug.eq.1)then - print*,'view ',iv,' -- ' - $ ,' n.cl: ',nclstr1 - $ ,' maxs: ',maxs(nclstr1) - $ ,' mult: ',mult(nclstr1) - $ ,' sign: ',sgnl(nclstr1) - print*,'----------------------' - endif +c$$$ print*,'view ',iv,' -- savecluster -- nclstr1: ' +c$$$ $ ,nclstr1,maxs(nclstr1),mult(nclstr1),sgnl(nclstr1) +c$$$ print*,'----------------------' + enddo return @@ -768,8 +748,7 @@ clinclcut(is)=incuty*sigma(iv,nvk(is),nst(is)) $ *mask(iv,nvk(is),nst(is)) sat(is)=0 - if( adc(iv,nvk(is),nst(is)).lt.adc_saty ) - $ sat(is)=mask(iv,nvk(is),nst(is)) + if( adc(iv,nvk(is),nst(is)).lt.adc_saty )sat(is)=1 else C=== > X view value(is)= (DBLE(adc(iv,nvk(is),nst(is))) @@ -780,8 +759,7 @@ clinclcut(is)=incutx*sigma(iv,nvk(is),nst(is)) $ *mask(iv,nvk(is),nst(is)) sat(is)=0 - if( adc(iv,nvk(is),nst(is)).gt.adc_satx ) - $ sat(is)=mask(iv,nvk(is),nst(is)) + if( adc(iv,nvk(is),nst(is)).gt.adc_satx )sat(is)=1 endif enddo !end loop on strips (1)