Index: trunk/BNC/scripts/Bnc.pm =================================================================== --- trunk/BNC/scripts/Bnc.pm (revision 9909) +++ trunk/BNC/scripts/Bnc.pm (revision 9910) @@ -488,5 +488,4 @@ $startSec = time () - $goBackSecs; } - my $isFreePPP = 1; # Free or closed PPP version my $epo; my $old_epochSec = 0; @@ -494,8 +493,7 @@ my $epochDiff = 0; my ( - @hlp, @EPOCHs, @N, @E, @U, %SATNUM, @TRPs, @CLKs, - @G_CLKs, @R_CLKs, @E_CLKs, @C_CLKs, @OGRs, @OGEs, @OGCs, @OFFGLOs + @hlp, @EPOCHs, @N, @E, @U, %SATNUM, @TRPs, + @G_CLKs, @R_CLKs, @E_CLKs, @C_CLKs, ); - my ( @EPOCHs_OGE, @EPOCHs_OGR, @EPOCHs_OGC ); my ( @EPOCHs_G_CLK, @EPOCHs_R_CLK, @EPOCHs_E_CLK, @EPOCHs_C_CLK ); my ( %AMB, %RES, %ELE, %ION, %BIA ); @@ -516,15 +514,9 @@ # PPP of Epoch 2015-08-27_14:00:15.000 - if ( $ln =~ /PPP of Epoch (\d{4}-\d{2}-\d{2}_\d{2}:\d{2}:\d{2})\.\d+/ ) { # closed PPP - $isFreePPP = 0; - $epo = $1; #print "$epo\n"; - } - elsif ( $ln =~ /Point Positioning of Epoch (\d{4}-\d{2}-\d{2}_\d{2}:\d{2}:\d{2})\.\d+/ ) { # free PPP - $isFreePPP = 1; - $epo = $1; + if ( $ln =~ /PPP of Epoch (\d{4}-\d{2}-\d{2}_\d{2}:\d{2}:\d{2})\.\d+/ ) { + $epo = $1; #print "$epo\n"; } else { ERROR "strange line: \"$ln\""; next } - #my $date = sprintf ( "%s %s", split ( /_/, $epo ) ); my $tp = Time::Piece->strptime( $epo, '%Y-%m-%d_%H:%M:%S' ); $epochSec = $tp->epoch(); @@ -539,13 +531,9 @@ @hlp = split ( /\s+/, $ln ); - if ( $ln =~ /\bOFFGLO\b/ ) { # ... OFFGLO 8.417 +- 28.479 - push ( @OFFGLOs, $hlp[2] ); - } - - elsif ( $ln =~ /\bdN\b/ ) { + if ( $ln =~ /\bdN\b/ ) { push ( @EPOCHs, $epochSec ); # besser $epo ? $old_epochSec = $epochSec; -#2015-08-27_13:59:50.000 DIEP1 X = 3842152.9054 +- 0.0242 Y = 563402.0331 +- 0.0176 Z = 5042888.5182 +- 0.0319 dN = 0.0130 +- 0.0193 dE = -0.0032 +- 0.0178 dU = -0.0248 +- 0.0349 + #2015-08-27_13:59:50.000 DIEP1 X = 3842152.9054 +- 0.0242 Y = 563402.0331 +- 0.0176 Z = 5042888.5182 +- 0.0319 dN = 0.0130 +- 0.0193 dE = -0.0032 +- 0.0178 dU = -0.0248 +- 0.0349 $station = $hlp[1]; @@ -559,33 +547,19 @@ } elsif ( ( $ln =~ /\bAMB\b/ ) && ( $ln !~ /RESET/ ) ) { - if ($isFreePPP) { # 2015-10... AMB G05 -6.754 +- 0.086 nEpo = 633 - $sat = $hlp[2]; - $sys = substr ( $sat, 0, 1 ); - $amb = $hlp[4]; - push @{ $AMB{$sys}{$sat}{EPOCH} }, $epochSec; - push @{ $AMB{$sys}{$sat}{DATA} }, $amb; - push @{ $AMB{$sys}{$sat}{NUMEPO} }, $hlp[9]; - } - else { # 2015-08... AMB lIF G04 253.0000 -8.9924 +- 1.7825 el = 22.03 epo = 86 - $lki = $hlp[2]; - $sat = $hlp[3]; - $sys = substr ( $sat, 0, 1 ); - $amb = $hlp[4] + $hlp[5]; - push @{ $AMB{$lki}{$sys}{$sat}{EPOCH} }, $epochSec; - push @{ $AMB{$lki}{$sys}{$sat}{DATA} }, $amb; - push @{ $AMB{$lki}{$sys}{$sat}{NUMEPO} }, $hlp[13]; - push @{ $ELE{$sys}{$sat}{EPOCH} }, $epochSec; - push @{ $ELE{$sys}{$sat}{DATA} }, $hlp[10]; - } + # 2015-08... AMB lIF G04 253.0000 -8.9924 +- 1.7825 el = 22.03 epo = 86 + $lki = $hlp[2]; + $sat = $hlp[3]; + $sys = substr ( $sat, 0, 1 ); + $amb = $hlp[4] + $hlp[5]; + push @{ $AMB{$lki}{$sys}{$sat}{EPOCH} }, $epochSec; + push @{ $AMB{$lki}{$sys}{$sat}{DATA} }, $amb; + push @{ $AMB{$lki}{$sys}{$sat}{NUMEPO} }, $hlp[13]; + push @{ $ELE{$sys}{$sat}{EPOCH} }, $epochSec; + push @{ $ELE{$sys}{$sat}{DATA} }, $hlp[10]; } elsif ( $ln =~ /\bRES\b/ && $ln !~ /Neglected/ ) { - if ($isFreePPP) { # 2015-10... RES R08 L3 -0.0069 - $sat = $hlp[2]; - $lki = $hlp[3]; - } - else { # 2015-08... RES lIF G30 -0.0076 - $sat = $hlp[3]; - $lki = $hlp[2]; - } + # 2015-08... RES lIF G30 -0.0076 + $sat = $hlp[3]; + $lki = $hlp[2]; $sys = substr ( $sat, 0, 1 ); @@ -610,14 +584,5 @@ push @{ $BIA{$lki}{$sys}{DATA} }, $hlp[4] + $hlp[5]; } - elsif ( $ln =~ /\bCLK\b/ ) { - if ($isFreePPP) { push ( @CLKs, $hlp[2] ) } - else { push ( @CLKs, $hlp[2] + $hlp[3] ) } - } - # REC_CLK in BNC 2.13 - #elsif ( $ln =~ /\bREC_CLK\b/ ) { - elsif ( $ln =~ /\bREC_CLK\s{8}/ ) { - push ( @CLKs, $hlp[2] + $hlp[3] ); - } elsif ( $ln =~ /\bREC_CLK G\b/ ) { push ( @EPOCHs_G_CLK, $epochSec ); @@ -635,16 +600,4 @@ push ( @EPOCHs_C_CLK, $epochSec ); push ( @C_CLKs, $hlp[3] + $hlp[4] ); - } - elsif ( $ln =~ /\bOGR\b/ ) { # 2015-08... OGR 52.6806 -3.8042 +- 9.0077 - push ( @EPOCHs_OGR, $epochSec ); - push ( @OGRs, $hlp[2] + $hlp[3] ); # only https so far - } - elsif ( $ln =~ /\bOGE\b/ ) { # 2015-08... OGE 52.6806 -3.8042 +- 9.0077 - push ( @EPOCHs_OGE, $epochSec ); - push ( @OGEs, $hlp[2] + $hlp[3] ); # only https so far - } - elsif ( $ln =~ /\bOGC\b/ ) { # 2015-08... OGC 52.6806 -3.8042 +- 9.0077 - push ( @EPOCHs_OGC, $epochSec ); - push ( @OGCs, $hlp[2] + $hlp[3] ); # only https so far } elsif ( $ln =~ /\bSATNUM\b/ ) { # 2015-09... SATNUM G 8 @@ -668,19 +621,11 @@ . scalar @U . ", TRPs:" - . scalar @TRPs - . ", CLKs:" - . scalar @CLKs - . ", OFFGLOs:" - . scalar @OFFGLOs ); + . scalar @TRPs ); if ( $nof_epochs != scalar @N ) { LOGDIE "number of epochs and residuals not equal\n" } if ( $nof_epochs != scalar @TRPs ) { LOGDIE "number of epochs and TRPs not equal\n" } - if ( @CLKs && $nof_epochs != scalar @CLKs ) { LOGDIE "number of epochs and CLKs not equal\n" } if ( @G_CLKs && scalar @EPOCHs_G_CLK != scalar @G_CLKs ) { LOGDIE "number of epochs and G_CLKs not equal\n" } if ( @R_CLKs && scalar @EPOCHs_R_CLK != scalar @R_CLKs ) { LOGDIE "number of epochs and R_CLKs not equal\n" } if ( @E_CLKs && scalar @EPOCHs_E_CLK != scalar @E_CLKs ) { LOGDIE "number of epochs and E_CLKs not equal\n" } if ( @C_CLKs && scalar @EPOCHs_C_CLK != scalar @C_CLKs ) { LOGDIE "number of epochs and C_CLKs not equal\n" } - if ( @OGRs && scalar @EPOCHs_OGR != scalar @OGRs ) { LOGDIE "number of epochs and OGRs not equal\n" } - if ( @OGEs && scalar @EPOCHs_OGE != scalar @OGEs ) { LOGDIE "number of epochs and OGEs not equal\n" } - if ( @OGCs && scalar @EPOCHs_OGC != scalar @OGCs ) { LOGDIE "number of epochs and OGCs not equal\n" } my %data = ( @@ -691,13 +636,8 @@ SATNUM => \%SATNUM, TRPs => \@TRPs, - CLKs => \@CLKs, G_CLKs => \@G_CLKs, R_CLKs => \@R_CLKs, E_CLKs => \@E_CLKs, C_CLKs => \@C_CLKs, - OGRs => \@OGRs, - OGEs => \@OGEs, - OGCs => \@OGCs, - OFFGLOs => \@OFFGLOs, RES => \%RES, AMB => \%AMB, @@ -707,5 +647,5 @@ ); - return ( $station, \%data, $isFreePPP ); + return ( $station, \%data, 0 ); } Index: trunk/BNC/scripts/pppPlot.pl =================================================================== --- trunk/BNC/scripts/pppPlot.pl (revision 9909) +++ trunk/BNC/scripts/pppPlot.pl (revision 9910) @@ -192,5 +192,6 @@ my $chartTRP = newChart($station); $chartTRP->set( output => $pngName ); - $chartTRP->set( ylabel => "Tropospheric Delay[m]", yrange => [ " 2.0 ", " 2.6 " ] ); + #$chartTRP->set( ylabel => "Tropospheric Delay[m]", yrange => [ " 2.0 ", " 2.6 " ] ); + $chartTRP->set( ylabel => "Tropospheric Delay[m]", yrange => [ " 1.0 ", " 3.0 " ] ); my $dataTRP = Chart::Gnuplot::DataSet->new( @@ -213,34 +214,4 @@ $png->image( $pdf->image_png($pngName), $x, $y, $width, $height ); - ######### CLK ##################### - if ( scalar @{ $file->{'CLKs'} } < 1 ) { - DEBUG "No CLKs found"; - } - else { - DEBUG "Plot CLKs"; - $pngName = sprintf ( "%s_CLK.png", $station ); - my $chartCLK = newChart($station); - $chartCLK->set( output => $pngName ); - $chartCLK->set( ylabel => "CLK [m]" ); - - $dataset = Chart::Gnuplot::DataSet->new( - xdata => $EPOCHS, - ydata => $file->{'CLKs'}, - title => "Receiver clock", - timefmt => '%s', - style => "linespoints", - ); - $chartCLK->plot2d($dataset); - $y = $y - $dy; - - if ( $y < 30 / mm ) { - $page = $pdf->page(); - $page->mediabox('A4'); - $y = $y0; - } - $png = $page->gfx(); - LOGDIE("could not find image file: $!\n") unless -e $pngName; - $png->image( $pdf->image_png($pngName), $x, $y, $width, $height ); - } ######### GPS CLK ##################### if ( scalar @{ $file->{'G_CLKs'} } < 1 ) { @@ -363,103 +334,4 @@ LOGDIE("could not find image file: $!\n") unless -e $pngName; $png->image( $pdf->image_png($pngName), $x, $y, $width, $height ); - } - - ######### OGR ##################### - if ( grep ( $_ eq "ALL", @plotTypes ) ) { - if ( scalar @{ $file->{'OGRs'} } < 1 ) { - DEBUG "No OGRs found"; - } - else { - DEBUG "Plot OGRs"; - my $pngName = sprintf ( "%s_OGR.png", $station ); - my $chartOGR = newChart($station); - $chartOGR->set( output => $pngName ); - $chartOGR->set( ylabel => "OGR [m]" ); - - $dataset = Chart::Gnuplot::DataSet->new( - xdata => $EPOCHS_OGR, - ydata => $file->{'OGRs'}, - title => "Offset GPS - GLONASS", - timefmt => '%s', - style => "linespoints", - ); - $chartOGR->plot2d($dataset); #system ("display $pngName&"); - $y = $y - $dy; - - if ( $y < 30 / mm ) { - $page = $pdf->page(); - $page->mediabox('A4'); - $y = $y0; - } - $png = $page->gfx(); - LOGDIE("could not find image file: $!\n") unless -e $pngName; - $png->image( $pdf->image_png($pngName), $x, $y, $width, $height ); - } - } - - ######### OGE ##################### - if ( grep ( $_ eq "ALL", @plotTypes ) ) { - if ( scalar @{ $file->{'OGEs'} } < 1 ) { - DEBUG "No OGEs found"; - } - else { - DEBUG "Plot OGEs"; - my $pngName = sprintf ( "%s_OGE.png", $station ); - my $chartOGE = newChart($station); - $chartOGE->set( output => $pngName ); - $chartOGE->set( ylabel => "OGE [m]" ); - - $dataset = Chart::Gnuplot::DataSet->new( - xdata => $EPOCHS_OGE, - ydata => $file->{'OGEs'}, - title => "Offset GPS - Galileo", - timefmt => '%s', - style => "linespoints", - ); - $chartOGE->plot2d($dataset); #system ("display $pngName&"); - $y = $y - $dy; - - if ( $y < 30 / mm ) { - $page = $pdf->page(); - $page->mediabox('A4'); - $y = $y0; - } - $png = $page->gfx(); - LOGDIE("could not find image file: $!\n") unless -e $pngName; - $png->image( $pdf->image_png($pngName), $x, $y, $width, $height ); - } - } - - ######### OGC ##################### - if ( grep ( $_ eq "ALL", @plotTypes ) ) { - if ( scalar @{ $file->{'OGCs'} } < 1 ) { - DEBUG "No OGCs found"; - } - else { - DEBUG "Plot OGCs"; - my $pngName = sprintf ( "%s_OGC.png", $station ); - my $chartOGC = newChart($station); - $chartOGC->set( output => $pngName ); - $chartOGC->set( ylabel => "OGC [m]" ); - - $dataset = Chart::Gnuplot::DataSet->new( - xdata => $EPOCHS_OGC, - ydata => $file->{'OGCs'}, - title => "Offset GPS - BDS", - timefmt => '%s', - style => "linespoints", - ); - $chartOGC->plot2d($dataset); #system ("display $pngName&"); - $y = $y - $dy; - - if ( $y < 30 / mm ) { - $page = $pdf->page(); - $page->mediabox('A4'); - $y = $y0; - } - $png = $page->gfx(); - LOGDIE("could not find image file: $!\n") unless -e $pngName; - $png->image( $pdf->image_png($pngName), $x, $y, $width, $height ); - } } @@ -647,8 +519,10 @@ if ( $key_resType =~ /^c/ ) { - $chartRES->set( yrange => [ " -6.0 ", " 6.0 " ] ); + #$chartRES->set( yrange => [ " -6.0 ", " 6.0 " ] ); + $chartRES->set( yrange => [ " -10.0 ", " 10.0 " ] ); } elsif ( $key_resType =~ /^l/ ) { - $chartRES->set( yrange => [ " -0.06 ", " 0.06 " ] ); + #$chartRES->set( yrange => [ " -0.06 ", " 0.06 " ] ); + $chartRES->set( yrange => [ " -0.10 ", " 0.10 " ] ); } @@ -787,7 +661,7 @@ $pdf->end(); - #system ("rm *.png"); + system ("rm *.png"); if (Common::amInteractiv ) { - system ("evince $inputDir/$pdf_name"); +# system ("evince $inputDir/$pdf_name"); } } # ----- next logfile -----