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

Fix some bugs in single hist fits.

Browse Source
This commit is contained in:
salman 2010-06-08 16:39:07 +00:00
parent b7bd0e5a2c
commit c385618291
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,6 +93,14 @@ sub CreateMSR {
} }
my @Hists = split( /,/, $All{"LRBF"} ); my @Hists = split( /,/, $All{"LRBF"} );
# TODO
# Check the number of histograms
# should be 2 or 4 histograms
# should be checked in GUI
# for 2 simple asymmetry fit
# for 4 two run blocks with different geometric parameters:
# Alpha, N0, NBg, Phi, Asy
my @TiVals = split( /,/, $All{"Tis"} ); my @TiVals = split( /,/, $All{"Tis"} );
my @TfVals = split( /,/, $All{"Tfs"} ); my @TfVals = split( /,/, $All{"Tfs"} );
my @BINVals = split( /,/, $All{"BINS"} ); my @BINVals = split( /,/, $All{"BINS"} );
@ -1282,6 +1290,8 @@ sub PrepParamTable {
# Change state/label of parameters # Change state/label of parameters
foreach my $Param (@Params) { foreach my $Param (@Params) {
my $Param_ORG = $Param; my $Param_ORG = $Param;
# If multiple histograms (sum or difference) take the first histogram only
($Hist,$tmp) = split(/ /,$Hist);
$Param=$Param.$Hist; $Param=$Param.$Hist;
if ( $#FitTypes != 0 && ( $Param_ORG ne "N0" && $Param_ORG ne "NBg" ) ){ if ( $#FitTypes != 0 && ( $Param_ORG ne "N0" && $Param_ORG ne "NBg" ) ){
$Param = join( $EMPTY, $Param, "_", "$Component" ); $Param = join( $EMPTY, $Param, "_", "$Component" );

2
src/external/MuSRFitGUI/musrfit.cgi vendored
View File

@ -248,7 +248,7 @@ elsif ( $Step == 2 ) {
elsif ( $Step <= 6 && $Step >= 3 ) { elsif ( $Step <= 6 && $Step >= 3 ) {
# Then create appropriate file # Then create appropriate file
if ($All{"FitAsyType"} eq "SingleHist") { if ($FitAsyType eq "SingleHist") {
($Full_T_Block,$Paramcomp_ref)= MSR::CreateMSRSingleHist(\%AllParameters); ($Full_T_Block,$Paramcomp_ref)= MSR::CreateMSRSingleHist(\%AllParameters);
} else { } else {
($Full_T_Block,$Paramcomp_ref)= MSR::CreateMSR(\%AllParameters); ($Full_T_Block,$Paramcomp_ref)= MSR::CreateMSR(\%AllParameters);