Added GEO/HEO belt to skymap

deproject.c

@@ -73,7 +73,7 @@ int main(int argc,char *argv[])
   double rx,ry,rx0,ry0;
   double x,y,d;
   double drx=-10.0,dry=10.0;
-  double ra0=303.91,de0=47.43;
+  double ra0=346.10,de0=-8.48;
 
   // Read image
   img=read_fits(argv[1],0);

measure.c

@@ -655,7 +655,7 @@ int main(int argc,char *argv[])
       printf("%d %d\n",ix,iy);
 
       // Set area
-      width=500;
+      width=750;
       x=width*(ix+0.5);
       y=width*(iy+0.5);
       xmin=x-1.5*fx*width;

skymap.c

@@ -36,7 +36,7 @@ struct map {
   float alt,timezone;
   float fw,fh,agelimit;
   int level,grid,site_id;
-  int leoflag,iodflag,iodpoint,visflag,planar,pssatno,psnr,xyzflag;
+  int leoflag,iodflag,iodpoint,visflag,planar,pssatno,psnr,xyzflag,pflag;
   float psrmin,psrmax,rvis;
 } m;
 struct sat {
@@ -158,6 +158,7 @@ void init_skymap(void)
   m.planar=0;
   m.agelimit=-1.0;
   m.saltmin=-6.0;
+  m.pflag=1;
 
   // Default settings
   strcpy(m.observer,"Unknown");
@@ -268,20 +269,22 @@ void read_iod(char *filename,int iobs)
   return;
 }
 
