added new satellite stuff from Steve K9AN. Fixed upper/lower problem

in convkeps.pl.

diff --git a/Changes b/Changes
index 28f1d6758085782cf4c6ed798267badda5b13ef3..149c5cd8c15320b2b5f2db50cce95c8bd4a51baf 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+17Dec01=======================================================================
+1. added new satellite stuff from Steve K9AN. Fixed upper/lower problem
+in convkeps.pl.
 15Dec01=======================================================================
 1. added superfluous spaces back into PC73 for the benefit of clx
 14Dec01=======================================================================

diff --git a/cmd/show/satellite.pl b/cmd/show/satellite.pl
index 07d935b2d663fc3e08eb9fdcf92d1ceac9f12f42..45e765f2928d8d5f6a9ba6fbb299046b7b7943fa 100644 (file)
--- a/cmd/show/satellite.pl
+++ b/cmd/show/satellite.pl
@@ -6,14 +6,19 @@
 #
 # $Id$
 # 
+# 2001/12/16 added age of keps in the sh/sat output list.
+#   Note - there is the potential for problems when satellite name
+#   is longer than 20 characters. The list shows only the 
+#   first 20 chars, so user won't know the full name.
+#   So far, it seems that only the GPS sats even come close... 
 
 my ($self, $line) = @_;
 my @out;
 
 my @f = split /\s+/, $line;
 my $satname = uc shift @f;
-my $numhours = shift @f;               # the number of hours ahead to print
-my $step = shift @f;                           # tracking table resolution in minutes
+my $numhours = shift @f;       # the number of hours ahead to print
+my $step = shift @f;           # tracking table resolution in minutes
 
 # default hours and step size
 $numhours = 3 unless $numhours && $numhours =~ /^\d+$/;
@@ -34,17 +39,18 @@ unless ($lon || $lat) {
        $call = $main::mycall;
 }
 
