--- DarthVader/TrackerLevel2/src/F77/analysissubroutines.f 2006/10/02 13:12:48 1.6 +++ DarthVader/TrackerLevel2/src/F77/analysissubroutines.f 2006/10/11 06:53:02 1.7 @@ -667,27 +667,27 @@ resxPAM = resxPAM*fbad_cog(2,icx) elseif(PFAx.eq.'ETA2')then c cog2 = cog(2,icx) -c etacorr = pfa_eta2(cog2,viewx,nldx,angx) +c etacorr = pfaeta2(cog2,viewx,nldx,angx) c stripx = stripx + etacorr - stripx = stripx + pfa_eta2(icx,angx) !(3) + stripx = stripx + pfaeta2(icx,angx) !(3) resxPAM = risx_eta2(angx) ! (4) if(DEBUG.and.fbad_cog(2,icx).ne.1) $ print*,'BAD icx >>> ',viewx,fbad_cog(2,icx) resxPAM = resxPAM*fbad_cog(2,icx) elseif(PFAx.eq.'ETA3')then !(3) - stripx = stripx + pfa_eta3(icx,angx) !(3) + stripx = stripx + pfaeta3(icx,angx) !(3) resxPAM = risx_eta3(angx) ! (4) if(DEBUG.and.fbad_cog(3,icx).ne.1) !(3) $ print*,'BAD icx >>> ',viewx,fbad_cog(3,icx)!(3) resxPAM = resxPAM*fbad_cog(3,icx) !(3) elseif(PFAx.eq.'ETA4')then !(3) - stripx = stripx + pfa_eta4(icx,angx) !(3) + stripx = stripx + pfaeta4(icx,angx) !(3) resxPAM = risx_eta4(angx) ! (4) if(DEBUG.and.fbad_cog(4,icx).ne.1) !(3) $ print*,'BAD icx >>> ',viewx,fbad_cog(4,icx)!(3) resxPAM = resxPAM*fbad_cog(4,icx) !(3) elseif(PFAx.eq.'ETA')then !(3) - stripx = stripx + pfa_eta(icx,angx) !(3) + stripx = stripx + pfaeta(icx,angx) !(3) resxPAM = ris_eta(icx,angx) ! (4) if(DEBUG.and.fbad_cog(2,icx).ne.1) !(3) $ print*,'BAD icx >>> ',viewx,fbad_cog(2,icx)!(3) @@ -731,25 +731,25 @@ resyPAM = resyPAM*fbad_cog(2,icy) elseif(PFAy.eq.'ETA2')then c cog2 = cog(2,icy) -c etacorr = pfa_eta2(cog2,viewy,nldy,angy) +c etacorr = pfaeta2(cog2,viewy,nldy,angy) c stripy = stripy + etacorr - stripy = stripy + pfa_eta2(icy,angy) !(3) + stripy = stripy + pfaeta2(icy,angy) !(3) resyPAM = risy_eta2(angy) ! (4) resyPAM = resyPAM*fbad_cog(2,icy) if(DEBUG.and.fbad_cog(2,icy).ne.1) $ print*,'BAD icy >>> ',viewy,fbad_cog(2,icy) elseif(PFAy.eq.'ETA3')then !(3) - stripy = stripy + pfa_eta3(icy,angy) !(3) + stripy = stripy + pfaeta3(icy,angy) !(3) resyPAM = resyPAM*fbad_cog(3,icy) !(3) if(DEBUG.and.fbad_cog(3,icy).ne.1) !(3) $ print*,'BAD icy >>> ',viewy,fbad_cog(3,icy)!(3) elseif(PFAy.eq.'ETA4')then !(3) - stripy = stripy + pfa_eta4(icy,angy) !(3) + stripy = stripy + pfaeta4(icy,angy) !(3) resyPAM = resyPAM*fbad_cog(4,icy) !(3) if(DEBUG.and.fbad_cog(4,icy).ne.1) !(3) $ print*,'BAD icy >>> ',viewy,fbad_cog(4,icy)!(3) elseif(PFAy.eq.'ETA')then !(3) - stripy = stripy + pfa_eta(icy,angy) !(3) + stripy = stripy + pfaeta(icy,angy) !(3) resyPAM = ris_eta(icy,angy) ! (4) c resyPAM = resyPAM*fbad_cog(2,icy) !(3)TEMPORANEO resyPAM = resyPAM*fbad_eta(icy,angy) ! (4)