LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

RRF added into GUI

Browse Source
This commit is contained in:
salman 2010-03-25 14:46:44 +00:00
parent b2d312eea3
commit c40244353c
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/external/MuSRFitGUI/MSR.pm vendored
View File

@ -47,6 +47,8 @@ my $erradd = "d";
my $minadd = "_min"; my $minadd = "_min";
my $maxadd = "_max"; my $maxadd = "_max";
########################################################################## ##########################################################################
# CreateMSR # CreateMSR
# #
@ -381,15 +383,7 @@ SAVE
# } # }
} }
$RRFBlock=""; my $RRFBlock=MSR::CreateRRFBlock(\%All);
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";
}
$PLOT_Block = $PLOT_Block =
"############################################################### "###############################################################
PLOT $PLT PLOT $PLT
@ -748,15 +742,7 @@ SAVE
# } # }
} }
$RRFBlock=""; my $RRFBlock=MSR::CreateRRFBlock(\%All);
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";
}
$PLOT_Block = $PLOT_Block =
"############################################################### "###############################################################
PLOT $PLT PLOT $PLT
@ -1644,6 +1630,28 @@ sub RUNFileNameMan {
return $RUN_Line; 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 # ExtractInfoLEM
######################## ########################
@ -1728,4 +1736,6 @@ sub ExtractInfoBulk {
} }
1; 1;

2
src/external/MuSRFitGUI/MuSRFit.pl vendored
View File

@ -1,6 +1,6 @@
# Form implementation generated from reading ui file 'MuSRFit.ui' # 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) # 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!