1
0
Fork 0

General update

pull/2/head
Cees Bassa 2015-07-21 18:15:08 +02:00
parent c043f6deaa
commit d41f23a324
4 changed files with 316 additions and 309 deletions

File diff suppressed because it is too large Load Diff

View File

@ -15,6 +15,7 @@
0434 IR -26.1030 27.9288 1646 Ian Roberts
0710 LS 52.3261 10.6756 85 Lutz Schindler
1056 MK 57.0122 23.9833 4 Martins Keruss
1086 NK 46.4778 30.7556 56 Nikolay Koshkin
1244 AM 44.3932 33.9701 69 Andriy Makeyev
1747 DD 45.7275 -72.3526 191 Daniel Deak
1775 KF 44.6062 -75.6910 200 Kevin Fetter
@ -33,6 +34,7 @@
4541 AR 41.9639 12.4531 80 Alberto Rango
4542 AR 41.9683 12.4545 80 Alberto Rango
4641 AR 41.1060 16.9010 70 Alberto Rango
5555 SG 56.1019 94.5533 154 Sergey Guryanov
5918 BG 59.2985 18.1045 40 Bjorn Gimle
5919 BG 59.2615 18.6206 30 Bjorn Gimle
6226 SC 28.4861 -97.8194 110 Scott Campbell
@ -52,7 +54,6 @@
6242 JM 42.9453 -2.8284 623 Jon Mikel
6241 JM 42.9565 -2.8203 619 Jon Mikel
4160 BD 51.2793 5.4768 35 Bram Dorreman
9001 MS -32.3793 20.810682 1760 Master K95
9000 PP 40.0848 21.1581 1433 Pierros Papadeas
9999 GR 47.348 5.5151 100 Graves
9000 NJ 51.4198 5.4086 25 Nico Janssen
9905 DR -26.8724 26.6481 1200 Deon van Rooyen

View File

@ -684,13 +684,14 @@ int main(int argc,char *argv[])
printf("%d points above %g sigma\n",n,sigma);
// Exit if too many
/*
if (n>2500) {
file=fopen("skipped.dat","a");
fprintf(file,"%s : %d points above %g sigma\n",fitsfile,n,sigma);
fclose(file);
return 0;
}
*/
// Fill points
p=(struct point *) malloc(sizeof(struct point)*n);
for (i=0,l=0;i<ff.naxis1;i++) {

View File

@ -6,7 +6,7 @@
#include "satutl.h"
#include <getopt.h>
#define LIM 128
#define LIM 1024
#define XKE 0.07436680 // Guassian Gravitational Constant
#define XKMPER 6378.135
#define AE 1.0
@ -341,7 +341,7 @@ int fgetline(FILE *file,char *s,int lim)
int main(int argc,char *argv[])
{
int imode,satno=99000,arg;
int imode,satno=99000,arg,gmat=0;
FILE *file;
orbit_t orb;
xyz_t r,v;
@ -351,7 +351,7 @@ int main(int argc,char *argv[])
char *env;
// Decode options
while ((arg=getopt(argc,argv,"p:i:d:"))!=-1) {
while ((arg=getopt(argc,argv,"p:i:d:g"))!=-1) {
switch (arg) {
case 'p':
@ -371,6 +371,10 @@ int main(int argc,char *argv[])
return 0;
break;
case 'g':
gmat=1;
break;
default:
usage();
return 0;
@ -383,6 +387,11 @@ int main(int argc,char *argv[])
while (fgetline(file,line,LIM)>0) {
sscanf(line,"%lf %lf %lf %lf %lf %lf %lf",&mjd,&r.x,&r.y,&r.z,&v.x,&v.y,&v.z);
// Convert to MJD
if (gmat==1)
mjd+=29999.5;
// Convert
orb=rv2el(orb.satno,mjd,r,v);
orb.satno=satno;