use WCY::r if recent enough and available

[spider.git] / cmd / show / muf.pl

diff --git a/cmd/show/muf.pl b/cmd/show/muf.pl
index 5487ea0d1602f3ffd174d17be3d1424285dda6bd..31bebfeec62b5c71b3d8765ca5fbaa0f81de0026 100644 (file)
--- a/cmd/show/muf.pl
+++ b/cmd/show/muf.pl
@@ -68,7 +68,12 @@ if ($lp) {
 my ($hr1, $day, $month) = (gmtime($main::systime))[2,3,4];
 $month++;
 my $flux = Geomag::sfi;
-my $ssn = Minimuf::spots($flux);
+my $ssn;
+if ($main::systime - $WCY::date < 86400) {
+       $ssn = $WCY::r
+} else {
+       $ssn = Minimuf::spots($flux);
+}
 
 my $theta;                                             # path angle (rad) 
 $theta=$lon1-$lon2;
@@ -76,7 +81,7 @@ $theta=$theta+2.*$pi if( $theta <= -$pi);
 $theta=$theta-2.*$pi if( $theta >= $pi);
 
 my ($lats, $lons);                             # subsolar coordinates (rad) 
-my $dB1 = 20;                                  # transmitter output power (dBW) 
+my $dB1 = 26;                                  # transmitter output power (dBW) 
 
 my $delay;                                             # path delay (ms) 
 my $psi;                                               # sun zenith angle (rad) 
@@ -90,7 +95,7 @@ my $beta1;                                            # elevation angle (rad)
 my $dhop;                                              # hop great-circle distance (rad) 
 my $height;                                            # height of F layer (km) 
 my $time;                                              # time of day (hour) 
-my $rsens = -123;                              # RX sensitivity
+my $rsens = -128;                              # RX sensitivity
 
 
 my @freq = qw(1.8 3.5 7.0 10.1 14.0 18.1 21.0 24.9 28.0 50.0); # working frequencies (MHz) 
@@ -116,7 +121,7 @@ $phiF = atan($ftemp / sqrt(1 - $ftemp * $ftemp));
 $delay = ((2 * $hop * sin($dhop) * ($R + $hF)) / cos($beta1) / $VOFL) * 1e6;
 
 # print summary of data so far
-push @out, sprintf("RxSens: $rsens dBM SFI:%4.0lf   R:%4.0lf   Month: $month   Day: $day", $flux, $ssn);
+push @out, sprintf("RxSens: $rsens dBM SFI:%4.0f   R:%4.0f   Month: $month   Day: $day", $flux, $ssn);
 push @out, sprintf("Power :  %3.0f dBW    Distance:%6.0f km    Delay:%5.1f ms", $dB1, $d * $R, $delay);
 push @out, sprintf("Location                       Lat / Long           Azim");
 push @out, sprintf("%-30.30s %-18s    %3.0f", $main::myqth, DXBearing::lltos($lat1*$r2d, -$lon1*$r2d), $b1 * $r2d);