scripts/check-{near-bragg,peak-detection}: Improve option processing

2 files changed, 15 insertions, 2 deletions

diff --git a/scripts/check-near-bragg b/scripts/check-near-bragg
index 5ebae9b1..27a1d61c 100755
--- a/scripts/check-near-bragg
+++ b/scripts/check-near-bragg
@@ -3,6 +3,15 @@
 use strict;
 use File::Basename;
 
+my $args = join(" ", splice(@ARGV, 1, scalar(@ARGV)-1));
+if ( !($args eq "") ) {
+        printf("Extra arguments for hdfsee: %s\n", $args);
+} else {
+        # Default arguments - feel free to override!
+        $args = "--binning=2 --int-boost=10";
+        printf("Using default arguments for hdfsee: %s\n", $args);
+}
+
 open(FH, $ARGV[0]);
 open(TMP, "> list.tmp");
 
@@ -38,7 +47,7 @@ while ( $line = <FH> ) {
 
 		printf(STDERR "Viewing %s\n", $filename);
 		system("hdfsee ".$filename.
-		       " --peak-overlay=list.tmp --binning=2 --int-boost=10");
+		       " --peak-overlay=list.tmp ".$args);
 		if ( $? != 0 ) { exit; }
 		unlink("list.tmp");
 		open(TMP, "> list.tmp");
diff --git a/scripts/check-peak-detection b/scripts/check-peak-detection
index e55bfdf8..7d9b6660 100755
--- a/scripts/check-peak-detection
+++ b/scripts/check-peak-detection
@@ -5,19 +5,23 @@ use File::Basename;
 
 my $only;
 my $file;
+my $start;
 
 # Horrible option processing
 if ( $ARGV[0] eq "--indexed" ) {
 	$only = "indexed";
 	$file = $ARGV[1];
+	$start = 2;
 } elsif ( $ARGV[0] eq "--not-indexed" ) {
 	$only = "notindexed";
 	$file = $ARGV[1];
+	$start = 2;
 } else {
 	$only = "";
 	$file = $ARGV[0];
+	$start = 1;
 }
-my $args = join(" ", splice(@ARGV, 2, scalar(@ARGV)-1));
+my $args = join(" ", splice(@ARGV, $start, scalar(@ARGV)-1));
 if ( !($args eq "") ) {
 	printf("Extra arguments for hdfsee: %s\n", $args);
 } else {