diff -urN miriad-orig/src/inc/maxdim.h miriad-mods/src/inc/maxdim.h --- miriad-orig/src/inc/maxdim.h Tue Mar 2 20:33:36 2004 +++ miriad-mods/src/inc/maxdim.h Tue Mar 2 20:36:57 2004 @@ -47,14 +47,14 @@ c maximum number of channels in spectral data INTEGER MAXCHAN - PARAMETER(MAXCHAN=4096) + PARAMETER(MAXCHAN=12288) c maximum number of windows in spectral data INTEGER MAXWIN - PARAMETER(MAXWIN=16) + PARAMETER(MAXWIN=48) c maximum number of wideband channels INTEGER MAXWIDE - PARAMETER(MAXWIDE=18) + PARAMETER(MAXWIDE=50) c======================================================================= diff -urN miriad-orig/src/inc/maxdimc.h miriad-mods/src/inc/maxdimc.h --- miriad-orig/src/inc/maxdimc.h Tue Mar 2 20:33:36 2004 +++ miriad-mods/src/inc/maxdimc.h Tue Mar 2 20:37:36 2004 @@ -28,9 +28,9 @@ #define MAXANT2 28 #define MAXBASE ((MAXANT * (MAXANT + 1)) / 2) #define MAXBASE2 500 -#define MAXCHAN 4096 +#define MAXCHAN 12288 #define MAXNAX 7 -#define MAXWIN 16 +#define MAXWIN 48 #ifdef unicos # define MAXBUF 2097152 diff -urN miriad-orig/src/prog/calib/mfcal.for miriad-mods/src/prog/calib/mfcal.for --- miriad-orig/src/prog/calib/mfcal.for Tue Mar 2 20:33:36 2004 +++ miriad-mods/src/prog/calib/mfcal.for Tue Mar 2 20:44:45 2004 @@ -101,7 +101,7 @@ c------------------------------------------------------------------------ include 'maxdim.h' integer MAXSPECT,MAXVIS,MAXSOLN,MAXITER,MAXPOL - parameter(MAXSPECT=33,MAXVIS=700000,MAXITER=30,MAXSOLN=1024) + parameter(MAXSPECT=51,MAXVIS=700000,MAXITER=30,MAXSOLN=1024) parameter(MAXPOL=2) c character version*(*) @@ -1513,7 +1513,7 @@ c------------------------------------------------------------------------ include 'maxdim.h' integer CHANNEL,WIDE,MSPECT - parameter(CHANNEL=1,WIDE=2,MSPECT=32) + parameter(CHANNEL=1,WIDE=2,MSPECT=48) integer i,j,n,ispect,ltype,start,nschan0(MSPECT),nspect0,nwide integer chans,ibeg,iend,bdrop,edrop,nwidth,nstep double precision line(6),sfreq0(MSPECT),sdf0(MSPECT),f diff -urN miriad-orig/src/prog/calib/xyphase.for miriad-mods/src/prog/calib/xyphase.for --- miriad-orig/src/prog/calib/xyphase.for Tue Mar 2 20:33:36 2004 +++ miriad-mods/src/prog/calib/xyphase.for Tue Mar 2 20:45:18 2004 @@ -784,7 +784,7 @@ c------------------------------------------------------------------------ include 'maxdim.h' integer MAXSPECT - parameter(MAXSPECT=16) + parameter(MAXSPECT=48) integer iostat,off,item,i,j,k,n,p,pd complex G(MAXCHAN),temp double precision freqs(2) diff -urN miriad-orig/src/prog/misc/telepar.for miriad-mods/src/prog/misc/telepar.for --- miriad-orig/src/prog/misc/telepar.for Tue Mar 2 20:33:37 2004 +++ miriad-mods/src/prog/misc/telepar.for Tue Mar 2 20:52:45 2004 @@ -19,6 +19,7 @@ c rjs 06dec96 Print altitude. c rjs 09jun97 Standardize keyword. c dpr 22may01 Add XY-EW +c mchw 26aug03 Add Nasmyth c------------------------------------------------------------------------ character version*(*) integer MAXOBS @@ -85,6 +86,7 @@ if(value.eq.0)string = 'Alt-az' if(value.eq.1)string = 'Equatorial' if(value.eq.3)string = 'XY-EW' + if(value.eq.4)string = 'Nasmyth' call output('Mount: '//string) endif c diff -urN miriad-orig/src/prog/vis/early.for miriad-mods/src/prog/vis/early.for --- miriad-orig/src/prog/vis/early.for Tue Mar 2 20:33:37 2004 +++ miriad-mods/src/prog/vis/early.for Tue Mar 2 20:47:41 2004 @@ -58,7 +58,7 @@ integer MAXSPECT character version*(*) parameter(version='Early: version 1.0 9-Sep-94') - parameter(MAXSPECT=16) + parameter(MAXSPECT=48) c real sigma,Sum,SumS,SumS2,s integer nrec,nflag,nchan,tno,n,vupd,nspect,nschan(MAXSPECT) @@ -274,7 +274,7 @@ c nschan c------------------------------------------------------------------------ integer MSPECT - parameter(MSPECT=16) + parameter(MSPECT=48) double precision line(6) integer start,step,n,nschand(MSPECT),ispect c diff -urN miriad-orig/src/prog/vis/fgflag.for miriad-mods/src/prog/vis/fgflag.for --- miriad-orig/src/prog/vis/fgflag.for Tue Mar 2 20:33:37 2004 +++ miriad-mods/src/prog/vis/fgflag.for Tue Mar 2 20:48:07 2004 @@ -497,7 +497,7 @@ c------------------------------------------------------------------------ include 'maxdim.h' integer MAXSPECT - parameter(MAXSPECT=16) + parameter(MAXSPECT=48) complex data(MAXCHAN) logical flags(MAXCHAN),flagged integer nchan,nspect,ipt,vupd,nschan(MAXSPECT) diff -urN miriad-orig/src/prog/vis/uvindex.for miriad-mods/src/prog/vis/uvindex.for --- miriad-orig/src/prog/vis/uvindex.for Tue Mar 2 20:33:37 2004 +++ miriad-mods/src/prog/vis/uvindex.for Tue Mar 2 20:49:35 2004 @@ -63,7 +63,7 @@ character*(*) version integer MAXSRC,MAXFREQ,MAXSPECT integer PolMin,PolMax,PolI - parameter(MAXSRC=2048,MAXFREQ=32,MAXSPECT=18) + parameter(MAXSRC=2048,MAXFREQ=32,MAXSPECT=50) parameter(PolMin=-8,PolMax=4,PolI=1) parameter(version='UVINDEX: version 1.0 15-Jun-00') c diff -urN miriad-orig/src/prog/vis/uvlin.for miriad-mods/src/prog/vis/uvlin.for --- miriad-orig/src/prog/vis/uvlin.for Tue Mar 2 20:33:37 2004 +++ miriad-mods/src/prog/vis/uvlin.for Tue Mar 2 20:48:32 2004 @@ -293,7 +293,7 @@ c------------------------------------------------------------------------ include 'maxdim.h' integer MAXPOL,MAXSPECT - parameter(MAXPOL=4,MAXSPECT=16) + parameter(MAXPOL=4,MAXSPECT=48) integer npol,poltype(MAXPOL),nvis,nchan,nspect,nschan(MAXSPECT) integer lScr complex line(MAXCHAN*MAXPOL) diff -urN miriad-orig/src/prog/vis/uvredo.for miriad-mods/src/prog/vis/uvredo.for --- miriad-orig/src/prog/vis/uvredo.for Tue Mar 2 20:33:37 2004 +++ miriad-mods/src/prog/vis/uvredo.for Tue Mar 2 20:53:18 2004 @@ -69,6 +69,7 @@ c history. I have improved it a bit. c rjs 19jun97 Eliminate jupaxis business (now in uvjup). c dpr 22may01 Marginal XY-EW support +c mchw 26aug03 Added Nasmyth for SMA c c Bugs: c * Much more needs to be added. @@ -340,11 +341,12 @@ real evec,chi integer mount double precision lat,dtemp + double precision elev,ha,sinha,cosha,sind,cosd,sinl,cosl logical ok character telescop*32 c - integer EQUATOR,ALTAZ,XYEW - parameter(EQUATOR=1,ALTAZ=0,XYEW=3) + integer EQUATOR,ALTAZ,XYEW,NASMYTH + parameter(EQUATOR=1,ALTAZ=0,XYEW=3,NASMYTH=4) c c Externals. c @@ -376,7 +378,17 @@ c if(mount.eq.EQUATOR)then chi = 0 - else + else if(mount.eq.ALTAZ) then + if(varprsnt(lIn,'latitud'))then + call uvgetvrd(lIn,'latitud',lat,1) + else + call uvrdvra(lIn,'telescop',telescop,' ') + call obspar(telescop,'latitude',lat,ok) + if(.not.ok)call bug('f', + * 'Unable to determine telescope latitude') + endif + call parang(rapp,dapp,lst,lat,chi) + else if(mount.eq.NASMYTH) then if(varprsnt(lIn,'latitud'))then call uvgetvrd(lIn,'latitud',lat,1) else @@ -386,6 +398,19 @@ * 'Unable to determine telescope latitude') endif call parang(rapp,dapp,lst,lat,chi) +c +c For Nasmyth SMA -- Needs to be modified by elev +c + ha = lst-rapp + sinha = sin(ha) + cosha = cos(ha) + sind = sin(dapp) + cosd = cos(dapp) + sinl = sin(lat) + cosl = cos(lat) + elev = asin(sinl*sind+cosl*cosd*cosha) + chi = - elev + chi + else endif c c At last, write out the "chi" variable. diff -urN miriad-orig/src/subs/obspar.for miriad-mods/src/subs/obspar.for --- miriad-orig/src/subs/obspar.for Tue Mar 2 20:33:38 2004 +++ miriad-mods/src/subs/obspar.for Tue Mar 2 20:52:13 2004 @@ -32,6 +32,7 @@ c mchw 24may01 Added RPA c mchw 03jan02 Added SZA c mchw 09jul02 Added ALMA +c mchw 26aug03 Added SMA c************************************************************************ c* ObsPrint -- Print list of known observatories. c: utility @@ -94,6 +95,7 @@ c 'mount' Telescope mount: 0 = alt-az c 1 equitorial c 3 xy-ew +c 4 nasmyth c 'antdiam' Antenna diameter, in meters. c 'subdiam' Subreflector diameter. c 'height' Height above sea level, in meters @@ -143,8 +145,8 @@ include 'mirconst.h' include 'obspar.h' c - double precision ALTAZ,EQUATOR,XYEW - parameter(ALTAZ=0.d0,EQUATOR=1.d0,XYEW=3.d0) + double precision ALTAZ,EQUATOR,NASMYTH,XYEW + parameter(ALTAZ=0.d0,EQUATOR=1.d0,NASMYTH=4.d0,XYEW=3.d0) c c Externals. c @@ -409,6 +411,17 @@ call obsad('sest/latitude', obsdms(-1,29,15,34.0)) call obsad('sest/longitude', obsdms( 1,70,44,04.0)) c +c Submillimeter Array (SMA). +c Supplied by Ramprasad Rao +c + call obsad('sma/antdiam', 6.0d0) + call obsad('sma/height', 4080.0d0) + call obsad('sma/jyperk', 130.d0) + call obsad('sma/latitude', obsdms( 1, 19,49,33.8)) + call obsad('sma/longitude', obsdms(-1,155,28,46.4)) + call obsad('sma/mount', NASMYTH) + call obsad('sma/nants', 8.0d0) +c c SZA - Sunyaev-Zel'dovich Array of 8 3.5m antennas - part of CARMA. c call obsad('sza/antdiam', 3.5d0) @@ -448,6 +461,7 @@ call obsad('wsrt/longitude', obsdms( 1, 6,36,15.01)) call obsad('wsrt/mount', EQUATOR) call obsad('wsrt/nants', 14.d0) +c c end c************************************************************************