diff --git a/noao/digiphot/daophot/addstar/dpartstar.x b/noao/digiphot/daophot/addstar/dpartstar.x index 9f464812c..8b369e08b 100644 --- a/noao/digiphot/daophot/addstar/dpartstar.x +++ b/noao/digiphot/daophot/addstar/dpartstar.x @@ -208,7 +208,7 @@ int iseed[ARB] # random number seed array int ix, iy pointer psffit real dx, dy, dxsq, dysq, radsq, dvdx, dvdy, value, err -real dp_usepsf(), dp_nrml(), daoran() +real dp_usepsf(), dp_nrml(), urand() begin psffit = DP_PSFFIT(dao) @@ -226,7 +226,7 @@ begin Memr[DP_PSFLUT(psffit)], DP_PSFSIZE(psffit), DP_NVLTABLE(psffit), DP_NFEXTABLE(psffit), xfrom_psf, yfrom_psf, dvdx, dvdy) - err = daoran (iseed[mod(ix+iy,3)+1]) + err = urand (iseed[mod(ix+iy,3)+1]) err = sqrt (max (0.0, value / gain)) * dp_nrml (err) subin[ix,iy] = subin[ix,iy] + value + err } @@ -252,12 +252,12 @@ real minmag # minimum magnitude real mwide # the magnitude range int iseed[ARB] # seed array for random number genrator -real daoran() +real urand() begin - x = xmin + daoran (iseed[1]) * xwide - y = ymin + daoran (iseed[2]) * ywide - mag = minmag + daoran (iseed[3]) * mwide + x = xmin + urand (iseed[1]) * xwide + y = ymin + urand (iseed[2]) * ywide + mag = minmag + urand (iseed[3]) * mwide end @@ -269,13 +269,13 @@ int seed # initial seed value int iseed[ARB] # the seed array int idum -real daoran() +real urand() begin idum = seed - iseed[1] = int (524288.* daoran (idum)) + 1 - iseed[2] = int (524288.* daoran (idum)) + 1 - iseed[3] = int (524288.* daoran (idum)) + 1 + iseed[1] = int (524288.* urand (idum)) + 1 + iseed[2] = int (524288.* urand (idum)) + 1 + iseed[3] = int (524288.* urand (idum)) + 1 end diff --git a/noao/digiphot/daophot/daolib/daoran.x b/noao/digiphot/daophot/daolib/daoran.x deleted file mode 100644 index a63b8b39a..000000000 --- a/noao/digiphot/daophot/daolib/daoran.x +++ /dev/null @@ -1,43 +0,0 @@ -define LEN_IR 97 -define IC 150889 -define M 714025 -define IA 1366 -define RM 1.400511e-6 - -# DAORAN -- The random number generator RAN2 from Numerical Recipes. - -real procedure daoran (idum) - -int idum # seed for the random number generator - -int j, iff, iy, ir[LEN_IR] -real rnum2 -data iff /0/ - -begin - repeat { - - # Initialize the random number generator. - if ((idum < 0) || (iff == 0)) { - iff = 1 - idum = mod (abs (IC - idum), M) - do j = 1, LEN_IR { - idum = mod (IA * idum + IC, M) - ir[j] = idum - } - idum = mod (IA * idum + IC, M) - iy = idum - } - - # Get the random number - j = 1 + (LEN_IR * iy) / M - j = max (1, min (LEN_IR, j)) - iy = ir[j] - rnum2 = iy * RM - idum = mod (IA * idum + IC, M) - ir[j] = idum - - } until (rnum2 > 0.0) - - return (rnum2) -end diff --git a/noao/digiphot/daophot/daolib/mkpkg b/noao/digiphot/daophot/daolib/mkpkg index 442539433..f5cdfa162 100644 --- a/noao/digiphot/daophot/daolib/mkpkg +++ b/noao/digiphot/daophot/daolib/mkpkg @@ -36,7 +36,6 @@ libpkg.a: dpwparam.x dpwcs.x ../lib/daophotdef.h bicubic.x - daoran.x erf.x invers.f invers2.x diff --git a/noao/digiphot/daophot/daolib/ran3.x b/noao/digiphot/daophot/daolib/ran3.x deleted file mode 100644 index c8915e707..000000000 --- a/noao/digiphot/daophot/daolib/ran3.x +++ /dev/null @@ -1,63 +0,0 @@ -define MBIG 1000000000 -define MSEED 161803398 -define MZ 0.0 -define FAC 1.0 / MBIG - -# RAN3 -- Returns a uniform random deviate between 0.0 and 1.0. Set -# 'idum' to any negative value to initialize or reinitialize the sequence. -# From Numerical Recipes (originally attributed to Donald Knuth, 1981; -# Seminumerical Algorithms, 2nd edition, volume 2 of 'The Art of Computer -# Programming' - Section 3.2-3.3. - -real procedure ran3 (idum) - -int idum - -int ma[55] -int mj, mk, i, k, ii -int iff, inext, inextp -data iff /0/ - -begin - if(idum < 0 || iff == 0) { - iff = 1 - mj = MSEED - iabs(idum) - mj = mod(mj, MBIG) - ma[55] = mj - mk = 1 - - do i = 1, 54 { - ii = mod(21 * i , 55) - ma[ii] = mk - mk = mj - mk - if (mk < MZ) - mk = mk + MBIG - mj = ma[ii] - } - - do k = 1, 4 { - do i = 1, 55 { - ma[i] = ma[i] - ma[1+mod(i+30, 55)] - if (ma[i] < MZ) - ma[i] = ma[i] + MBIG - } - } - - inext = 0 - inextp = 31 - idum = 1 - } - - inext = inext + 1 - if (inext == 56) - inext = 1 - inextp = inextp + 1 - if (inextp == 56) - inextp = 1 - mj = ma[inext] - ma[inextp] - if (mj < MZ) - mj = mj + MBIG - ma[inext]= mj - return (mj * FAC) - -end