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

More work on FUNCTIONS block.

Browse Source
This commit is contained in:
salman 2010-06-07 22:07:38 +00:00
parent 1240ab8b51
commit 5d4683ff1f
2 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/external/MuSRFitGUI/devel/MuSRFit.ui vendored
View File

@ -22,8 +22,8 @@
</property>
<property name="minimumSize">
<size>
<width>21</width>
<height>264</height>
<width>23</width>
<height>270</height>
</size>
</property>
<property name="caption">
@ -70,9 +70,6 @@
<height>32767</height>
</size>
</property>
<property name="mouseTracking">
<bool>false</bool>
</property>
<widget class="QWidget">
<property name="name">
<cstring>RUNSPage</cstring>
@ -5459,6 +5456,7 @@
<slot>fileBrowse()</slot>
<slot>AppendToFunctions()</slot>
<slot>ResetFunctions()</slot>
<slot>InitializeFunction()</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>

50
src/external/MuSRFitGUI/devel/MuSRFit.ui.h vendored
View File

@ -339,7 +339,12 @@ void MuSRFitform::CreateAllInput()
# Functions block
$All{"FunctionsBlock"}=FunctionsBlock->text;
# and the associated theory block
$All{"Func_T_Block"}=TheoryBlock->text;
if ($All{"Func_T_Block"} eq "") {
InitializeFunction();
}
# Read initial values of paramets from tabel
my $erradd = "d";
my $minadd = "_min";
@ -417,8 +422,6 @@ void MuSRFitform::CreateAllInput()
$All{"FILENAME"}="TMP";
}
# Return Hash with all important values
return %All;
}
@ -600,7 +603,7 @@ void MuSRFitform::ActivateShComp()
my $ParamChkBx="ShParam_".$Component."_".$i;
my $ChkBx = child($ParamChkBx);
# my $CParam = $Params[$i-1]."_".$Component;
if ($Params[$i-1] ne "" && $Params[$i-1] ne "Alpha" && $Params[$i-1] ne "N0" && $Params[$i-1] ne "NBg") {
if ($Params[$i-1] ne "" ) {
$ChkBx->setHidden(0);
$ChkBx->setEnabled(1);
$ChkBx ->setText($Params[$i-1]);
@ -870,3 +873,42 @@ void MuSRFitform::ResetFunctions()
FunctionsBlock->setText("");
}
void MuSRFitform::InitializeFunction()
{
my %All=CreateAllInput();
my @RUNS = split( /,/, $All{"RunNumbers"} );
my @FitTypes =();
foreach my $FitType ($All{"FitType1"}, $All{"FitType2"}, $All{"FitType3"}) {
if ( $FitType ne "None" ) {
push( @FitTypes, $FitType );
}
}
# Get number of parameters to determine the size of the table
my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateTheory(@FitTypes);
my @Paramcomp = @$Paramcomp_ref;
my $Full_T_Block= $All{"Full_T_Block"};
my $Component=1;
foreach my $FitType (@FitTypes) {
my $Parameters=$Paramcomp[$Component-1];
my @Params = split( /\s+/, $Parameters );
# Add list to the constraints drop down menu
for (my $i=1; $i<=9;$i++) {
my $CParam = $Params[$i-1]."_".$Component;
if ($Params[$i-1] ne "" ) {
CParamsCombo->insertItem($CParam,-1);
$Full_T_Block=~ s/\b$Params[$i-1]\b/$CParam/;
}
}
$Component++;
}
# Set theory block in Constraints
TheoryBlock->setText($Full_T_Block);
# Then clear the text
ConstraintLine->setText("");
FunctionsBlock->setText("");
}