post merge
authorAndreas Thurnherr <ant@ldeo.columbia.edu>
Wed, 26 Jun 2019 09:29:19 -0400
changeset 49 8f4fbdaf0102
parent 48 cdc74ebada81 (current diff)
parent 47 494a76548e94 (diff)
child 50 6bfec705d25e
post merge
RDI_PD0_IO.pl
RDI_Utils.pl
listHdr
--- a/RDI_PD0_IO.pl
+++ b/RDI_PD0_IO.pl
@@ -1,9 +1,9 @@
 #======================================================================
 #                    R D I _ P D 0 _ I O . P L 
 #                    doc: Sat Jan 18 14:54:43 2003
-#                    dlm: Thu Jun 13 22:13:12 2019
+#                    dlm: Wed Jun 26 09:27:46 2019
 #                    (c) 2003 A.M. Thurnherr
-#					 uE-Info: 116 45 NIL 0 0 72 2 2 4 NIL ofnI
+#					 uE-Info: 645 39 NIL 0 0 72 2 2 4 NIL ofnI
 #======================================================================
 	
 # Read RDI PD0 binary data files (*.[0-9][0-9][0-9])
@@ -191,7 +191,6 @@
 #	CORRELATION_DATA_BYTES			scalar		?
 #	ECHO_INTENSITY_DATA_BYTES		scalar		?
 #	PERCENT_GOOD_DATA_BYTES 		scalar		?
-#	BT_DATA_BYTES					scalar		undefined, ? if BT_PRESENT
 #	CPU_FW_VER						scalar		0--255
 #	CPU_FW_REV						scalar		0--255
 #	BEAM_FREQUENCY					scalar		75, 150, 300, 600, 1200, 2400 [kHz]
@@ -638,6 +637,42 @@
 		$dta->{WIDE_BANDWIDTH}	 = ($W5 == 0);
     }
 
+	#-----------------------
+	# 1st ENSEMBLE, BT Setup
+	#-----------------------
+
+# 	CODE DISABLED BECAUSE BT_PRESENT FLAG WAS REMOVED. WITHOUT THIS CODE,
+#	[listHdr] DOES NOT LIST ANY BT INFO
+#
+#	if ($dta->{BT_PRESENT}) {
+#		sysseek(WBRF,$start_ens+$WBRofs[$BT_dt],0) || die("$WBRcfn: $!");
+#		sysread(WBRF,$buf,12) == 12 || die("$WBRcfn: $!");
+#		($id,$dta->{BT_PINGS_PER_ENSEMBLE},$dta->{BT_DELAY_BEFORE_REACQUIRE},
+#		 $dta->{BT_MIN_CORRELATION},$dta->{BT_MIN_EVAL_AMPLITUDE},
+#		 $dta->{BT_MIN_PERCENT_GOOD},$dta->{BT_MODE},
+#		 $dta->{BT_MAX_ERROR_VELOCITY}) = unpack('vvvCCCCv',$buf);
+#		 
+#		$id == 0x0600 ||
+#			printf(STDERR $FmtErr."\n",$WBRcfn,"Bottom Track",$id,0,tell(WBRF));
+#	
+#		$dta->{BT_MAX_ERROR_VELOCITY} =
+#			$dta->{BT_MAX_ERROR_VELOCITY} ? $dta->{BT_MAX_ERROR_VELOCITY} / 1000
+#										  : undef;
+#	
+#		sysseek(WBRF,28,1) || die("$WBRcfn: $!");
+#		sysread(WBRF,$buf,6) == 6 || die("$WBRcfn: $!");
+#		($dta->{BT_RL_MIN_SIZE},$dta->{BT_RL_NEAR},$dta->{BT_RL_FAR})
+#			= unpack('vvv',$buf);
+#	
+#		$dta->{BT_RL_MIN_SIZE} /= 10;
+#		$dta->{BT_RL_NEAR} /= 10;
+#		$dta->{BT_RL_FAR} /= 10;
+#	    
+#		sysseek(WBRF,20,1) || die("$WBRcfn: $!");		# skip data
+#		sysread(WBRF,$buf,2) == 2 || die("$WBRcfn: $!");
+#	    $dta->{BT_MAX_TRACKING_DEPTH} = unpack('v',$buf) / 10;
+#    }
+    
     return $dta;
 }
 
--- a/listHdr
+++ b/listHdr
@@ -2,9 +2,9 @@
 #======================================================================
 #                    L I S T H D R 
 #                    doc: Sat Jan 18 18:41:49 2003
-#                    dlm: Thu Jun 13 21:56:00 2019
+#                    dlm: Wed Jun 26 09:29:09 2019
 #                    (c) 2003 A.M. Thurnherr
-#                    uE-Info: 46 51 NIL 0 0 72 10 2 4 NIL ofnI
+#                    uE-Info: 48 46 NIL 0 0 72 10 2 4 NIL ofnI
 #======================================================================
 
 # Print useful info from the RDI BB header
@@ -44,6 +44,8 @@
 #				  - added AMBIGUITY_VELOCITY
 #	Aug  8, 2017: - added -l)ong listing
 # 	Jun 13, 2019: - removed BT_PRESENT flag support
+#	Jun 26, 2019: - added comment to the effect that BT setup cannot be listed
+#					with this utility any more
 
 use Getopt::Std;
 
@@ -205,11 +207,13 @@
 	printf("TRANSMIT_POWER_HIGH ")				if ($hdr{TRANSMIT_POWER_HIGH});
 	print("\n");
 
-#----------------------------------------------------------------------
+	#----------------------------------------------------------------------
+	# BT code is never executed since BT_MODE is not set any more
+	#----------------------------------------------------------------------
 
 	if (defined($hdr{BT_MODE})) {
 		print("    Bottom-Track Setup:\n");
-		printf("\tBT_MODE\t\t\t\t= %d\n", 		$hdr{BT_MODE});
+		printf("\tBT_MODE\t\t\t\t= %d\n", 			$hdr{BT_MODE});
 		printf("\tBT_PINGS_PER_ENSEMBLE\t\t= %d\n",
 													$hdr{BT_PINGS_PER_ENSEMBLE});
 		printf("\tBT_TIME_BEFORE_REACQUIRE\t= %g s\n",