+my $jtime; # lats and longs in radians
+my ($sec, $min, $hr, $day, $mon, $yr) = (gmtime($main::systime))[0,1,2,3,4,5];
+#printf("%2.2d %2.2d %2.2d %2.2d %2.2d\n",$min,$hr,$day,$mon,$yr);
+
+$mon++;
+$yr += 1900;
+
+$jtime=Sun::Julian_Day($yr,$mon,$day)+$hr/24+$min/60/24;
+
 #$DB::single=1;
 if ($satname && $Sun::keps{$satname}) {
-       my $jtime; # lats and longs in radians
-       my ($sec, $min, $hr, $day, $mon, $yr) = (gmtime($main::systime))[0,1,2,3,4,5];
-       #printf("%2.2d %2.2d %2.2d %2.2d %2.2d\n",$min,$hr,$day,$mon,$yr);
-
-       $mon++;
-       $yr += 1900;
-       $alt=0.0;
 
-       $jtime=Sun::Julian_Day($yr,$mon,$day)+$hr/24+$min/60/24;
        ($yr,$mon,$day,$hr,$min)=Sun::Calendar_date_and_time_from_JD($jtime);
        #printf("%2.2d %2.2d %2.2d %2.2d %2.2d\n",$min,$hr,$day,$mon,$yr);
        push @out, $self->msg("pos", $call, slat($lat), slong($lon));
@@ -86,15 +92,18 @@ if ($satname && $Sun::keps{$satname}) {
        my $i = 0;
        my $sat;
        foreach $sat (sort keys %Sun::keps) {
-               if ($i >= 6) {
-                       push @out, join ' + ', @l;
+               if ($i >= 2) {
+                       push @out,join '  ', @l;
                        @l = ();
                        $i = 0;
                }
-               push @l, $sat;
+               my $epoch=$Sun::keps{$sat}->{epoch};
+               my $jt_epoch=Sun::Julian_Date_of_Epoch($epoch);
+               my $keps_age=int($jtime-$jt_epoch);
+               push @l, sprintf("%20s: %4s",$sat,$keps_age);
                $i++;
        }
-       push @out, join ' + ', @l;
+       push @out, join '  ', @l;
 }
 
 return (1,@out);

diff --git a/perl/Keps.pm b/perl/Keps.pm
index 24d46667213d85998eeee0b42f513bc1cf2b2b11..943916abf77e3ab7317c57eb9f0ed0b13c8aca37 100644 (file)
--- a/perl/Keps.pm
+++ b/perl/Keps.pm
@@ -1,955 +1,955 @@
 #
 # this file is automatically produced by convkeps.pl
 #
-# Last update: Thu Dec 13 15:02:36 2001
+# Last update: Mon Dec 17 16:52:38 2001
 #
 
 package Sun;
 
 %keps = (
   'SAUDISAT-1B' => {
-    orbit => '6427',
-    elset => '331',
-    argperigee => '312.8153',
-    epoch => '1340.34540793',
-    bstar => '0.00067944',
+    orbit => '6528',
+    elset => '337',
+    argperigee => '311.0657',
+    epoch => '1347.19051484',
+    bstar => '0.00077615',
     number => '57',
-    raan => '301.6962',
-    mm1 => '4.61e-05',
-    meanmotion => '14.75538783',
+    raan => '280.7676',
+    mm1 => '5.3e-05',
+    meanmotion => '14.75619658',
     mm2 => '0',
     id => '26549',
-    meananomaly => '46.8545',
-    eccentricity => '0.0052929',
-    inclination => '64.5519'
+    meananomaly => '48.5806',
+    eccentricity => '0.0053349',
+    inclination => '64.5512'
   },
   'SO-33' => {
-    orbit => '16258',
-    elset => '458',
-    argperigee => '73.5752',
-    epoch => '1340.71321591',
-    bstar => '0.0003126',
+    orbit => '16356',
+    elset => '463',
+    argperigee => '133.4189',
+    epoch => '1347.57309306',
+    bstar => '0.00035651',
     number => '98061',
-    raan => '109.5296',
-    mm1 => '1.579e-05',
-    meanmotion => '14.26126721',
+    raan => '70.871',
+    mm1 => '1.804e-05',
+    meanmotion => '14.26151926',
     mm2 => '0',
     id => '25509',
-    meananomaly => '290.4419',
-    eccentricity => '0.0362087',
-    inclination => '31.4272'
+    meananomaly => '229.7197',
+    eccentricity => '0.0362334',
+    inclination => '31.4279'
+  },
+  'AO-21' => {
+    orbit => '54556',
+    elset => '170',
+    argperigee => '17.1416',
+    epoch => '1347.86209978',
+    bstar => '0.00023338',
+    number => '91006',
+    raan => '277.0781',
+    mm1 => '2.38e-06',
+    meanmotion => '13.74828984',
+    mm2 => '0',
+    id => '21087',
+    meananomaly => '343.0931',
+    eccentricity => '0.0035652',
+    inclination => '82.94'
+  },
+  'RS-10/11' => {
+    orbit => '72528',
+    elset => '21',
+    argperigee => '353.0448',
+    epoch => '1347.84454243',
+    bstar => '0.00023442',
+    number => '87054',
+    raan => '105.8309',
+    mm1 => '2.3e-06',
+    meanmotion => '13.72611548',
+    mm2 => '0',
+    id => '18129',
+    meananomaly => '7.0532',
+    eccentricity => '0.0012448',
+    inclination => '82.9232'
   },
   'SO-35' => {
-    elset => '281',
     orbit => '9604',
-    epoch => '356.30570266',
+    elset => '281',
     argperigee => '310.331',
+    epoch => '356.30570266',
     bstar => '0.00020263',
     number => '99008',
     raan => '155.0303',
-    meanmotion => '14.41615958',
     mm1 => '7.23e-06',
+    meanmotion => '14.41615958',
     mm2 => '0',
-    id => '25636',
     meananomaly => '48.4786',
-    eccentricity => '0.0151034',
-    inclination => '96.4508'
-  },
-  'RS-10/11' => {
-    orbit => '72419',
-    elset => '14',
-    argperigee => '13.168',
-    epoch => '1339.89901183',
-    bstar => '0.00015402',
-    number => '87054',
-    raan => '111.7069',
-    mm1 => '1.56e-06',
-    meanmotion => '13.7260793',
-    mm2 => '0',
-    id => '18129',
-    meananomaly => '346.9808',
-    eccentricity => '0.0012859',
-    inclination => '82.9222'
+    id => '25636',
+    inclination => '96.4508',
+    eccentricity => '0.0151034'
   },
-  'AO-21' => {
-    orbit => '54460',
-    elset => '149',
-    argperigee => '36.0381',
-    epoch => '1340.87549553',
-    bstar => '0.00015256',
-    number => '91006',
-    raan => '282.2521',
-    mm1 => '1.61e-06',
-    meanmotion => '13.74825162',
+  'GO-32' => {
+    orbit => '17796',
+    elset => '436',
+    argperigee => '359.4978',
+    epoch => '1346.87603256',
+    bstar => '0.00023894',
+    number => '98043',
+    raan => '60.8371',
+    mm1 => '4.92e-06',
+    meanmotion => '14.22717592',
     mm2 => '0',
-    id => '21087',
-    meananomaly => '324.3228',
-    eccentricity => '0.0036312',
-    inclination => '82.941'
+    id => '25397',
+    meananomaly => '0.62',
+    eccentricity => '0.0001278',
+    inclination => '98.6681'
   },
   'TO-31' => {
-    orbit => '17697',
-    elset => '613',
-    argperigee => '356.1752',
-    epoch => '1339.84158331',
+    orbit => '17798',
+    elset => '622',
+    argperigee => '323.6997',
+    epoch => '1346.94234123',
     bstar => '0',
     number => '98043',
-    raan => '54.5327',
+    raan => '61.5273',
     mm1 => '-4.4e-07',
-    meanmotion => '14.231758',
+    meanmotion => '14.23185057',
     mm2 => '0',
     id => '25396',
-    meananomaly => '3.9412',
-    eccentricity => '0.0002107',
-    inclination => '98.6719'
-  },
-  'GO-32' => {
-    orbit => '17683',
-    elset => '412',
-    argperigee => '22.0323',
-    epoch => '1338.92897019',
-    bstar => '0.00014849',
-    number => '98043',
-    raan => '53.0185',
-    mm1 => '2.89e-06',
-    meanmotion => '14.22708204',
-    mm2 => '0',
-    id => '25397',
-    meananomaly => '338.0919',
-    eccentricity => '0.0001479',
-    inclination => '98.6695'
+    meananomaly => '36.407',
+    eccentricity => '0.000172',
+    inclination => '98.6694'
   },
   'UO-11' => {
-    orbit => '95149',
-    elset => '686',
-    argperigee => '171.4677',
-    epoch => '1340.91846271',
-    bstar => '0.00071265',
+    orbit => '95252',
+    elset => '692',
+    argperigee => '150.5494',
+    epoch => '1347.9046019',
+    bstar => '0.00073061',
     number => '84021',
-    raan => '303.8855',
-    mm1 => '4.77e-05',
-    meanmotion => '14.75200964',
+    raan => '310.8404',
+    mm1 => '4.901e-05',
+    meanmotion => '14.75274314',
     mm2 => '0',
     id => '14781',
-    meananomaly => '188.6706',
-    eccentricity => '0.0010032',
-    inclination => '98.0572'
+    meananomaly => '209.6314',
+    eccentricity => '0.0010625',
+    inclination => '98.0576'
   },
   'AO-40' => {
-    orbit => '506',
-    elset => '177',
-    argperigee => '357.6245',
-    epoch => '1340.01516426',
+    orbit => '509',
+    elset => '180',
+    argperigee => '358.2314',
+    epoch => '1342.40370237',
     bstar => '0.0001',
     number => '72',
-    raan => '140.0806',
-    mm1 => '0',
-    meanmotion => '1.25594343',
+    raan => '139.7874',
+    mm1 => '-4.8e-07',
+    meanmotion => '1.25597182',
     mm2 => '0',
     id => '26609',
-    meananomaly => '359.9624',
-    eccentricity => '0.7950567',
-    inclination => '6.5626'
+    meananomaly => '359.9262',
+    eccentricity => '0.7951867',
+    inclination => '6.6079'
   },
   'MET-3/5' => {
-    orbit => '49556',
-    elset => '390',
-    argperigee => '215.6391',
-    epoch => '1339.56717222',
+    orbit => '49653',
+    elset => '404',
+    argperigee => '195.4354',
+    epoch => '1346.93658451',
     bstar => '0.0001',
     number => '91056',
-    raan => '349.6954',
+    raan => '344.4878',
     mm1 => '5.1e-07',
-    meanmotion => '13.16946694',
+    meanmotion => '13.16948404',
     mm2 => '0',
     id => '21655',
-    meananomaly => '144.3879',
-    eccentricity => '0.0012768',
-    inclination => '82.5558'
-  },
-  'UO-14' => {
-    orbit => '61958',
-    elset => '839',
-    argperigee => '66.5805',
-    epoch => '1339.7237766',
-    bstar => '0.00021826',
-    number => '90005',
-    raan => '32.8558',
-    mm1 => '5.32e-06',
-    meanmotion => '14.30883081',
-    mm2 => '0',
-    id => '20437',
-    meananomaly => '293.6618',
-    eccentricity => '0.0011803',
-    inclination => '98.3366'
+    meananomaly => '164.6365',
+    eccentricity => '0.0013231',
+    inclination => '82.5559'
   },
   'NOAA-10' => {
-    orbit => '79135',
-    elset => '133',
-    argperigee => '286.8456',
-    epoch => '1340.93349425',
-    bstar => '0.00039976',
+    orbit => '79234',
+    elset => '142',
+    argperigee => '265.6315',
+    epoch => '1347.87705474',
+    bstar => '0.00048547',
     number => '86073',
-    raan => '326.9048',
-    mm1 => '9.21e-06',
-    meanmotion => '14.26579965',
+    raan => '333.8011',
+    mm1 => '1.128e-05',
+    meanmotion => '14.26598138',
     mm2 => '0',
     id => '16969',
-    meananomaly => '73.1449',
-    eccentricity => '0.0011679',
-    inclination => '98.6928'
+    meananomaly => '94.3531',
+    eccentricity => '0.0011676',
+    inclination => '98.6933'
   },
-  FENGYUN1 => {
-    orbit => '13265',
-    elset => '423',
-    argperigee => '170.7304',
-    epoch => '1340.13134563',
-    bstar => '0.00020482',
-    number => '99025',
-    raan => '10.4947',
-    mm1 => '3.22e-06',
-    meanmotion => '14.10426439',
-    mm2 => '0',
-    id => '25730',
-    meananomaly => '189.4125',
-    eccentricity => '0.0014166',
-    inclination => '98.6745'
-  },
-  'NOAA-11' => {
-    orbit => '68079',
-    elset => '962',
-    argperigee => '9.8759',
-    epoch => '1340.91026523',
-    bstar => '0.00031934',
-    number => '88089',
-    raan => '52.8713',
-    mm1 => '5.63e-06',
-    meanmotion => '14.14124306',
+  'UO-14' => {
+    orbit => '62072',
+    elset => '845',
+    argperigee => '44.6675',
+    epoch => '1347.69542577',
+    bstar => '0.00027136',
+    number => '90005',
+    raan => '40.4987',
+    mm1 => '6.71e-06',
+    meanmotion => '14.30895698',
     mm2 => '0',
-    id => '19531',
-    meananomaly => '350.2649',
-    eccentricity => '0.0012088',
-    inclination => '98.944'
+    id => '20437',
+    meananomaly => '315.5454',
+    eccentricity => '0.0011822',
+    inclination => '98.3351'
   },
   'AO-27' => {
-    orbit => '42716',
-    elset => '143',
-    argperigee => '115.6225',
-    epoch => '1340.39150897',
-    bstar => '0.00025389',
+    orbit => '42823',
+    elset => '149',
+    argperigee => '94.8763',
+    epoch => '1347.88570444',
+    bstar => '0.0002808',
     number => '93061',
-    raan => '21.2779',
-    mm1 => '5.96e-06',
-    meanmotion => '14.28586034',
+    raan => '28.4306',
+    mm1 => '6.64e-06',
+    meanmotion => '14.28597495',
     mm2 => '0',
     id => '22825',
-    meananomaly => '244.5934',
-    eccentricity => '0.0009376',
-    inclination => '98.3282'
-  },
-  'RS-15' => {
-    orbit => '28605',
-    elset => '586',
-    argperigee => '196.9334',
-    epoch => '1340.17823988',
-    bstar => '0.00044822',
-    number => '94085',
-    raan => '32.031',
-    mm1 => '-2.7e-07',
-    meanmotion => '11.2754358',
-    mm2 => '0',
-    id => '23439',
-    meananomaly => '162.6201',
-    eccentricity => '0.0160354',
-    inclination => '64.8203'
+    meananomaly => '265.3505',
+    eccentricity => '0.0009495',
+    inclination => '98.3272'
   },
-  'NOAA-12' => {
-    orbit => '54875',
-    elset => '419',
-    argperigee => '216.2813',
-    epoch => '1340.92767586',
-    bstar => '0.00055873',
-    number => '91032',
-    raan => '329.1329',
-    mm1 => '1.249e-05',
-    meanmotion => '14.24352405',
+  'NOAA-11' => {
+    orbit => '68177',
+    elset => '971',
+    argperigee => '350.2685',
+    epoch => '1347.84416344',
+    bstar => '0.000396',
+    number => '88089',
+    raan => '59.8103',
+    mm1 => '7.1e-06',
+    meanmotion => '14.14136105',
     mm2 => '0',
-    id => '21263',
-    meananomaly => '143.754',
-    eccentricity => '0.0012253',
-    inclination => '98.5869'
+    id => '19531',
+    meananomaly => '9.8253',
+    eccentricity => '0.0011964',
+    inclination => '98.9441'
   },
-  'TIUNGSAT-1' => {
-    orbit => '6407',
-    elset => '217',
-    argperigee => '300.8879',
-    epoch => '1338.3927079',
-    bstar => '0.00089075',
-    number => '57',
-    raan => '302.9226',
-    mm1 => '6.445e-05',
-    meanmotion => '14.78110386',
+  FENGYUN1 => {
+    orbit => '13372',
+    elset => '429',
+    argperigee => '148.7618',
+    epoch => '1347.72195466',
+    bstar => '0.00012402',
+    number => '99025',
+    raan => '17.8166',
+    mm1 => '1.79e-06',
+    meanmotion => '14.10428848',
     mm2 => '0',
-    id => '26548',
-    meananomaly => '58.7821',
-    eccentricity => '0.0046692',
-    inclination => '64.5637'
+    id => '25730',
+    meananomaly => '211.4408',
+    eccentricity => '0.0014339',
+    inclination => '98.6741'
   },
   OCS => {
-    elset => '405',
     orbit => '4779',
-    epoch => '356.70018964',
+    elset => '405',
     argperigee => '347.6221',
+    epoch => '356.70018964',
     bstar => '0.030241',
     number => '4',
     raan => '263.5965',
-    meanmotion => '14.81378842',
     mm1 => '0.00237336',
+    meanmotion => '14.81378842',
     mm2 => '0',
-    id => '26062',
     meananomaly => '12.499',
-    eccentricity => '0.0022433',
-    inclination => '100.2182'
+    id => '26062',
+    inclination => '100.2182',
+    eccentricity => '0.0022433'
+  },
+  'TIUNGSAT-1' => {
+    orbit => '6538',
+    elset => '221',
+    argperigee => '299.7435',
+    epoch => '1347.2554667',
+    bstar => '0.00083493',
+    number => '57',
+    raan => '275.7103',
+    mm1 => '6.053e-05',
+    meanmotion => '14.78230514',
+    mm2 => '0',
+    id => '26548',
+    meananomaly => '59.8964',
+    eccentricity => '0.0047431',
+    inclination => '64.5594'
+  },
+  'NOAA-12' => {
+    orbit => '54974',
+    elset => '428',
+    argperigee => '195.3965',
+    epoch => '1347.88210494',
+    bstar => '0.00061722',
+    number => '91032',
+    raan => '335.9303',
+    mm1 => '1.385e-05',
+    meanmotion => '14.24373365',
+    mm2 => '0',
+    id => '21263',
+    meananomaly => '164.6835',
+    eccentricity => '0.0012491',
+    inclination => '98.5871'
+  },
+  'RS-15' => {
+    orbit => '28672',
+    elset => '597',
+    argperigee => '195.8715',
+    epoch => '1346.12063701',
+    bstar => '8.4324e-05',
+    number => '94085',
+    raan => '22.4222',
+    mm1 => '-4e-07',
+    meanmotion => '11.27543475',
+    mm2 => '0',
+    id => '23439',
+    meananomaly => '163.7155',
+    eccentricity => '0.0160287',
+    inclination => '64.8204'
   },
   'NOAA-14' => {
-    orbit => '35752',
-    elset => '987',
-    argperigee => '24.9687',
-    epoch => '1340.91837252',
-    bstar => '0.00031888',
+    orbit => '35850',
+    elset => '996',
+    argperigee => '6.4256',
+    epoch => '1347.8582936',
+    bstar => '0.00043701',
     number => '94089',
-    raan => '337.7949',
-    mm1 => '5.47e-06',
-    meanmotion => '14.12889898',
+    raan => '344.9144',
+    mm1 => '7.67e-06',
+    meanmotion => '14.12902898',
     mm2 => '0',
     id => '23455',
-    meananomaly => '335.1957',
-    eccentricity => '0.0009786',
-    inclination => '99.188'
+    meananomaly => '353.7033',
+    eccentricity => '0.0009431',
+    inclination => '99.1885'
+  },
+  'RS-12/13' => {
+    orbit => '54436',
+    elset => '387',
+    argperigee => '51.3648',
+    epoch => '1346.95326096',
+    bstar => '0.00019814',
+    number => '91007',
+    raan => '142.3842',
+    mm1 => '2.03e-06',
+    meanmotion => '13.7431434',
+    mm2 => '0',
+    id => '21089',
+    meananomaly => '309.0257',
+    eccentricity => '0.0030776',
+    inclination => '82.9195'
   },
   'NOAA-15' => {
-    orbit => '18536',
-    elset => '453',
-    argperigee => '150.1696',
-    epoch => '1340.88567599',
-    bstar => '0.00027994',
+    orbit => '18636',
+    elset => '462',
+    argperigee => '130.2972',
+    epoch => '1347.91315447',
+    bstar => '0.000356',
     number => '98030',
-    raan => '4.2086',
-    mm1 => '5.98e-06',
-    meanmotion => '14.2378757',
+    raan => '11.0677',
+    mm1 => '7.72e-06',
+    meanmotion => '14.23800077',
     mm2 => '0',
     id => '25338',
-    meananomaly => '210.0108',
-    eccentricity => '0.0010933',
+    meananomaly => '229.9179',
+    eccentricity => '0.0011105',
     inclination => '98.5835'
   },
-  'RS-12/13' => {
-    orbit => '54326',
-    elset => '388',
-    argperigee => '73.0938',
-    epoch => '1338.94476571',
-    bstar => '0.0001613',
-    number => '91007',
-    raan => '148.3251',
-    mm1 => '1.68e-06',
-    meanmotion => '13.74311368',
-    mm2 => '0',
-    id => '21089',
-    meananomaly => '287.3576',
-    eccentricity => '0.0030611',
-    inclination => '82.9169'
-  },
-  'UO-36' => {
-    orbit => '14154',
-    elset => '433',
-    argperigee => '225.985',
-    epoch => '1340.88498922',
-    bstar => '0.00035282',
-    number => '99021',
-    raan => '271.0209',
-    mm1 => '2.238e-05',
-    meanmotion => '14.74536764',
+  'NOAA-16' => {
+    orbit => '6323',
+    elset => '613',
+    argperigee => '88.3285',
+    epoch => '1347.80714413',
+    bstar => '0.00042048',
+    number => '55',
+    raan => '290.7081',
+    mm1 => '7.18e-06',
+    meanmotion => '14.11410831',
     mm2 => '0',
-    id => '25693',
-    meananomaly => '133.8524',
-    eccentricity => '0.0033099',
-    inclination => '64.5612'
+    id => '26536',
+    meananomaly => '271.9166',
+    eccentricity => '0.0011459',
+    inclination => '98.8477'
   },
   HUBBLE => {
-    orbit => '43682',
-    elset => '787',
-    argperigee => '325.4716',
-    epoch => '1340.6999801',
-    bstar => '0.00077524',
+    orbit => '43769',
+    elset => '792',
+    argperigee => '25.9487',
+    epoch => '1346.50459803',
+    bstar => '0.00081808',
     number => '90037',
-    raan => '4.1666',
-    mm1 => '9.036e-05',
-    meanmotion => '14.95822848',
+    raan => '326.5706',
+    mm1 => '9.553e-05',
+    meanmotion => '14.95936957',
     mm2 => '0',
     id => '20580',
-    meananomaly => '34.5082',
-    eccentricity => '0.0012225',
-    inclination => '28.4625'
+    meananomaly => '334.169',
+    eccentricity => '0.00118',
+    inclination => '28.4644'
   },
-  'NOAA-16' => {
-    orbit => '6225',
-    elset => '603',
-    argperigee => '105.4346',
-    epoch => '1340.85985025',
-    bstar => '0.00042479',
-    number => '55',
-    raan => '283.8578',
-    mm1 => '7.69e-06',
-    meanmotion => '14.11397049',
+  'UO-36' => {
+    orbit => '14257',
+    elset => '455',
+    argperigee => '225.8822',
+    epoch => '1347.87053407',
+    bstar => '0.00030844',
+    number => '99021',
+    raan => '249.7026',
+    mm1 => '1.94e-05',
+    meanmotion => '14.74566789',
     mm2 => '0',
-    id => '26536',
-    meananomaly => '254.8577',
-    eccentricity => '0.0011451',
-    inclination => '98.848'
+    id => '25693',
+    meananomaly => '133.9607',
+    eccentricity => '0.0032417',
+    inclination => '64.5628'
   },
   MIR => {
-    elset => '341',
     orbit => '84870',
-    epoch => '356.86032407',
+    elset => '341',
     argperigee => '138.854',
+    epoch => '356.86032407',
     bstar => '0.00042632',
     number => '86017',
     raan => '14.9528',
-    meanmotion => '15.84741655',
     mm1 => '0.00102535',
+    meanmotion => '15.84741655',
     mm2 => '0',
-    id => '16609',
     meananomaly => '231.2527',
-    eccentricity => '0.0016068',
-    inclination => '51.6493'
+    id => '16609',
+    inclination => '51.6493',
+    eccentricity => '0.0016068'
   },
   'WO-18' => {
-    orbit => '61983',
-    elset => '668',
-    argperigee => '70.0909',
-    epoch => '1340.92791113',
-    bstar => '0.00025661',
+    orbit => '62073',
+    elset => '673',
+    argperigee => '51.9279',
+    epoch => '1347.22020596',
+    bstar => '0.00032881',
     number => '90005',
-    raan => '45.5322',
-    mm1 => '6.35e-06',
-    meanmotion => '14.31134691',
+    raan => '51.6112',
+    mm1 => '8.26e-06',
+    meanmotion => '14.31146764',
     mm2 => '0',
     id => '20441',
-    meananomaly => '290.1644',
-    eccentricity => '0.0012692',
-    inclination => '98.3948'
+    meananomaly => '308.3034',
+    eccentricity => '0.0012549',
+    inclination => '98.3944'
   },
   'SICH-1' => {
-    orbit => '33729',
-    elset => '854',
-    argperigee => '32.133',
-    epoch => '1340.2176448',
-    bstar => '0.00028809',
+    orbit => '33828',
+    elset => '939',
+    argperigee => '10.7918',
+    epoch => '1346.92165594',
+    bstar => '0.00038615',
     number => '95046',
-    raan => '157.8008',
-    mm1 => '2.093e-05',
-    meanmotion => '14.77608277',
+    raan => '151.5841',
+    mm1 => '2.8e-05',
+    meanmotion => '14.77648539',
     mm2 => '0',
     id => '23657',
-    meananomaly => '328.1537',
-    eccentricity => '0.0027033',
-    inclination => '82.529'
+    meananomaly => '349.3869',
+    eccentricity => '0.0026801',
+    inclination => '82.5289'
   },
   ISS => {
-    orbit => '17403',
-    elset => '804',
-    argperigee => '64.8789',
-    epoch => '1340.87581517',
-    bstar => '0.00068419',
+    orbit => '17513',
+    elset => '835',
+    argperigee => '42.7546',
+    epoch => '1347.90130351',
+    bstar => '3.5835e-05',
     number => '98067',
-    raan => '299.8562',
-    mm1 => '0.00064719',
-    meanmotion => '15.63499635',
+    raan => '264.3874',
+    mm1 => '2.392e-05',
+    meanmotion => '15.5955012',
     mm2 => '0',
     id => '25544',
-    meananomaly => '27.0755',
-    eccentricity => '0.0010188',
-    inclination => '51.6408'
+    meananomaly => '353.6699',
+    eccentricity => '0.0001093',
+    inclination => '51.6398'
   },
   'MET-2/21' => {
-    orbit => '41743',
-    elset => '146',
-    argperigee => '134.3754',
-    epoch => '1340.90413669',
-    bstar => '0.0002268',
+    orbit => '41838',
+    elset => '152',
+    argperigee => '115.5234',
+    epoch => '1347.77504681',
+    bstar => '0.00013522',
     number => '93055',
-    raan => '202.8103',
-    mm1 => '2.65e-06',
-    meanmotion => '13.8342039',
+    raan => '197.3631',
+    mm1 => '1.64e-06',
+    meanmotion => '13.83422644',
     mm2 => '0',
     id => '22782',
-    meananomaly => '225.9264',
-    eccentricity => '0.0023036',
+    meananomaly => '244.8313',
+    eccentricity => '0.0023078',
     inclination => '82.5489'
   },
-  'WO-39' => {
-    orbit => '9737',
-    elset => '418',
-    argperigee => '80.5213',
-    epoch => '1339.90665695',
-    bstar => '0.00088792',
-    number => '4',
-    raan => '304.9535',
-    mm1 => '2.56e-05',
-    meanmotion => '14.36344851',
-    mm2 => '0',
-    id => '26061',
-    meananomaly => '280.0101',
-    eccentricity => '0.0036597',
-    inclination => '100.2095'
-  },
   'FO-20' => {
-    orbit => '55396',
-    elset => '382',
-    argperigee => '283.1892',
-    epoch => '1338.67361656',
-    bstar => '0.00015471',
+    orbit => '55498',
+    elset => '368',
+    argperigee => '265.152',
+    epoch => '1346.62570696',
+    bstar => '7.6115e-05',
     number => '90013',
-    raan => '15.0687',
-    mm1 => '3.3e-07',
-    meanmotion => '12.8330348',
+    raan => '21.5136',
+    mm1 => '-2e-08',
+    meanmotion => '12.83303773',
     mm2 => '0',
     id => '20480',
-    meananomaly => '70.952',
-    eccentricity => '0.0540003',
-    inclination => '99.0359'
+    meananomaly => '88.7769',
+    eccentricity => '0.0539851',
+    inclination => '99.0333'
+  },
+  'WO-39' => {
+    orbit => '9852',
+    elset => '424',
+    argperigee => '58.2272',
+    epoch => '1347.91727075',
+    bstar => '0.0011149',
+    number => '4',
+    raan => '314.4351',
+    mm1 => '3.234e-05',
+    meanmotion => '14.36401483',
+    mm2 => '0',
+    id => '26061',
+    meananomaly => '302.2456',
+    eccentricity => '0.0036514',
+    inclination => '100.2096'
   },
   'AO-10' => {
-    orbit => '13896',
-    elset => '853',
-    argperigee => '204.9066',
-    epoch => '1338.97255464',
+    orbit => '13904',
+    elset => '854',
+    argperigee => '205.9796',
+    epoch => '1342.85493778',
     bstar => '0.0001',
     number => '83058',
-    raan => '239.6495',
-    mm1 => '1.82e-06',
-    meanmotion => '2.05866128',
+    raan => '239.0027',
+    mm1 => '-1.32e-06',
+    meanmotion => '2.05868745',
     mm2 => '0',
     id => '14129',
-    meananomaly => '106.4043',
-    eccentricity => '0.6048198',
-    inclination => '26.1163'
-  },
-  'LO-19' => {
-    orbit => '61978',
-    elset => '639',
-    argperigee => '68.8642',
-    epoch => '1340.25579677',
-    bstar => '0.00027987',
-    number => '90005',
-    raan => '47.1647',
-    mm1 => '6.99e-06',
-    meanmotion => '14.31285615',
-    mm2 => '0',
-    id => '20442',
-    meananomaly => '291.3926',
-    eccentricity => '0.0012983',
-    inclination => '98.4068'
+    meananomaly => '103.7199',
+    eccentricity => '0.6049418',
+    inclination => '26.1045'
   },
   OPAL => {
-    elset => '46',
     orbit => '688',
-    epoch => '75.10024777',
+    elset => '46',
     argperigee => '55.7964',
+    epoch => '75.10024777',
     bstar => '0.00026939',
     number => '4',
     raan => '280.3797',
-    meanmotion => '14.34200204',
     mm1 => '7.03e-06',
+    meanmotion => '14.34200204',
     mm2 => '0',
-    id => '26063',
     meananomaly => '304.6814',
-    eccentricity => '0.0038081',
-    inclination => '100.2291'
+    id => '26063',
+    inclination => '100.2291',
+    eccentricity => '0.0038081'
+  },
+  'LO-19' => {
+    orbit => '62077',
+    elset => '644',
+    argperigee => '49.9291',
+    epoch => '1347.17658908',
+    bstar => '0.00033135',
+    number => '90005',
+    raan => '53.8597',
+    mm1 => '8.35e-06',
+    meanmotion => '14.31299042',
+    mm2 => '0',
+    id => '20442',
+    meananomaly => '310.3031',
+    eccentricity => '0.0013038',
+    inclination => '98.4051'
   },
   'SO-43' => {
-    orbit => '1034',
-    elset => '93',
-    argperigee => '308.3542',
-    epoch => '1340.64350867',
-    bstar => '0.0011192',
+    orbit => '1133',
+    elset => '100',
+    argperigee => '312.7918',
+    epoch => '1347.08686553',
+    bstar => '0.0010817',
     number => '1043',
-    raan => '273.7573',
-    mm1 => '0.00040004',
-    meanmotion => '15.36452171',
+    raan => '254.1056',
+    mm1 => '0.0003932',
+    meanmotion => '15.36979946',
     mm2 => '0',
     id => '26929',
-    meananomaly => '51.7328',
-    eccentricity => '0.0003166',
-    inclination => '67.0531'
-  },
-  POSAT => {
-    orbit => '42721',
-    elset => '120',
-    argperigee => '97.8644',
-    epoch => '1339.73934535',
-    bstar => '0.00030993',
-    number => '93061',
-    raan => '22.1864',
-    mm1 => '7.48e-06',
-    meanmotion => '14.29290299',
-    mm2 => '0',
-    id => '22829',
-    meananomaly => '262.3756',
-    eccentricity => '0.0010728',
-    inclination => '98.3293'
+    meananomaly => '47.2724',
+    eccentricity => '0.0003453',
+    inclination => '67.0529'
   },
   'FO-29' => {
-    orbit => '26175',
-    elset => '461',
-    argperigee => '278.7565',
-    epoch => '1339.12287347',
-    bstar => '0.00013924',
+    orbit => '26290',
+    elset => '463',
+    argperigee => '256.7106',
+    epoch => '1347.62828255',
+    bstar => '0.00015964',
     number => '96046',
-    raan => '180.947',
-    mm1 => '9.8e-07',
-    meanmotion => '13.52800908',
+    raan => '188.2787',
+    mm1 => '1.18e-06',
+    meanmotion => '13.52803169',
     mm2 => '0',
     id => '24278',
-    meananomaly => '77.4077',
-    eccentricity => '0.0350089',
-    inclination => '98.5152'
+    meananomaly => '99.4764',
+    eccentricity => '0.0350179',
+    inclination => '98.5162'
+  },
+  POSAT => {
+    orbit => '42820',
+    elset => '125',
+    argperigee => '77.6095',
+    epoch => '1346.6698054',
+    bstar => '0.00037545',
+    number => '93061',
+    raan => '28.8093',
+    mm1 => '9.15e-06',
+    meanmotion => '14.29304324',
+    mm2 => '0',
+    id => '22829',
+    meananomaly => '282.6301',
+    eccentricity => '0.0010802',
+    inclination => '98.3286'
   },
   'AO-16' => {
-    orbit => '61976',
-    elset => '643',
-    argperigee => '69.2548',
-    epoch => '1340.78120496',
-    bstar => '0.00026505',
+    orbit => '62075',
+    elset => '648',
+    argperigee => '50.4193',
+    epoch => '1347.70316071',
+    bstar => '0.00032761',
     number => '90005',
-    raan => '42.9958',
-    mm1 => '6.57e-06',
-    meanmotion => '14.31045594',
+    raan => '49.673',
+    mm1 => '8.22e-06',
+    meanmotion => '14.31058847',
     mm2 => '0',
     id => '20439',
-    meananomaly => '290.9917',
-    eccentricity => '0.0012036',
-    inclination => '98.3815'
+    meananomaly => '309.8045',
+    eccentricity => '0.0011986',
+    inclination => '98.3808'
   },
   'OKEAN-0' => {
-    orbit => '12837',
-    elset => '504',
-    argperigee => '57.8299',
-    epoch => '1340.73634106',
-    bstar => '0.00022887',
+    orbit => '12939',
+    elset => '526',
+    argperigee => '47.5266',
+    epoch => '1347.67280854',
+    bstar => '0.0002126',
     number => '99039',
-    raan => '31.0909',
-    mm1 => '1.368e-05',
-    meanmotion => '14.71367041',
+    raan => '37.8421',
+    mm1 => '1.268e-05',
+    meanmotion => '14.71386779',
     mm2 => '0',
     id => '25860',
-    meananomaly => '302.3084',
-    eccentricity => '0.0001852',
-    inclination => '97.9287'
+    meananomaly => '312.608',
+    eccentricity => '0.0001598',
+    inclination => '97.9256'
   },
   'UO-22' => {
-    orbit => '54513',
-    elset => '373',
-    argperigee => '28.1897',
-    epoch => '1340.4379542',
-    bstar => '0.00032752',
+    orbit => '54620',
+    elset => '379',
+    argperigee => '6.3224',
+    epoch => '1347.88076337',
+    bstar => '0.00044218',
     number => '91050',
-    raan => '345.4792',
-    mm1 => '9.59e-06',
-    meanmotion => '14.38453857',
+    raan => '352.5217',
+    mm1 => '1.31e-05',
+    meanmotion => '14.38475504',
     mm2 => '0',
     id => '21575',
-    meananomaly => '331.9726',
-    eccentricity => '0.0008036',
-    inclination => '98.1238'
+    meananomaly => '353.8062',
+    eccentricity => '0.0007819',
+    inclination => '98.1234'
   },
   UNK1 => {
-    elset => '34',
     orbit => '446',
-    epoch => '75.10152136',
+    elset => '34',
     argperigee => '54.8262',
+    epoch => '75.10152136',
     bstar => '0.0013283',
     number => '4',
     raan => '280.3591',
-    meanmotion => '14.34222766',
     mm1 => '3.697e-05',
+    meanmotion => '14.34222766',
     mm2 => '0',
-    id => '26091',
     meananomaly => '305.6315',
-    eccentricity => '0.0036379',
-    inclination => '100.2243'
+    id => '26091',
+    inclination => '100.2243',
+    eccentricity => '0.0036379'
+  },
+  'AO-37' => {
+    orbit => '9845',
+    elset => '394',
+    argperigee => '62.5166',
+    epoch => '1347.87179766',
+    bstar => '0.00046965',
+    number => '4',
+    raan => '313.518',
+    mm1 => '1.288e-05',
+    meanmotion => '14.34933',
+    mm2 => '0',
+    id => '26065',
+    meananomaly => '297.9883',
+    eccentricity => '0.0038145',
+    inclination => '100.2129'
   },
   'OKEAN-4' => {
-    orbit => '38514',
-    elset => '943',
-    argperigee => '54.9415',
-    epoch => '1340.38897389',
-    bstar => '0.00044906',
+    orbit => '38610',
+    elset => '949',
+    argperigee => '35.012',
+    epoch => '1346.88528992',
+    bstar => '0.00049735',
     number => '94066',
-    raan => '16.9644',
-    mm1 => '3.327e-05',
-    meanmotion => '14.78639484',
+    raan => '10.9396',
+    mm1 => '3.687e-05',
+    meanmotion => '14.78690062',
     mm2 => '0',
     id => '23317',
-    meananomaly => '305.4123',
-    eccentricity => '0.0024826',
-    inclination => '82.5432'
+    meananomaly => '325.27',
+    eccentricity => '0.0024546',
+    inclination => '82.5418'
   },
-  'AO-37' => {
-    orbit => '9738',
-    elset => '388',
-    argperigee => '83.2647',
-    epoch => '1340.41090341',
-    bstar => '0.00040417',
+  UNK2 => {
+    orbit => '449',
+    elset => '38',
+    argperigee => '57.7071',
+    epoch => '75.16312311',
+    bstar => '0.0008449',
     number => '4',
-    raan => '304.707',
-    mm1 => '1.1e-05',
-    meanmotion => '14.34911677',
+    raan => '280.4286',
+    mm1 => '2.348e-05',
+    meanmotion => '14.34558971',
     mm2 => '0',
-    id => '26065',
-    meananomaly => '277.2892',
-    eccentricity => '0.003833',
-    inclination => '100.2121'
+    meananomaly => '302.7904',
+    id => '26092',
+    inclination => '100.2173',
+    eccentricity => '0.0038886'
   },
   GRO => {
-    elset => '788',
     orbit => '37903',
-    epoch => '75.14126322',
+    elset => '788',
     argperigee => '62.445',
+    epoch => '75.14126322',
     bstar => '0.0004263',
     number => '91027',
     raan => '259.3084',
-    meanmotion => '15.25595337',
     mm1 => '0.00011373',
+    meanmotion => '15.25595337',
     mm2 => '0',
-    id => '21225',
     meananomaly => '297.6646',
-    eccentricity => '0.0005035',
-    inclination => '28.4577'
-  },
-  UNK2 => {
-    elset => '38',
-    orbit => '449',
-    epoch => '75.16312311',
-    argperigee => '57.7071',
-    bstar => '0.0008449',
-    number => '4',
-    raan => '280.4286',
-    meanmotion => '14.34558971',
-    mm1 => '2.348e-05',
-    mm2 => '0',
-    id => '26092',
-    meananomaly => '302.7904',
-    eccentricity => '0.0038886',
-    inclination => '100.2173'
+    id => '21225',
+    inclination => '28.4577',
+    eccentricity => '0.0005035'
   },
   UNK3 => {
-    elset => '41',
     orbit => '470',
-    epoch => '75.09738477',
+    elset => '41',
     argperigee => '59.0925',
+    epoch => '75.09738477',
     bstar => '0.0013991',
     number => '4',
     raan => '280.3768',
-    meanmotion => '14.34403542',
     mm1 => '3.914e-05',
+    meanmotion => '14.34403542',
     mm2 => '0',
-    id => '26093',
     meananomaly => '301.4011',
-    eccentricity => '0.0038328',
-    inclination => '100.2214'
+    id => '26093',
+    inclination => '100.2214',
+    eccentricity => '0.0038328'
   },
   UNK4 => {
-    elset => '22',
     orbit => '417',
-    epoch => '75.02817116',
+    elset => '22',
     argperigee => '57.489',
+    epoch => '75.02817116',
     bstar => '0.00079759',
     number => '4',
     raan => '280.2847',
-    meanmotion => '14.34342323',
     mm1 => '2.202e-05',
+    meanmotion => '14.34342323',
     mm2 => '0',
-    id => '26094',
     meananomaly => '302.9942',
-    eccentricity => '0.003787',
-    inclination => '100.2222'
+    id => '26094',
+    inclination => '100.2222',
+    eccentricity => '0.003787'
   },
   'IO-26' => {
-    orbit => '42716',
-    elset => '117',
-    argperigee => '114.6136',
-    epoch => '1340.13589301',
-    bstar => '0.00023858',
+    orbit => '42810',
+    elset => '122',
+    argperigee => '95.471',
+    epoch => '1346.71871852',
+    bstar => '0.00031367',
     number => '93061',
-    raan => '21.9239',
-    mm1 => '5.6e-06',
-    meanmotion => '14.28772789',
+    raan => '28.2123',
+    mm1 => '7.49e-06',
+    meanmotion => '14.28783986',
     mm2 => '0',
     id => '22826',
-    meananomaly => '245.6055',
-    eccentricity => '0.0009673',
-    inclination => '98.3302'
+    meananomaly => '264.7586',
+    eccentricity => '0.0009779',
+    inclination => '98.3309'
   },
   'OO-38' => {
-    orbit => '9732',
-    elset => '383',
-    argperigee => '83.4991',
-    epoch => '1339.96292327',
-    bstar => '0.00033551',
+    orbit => '9846',
+    elset => '389',
+    argperigee => '61.1764',
+    epoch => '1347.91178639',
+    bstar => '0.00042715',
     number => '4',
-    raan => '304.1171',
-    mm1 => '9.04e-06',
-    meanmotion => '14.34934621',
+    raan => '313.5039',
+    mm1 => '1.167e-05',
+    meanmotion => '14.3495562',
     mm2 => '0',
     id => '26063',
-    meananomaly => '277.0485',
-    eccentricity => '0.0037748',
-    inclination => '100.2104'
+    meananomaly => '299.3183',
+    eccentricity => '0.0037628',
+    inclination => '100.2112'
   },
-  PCSAT => {
-    orbit => '955',
-    elset => '57',
-    argperigee => '260.5656',
-    epoch => '1340.02488719',
-    bstar => '0.00037533',
-    number => '1043',
-    raan => '306.7473',
-    mm1 => '8.6e-06',
-    meanmotion => '14.28523529',
+  RESURS => {
+    orbit => '17809',
+    elset => '61',
+    argperigee => '330.0024',
+    epoch => '1347.76053225',
+    bstar => '0.0012571',
+    number => '98043',
+    raan => '62.7588',
+    mm1 => '2.808e-05',
+    meanmotion => '14.23364838',
     mm2 => '0',
-    id => '26931',
-    meananomaly => '99.4874',
-    eccentricity => '0.0005038',
-    inclination => '67.051'
+    id => '25394',
+    meananomaly => '30.112',
+    eccentricity => '0.0001193',
+    inclination => '98.6705'
   },
   'PO-34' => {
-    orbit => '17100',
-    elset => '503',
-    argperigee => '277.0873',
-    epoch => '1340.14416068',
-    bstar => '0.00036273',
+    orbit => '17216',
+    elset => '506',
+    argperigee => '357.9319',
+    epoch => '1347.81123577',
+    bstar => '0.00040831',
     number => '98064',
-    raan => '263.0959',
-    mm1 => '6.217e-05',
-    meanmotion => '15.09911118',
+    raan => '212.3449',
+    mm1 => '6.997e-05',
+    meanmotion => '15.10022568',
     mm2 => '0',
     id => '25520',
-    meananomaly => '82.9004',
-    eccentricity => '0.0006323',
-    inclination => '28.4623'
+    meananomaly => '2.1247',
+    eccentricity => '0.0006081',
+    inclination => '28.462'
   },
-  RESURS => {
-    orbit => '17711',
-    elset => '34',
-    argperigee => '343.5986',
-    epoch => '1340.87149034',
-    bstar => '0.00081871',
-    number => '98043',
-    raan => '55.9693',
-    mm1 => '1.813e-05',
-    meanmotion => '14.2335119',
+  PCSAT => {
+    orbit => '1066',
+    elset => '62',
+    argperigee => '237.5807',
+    epoch => '1347.84716306',
+    bstar => '0.00036247',
+    number => '1043',
+    raan => '286.549',
+    mm1 => '9.17e-06',
+    meanmotion => '14.28886901',
     mm2 => '0',
-    id => '25394',
-    meananomaly => '16.517',
-    eccentricity => '7.05e-05',
-    inclination => '98.6734'
+    id => '26931',
+    meananomaly => '122.534',
+    eccentricity => '0.0004387',
+    inclination => '67.0562'
   },
   UARS => {
-    orbit => '55977',
-    elset => '487',
-    argperigee => '113.0972',
-    epoch => '1340.7171317',
-    bstar => '0.00021809',
+    orbit => '56073',
+    elset => '492',
+    argperigee => '115.432',
+    epoch => '1347.11079891',
+    bstar => '0.00025006',
     number => '91063',
-    raan => '6.155',
-    mm1 => '2.555e-05',
-    meanmotion => '15.00965994',
+    raan => '340.3497',
+    mm1 => '2.97e-05',
+    meanmotion => '15.01009631',
     mm2 => '0',
     id => '21701',
-    meananomaly => '247.0725',
-    eccentricity => '0.0005714',
-    inclination => '56.9842'
+    meananomaly => '244.7278',
+    eccentricity => '0.0005433',
+    inclination => '56.984'
   },
   'DO-17' => {
-    orbit => '61968',
-    elset => '626',
-    argperigee => '70.2429',
-    epoch => '1339.80181885',
-    bstar => '0.00027334',
+    orbit => '62082',
+    elset => '628',
+    argperigee => '45.7437',
+    epoch => '1347.77124615',
+    bstar => '0.00036563',
     number => '90005',
-    raan => '44.9758',
-    mm1 => '6.82e-06',
-    meanmotion => '14.31278646',
+    raan => '52.6799',
+    mm1 => '9.26e-06',
+    meanmotion => '14.31295649',
     mm2 => '0',
     id => '20440',
-    meananomaly => '290.0065',
-    eccentricity => '0.0012179',
-    inclination => '98.3984'
-  },
-  'KO-23' => {
-    orbit => '43788',
-    elset => '50',
-    argperigee => '194.255',
-    epoch => '1340.93414147',
-    bstar => '0.0001',
-    number => '92052',
-    raan => '324.2955',
-    mm1 => '-3.7e-07',
-    meanmotion => '12.86379619',
-    mm2 => '0',
-    id => '22077',
-    meananomaly => '165.832',
-    eccentricity => '0.0005283',
-    inclination => '66.0875'
+    meananomaly => '314.4753',
+    eccentricity => '0.0012385',
+    inclination => '98.3959'
   },
   JAWSAT => {
-    elset => '32',
     orbit => '693',
-    epoch => '75.52219673',
+    elset => '32',
     argperigee => '55.7126',
+    epoch => '75.52219673',
     bstar => '0.00029735',
     number => '4',
     raan => '280.8828',
-    meanmotion => '14.34110882',
     mm1 => '7.8e-06',
+    meanmotion => '14.34110882',
     mm2 => '0',
-    id => '26065',
     meananomaly => '304.7691',
-    eccentricity => '0.003852',
-    inclination => '100.2316'
+    id => '26065',
+    inclination => '100.2316',
+    eccentricity => '0.003852'
+  },
+  'KO-23' => {
+    orbit => '43865',
+    elset => '109',
+    argperigee => '192.1222',
+    epoch => '1346.92053105',
+    bstar => '0.0001',
+    number => '92052',
+    raan => '311.7606',
+    mm1 => '-3.7e-07',
+    meanmotion => '12.86380095',
+    mm2 => '0',
+    id => '22077',
+    meananomaly => '167.9672',
+    eccentricity => '0.0005196',
+    inclination => '66.0872'
   },
   'KO-25' => {
-    orbit => '39542',
-    elset => '94',
-    argperigee => '93.1129',
-    epoch => '1340.64776191',
-    bstar => '0.00023096',
+    orbit => '39636',
+    elset => '99',
+    argperigee => '75.767',
+    epoch => '1347.22876464',
+    bstar => '0.0002728',
     number => '93061',
-    raan => '22.6569',
-    mm1 => '5.45e-06',
-    meanmotion => '14.2916941',
+    raan => '28.9429',
+    mm1 => '6.52e-06',
+    meanmotion => '14.29179149',
     mm2 => '0',
     id => '22828',
-    meananomaly => '267.1286',
-    eccentricity => '0.0010779',
-    inclination => '98.3275'
+    meananomaly => '284.4722',
+    eccentricity => '0.0010889',
+    inclination => '98.3266'
   },
   'SAUDISAT-1A' => {
-    orbit => '6438',
-    elset => '215',
-    argperigee => '307.7891',
-    epoch => '1340.88452985',
-    bstar => '0.00079986',
+    orbit => '6540',
+    elset => '218',
+    argperigee => '306.6992',
+    epoch => '1347.79284312',
+    bstar => '0.00072038',
     number => '57',
-    raan => '298.092',
-    mm1 => '5.575e-05',
-    meanmotion => '14.76521761',
+    raan => '276.9415',
+    mm1 => '5.016e-05',
+    meanmotion => '14.76596265',
     mm2 => '0',
     id => '26545',
-    meananomaly => '51.8606',
-    eccentricity => '0.0051077',
-    inclination => '64.5616'
+    meananomaly => '52.9436',
+    eccentricity => '0.0051238',
+    inclination => '64.561'
   }
 );
 1;

diff --git a/perl/Messages b/perl/Messages
index ccde0307543c26b644340ab0823e93b74b112c15..8474275703a9b120acd21c49197e7c791d41c148 100644 (file)
--- a/perl/Messages
+++ b/perl/Messages
@@ -229,7 +229,7 @@ package DXM;
                                sat1 => 'Tracking Table for $_[0] for the next $_[1] hours every $_[2] mins',
                                sat2 => 'dd/mm  UTC      Lat     Lon  Alt Km      Az      El Dist Km',
                                sat3 => 'Syntax: SH/SAT <name> [<hours> <interval>]',
-                               sat4 => 'Satellites available:-',
+                               sat4 => 'Satellites available/Age of Keps (days):-',
                                satnf => 'Satellite $_[0] unknown',
                                satdisc => '-----',
                                sethop1 => 'usage: set/hops <call> ann|spots|wwv|wcy <no of hops>',

diff --git a/perl/Sun.pm b/perl/Sun.pm
index 759f99489a76199f0e2572f08b39d07ea852850a..90c2370537b94cb85c23a12fa6a7409827858c16 100644 (file)
--- a/perl/Sun.pm
+++ b/perl/Sun.pm
@@ -18,6 +18,7 @@
 #
 # $Id$
 # 
+# 2001/12/16 Fixed Julian_Date_of_Epoch and now I actually use it...
 # 2001/09/15 some changes to take care of cases where the object 
 #            doesn't rise or set on a given day... 
 
@@ -76,13 +77,18 @@ sub Julian_Day
 sub Julian_Date_of_Epoch
 {
        my $epoch=shift;
-       my $year=int($epoch*1e-3);
-       $year=$year+2000 if ($year < 57);
-       $year=$year+1900 if ($year >= 57);
-       my $day=$epoch-$year*1e3;
+       my $year=int($epoch/1000);
+       my $day=$epoch-$year*1000;
+       if ($year < 57 ) {
+               $year=$year+2000;
+       }
+       else {
+               $year=$year+1900;
+       }
        my $Julian_Date_of_Epoch=Julian_Date_of_Year($year)+$day;
        return $Julian_Date_of_Epoch;
 }
+
 sub Julian_Date_of_Year
 {
        my $year=shift;
@@ -645,14 +651,7 @@ sub get_satellite_pos
 
        my $epoch = $sat_ref ->{epoch};
 #printf("epoch = %10.2f\n",$epoch);
-       my $epoch_year=int($epoch/1000);
-       my $epoch_day=$epoch-int(1000*$epoch_year);
-#printf("epoch_year = %10.2f\n",$epoch_year);
-#printf("epoch_day = %17.12f\n",$epoch_day);
-       my $ep_year=$epoch_year+2000 if ($epoch_year < 57);
-       $ep_year=$epoch_year+1900 if ($epoch_year >= 57);
-       my $jt_epoch=Julian_Date_of_Year($ep_year);
-       $jt_epoch=$jt_epoch+$epoch_day;
+       my $jt_epoch=Julian_Date_of_Epoch($epoch);
 #printf("JT for epoch = %17.12f\n",$jt_epoch);
        my $tsince=($jtime-$jt_epoch)*24*60;
 #printf("tsince (min) = %17.12f\n",$tsince);

diff --git a/perl/convkeps.pl b/perl/convkeps.pl
index 4c05d05a04d2b49d6970fcd3e350d40ad85d4a96..268a7f29f7ea58a1ce3ba326a37125e4297e9bde 100755 (executable)
--- a/perl/convkeps.pl
+++ b/perl/convkeps.pl
@@ -81,7 +81,7 @@ while (<$f>) {
        ++$line;
        chomp;
        s/^\s+//;
-    s/\s+$//;
+    s/[\s\r]+$//;
        next unless $_;
        last if m{^/EX}i;
        last if m{^-};
@@ -93,7 +93,7 @@ while (<$f>) {
                
                if (/^\w+/) {
                        s/\s/-/g;
-                       $name = $_;
+                       $name = uc $_;
                        $ref = $keps{$name} = {}; 
                        $state = 2;
                }