X-Git-Url: https://git.donarmstrong.com/?p=rsem.git;a=blobdiff_plain;f=rsem-calculate-expression;h=edb6fddf5458d3d80da38dc9996d586e902a8b9d;hp=4fbb4a59beac6a449a90e4dc6335d7a9633f6dcc;hb=bbf0a850706b5af654927579105165a5dcb5c4f1;hpb=52f1bd6f44f9b2630b839f192fb9ece18581983b

diff --git a/rsem-calculate-expression b/rsem-calculate-expression
index 4fbb4a5..edb6fdd 100755
--- a/rsem-calculate-expression
+++ b/rsem-calculate-expression
@@ -2,7 +2,8 @@
 
 use Getopt::Long;
 use Pod::Usage;
-use File::Basename;
+use FindBin;
+use lib $FindBin::Bin;
 use strict;
 
 use rsem_perl_utils qw(runCommand collectResults showVersionInfo);
@@ -87,9 +88,9 @@ GetOptions("keep-intermediate-files" => \$keep_intermediate_files,
 	   "bowtie-e=i" => \$E,
 	   "bowtie-m=i" => \$maxHits,
 	   "bowtie-chunkmbs=i" => \$chunkMbs,
-	   "phred33-quals" => \$phred33,
-	   "phred64-quals" => \$phred64, #solexa1.3-quals" => \$phred64,
-	   "solexa-quals" => \$solexa,
+	   "bowtie-phred33-quals" => \$phred33,
+	   "bowtie-phred64-quals" => \$phred64, #solexa1.3-quals" => \$phred64,
+	   "bowtie-solexa-quals" => \$solexa,
 	   "forward-prob=f" => \$probF,
 	   "fragment-length-min=i" => \$minL,
 	   "fragment-length-max=i" => \$maxL,
@@ -109,7 +110,7 @@ GetOptions("keep-intermediate-files" => \$keep_intermediate_files,
 	   "q|quiet" => \$quiet,
 	   "h|help" => \$help) or pod2usage(-exitval => 2, -verbose => 2);
 
-my ($fn, $dir, $suf) = fileparse($0);
+my $dir = "$FindBin::Bin/";
 
 pod2usage(-verbose => 2) if ($help == 1);
 &showVersionInfo($dir) if ($version == 1);
@@ -463,17 +464,17 @@ The path to the bowtie executables. (Default: the path to the bowtie executables
 
 (Bowtie parameter) memory allocated for best first alignment calculation (Default: 0 - use bowtie's default)
 
-=item B<--phred33-quals>
+=item B<--bowtie-phred33-quals>
 
-Input quality scores are encoded as Phred+33. (Default: on)
+(Bowtie parameter) Input quality scores are encoded as Phred+33. (Default: on)
 
-=item B<--phred64-quals>
+=item B<--bowtie-phred64-quals>
 
-Input quality scores are encoded as Phred+64 (default for GA Pipeline ver. >= 1.3). (Default: off)
+(Bowtie parameter) Input quality scores are encoded as Phred+64 (default for GA Pipeline ver. >= 1.3). (Default: off)
 
-=item B<--solexa-quals>
+=item B<--bowtie-solexa-quals>
 
-Input quality scores are solexa encoded (from GA Pipeline ver. < 1.3). (Default: off)
+(Bowtie parameter) Input quality scores are solexa encoded (from GA Pipeline ver. < 1.3). (Default: off)
 
 =item B<--forward-prob> <double>