--- DarthVader/TrackerLevel2/src/F77/functionspfa.f 2007/05/23 15:31:19 1.12 +++ DarthVader/TrackerLevel2/src/F77/functionspfa.f 2007/05/24 13:29:09 1.13 @@ -170,10 +170,10 @@ * this function returns the average spatial resolution * (in cm) for the ETA algorithm (function pfaeta(ic,angle)) * it calls: -* - risx_eta2(angle) -* - risy_eta2(angle) -* - risx_eta3(angle) -* - risx_eta4(angle) +* - risxeta2(angle) +* - risyeta2(angle) +* - risxeta3(angle) +* - risxeta4(angle) * according to the angle *-------------------------------------------------------------- include 'commontracker.f' @@ -187,7 +187,7 @@ if( abs(angle).ge.e2fay.and.abs(angle).le.e2tay )then - riseta = risy_eta2(angle) + riseta = risyeta2(angle) elseif( abs(angle).ge.e3fay.and.abs(angle).le.e3tay )then riseta = risy_cog(angle) !ATTENZIONE!! elseif( abs(angle).ge.e4fay.and.abs(angle).le.e4tay )then @@ -199,11 +199,11 @@ else !X-view if( abs(angle).ge.e2fax.and.abs(angle).le.e2tax )then - riseta = risx_eta2(angle) + riseta = risxeta2(angle) elseif( abs(angle).ge.e3fax.and.abs(angle).le.e3tax )then - riseta = risx_eta3(angle) + riseta = risxeta3(angle) elseif( abs(angle).ge.e4fax.and.abs(angle).le.e4tax )then - riseta = risx_eta4(angle) + riseta = risxeta4(angle) else riseta = risx_cog(angle) endif @@ -1193,7 +1193,7 @@ *** * * * *** * * * *** * * * *** * * * *** * * * *** * * * *** - FUNCTION risx_eta2(x) + FUNCTION risxeta2(x) DOUBLE PRECISION V( 1) INTEGER NPAR, NDIM, IMQFUN, I, J @@ -1280,12 +1280,12 @@ 20 CONTINUE IF (IMQFUN .EQ. 2) HQUADF = VCONST * EXP (HQUADF) - risx_eta2=HQUADF* 1e-4 + risxeta2=HQUADF* 1e-4 END *** * * * *** * * * *** * * * *** * * * *** * * * *** * * * *** - FUNCTION risx_eta3(x) + FUNCTION risxeta3(x) DOUBLE PRECISION V( 1) INTEGER NPAR, NDIM, IMQFUN, I, J DOUBLE PRECISION HQDJ, VV, VCONST @@ -1371,11 +1371,11 @@ 20 CONTINUE IF (IMQFUN .EQ. 2) HQUADF = VCONST * EXP (HQUADF) - risx_eta3 = HQUADF* 1e-4 + risxeta3 = HQUADF* 1e-4 END *** * * * *** * * * *** * * * *** * * * *** * * * *** * * * *** - FUNCTION risx_eta4(x) + FUNCTION risxeta4(x) DOUBLE PRECISION V( 1) INTEGER NPAR, NDIM, IMQFUN, I, J DOUBLE PRECISION HQDJ, VV, VCONST @@ -1461,11 +1461,11 @@ 20 CONTINUE IF (IMQFUN .EQ. 2) HQUADF = VCONST * EXP (HQUADF) - risx_eta4=HQUADF* 1e-4 + risxeta4=HQUADF* 1e-4 END *** * * * *** * * * *** * * * *** * * * *** * * * *** * * * *** - FUNCTION risy_eta2(x) + FUNCTION risyeta2(x) DOUBLE PRECISION V( 1) INTEGER NPAR, NDIM, IMQFUN, I, J DOUBLE PRECISION HQDJ, VV, VCONST @@ -1533,7 +1533,7 @@ 20 CONTINUE IF (IMQFUN .EQ. 2) HQUADF = VCONST * EXP (HQUADF) - risy_eta2=HQUADF* 1e-4 + risyeta2=HQUADF* 1e-4 END *** * * * *** * * * *** * * * *** * * * *** * * * *** * * * ***