1
0
Fork 0

More changes

pull/2/head
Cees Bassa 2015-04-16 09:58:24 +02:00
parent 549d3c2f09
commit f59dc343b9
7 changed files with 25 additions and 25 deletions

View File

@ -63,10 +63,11 @@
# Auriga # Auriga
2924027421 0 90.22223035 44.94734099 move to beta 2924027421 0 90.22223035 44.94734099 move to beta
2418015731 1 90.24531014 37.21265894 draw dotted to theta 2418015731 1 90.24531014 37.21265894 draw dotted to theta
1859014701 5 81.86555953 28.62270747 draw dotted to beta tauri 1859014701 1 81.86555953 28.62270747 draw dotted to beta tauri
2391014461 5 74.55031388 33.19383605 draw dotted to iota 2391014461 1 74.55031388 33.19383605 draw dotted to iota
2899022371 1 76.95359546 41.25817798 draw to eta 0000000001 1 75.81966666 41.10361111 draw to zeta
2899022371 1 76.95359546 41.25817798 draw to eta 2899022371 1 76.95359546 41.25817798 draw to eta
0000000002 1 75.77083333 43.85333333 draw to epsilon
3358031411 1 79.51396320 46.01807784 draw to alpha 3358031411 1 79.51396320 46.01807784 draw to alpha
2924027421 1 90.22223035 44.94734099 draw to beta 2924027421 1 90.22223035 44.94734099 draw to beta
# Bootes # Bootes

View File

@ -53,4 +53,7 @@
9999 GR 47.348 5.5151 100 Graves 9999 GR 47.348 5.5151 100 Graves
9000 NJ 51.4198 5.4086 25 Nico Janssen 9000 NJ 51.4198 5.4086 25 Nico Janssen
9990 WS 53.0574 -2.5688 65 William Stewart 9990 WS 53.0574 -2.5688 65 William Stewart
9001 ES -24.6272 -70.4047 2635 Cerro Paranal
9992 DB 53.3478 -6.2597 0 Dublin 9992 DB 53.3478 -6.2597 0 Dublin
0501 IS 43.6986 132.1656 273 ISON
9002 PK -32.9999 148.2623 0 Parkes

View File

@ -73,12 +73,12 @@ int main(int argc,char *argv[])
double rx,ry,rx0,ry0; double rx,ry,rx0,ry0;
double x,y,d; double x,y,d;
double drx=-10.0,dry=10.0; double drx=-10.0,dry=10.0;
double ra0=346.10,de0=-8.48; double ra0=245.578,de0=40.613;
// Read image // Read image
img=read_fits(argv[1],0); img=read_fits(argv[1],0);
jpg=read_jpg(argv[2]); jpg=read_jpg(argv[2]);
printf("%d %d %d\n",jpg.nx,jpg.ny,jpg.nz);
// Offset // Offset
forward(img.ra0,img.de0,ra0,de0,&rx0,&ry0); forward(img.ra0,img.de0,ra0,de0,&rx0,&ry0);

View File

@ -22,8 +22,8 @@ va_list arg_ptr;
fprintf(stderr, "\nNow terminating the program...\n"); fprintf(stderr, "\nNow terminating the program...\n");
fflush(stderr); fflush(stderr);
exit(5); //exit(5);
return;
} }
/* ===================================================================== */ /* ===================================================================== */

View File

@ -4,7 +4,7 @@
CFLAGS = #-O3 -Wno-unused-result CFLAGS = #-O3 -Wno-unused-result
# Linking flags # Linking flags
LFLAGS = -lm -L/usr/local/src/pgplot-5.2.2 -lcpgplot -lpgplot -lX11 -fno-backslash -lpng -L/usr/local/src/qfits-5.4.0/lib -lqfits -lwcs_c -lgsl -lgslcblas -ljpeg -lexif LFLAGS = -lm -lcpgplot -lpgplot -lX11 -fno-backslash -lpng -L/usr/local/lib -lqfits -lwcs_c -lgsl -lgslcblas -ljpeg -lexif
# Compilers # Compilers
CC = gcc CC = gcc
@ -112,10 +112,10 @@ runsched: runsched.o
$(CC) -o runsched runsched.o $(LFLAGS) $(CC) -o runsched runsched.o $(LFLAGS)
fitskey: fitskey.o fitskey: fitskey.o
$(CC) -o fitskey fitskey.o -L/usr/local/src/qfits-5.4.0/lib -lqfits $(CC) -o fitskey fitskey.o -L/usr/local/lib -lqfits
fitsheader: fitsheader.o fitsheader: fitsheader.o
$(CC) -o fitsheader fitsheader.o -L/usr/local/src/qfits-5.4.0/lib -lqfits $(CC) -o fitsheader fitsheader.o -L/usr/local/lib -lqfits
satid: satid.o sgdp4.o satutl.o deep.o ferror.o satid: satid.o sgdp4.o satutl.o deep.o ferror.o
$(F77) -o satid satid.o sgdp4.o satutl.o deep.o ferror.o $(LFLAGS) $(F77) -o satid satid.o sgdp4.o satutl.o deep.o ferror.o $(LFLAGS)