-void plot_geo_belt(void)
+void plot_belt(float h,float beta)
 {
   int i;
   xyz_t obspos,obsvel;
   xyz_t satpos;
-  double theta,dx,dy,dz,r,ra,de,azi,alt,rx,ry;
+  double rr,theta,dx,dy,dz,r,ra,de,azi,alt,rx,ry;
 
   obspos_xyz(m.mjd,&obspos,&obsvel);
 
+  rr=h+6378.0;
+
   cpgsci(3);
   for (theta=0.0;theta<=360.0;theta+=1.0) {
-    satpos.x=42164*cos(theta*D2R);
-    satpos.y=42164*sin(theta*D2R);
-    satpos.z=0.0;
+    satpos.x=rr*cos(theta*D2R)*cos(beta*D2R);
+    satpos.y=rr*sin(theta*D2R)*cos(beta*D2R);
+    satpos.z=rr*sin(beta*D2R);
 
     // Position differences
     dx=satpos.x-obspos.x;  
@@ -311,6 +314,7 @@ void plot_geo_belt(void)
   return;
 }
 
+
 // Plot XYZ point
 void plot_xyz(double mjd0,char *filename)
 {
@@ -1464,7 +1468,7 @@ void skymap_plotsatellite(char *filename,int satno,double mjd0,double dt)
 	cpgsch(0.6);
 
 	// Print name if in viewport
-	if (fabs(x)<1.5*m.w && fabs(y)<m.w && x<1.32*m.w && y<0.96*m.w)
+	if (fabs(x)<1.5*m.w && fabs(y)<m.w && x<1.32*m.w && y<0.96*m.w && m.pflag==1)
 	  cpgtext(x,y,norad);
 	cpgsch(isch);
 	cpgmove(x,y);
@@ -1921,12 +1925,12 @@ void skymap_plotsun(void)
 // plot skymap
 int plot_skymap(void)
 {
-  int redraw=1,fov=3,status;
+  int redraw=1,fov=4,status;
   float x,y;
   char c,text[256],sra[16],sde[16],filename[LIM];
   double ra,de,azi,alt,rx,ry;
   xyz_t sunpos;
-  float focallength[]={12,28,35,50,100,200,300};
+  float focallength[]={12,28,35,50,85,100,200,300};
 
   for (;;) {
     if (redraw>0) {
@@ -1978,10 +1982,10 @@ int plot_skymap(void)
       if (fov>=0) {
 	cpgsfs(2);
 
-	m.fw=atan(0.5*6.3265/focallength[fov])*R2D;
-	m.fh=atan(0.5*4.6389/focallength[fov])*R2D;
-	//m.fw=atan(0.5*22.3/focallength[fov])*R2D;
-	//m.fh=atan(0.5*14.9/focallength[fov])*R2D;
+	//m.fw=atan(0.5*6.3265/focallength[fov])*R2D;
+	//	m.fh=atan(0.5*4.6389/focallength[fov])*R2D;
+	m.fh=atan(0.5*22.5/focallength[fov])*R2D;
+	m.fw=atan(0.5*15.0/focallength[fov])*R2D;
 
 	cpgrect(-m.fw,m.fw,-m.fh,m.fh);
 	cpgsfs(1);
@@ -2051,7 +2055,8 @@ int plot_skymap(void)
 
       skymap_plotsun();
 
-      plot_geo_belt();
+      plot_belt(35786.0,0.0);
+      plot_belt(39035,63.4);
     }
     // Reset redraw
     redraw=0;
@@ -2139,7 +2144,15 @@ int plot_skymap(void)
       redraw=1;
     }
 
-      
+    // Toggle satellite name
+    if (c=='p') {
+      if (m.pflag==1)
+	m.pflag=0;
+      else if (m.pflag==0)
+	m.pflag=1;
+      redraw=1;
+      continue;
+    }
 
     // Toggle visibility contours
     if (c=='v') {
@@ -2206,10 +2219,10 @@ int plot_skymap(void)
       if (fov>=sizeof(focallength)/sizeof(focallength[0]))
 	fov=0;
       printf("Focallength: %.0f mm\n",focallength[fov]);
-      m.fw=atan(0.5*6.3265/focallength[fov])*R2D;
-      m.fh=atan(0.5*4.6389/focallength[fov])*R2D;
-      //m.fw=atan(0.5*22.3/focallength[fov])*R2D;
-      //m.fh=atan(0.5*14.9/focallength[fov])*R2D;
+      //m.fw=atan(0.5*6.3265/focallength[fov])*R2D;
+      //m.fh=atan(0.5*4.6389/focallength[fov])*R2D;
+      m.fh=atan(0.5*22.5/focallength[fov])*R2D;
+      m.fw=atan(0.5*15.0/focallength[fov])*R2D;
       printf("FOV: %.1fx%.1f\n",2*m.fw,2*m.fh);
       redraw=1;
     }

slewto.c

@@ -324,8 +324,10 @@ void dec2sex(double x,char *s,int f,int len)
 
 int main(int argc,char *argv[])
 {
-  int arg=0;
+  int arg=0,haflag=0;
   char sra[16],sde[16];
+  double ha;
+  FILE *file;
 
   // Initialize
   initialize();
@@ -335,7 +337,7 @@ int main(int argc,char *argv[])
   m.mjd=nfd2mjd(m.nfd);
 
     // Decode options
-  while ((arg=getopt(argc,argv,"t:R:D:A:E:h"))!=-1) {
+  while ((arg=getopt(argc,argv,"t:H:R:D:A:E:h"))!=-1) {
     switch(arg) {
 
     case 't':
@@ -343,6 +345,12 @@ int main(int argc,char *argv[])
       m.mjd=nfd2mjd(m.nfd);
       break;
 
+    case 'H':
+      ha=atof(optarg);
+      haflag=1;
+      strcpy(m.orientation,"equatorial");
+      break;
+
     case 'R':
       m.ra0=15.0*sex2dec(optarg);
       strcpy(m.orientation,"equatorial");
@@ -374,6 +382,10 @@ int main(int argc,char *argv[])
     }
   }
 
+  // Compute RA from HA
+  if (haflag==1) 
+    m.ra0=modulo(gmst(m.mjd)+m.lng-ha,360.0);
+
   // Compute RA and Dec
   if (strcmp(m.orientation,"horizontal")==0) 
     horizontal2equatorial(m.mjd,m.azi0,m.alt0,&m.ra0,&m.de0);
@@ -393,5 +405,10 @@ int main(int argc,char *argv[])
   // Send position
   send_position(sra,sde);
 
+  // Log
+  file=fopen("position.txt","a");
+  fprintf(file,"%s %lf %lf %f\n",m.nfd,m.ra0,m.de0,m.q);
+  fclose(file);
+
   return 0;
 }