Implimentation of msr2dat in the MSR module.
This commit is contained in:
parent
aa8b0953d0
commit
d7ef7b2ebe
4
src/external/MuSRFitGUI/MSR.pm
vendored
4
src/external/MuSRFitGUI/MSR.pm
vendored
@ -987,7 +987,7 @@ sub CreateTheory {
|
|||||||
########################
|
########################
|
||||||
# ExtractBlks
|
# ExtractBlks
|
||||||
########################
|
########################
|
||||||
sub ExtractBlk {
|
sub ExtractBlks {
|
||||||
# This subroutine takes the MSR file as input and extracts the parameters
|
# This subroutine takes the MSR file as input and extracts the parameters
|
||||||
# with the corresponding values, errors etc...
|
# with the corresponding values, errors etc...
|
||||||
|
|
||||||
@ -1310,7 +1310,7 @@ sub ExportParams {
|
|||||||
# open (MSRF,q{<},"$FILENAME.msr" );
|
# open (MSRF,q{<},"$FILENAME.msr" );
|
||||||
# my @lines = <MSRF>;
|
# my @lines = <MSRF>;
|
||||||
# close(IFILE);
|
# close(IFILE);
|
||||||
# my $FPBlock_ref=MSR::ExtractBlk(@lines);
|
# my $FPBlock_ref=MSR::ExtractBlks(@lines);
|
||||||
# my @FPBloc = @$FPBlock_ref;
|
# my @FPBloc = @$FPBlock_ref;
|
||||||
|
|
||||||
# Then loop over expected parameters and extract their values and error bar
|
# Then loop over expected parameters and extract their values and error bar
|
||||||
|
4
src/external/MuSRFitGUI/MuSRFit.pl
vendored
4
src/external/MuSRFitGUI/MuSRFit.pl
vendored
@ -1,6 +1,6 @@
|
|||||||
# Form implementation generated from reading ui file 'MuSRFit.ui'
|
# 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)
|
# by: The PerlQt User Interface Compiler (puic)
|
||||||
#
|
#
|
||||||
# WARNING! All changes made in this file will be lost!
|
# WARNING! All changes made in this file will be lost!
|
||||||
@ -3419,7 +3419,7 @@ sub UpdateMSRFileInitTable
|
|||||||
textMSROutput->append("$line");
|
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 @FPBloc = @$FPBlock_ref;
|
||||||
|
|
||||||
my $PCount=0;
|
my $PCount=0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user