View File

@ -121,7 +121,8 @@ void initialize_setup(void)
} else { } else {
printf("ST_TLEDIR environment variable not found.\n"); printf("ST_TLEDIR environment variable not found.\n");
} }
sprintf(m.tlefile,"%s/classfd.tle",m.tledir); // sprintf(m.tlefile,"%s/classfd.tle",m.tledir);
strcpy(m.tlefile,"");
// Read LR coefficients // Read LR coefficients
sprintf(filename,"%s/data/moonLR.dat",m.datadir); sprintf(filename,"%s/data/moonLR.dat",m.datadir);
@ -287,6 +288,9 @@ void plot_track(void)
float rmin,rmax; float rmin,rmax;
float xmin,ymin,zmin,xmax,ymax,zmax; float xmin,ymin,zmin,xmax,ymax,zmax;
if (strcmp(m.tlefile,"")==0)
return;
cpgqci(&isci); cpgqci(&isci);
cpgqch(&isch); cpgqch(&isch);
cpgsci(7); cpgsci(7);
@ -928,13 +932,14 @@ void plot_notam(char *filename)
{ {
int i,flag=0; int i,flag=0;
float x,y,z; float x,y,z;
float l,b; float l,b,r;
char line[LIM]; char line[LIM];
FILE *file; FILE *file;
file=fopen(filename,"r"); file=fopen(filename,"r");
while (fgetline(file,line,LIM)>0) { while (fgetline(file,line,LIM)>0) {
sscanf(line,"%f %f",&b,&l); r=0.0;
sscanf(line,"%f %f %f",&b,&l,&r);
if (strlen(line)<2) { if (strlen(line)<2) {
flag=0; flag=0;
continue; continue;

View File

@ -153,7 +153,7 @@ void mjd2nfd(double mjd,char *nfd)
int main(int argc,char *argv[]) int main(int argc,char *argv[])
{ {
int arg=0,satno=0,header=0,oneline=0,no,time=0,name=0,desig=0; int arg=0,satno=0,header=0,oneline=0,no,name=0,desig=0;
char tlefile[LIM]; char tlefile[LIM];
char line0[LIM],line1[LIM],line2[LIM],nfd[32]; char line0[LIM],line1[LIM],line2[LIM],nfd[32];
FILE *file; FILE *file;
@ -182,10 +182,6 @@ int main(int argc,char *argv[])
oneline=2; oneline=2;
break; break;
case 't':
time=1;
break;
case 'n': case 'n':
name=1; name=1;
break; break;
@ -283,13 +279,8 @@ int main(int argc,char *argv[])
orbit(orb,&aodp,&perigee,&apogee,&period); orbit(orb,&aodp,&perigee,&apogee,&period);
mjd=doy2mjd(orb.ep_year,orb.ep_day); mjd=doy2mjd(orb.ep_year,orb.ep_day);
mjd2nfd(mjd,nfd); mjd2nfd(mjd,nfd);
if (time==0) { if (info==0) printf("%05d %10.4lf %8.4f %8.4f %8.4f %8.4f %8.6f %8.5f\n",orb.satno,mjd,DEG(orb.eqinc),DEG(orb.ascn),DEG(orb.argp),DEG(orb.mnan),orb.ecc,orb.rev);
if (info==0) printf("%05d %10.4lf %8.4f %8.4f %8.4f %8.4f %8.6f %8.5f\n",orb.satno,mjd,DEG(orb.eqinc),DEG(orb.ascn),DEG(orb.argp),DEG(orb.mnan),orb.ecc,orb.rev); if (info==1) printf("%05d %6.0f x %6.0f x %6.2f %8.2f %8.6f %14.8lf\n",orb.satno,perigee,apogee,DEG(orb.eqinc),period,orb.ecc,mjd);
if (info==1) printf("%05d %6.0f x %6.0f x %6.2f %8.2f %8.6f %14.8lf\n",orb.satno,perigee,apogee,DEG(orb.eqinc),period,orb.ecc,mjd);
} else if (time==1) {
if (info==0) printf("%05d %s %7.3f %7.3f %7.3f %7.3f %7.5f %7.4f\n",orb.satno,nfd,DEG(orb.eqinc),DEG(orb.ascn),DEG(orb.argp),DEG(orb.mnan),orb.ecc,orb.rev);
if (info==1) printf("%05d %9.2f %9.2f %9.2f %8.2f %8.6f %s\n",orb.satno,aodp,perigee,apogee,period,orb.ecc,nfd);
}
} }
fclose(file); fclose(file);
} else if (oneline==2) { } else if (oneline==2) {