--- DarthVader/TrackerLevel2/src/F77/analysissubroutines.f 2007/05/24 16:45:48 1.26 +++ DarthVader/TrackerLevel2/src/F77/analysissubroutines.f 2007/08/17 14:36:05 1.27 @@ -698,16 +698,16 @@ stripx = stripx + pfaeta3(icx,angx) resxPAM = risxeta3(abs(angx)) resxPAM = resxPAM*fbad_cog(3,icx) - if(DEBUG.and.fbad_cog(3,icx).ne.1) - $ print*,'BAD icx >>> ',viewx,fbad_cog(3,icx) +c if(DEBUG.and.fbad_cog(3,icx).ne.1) +c $ print*,'BAD icx >>> ',viewx,fbad_cog(3,icx) elseif(PFAx.eq.'ETA4')then stripx = stripx + pfaeta4(icx,angx) resxPAM = risxeta4(abs(angx)) resxPAM = resxPAM*fbad_cog(4,icx) - if(DEBUG.and.fbad_cog(4,icx).ne.1) - $ print*,'BAD icx >>> ',viewx,fbad_cog(4,icx) +c if(DEBUG.and.fbad_cog(4,icx).ne.1) +c $ print*,'BAD icx >>> ',viewx,fbad_cog(4,icx) elseif(PFAx.eq.'ETA')then @@ -715,8 +715,16 @@ c resxPAM = riseta(icx,angx) resxPAM = riseta(viewx,angx) resxPAM = resxPAM*fbad_eta(icx,angx) - if(DEBUG.and.fbad_cog(2,icx).ne.1) - $ print*,'BAD icx >>> ',viewx,fbad_cog(2,icx) +c if(DEBUG.and.fbad_cog(2,icx).ne.1) +c $ print*,'BAD icx >>> ',viewx,fbad_cog(2,icx) + + elseif(PFAx.eq.'ETAL')then + + stripx = stripx + pfaetal(icx,angx) + resxPAM = riseta(viewx,angx) + resxPAM = resxPAM*fbad_eta(icx,angx) +c if(DEBUG.and.fbad_cog(2,icx).ne.1) +c $ print*,'BAD icx >>> ',viewx,fbad_cog(2,icx) elseif(PFAx.eq.'COG')then @@ -824,22 +832,22 @@ stripy = stripy + pfaeta2(icy,angy) resyPAM = risyeta2(abs(angy)) resyPAM = resyPAM*fbad_cog(2,icy) - if(DEBUG.and.fbad_cog(2,icy).ne.1) - $ print*,'BAD icy >>> ',viewy,fbad_cog(2,icy) +c if(DEBUG.and.fbad_cog(2,icy).ne.1) +c $ print*,'BAD icy >>> ',viewy,fbad_cog(2,icy) elseif(PFAy.eq.'ETA3')then stripy = stripy + pfaeta3(icy,angy) resyPAM = resyPAM*fbad_cog(3,icy) - if(DEBUG.and.fbad_cog(3,icy).ne.1) - $ print*,'BAD icy >>> ',viewy,fbad_cog(3,icy) +c if(DEBUG.and.fbad_cog(3,icy).ne.1) +c $ print*,'BAD icy >>> ',viewy,fbad_cog(3,icy) elseif(PFAy.eq.'ETA4')then stripy = stripy + pfaeta4(icy,angy) resyPAM = resyPAM*fbad_cog(4,icy) - if(DEBUG.and.fbad_cog(4,icy).ne.1) - $ print*,'BAD icy >>> ',viewy,fbad_cog(4,icy) +c if(DEBUG.and.fbad_cog(4,icy).ne.1) +c $ print*,'BAD icy >>> ',viewy,fbad_cog(4,icy) elseif(PFAy.eq.'ETA')then @@ -847,8 +855,16 @@ c resyPAM = riseta(icy,angy) resyPAM = riseta(viewy,angy) resyPAM = resyPAM*fbad_eta(icy,angy) - if(DEBUG.and.fbad_cog(2,icy).ne.1) - $ print*,'BAD icy >>> ',viewy,fbad_cog(2,icy) +c if(DEBUG.and.fbad_cog(2,icy).ne.1) +c $ print*,'BAD icy >>> ',viewy,fbad_cog(2,icy) + + elseif(PFAy.eq.'ETAL')then + + stripy = stripy + pfaetal(icy,angy) + resyPAM = riseta(viewy,angy) + resyPAM = resyPAM*fbad_eta(icy,angy) +c if(DEBUG.and.fbad_cog(2,icy).ne.1) +c $ print*,'BAD icy >>> ',viewy,fbad_cog(2,icy) elseif(PFAy.eq.'COG')then