projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added -c option to convkeps.pl
[spider.git]
/
cmd
/
show
/
muf.pl
diff --git
a/cmd/show/muf.pl
b/cmd/show/muf.pl
index 65cc21b5883a9f58e70ca7338699384046773795..5487ea0d1602f3ffd174d17be3d1424285dda6bd 100644
(file)
--- a/
cmd/show/muf.pl
+++ b/
cmd/show/muf.pl
@@
-10,8
+10,18
@@
#
my ($self, $line) = @_;
#
my ($self, $line) = @_;
-my ($prefix, $hr2) = split /\s+/, $line;
+my @f = split /\s+/, $line;
+
+my $prefix = uc shift @f;
return (1, $self->msg('e4')) unless $prefix;
return (1, $self->msg('e4')) unless $prefix;
+my $lp;
+my $hr2;
+
+while (@f) {
+ my $f = shift @f;
+ $lp++ if $f =~ /^l/;
+ $hr2 = $f if $f =~ /^\d+$/;
+}
$hr2 = 2 if !$hr2 || $hr2 < 2;
$hr2 = 24 if $hr2 > 24;
$hr2 = 2 if !$hr2 || $hr2 < 2;
$hr2 = 24 if $hr2 > 24;
@@
-45,6
+55,16
@@
$b1 *= $d2r;
$b2 *= $d2r;
$d = ($d / $R);
$b2 *= $d2r;
$d = ($d / $R);
+# handle long path
+if ($lp) {
+ $d = $pi2 - $d;
+ $b1 += $pi;
+ $b1 -= $pi2 if ($b1 >= $pi2);
+ $b2 += $pi;
+ $b2 -= $pi2 if ($b2 >= $pi2);
+}
+
+
my ($hr1, $day, $month) = (gmtime($main::systime))[2,3,4];
$month++;
my $flux = Geomag::sfi;
my ($hr1, $day, $month) = (gmtime($main::systime))[2,3,4];
$month++;
my $flux = Geomag::sfi;