From d7ef7b2ebe11f303f5ddadf956d36c835e6e1948 Mon Sep 17 00:00:00 2001 From: Zaher Salman Date: Thu, 8 Oct 2009 15:42:39 +0000 Subject: [PATCH] Implimentation of msr2dat in the MSR module. --- src/external/MuSRFitGUI/MSR.pm | 4 ++-- src/external/MuSRFitGUI/MuSRFit.pl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/external/MuSRFitGUI/MSR.pm b/src/external/MuSRFitGUI/MSR.pm index 2904f237..0ccb9f31 100755 --- a/src/external/MuSRFitGUI/MSR.pm +++ b/src/external/MuSRFitGUI/MSR.pm @@ -987,7 +987,7 @@ sub CreateTheory { ######################## # ExtractBlks ######################## -sub ExtractBlk { +sub ExtractBlks { # This subroutine takes the MSR file as input and extracts the parameters # with the corresponding values, errors etc... @@ -1310,7 +1310,7 @@ sub ExportParams { # open (MSRF,q{<},"$FILENAME.msr" ); # my @lines = ; # close(IFILE); -# my $FPBlock_ref=MSR::ExtractBlk(@lines); +# my $FPBlock_ref=MSR::ExtractBlks(@lines); # my @FPBloc = @$FPBlock_ref; # Then loop over expected parameters and extract their values and error bar diff --git a/src/external/MuSRFitGUI/MuSRFit.pl b/src/external/MuSRFitGUI/MuSRFit.pl index 63dab304..aeff2de5 100755 --- a/src/external/MuSRFitGUI/MuSRFit.pl +++ b/src/external/MuSRFitGUI/MuSRFit.pl @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file 'MuSRFit.ui' # -# Created: Thu Oct 8 17:22:34 2009 +# Created: Thu Oct 8 17:42:16 2009 # by: The PerlQt User Interface Compiler (puic) # # WARNING! All changes made in this file will be lost! @@ -3419,7 +3419,7 @@ sub UpdateMSRFileInitTable textMSROutput->append("$line"); } - (my $TBlock_ref, my $FPBlock_ref)=MSR::ExtractParamBlk(@lines); + (my $TBlock_ref, my $FPBlock_ref)=MSR::ExtractBlks(@lines); my @FPBloc = @$FPBlock_ref; my $PCount=0;