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

Updated to the last working version.

Browse Source
This commit is contained in:
salman
2018-08-23 17:35:57 +02:00
parent 5f6a4c674b
commit ae60581d5d
1 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,9 +88,9 @@ sub CreateMSRUni {
my @FitTypes = (); my @FitTypes = ();
foreach ($All{"FitType1"},$All{"FitType2"},$All{"FitType3"}) { foreach ($All{"FitType1"},$All{"FitType2"},$All{"FitType3"}) {
if ($_ ne "None") { if ($_ ne "None") {
@FitTypes=(@FitTypes,$_); @FitTypes=(@FitTypes,$_);
} }
} }
my @Hists = split( /,/, $All{"LRBF"} ); my @Hists = split( /,/, $All{"LRBF"} );
@ -672,12 +672,12 @@ sub CreateTheory {
"statExpKTLF", "Frq Aa", "statExpKTLF", "Frq Aa",
"dynExpKTLF", "Frq Aa Lam", "dynExpKTLF", "Frq Aa Lam",
"combiLGKT", "Del Sgm", "combiLGKT", "Del Sgm",
"spinGlass", "Lam gam q", "spinGlass", "Lam gam q",
"rdAnisoHf", "Frq Lam", "rdAnisoHf", "Frq Lam",
"TFieldCos", "Phi Frq", "TFieldCos", "Phi Frq",
"internFld", "Alp Phi Frq LamT LamL", "internFld", "Alp Phi Frq LamT LamL",
"Bessel", "Phi Frq", "Bessel", "Phi Frq",
"internBsl", "Alp Phi Frq LamT LamL", "internBsl", "Alp Phi Frq LamT LamL",
"abragam", "Sgm gam", "abragam", "Sgm gam",
"Meissner", "Phi Energy Field DeadLayer Lambda", "Meissner", "Phi Energy Field DeadLayer Lambda",
"skewedGss", "Phi Frq Sgmm Sgmp" "skewedGss", "Phi Frq Sgmm Sgmp"
@ -731,13 +731,13 @@ sub CreateTheory {
$T_Block = $T_Block . "\n" . "simplExpo " . $THEORY{'simplExpo'}; $T_Block = $T_Block . "\n" . "simplExpo " . $THEORY{'simplExpo'};
$Parameters = join( $SPACE, $Parameters, $THEORY{'simplExpo'} ); $Parameters = join( $SPACE, $Parameters, $THEORY{'simplExpo'} );
$T_Block = $T_Block . "\n" . "TFieldCos " . $THEORY{'TFieldCos'}; $T_Block = $T_Block . "\n" . "TFieldCos " . $THEORY{'TFieldCos'};
$Parameters = join( $SPACE, $Parameters, $THEORY{'TFieldCos'} ); $Parameters = join( $SPACE, $Parameters, $THEORY{'TFieldCos'} );
} }
# Oscillationg gaussian # Oscillationg gaussian
elsif ( $FitType eq "GaussianCos" ) { elsif ( $FitType eq "GaussianCos" ) {
$T_Block = $T_Block . "\n" . "simpleGss " . $THEORY{'simpleGss'}; $T_Block = $T_Block . "\n" . "simpleGss " . $THEORY{'simpleGss'};
$Parameters = join( $SPACE, $Parameters, $THEORY{'simpleGss'} ); $Parameters = join( $SPACE, $Parameters, $THEORY{'simpleGss'} );
$T_Block = $T_Block . "\n" . "TFieldCos " . $THEORY{'TFieldCos'}; $T_Block = $T_Block . "\n" . "TFieldCos " . $THEORY{'TFieldCos'};
$Parameters = join( $SPACE, $Parameters, $THEORY{'TFieldCos'} ); $Parameters = join( $SPACE, $Parameters, $THEORY{'TFieldCos'} );
} }
@ -747,18 +747,18 @@ sub CreateTheory {
$T_Block = $T_Block . "\n" . "generExpo " . $THEORY{'generExpo'}; $T_Block = $T_Block . "\n" . "generExpo " . $THEORY{'generExpo'};
$Parameters = join( $SPACE, $Parameters, $THEORY{'generExpo'} ); $Parameters = join( $SPACE, $Parameters, $THEORY{'generExpo'} );
$T_Block = $T_Block . "\n" . "TFieldCos " . $THEORY{'TFieldCos'}; $T_Block = $T_Block . "\n" . "TFieldCos " . $THEORY{'TFieldCos'};
$Parameters = join( $SPACE, $Parameters, $THEORY{'TFieldCos'} ); $Parameters = join( $SPACE, $Parameters, $THEORY{'TFieldCos'} );
} }
# Oscillationg Gaussian # Oscillationg Gaussian
elsif ( $FitType eq "GaussianCos" ) { elsif ( $FitType eq "GaussianCos" ) {
$T_Block = $T_Block . "\n" . "simpelGss " . $THEORY{'simpelGss'}; $T_Block = $T_Block . "\n" . "simpelGss " . $THEORY{'simpelGss'};
$Parameters = join( $SPACE, $Parameters, $THEORY{'simpleGss'} ); $Parameters = join( $SPACE, $Parameters, $THEORY{'simpleGss'} );
$T_Block = $T_Block . "\n" . "TFieldCos " . $THEORY{'TFieldCos'}; $T_Block = $T_Block . "\n" . "TFieldCos " . $THEORY{'TFieldCos'};
$Parameters = join( $SPACE, $Parameters, $THEORY{'TFieldCos'} ); $Parameters = join( $SPACE, $Parameters, $THEORY{'TFieldCos'} );
} }
# Static Lorentzian KT # Static Lorentzian KT
elsif ( $FitType eq "SLKT" ) { elsif ( $FitType eq "SLKT" ) {
$T_Block = $T_Block . "\n" . "statExpKT " . $THEORY{'statExpKT'}; $T_Block = $T_Block . "\n" . "statExpKT " . $THEORY{'statExpKT'};
$Parameters = join( $SPACE, $Parameters, $THEORY{'statExpKT'} ); $Parameters = join( $SPACE, $Parameters, $THEORY{'statExpKT'} );
@ -1049,7 +1049,7 @@ sub PrepParamTable {
my @FitTypes =(); my @FitTypes =();
foreach my $FitType ($All{"FitType1"}, $All{"FitType2"}, $All{"FitType3"}) { foreach my $FitType ($All{"FitType1"}, $All{"FitType2"}, $All{"FitType3"}) {
if ( $FitType ne "None" ) { push( @FitTypes, $FitType ); } if ( $FitType ne "None" ) { push( @FitTypes, $FitType ); }
} }
# Get theory block to determine the size of the table # Get theory block to determine the size of the table
my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateTheory(@FitTypes); my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateTheory(@FitTypes);
@ -1241,7 +1241,7 @@ sub ExportParams {
my @FitTypes =(); my @FitTypes =();
foreach my $FitType ($All{"FitType1"}, $All{"FitType2"}, $All{"FitType3"}) { foreach my $FitType ($All{"FitType1"}, $All{"FitType2"}, $All{"FitType3"}) {
if ( $FitType ne "None" ) { push( @FitTypes, $FitType ); } if ( $FitType ne "None" ) { push( @FitTypes, $FitType ); }
} }
# Get theory block to determine the size of the table # Get theory block to determine the size of the table
my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateTheory(@FitTypes); my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateTheory(@FitTypes);