diff --git a/src/external/MuSRFitGUI/MSR.pm b/src/external/MuSRFitGUI/MSR.pm index 04f98583..389e16f2 100755 --- a/src/external/MuSRFitGUI/MSR.pm +++ b/src/external/MuSRFitGUI/MSR.pm @@ -47,6 +47,8 @@ my $erradd = "d"; my $minadd = "_min"; my $maxadd = "_max"; + + ########################################################################## # CreateMSR # @@ -381,15 +383,7 @@ SAVE # } } - $RRFBlock=""; - if ($All{"RRFFrq"}!= 0) { - if ($All{"RRFPhase"} eq $EMPTY) {$All{"RRFPhase"}=0;} - if ($All{"RRFPack"} eq $EMPTY) {$All{"RRFPack"}=1;} - $RRFBlock="rrf_freq ".$All{"RRFFrq"}." ".$All{"RRFUnits"}."\n"; - $RRFBlock=$RRFBlock."rrf_phase ".$All{"RRFPhase"}."\n"; - $RRFBlock=$RRFBlock."rrf_packing ".$All{"RRFPack"}."\n"; - } - + my $RRFBlock=MSR::CreateRRFBlock(\%All); $PLOT_Block = "############################################################### PLOT $PLT @@ -748,15 +742,7 @@ SAVE # } } - $RRFBlock=""; - if ($All{"RRFFrq"}!= 0) { - if ($All{"RRFPhase"} eq $EMPTY) {$All{"RRFPhase"}=0;} - if ($All{"RRFPack"} eq $EMPTY) {$All{"RRFPack"}=1;} - $RRFBlock="rrf_freq ".$All{"RRFFrq"}." ".$All{"RRFUnits"}."\n"; - $RRFBlock=$RRFBlock."rrf_phase ".$All{"RRFPhase"}."\n"; - $RRFBlock=$RRFBlock."rrf_packing ".$All{"RRFPack"}."\n"; - } - + my $RRFBlock=MSR::CreateRRFBlock(\%All); $PLOT_Block = "############################################################### PLOT $PLT @@ -1644,6 +1630,28 @@ sub RUNFileNameMan { return $RUN_Line; } +######################## +# ExtractInfoLEM +######################## +# This creates the RRF related lines, these are the same always +sub CreateRRFBlock { + + my %All = %{$_[0]}; + + $RRFBlock=""; + if ($All{"RRFFrq"}!= 0) { + if ($All{"RRFPhase"} eq $EMPTY) {$All{"RRFPhase"}=0;} + if ($All{"RRFPack"} eq $EMPTY) {$All{"RRFPack"}=1;} + $RRFBlock="rrf_freq ".$All{"RRFFrq"}." ".$All{"RRFUnits"}."\n"; + $RRFBlock=$RRFBlock."rrf_phase ".$All{"RRFPhase"}."\n"; + $RRFBlock=$RRFBlock."rrf_packing ".$All{"RRFPack"}."\n"; + } + return $RRFBlock; +} + + + + ######################## # ExtractInfoLEM ######################## @@ -1728,4 +1736,6 @@ sub ExtractInfoBulk { } + + 1; diff --git a/src/external/MuSRFitGUI/MuSRFit.pl b/src/external/MuSRFitGUI/MuSRFit.pl index 72df400e..17e85fa7 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 Mar 25 11:36:15 2010 +# Created: Thu Mar 25 15:00:34 2010 # by: The PerlQt User Interface Compiler (puic) # # WARNING! All changes made in this file will be lost!