diff --git a/src/external/MuSRFitGUI/MSR.pm b/src/external/MuSRFitGUI/MSR.pm index ff92e18b..09d8ca6d 100755 --- a/src/external/MuSRFitGUI/MSR.pm +++ b/src/external/MuSRFitGUI/MSR.pm @@ -335,9 +335,9 @@ sub CreateMSR { # Get parameter block from MSR::PrepParamTable(\%All); my $FitParaBlk = " -################################################################### +############################################################### FITPARAMETER -################################################################### +############################################################### # No Name Value Err Min Max "; my %PTable=MSR::PrepParamTable(\%All); my $NParam=scalar keys( %PTable ); @@ -355,18 +355,18 @@ FITPARAMETER $Full_T_Block = " -################################################################### +############################################################### THEORY -################################################################### +############################################################### $Full_T_Block "; $RUN_Block = - "################################################################### + "############################################################### $RUN_Block"; $COMMANDS_Block = - "################################################################### + "############################################################### COMMANDS FITMINTYPE SAVE @@ -391,7 +391,7 @@ SAVE } $PLOT_Block = - "################################################################### + "############################################################### PLOT $PLT runs $RUNS_Line $PRANGE_Line @@ -403,7 +403,7 @@ $logxy"; $FOURIER_Block= - "################################################################### + "############################################################### FOURIER units FUNITS # units either 'Gauss', 'MHz', or 'Mc/s' fourier_power 12 @@ -541,7 +541,6 @@ sub CreateMSRSingleHist { # Otherwise check input if it was marked as shared else { $Shared = $All{"Sh_$Param"}; - print "Shared=$Shared\n"; } # N0 and NBg Lines @@ -576,9 +575,7 @@ sub CreateMSRSingleHist { #################################################################################################### # Start preparing the parameters block - print "Param=$Param_ORG is Shared=$Shared\n"; if ($Shared) { - # Parameter is shared enough to keep order from first run if ( $iRun == 1 ) { $Full_T_Block =~ s/$Param_ORG/$j/; @@ -586,7 +583,6 @@ sub CreateMSRSingleHist { ++$j; } } else { - # Parameter is not shared, use map unless it is a single RUN fit # Skip adding to map line in these cases if ( $Param ne "N0" && $Param ne "NBg" && ($#RUNS != 0 || $#Hist != 0)) { @@ -732,9 +728,9 @@ sub CreateMSRSingleHist { # Get parameter block from MSR::PrepParamTable(\%All); my $FitParaBlk = " -################################################################### +############################################################### FITPARAMETER -################################################################### +############################################################### # No Name Value Err Min Max "; my %PTable=MSR::PrepParamTable(\%All); my $NParam=scalar keys( %PTable ); @@ -751,18 +747,18 @@ FITPARAMETER } $Full_T_Block = " -################################################################### +############################################################### THEORY -################################################################### +############################################################### $Full_T_Block "; $RUN_Block = - "################################################################### + "############################################################### $RUN_Block"; $COMMANDS_Block = - "################################################################### + "############################################################### COMMANDS FITMINTYPE SAVE @@ -787,7 +783,7 @@ SAVE } $PLOT_Block = - "################################################################### + "############################################################### PLOT $PLT runs $RUNS_Line $PRANGE_Line @@ -799,7 +795,7 @@ $logxy"; $FOURIER_Block= - "################################################################### + "############################################################### FOURIER units FUNITS # units either 'Gauss', 'MHz', or 'Mc/s' fourier_power 12 @@ -1191,6 +1187,7 @@ sub PrepParamTable { my %All = %{$_[0]}; my @RUNS = split( /,/, $All{"RunNumbers"} ); + my @Hists = split( /,/, $All{"LRBF"} ); my @FitTypes =(); foreach my $FitType ($All{"FitType1"}, $All{"FitType2"}, $All{"FitType3"}) { @@ -1208,61 +1205,110 @@ sub PrepParamTable { my $error = 0; my $minvalue = 0; my $maxvalue = 0; + my $Component=1; foreach my $RUN (@RUNS) { $iRun++; - my $Component=1; - foreach my $FitType (@FitTypes) { - my $Parameters=$Paramcomp[$Component-1]; - my @Params = split( /\s+/, $Parameters ); - - if ( $Component == 1 && $All{"FitAsyType"} eq "Asymmetry" ) { - unshift( @Params, "Alpha" ); - } - elsif ( $Component == 1 && $All{"FitAsyType"} eq "SingleHist" ) { - unshift( @Params, ( "N0", "NBg" ) ); - } - - -# This is the counter for parameters of this component - my $NP=1; - $Shared = 0; -# Change state/label of parameters - foreach my $Param (@Params) { - my $Param_ORG = $Param; - if ( $#FitTypes != 0 && ( $Param ne "Alpha" && $Param ne "N0" && $Param ne "NBg" ) ){ - $Param = join( "", $Param, "_", "$Component" ); + $Component=1; + if ($All{"FitAsyType"} eq "Asymmetry") { + foreach my $FitType (@FitTypes) { + my $Parameters=$Paramcomp[$Component-1]; + my @Params = split( /\s+/, $Parameters ); + if ( $Component == 1 ) { + unshift( @Params, "Alpha" ); } - $Shared = $All{"Sh_$Param"}; +# This is the counter for parameters of this component + my $NP=1; + $Shared = 0; +# Change state/label of parameters + foreach my $Param (@Params) { + my $Param_ORG = $Param; + if ( $#FitTypes != 0 && ( $Param ne "Alpha" ) ){ + $Param = join( "", $Param, "_", "$Component" ); + } + + $Shared = $All{"Sh_$Param"}; # It there are multiple runs index the parameters accordingly - $Param=$Param."_".$iRun; + $Param=$Param."_".$iRun; # Check if this parameter has been initialized befor. If not take from defaults -# print "$Param=".$All{"$Param"}."\n"; - $value = $All{"$Param"}; - if ( $value ne "" ) { - $error = $All{"$erradd$Param"}; - $minvalue = $All{"$Param$minadd"}; - $maxvalue = $All{"$Param$maxadd"}; - } else { + $value = $All{"$Param"}; + if ( $value ne "" ) { + $error = $All{"$erradd$Param"}; + $minvalue = $All{"$Param$minadd"}; + $maxvalue = $All{"$Param$maxadd"}; + } else { # I need this although it is already in the MSR.pm module, just for this table # We can remove it from the MSR module later... # Or keep in the MSR as function ?? - $value = $Defaults{$Param_ORG}; - $error = $Defaults{ join( "", $erradd, $Param_ORG ) }; - $minvalue = $Defaults{ join("", $Param_ORG, $minadd ) }; - $maxvalue = $Defaults{ join("", $Param_ORG, $maxadd ) }; + $value = $Defaults{$Param_ORG}; + $error = $Defaults{ join( "", $erradd, $Param_ORG ) }; + $minvalue = $Defaults{ join("", $Param_ORG, $minadd ) }; + $maxvalue = $Defaults{ join("", $Param_ORG, $maxadd ) }; + } + $values=join(",",$Param,$value,$error,$minvalue,$maxvalue); + $ParTable{$PCount}=$values; + + if ( $Shared!=1 || $iRun == 1 ) { + $PCount++; + } + $NP++; + } + $Component++; + } + } + elsif ($All{"FitAsyType"} eq "SingleHist") { +# For a single histogram fit we basically need to repeat this for each hist + foreach my $Hist (@Hists) { + $Component=1; + foreach my $FitType (@FitTypes) { + my $Parameters=$Paramcomp[$Component-1]; + my @Params = split( /\s+/, $Parameters ); + if ( $Component == 1 ) { + unshift( @Params, ( "N0", "NBg" ) ); + } + +# This is the counter for parameters of this component + my $NP=1; + $Shared = 0; +# Change state/label of parameters + foreach my $Param (@Params) { + my $Param_ORG = $Param; + $Param=$Param.$Hist; + if ( $#FitTypes != 0 && ( $Param_ORG ne "N0" && $Param_ORG ne "NBg" ) ){ + $Param = join( "", $Param, "_", "$Component" ); + } + + $Shared = $All{"Sh_$Param"}; +# It there are multiple runs index the parameters accordingly + $Param=$Param."_".$iRun; +# Check if this parameter has been initialized befor. If not take from defaults + $value = $All{"$Param"}; + if ( $value ne "" ) { + $error = $All{"$erradd$Param"}; + $minvalue = $All{"$Param$minadd"}; + $maxvalue = $All{"$Param$maxadd"}; + } else { +# I need this although it is already in the MSR.pm module, just for this table +# We can remove it from the MSR module later... +# Or keep in the MSR as function ?? + $value = $Defaults{$Param_ORG}; + $error = $Defaults{ join( "", $erradd, $Param_ORG ) }; + $minvalue = $Defaults{ join("", $Param_ORG, $minadd ) }; + $maxvalue = $Defaults{ join("", $Param_ORG, $maxadd ) }; + } + $values=join(",",$Param,$value,$error,$minvalue,$maxvalue); + $ParTable{$PCount}=$values; + if ( $Shared!=1 || $iRun == 1 ) { + $PCount++; + } + $NP++; + } + $Component++; } - $values=join(",",$Param,$value,$error,$minvalue,$maxvalue); - $ParTable{$PCount}=$values; - - if ( $Shared!=1 || $iRun == 1 ) { - $PCount++; - } - $NP++; } - $Component++; } + } return %ParTable; } diff --git a/src/external/MuSRFitGUI/MuSRFit.pl b/src/external/MuSRFitGUI/MuSRFit.pl index 541e7f2b..b7e1e292 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: Tue Sep 1 11:46:17 2009 +# Created: Tue Sep 1 13:11:16 2009 # by: The PerlQt User Interface Compiler (puic) # # WARNING! All changes made in this file will be lost! @@ -109,7 +109,6 @@ use Qt::attributes qw( FittingPage textMSROutput TabPage - FitTextOutput Minimization MINIMIZE MIGRAD @@ -119,17 +118,26 @@ use Qt::attributes qw( MINOS go PlotMSR + FitTextOutput TabPage_2 - FPlot - FApodization - FApodizationLabel - FUnits - FPlotLabel FUnitsLabel + FApodizationLabel + FPlotLabel + FUnits + FApodization + FPlot textLabel1 + textLabel1_3 + textLabel1_3_5 lineEdit28 + textLabel1_3_2 + textLabel1_3_6 textLabel1_2 + textLabel1_3_3 + textLabel1_3_7 lineEdit28_2 + textLabel1_3_4 + textLabel1_3_8 TabPage_3 groupHist0 textLabel2 @@ -559,14 +567,13 @@ sub NEW setIcon($image0 ); setCentralWidget(Qt::Widget(this, "qt_central_widget")); - my $MuSRFitformLayout = Qt::GridLayout(centralWidget(), 1, 1, 11, 6, '$MuSRFitformLayout'); textLabel2_2 = Qt::Label(centralWidget(), "textLabel2_2"); - - $MuSRFitformLayout->addWidget(textLabel2_2, 0, 0); + textLabel2_2->setGeometry( Qt::Rect(13, 78, 55, 19) ); musrfit_tabs = Qt::TabWidget(centralWidget(), "musrfit_tabs"); musrfit_tabs->setEnabled( 1 ); + musrfit_tabs->setGeometry( Qt::Rect(11, 11, 560, 402) ); musrfit_tabs->setSizePolicy( Qt::SizePolicy(7, 7, 1, 1, musrfit_tabs->sizePolicy()->hasHeightForWidth()) ); musrfit_tabs->setMinimumSize( Qt::Size(560, 400) ); musrfit_tabs->setMaximumSize( Qt::Size(95, 32767) ); @@ -706,14 +713,14 @@ sub NEW SharingPahe = Qt::Widget(musrfit_tabs, "SharingPahe"); buttonGroupSharing = Qt::ButtonGroup(SharingPahe, "buttonGroupSharing"); - buttonGroupSharing->setGeometry( Qt::Rect(0, 0, 550, 400) ); + buttonGroupSharing->setGeometry( Qt::Rect(5, 5, 545, 355) ); buttonGroupSharing->setSizePolicy( Qt::SizePolicy(7, 7, 0, 0, buttonGroupSharing->sizePolicy()->hasHeightForWidth()) ); buttonGroupSharing->setAlignment( int(&Qt::ButtonGroup::AlignLeft) ); buttonGroupSharing->setCheckable( 0 ); SharingComp1 = Qt::ButtonGroup(buttonGroupSharing, "SharingComp1"); SharingComp1->setEnabled( 0 ); - SharingComp1->setGeometry( Qt::Rect(31, 25, 162, 335) ); + SharingComp1->setGeometry( Qt::Rect(31, 20, 162, 330) ); SharingComp1->setSizePolicy( Qt::SizePolicy(5, 3, 0, 0, SharingComp1->sizePolicy()->hasHeightForWidth()) ); SharingComp1->setAlignment( int(&Qt::ButtonGroup::AlignLeft) ); @@ -769,7 +776,7 @@ sub NEW SharingComp2 = Qt::ButtonGroup(buttonGroupSharing, "SharingComp2"); SharingComp2->setEnabled( 0 ); - SharingComp2->setGeometry( Qt::Rect(199, 25, 162, 335) ); + SharingComp2->setGeometry( Qt::Rect(199, 20, 162, 330) ); SharingComp2->setSizePolicy( Qt::SizePolicy(5, 3, 0, 0, SharingComp2->sizePolicy()->hasHeightForWidth()) ); Comp2ShLabel = Qt::Label(SharingComp2, "Comp2ShLabel"); @@ -821,7 +828,7 @@ sub NEW SharingComp3 = Qt::ButtonGroup(buttonGroupSharing, "SharingComp3"); SharingComp3->setEnabled( 0 ); - SharingComp3->setGeometry( Qt::Rect(367, 25, 162, 335) ); + SharingComp3->setGeometry( Qt::Rect(367, 20, 162, 330) ); SharingComp3->setSizePolicy( Qt::SizePolicy(5, 3, 0, 0, SharingComp3->sizePolicy()->hasHeightForWidth()) ); SharingComp3->setAlignment( int(&Qt::ButtonGroup::AlignJustify | &Qt::ButtonGroup::AlignVCenter) ); @@ -911,10 +918,6 @@ sub NEW TabPage = Qt::Widget(musrfit_tabs, "TabPage"); - FitTextOutput = Qt::TextEdit(TabPage, "FitTextOutput"); - FitTextOutput->setGeometry( Qt::Rect(5, 135, 545, 230) ); - FitTextOutput->setOverwriteMode( 1 ); - Minimization = Qt::ButtonGroup(TabPage, "Minimization"); Minimization->setGeometry( Qt::Rect(6, 1, 200, 125) ); Minimization->setExclusive( 1 ); @@ -964,182 +967,220 @@ sub NEW PlotMSR->setAutoDefault( 0 ); PlotMSR->setDefault( 1 ); $layout28->addWidget(PlotMSR); + + FitTextOutput = Qt::TextEdit(TabPage, "FitTextOutput"); + FitTextOutput->setGeometry( Qt::Rect(5, 135, 545, 230) ); + FitTextOutput->setOverwriteMode( 1 ); musrfit_tabs->insertTab( TabPage, "" ); TabPage_2 = Qt::Widget(musrfit_tabs, "TabPage_2"); my $LayoutWidget_6 = Qt::Widget(TabPage_2, '$LayoutWidget_6'); - $LayoutWidget_6->setGeometry( Qt::Rect(8, 18, 225, 105) ); - my $layout11 = Qt::GridLayout($LayoutWidget_6, 1, 1, 11, 6, '$layout11'); + $LayoutWidget_6->setGeometry( Qt::Rect(5, 5, 545, 94) ); + my $layout33 = Qt::HBoxLayout($LayoutWidget_6, 11, 6, '$layout33'); - FPlot = Qt::ComboBox(0, $LayoutWidget_6, "FPlot"); - FPlot->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FPlot->sizePolicy()->hasHeightForWidth()) ); + my $layout26 = Qt::VBoxLayout(undef, 0, 6, '$layout26'); - $layout11->addWidget(FPlot, 2, 1); - - FApodization = Qt::ComboBox(0, $LayoutWidget_6, "FApodization"); - FApodization->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FApodization->sizePolicy()->hasHeightForWidth()) ); - - $layout11->addWidget(FApodization, 1, 1); + FUnitsLabel = Qt::Label($LayoutWidget_6, "FUnitsLabel"); + $layout26->addWidget(FUnitsLabel); FApodizationLabel = Qt::Label($LayoutWidget_6, "FApodizationLabel"); + $layout26->addWidget(FApodizationLabel); - $layout11->addWidget(FApodizationLabel, 1, 0); + FPlotLabel = Qt::Label($LayoutWidget_6, "FPlotLabel"); + $layout26->addWidget(FPlotLabel); + $layout33->addLayout($layout26); + + my $layout27 = Qt::VBoxLayout(undef, 0, 6, '$layout27'); FUnits = Qt::ComboBox(0, $LayoutWidget_6, "FUnits"); FUnits->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FUnits->sizePolicy()->hasHeightForWidth()) ); + $layout27->addWidget(FUnits); - $layout11->addWidget(FUnits, 0, 1); + FApodization = Qt::ComboBox(0, $LayoutWidget_6, "FApodization"); + FApodization->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FApodization->sizePolicy()->hasHeightForWidth()) ); + $layout27->addWidget(FApodization); - FPlotLabel = Qt::Label($LayoutWidget_6, "FPlotLabel"); + FPlot = Qt::ComboBox(0, $LayoutWidget_6, "FPlot"); + FPlot->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FPlot->sizePolicy()->hasHeightForWidth()) ); + $layout27->addWidget(FPlot); + $layout33->addLayout($layout27); - $layout11->addWidget(FPlotLabel, 2, 0); + my $layout28_2 = Qt::VBoxLayout(undef, 0, 6, '$layout28_2'); - FUnitsLabel = Qt::Label($LayoutWidget_6, "FUnitsLabel"); + textLabel1 = Qt::Label($LayoutWidget_6, "textLabel1"); + $layout28_2->addWidget(textLabel1); - $layout11->addWidget(FUnitsLabel, 0, 0); + textLabel1_3 = Qt::Label($LayoutWidget_6, "textLabel1_3"); + $layout28_2->addWidget(textLabel1_3); - my $LayoutWidget_7 = Qt::Widget(TabPage_2, '$LayoutWidget_7'); - $LayoutWidget_7->setGeometry( Qt::Rect(250, 20, 290, 40) ); - my $layout19_2 = Qt::HBoxLayout($LayoutWidget_7, 11, 6, '$layout19_2'); + textLabel1_3_5 = Qt::Label($LayoutWidget_6, "textLabel1_3_5"); + $layout28_2->addWidget(textLabel1_3_5); + $layout33->addLayout($layout28_2); - textLabel1 = Qt::Label($LayoutWidget_7, "textLabel1"); - $layout19_2->addWidget(textLabel1); + my $layout29 = Qt::VBoxLayout(undef, 0, 6, '$layout29'); - lineEdit28 = Qt::LineEdit($LayoutWidget_7, "lineEdit28"); - $layout19_2->addWidget(lineEdit28); + lineEdit28 = Qt::LineEdit($LayoutWidget_6, "lineEdit28"); + lineEdit28->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, lineEdit28->sizePolicy()->hasHeightForWidth()) ); + $layout29->addWidget(lineEdit28); - textLabel1_2 = Qt::Label($LayoutWidget_7, "textLabel1_2"); - $layout19_2->addWidget(textLabel1_2); + textLabel1_3_2 = Qt::Label($LayoutWidget_6, "textLabel1_3_2"); + $layout29->addWidget(textLabel1_3_2); - lineEdit28_2 = Qt::LineEdit($LayoutWidget_7, "lineEdit28_2"); - $layout19_2->addWidget(lineEdit28_2); + textLabel1_3_6 = Qt::Label($LayoutWidget_6, "textLabel1_3_6"); + $layout29->addWidget(textLabel1_3_6); + $layout33->addLayout($layout29); + + my $layout31 = Qt::VBoxLayout(undef, 0, 6, '$layout31'); + + textLabel1_2 = Qt::Label($LayoutWidget_6, "textLabel1_2"); + $layout31->addWidget(textLabel1_2); + + textLabel1_3_3 = Qt::Label($LayoutWidget_6, "textLabel1_3_3"); + $layout31->addWidget(textLabel1_3_3); + + textLabel1_3_7 = Qt::Label($LayoutWidget_6, "textLabel1_3_7"); + $layout31->addWidget(textLabel1_3_7); + $layout33->addLayout($layout31); + + my $layout32 = Qt::VBoxLayout(undef, 0, 6, '$layout32'); + + lineEdit28_2 = Qt::LineEdit($LayoutWidget_6, "lineEdit28_2"); + lineEdit28_2->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, lineEdit28_2->sizePolicy()->hasHeightForWidth()) ); + $layout32->addWidget(lineEdit28_2); + + textLabel1_3_4 = Qt::Label($LayoutWidget_6, "textLabel1_3_4"); + $layout32->addWidget(textLabel1_3_4); + + textLabel1_3_8 = Qt::Label($LayoutWidget_6, "textLabel1_3_8"); + $layout32->addWidget(textLabel1_3_8); + $layout33->addLayout($layout32); musrfit_tabs->insertTab( TabPage_2, "" ); TabPage_3 = Qt::Widget(musrfit_tabs, "TabPage_3"); - my $LayoutWidget_8 = Qt::Widget(TabPage_3, '$LayoutWidget_8'); - $LayoutWidget_8->setGeometry( Qt::Rect(7, 5, 540, 180) ); - my $layout27 = Qt::HBoxLayout($LayoutWidget_8, 0, 6, '$layout27'); + my $LayoutWidget_7 = Qt::Widget(TabPage_3, '$LayoutWidget_7'); + $LayoutWidget_7->setGeometry( Qt::Rect(7, 5, 540, 180) ); + my $layout27_2 = Qt::HBoxLayout($LayoutWidget_7, 0, 6, '$layout27_2'); - groupHist0 = Qt::GroupBox($LayoutWidget_8, "groupHist0"); + groupHist0 = Qt::GroupBox($LayoutWidget_7, "groupHist0"); groupHist0->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, groupHist0->sizePolicy()->hasHeightForWidth()) ); groupHist0->setMinimumSize( Qt::Size(0, 0) ); - my $LayoutWidget_9 = Qt::Widget(groupHist0, '$LayoutWidget_9'); - $LayoutWidget_9->setGeometry( Qt::Rect(5, 18, 100, 150) ); - my $layout16_2 = Qt::VBoxLayout($LayoutWidget_9, 11, 6, '$layout16_2'); + my $LayoutWidget_8 = Qt::Widget(groupHist0, '$LayoutWidget_8'); + $LayoutWidget_8->setGeometry( Qt::Rect(5, 18, 100, 150) ); + my $layout16_2 = Qt::VBoxLayout($LayoutWidget_8, 11, 6, '$layout16_2'); - textLabel2 = Qt::Label($LayoutWidget_9, "textLabel2"); + textLabel2 = Qt::Label($LayoutWidget_8, "textLabel2"); $layout16_2->addWidget(textLabel2); - textLabel2_2_2_3 = Qt::Label($LayoutWidget_9, "textLabel2_2_2_3"); + textLabel2_2_2_3 = Qt::Label($LayoutWidget_8, "textLabel2_2_2_3"); $layout16_2->addWidget(textLabel2_2_2_3); - textLabel2_2_2 = Qt::Label($LayoutWidget_9, "textLabel2_2_2"); + textLabel2_2_2 = Qt::Label($LayoutWidget_8, "textLabel2_2_2"); $layout16_2->addWidget(textLabel2_2_2); - textLabel2_2_2_2 = Qt::Label($LayoutWidget_9, "textLabel2_2_2_2"); + textLabel2_2_2_2 = Qt::Label($LayoutWidget_8, "textLabel2_2_2_2"); $layout16_2->addWidget(textLabel2_2_2_2); - textLabel2_2_2_2_2 = Qt::Label($LayoutWidget_9, "textLabel2_2_2_2_2"); + textLabel2_2_2_2_2 = Qt::Label($LayoutWidget_8, "textLabel2_2_2_2_2"); $layout16_2->addWidget(textLabel2_2_2_2_2); - $layout27->addWidget(groupHist0); + $layout27_2->addWidget(groupHist0); - groupHist1 = Qt::GroupBox($LayoutWidget_8, "groupHist1"); + groupHist1 = Qt::GroupBox($LayoutWidget_7, "groupHist1"); groupHist1->setFrameShadow( &Qt::GroupBox::Plain() ); - my $LayoutWidget_10 = Qt::Widget(groupHist1, '$LayoutWidget_10'); - $LayoutWidget_10->setGeometry( Qt::Rect(8, 17, 75, 150) ); - my $layout18_2 = Qt::VBoxLayout($LayoutWidget_10, 0, 0, '$layout18_2'); + my $LayoutWidget_9 = Qt::Widget(groupHist1, '$LayoutWidget_9'); + $LayoutWidget_9->setGeometry( Qt::Rect(8, 17, 75, 150) ); + my $layout18_2 = Qt::VBoxLayout($LayoutWidget_9, 0, 0, '$layout18_2'); - t01 = Qt::LineEdit($LayoutWidget_10, "t01"); + t01 = Qt::LineEdit($LayoutWidget_9, "t01"); $layout18_2->addWidget(t01); - Bg11 = Qt::LineEdit($LayoutWidget_10, "Bg11"); + Bg11 = Qt::LineEdit($LayoutWidget_9, "Bg11"); $layout18_2->addWidget(Bg11); - Bg21 = Qt::LineEdit($LayoutWidget_10, "Bg21"); + Bg21 = Qt::LineEdit($LayoutWidget_9, "Bg21"); $layout18_2->addWidget(Bg21); - Data11 = Qt::LineEdit($LayoutWidget_10, "Data11"); + Data11 = Qt::LineEdit($LayoutWidget_9, "Data11"); $layout18_2->addWidget(Data11); - Data21 = Qt::LineEdit($LayoutWidget_10, "Data21"); + Data21 = Qt::LineEdit($LayoutWidget_9, "Data21"); $layout18_2->addWidget(Data21); - $layout27->addWidget(groupHist1); + $layout27_2->addWidget(groupHist1); - groupHist2 = Qt::GroupBox($LayoutWidget_8, "groupHist2"); + groupHist2 = Qt::GroupBox($LayoutWidget_7, "groupHist2"); groupHist2->setEnabled( 1 ); groupHist2->setFrameShadow( &Qt::GroupBox::Plain() ); - my $LayoutWidget_11 = Qt::Widget(groupHist2, '$LayoutWidget_11'); - $LayoutWidget_11->setGeometry( Qt::Rect(8, 17, 75, 150) ); - my $layout18_2_2 = Qt::VBoxLayout($LayoutWidget_11, 0, 0, '$layout18_2_2'); + my $LayoutWidget_10 = Qt::Widget(groupHist2, '$LayoutWidget_10'); + $LayoutWidget_10->setGeometry( Qt::Rect(8, 17, 75, 150) ); + my $layout18_2_2 = Qt::VBoxLayout($LayoutWidget_10, 0, 0, '$layout18_2_2'); - t02 = Qt::LineEdit($LayoutWidget_11, "t02"); + t02 = Qt::LineEdit($LayoutWidget_10, "t02"); $layout18_2_2->addWidget(t02); - Bg12 = Qt::LineEdit($LayoutWidget_11, "Bg12"); + Bg12 = Qt::LineEdit($LayoutWidget_10, "Bg12"); $layout18_2_2->addWidget(Bg12); - Bg22 = Qt::LineEdit($LayoutWidget_11, "Bg22"); + Bg22 = Qt::LineEdit($LayoutWidget_10, "Bg22"); $layout18_2_2->addWidget(Bg22); - Data12 = Qt::LineEdit($LayoutWidget_11, "Data12"); + Data12 = Qt::LineEdit($LayoutWidget_10, "Data12"); $layout18_2_2->addWidget(Data12); - Data22 = Qt::LineEdit($LayoutWidget_11, "Data22"); + Data22 = Qt::LineEdit($LayoutWidget_10, "Data22"); $layout18_2_2->addWidget(Data22); - $layout27->addWidget(groupHist2); + $layout27_2->addWidget(groupHist2); - groupHist3 = Qt::GroupBox($LayoutWidget_8, "groupHist3"); + groupHist3 = Qt::GroupBox($LayoutWidget_7, "groupHist3"); groupHist3->setEnabled( 1 ); groupHist3->setFrameShadow( &Qt::GroupBox::Plain() ); - my $LayoutWidget_12 = Qt::Widget(groupHist3, '$LayoutWidget_12'); - $LayoutWidget_12->setGeometry( Qt::Rect(8, 17, 75, 150) ); - my $layout18_3 = Qt::VBoxLayout($LayoutWidget_12, 0, 0, '$layout18_3'); + my $LayoutWidget_11 = Qt::Widget(groupHist3, '$LayoutWidget_11'); + $LayoutWidget_11->setGeometry( Qt::Rect(8, 17, 75, 150) ); + my $layout18_3 = Qt::VBoxLayout($LayoutWidget_11, 0, 0, '$layout18_3'); - t03 = Qt::LineEdit($LayoutWidget_12, "t03"); + t03 = Qt::LineEdit($LayoutWidget_11, "t03"); $layout18_3->addWidget(t03); - Bg13 = Qt::LineEdit($LayoutWidget_12, "Bg13"); + Bg13 = Qt::LineEdit($LayoutWidget_11, "Bg13"); $layout18_3->addWidget(Bg13); - Bg23 = Qt::LineEdit($LayoutWidget_12, "Bg23"); + Bg23 = Qt::LineEdit($LayoutWidget_11, "Bg23"); $layout18_3->addWidget(Bg23); - Data13 = Qt::LineEdit($LayoutWidget_12, "Data13"); + Data13 = Qt::LineEdit($LayoutWidget_11, "Data13"); $layout18_3->addWidget(Data13); - Data23 = Qt::LineEdit($LayoutWidget_12, "Data23"); + Data23 = Qt::LineEdit($LayoutWidget_11, "Data23"); $layout18_3->addWidget(Data23); - $layout27->addWidget(groupHist3); + $layout27_2->addWidget(groupHist3); - groupHist4 = Qt::GroupBox($LayoutWidget_8, "groupHist4"); + groupHist4 = Qt::GroupBox($LayoutWidget_7, "groupHist4"); groupHist4->setEnabled( 1 ); groupHist4->setFrameShadow( &Qt::GroupBox::Plain() ); - my $LayoutWidget_13 = Qt::Widget(groupHist4, '$LayoutWidget_13'); - $LayoutWidget_13->setGeometry( Qt::Rect(8, 17, 75, 150) ); - my $layout18_4 = Qt::VBoxLayout($LayoutWidget_13, 0, 0, '$layout18_4'); + my $LayoutWidget_12 = Qt::Widget(groupHist4, '$LayoutWidget_12'); + $LayoutWidget_12->setGeometry( Qt::Rect(8, 17, 75, 150) ); + my $layout18_4 = Qt::VBoxLayout($LayoutWidget_12, 0, 0, '$layout18_4'); - t04 = Qt::LineEdit($LayoutWidget_13, "t04"); + t04 = Qt::LineEdit($LayoutWidget_12, "t04"); $layout18_4->addWidget(t04); - Bg14 = Qt::LineEdit($LayoutWidget_13, "Bg14"); + Bg14 = Qt::LineEdit($LayoutWidget_12, "Bg14"); $layout18_4->addWidget(Bg14); - Bg24 = Qt::LineEdit($LayoutWidget_13, "Bg24"); + Bg24 = Qt::LineEdit($LayoutWidget_12, "Bg24"); $layout18_4->addWidget(Bg24); - Data14 = Qt::LineEdit($LayoutWidget_13, "Data14"); + Data14 = Qt::LineEdit($LayoutWidget_12, "Data14"); $layout18_4->addWidget(Data14); - Data24 = Qt::LineEdit($LayoutWidget_13, "Data24"); + Data24 = Qt::LineEdit($LayoutWidget_12, "Data24"); $layout18_4->addWidget(Data24); - $layout27->addWidget(groupHist4); + $layout27_2->addWidget(groupHist4); ShowT0 = Qt::PushButton(TabPage_3, "ShowT0"); ShowT0->setGeometry( Qt::Rect(451, 190, 95, 30) ); @@ -1149,8 +1190,6 @@ sub NEW ShowT0->setDefault( 1 ); musrfit_tabs->insertTab( TabPage_3, "" ); - $MuSRFitformLayout->addWidget(musrfit_tabs, 0, 0); - fileNewAction= Qt::Action(this, "fileNewAction"); fileNewAction->setIconSet( Qt::IconSet($image1) ); fileOpenAction= Qt::Action(this, "fileOpenAction"); @@ -1209,6 +1248,7 @@ sub NEW MenuBar= Qt::MenuBar( this, "MenuBar"); MenuBar->setEnabled( 1 ); + MenuBar->setGeometry( Qt::Rect(0, 0, 582, 27) ); fileMenu = Qt::PopupMenu( this ); fileOpenAction->addTo( fileMenu ); @@ -1218,7 +1258,7 @@ sub NEW filePrintAction->addTo( fileMenu ); fileMenu->insertSeparator(); fileExitAction->addTo( fileMenu ); - MenuBar->insertItem( "", fileMenu, 2 ); + MenuBar->insertItem( "", fileMenu, 3 ); editMenu = Qt::PopupMenu( this ); editUndoAction->addTo( editMenu ); @@ -1227,21 +1267,21 @@ sub NEW editCutAction->addTo( editMenu ); editCopyAction->addTo( editMenu ); editPasteAction->addTo( editMenu ); - MenuBar->insertItem( "", editMenu, 3 ); + MenuBar->insertItem( "", editMenu, 4 ); Options = Qt::PopupMenu( this ); FileExistCheck->addTo( Options ); MaualFile->addTo( Options ); - MenuBar->insertItem( "", Options, 4 ); + MenuBar->insertItem( "", Options, 5 ); helpMenu = Qt::PopupMenu( this ); helpContentsAction->addTo( helpMenu ); helpIndexAction->addTo( helpMenu ); helpMenu->insertSeparator(); helpAboutAction->addTo( helpMenu ); - MenuBar->insertItem( "", helpMenu, 5 ); + MenuBar->insertItem( "", helpMenu, 6 ); - MenuBar->insertSeparator( 6 ); + MenuBar->insertSeparator( 7 ); languageChange(); my $resize = Qt::Size(582, 505); @@ -1455,26 +1495,34 @@ sub languageChange go->setText( trUtf8("Fit") ); PlotMSR->setText( trUtf8("Plot") ); musrfit_tabs->changeTab( TabPage, trUtf8("Fitting") ); + FUnitsLabel->setText( trUtf8("Units") ); + FApodizationLabel->setText( trUtf8("Apodization") ); + FPlotLabel->setText( trUtf8("Plot") ); + FUnits->clear(); + FUnits->insertItem( trUtf8("MHz") ); + FUnits->insertItem( trUtf8("Gauss") ); + FUnits->insertItem( trUtf8("Mc/s") ); + FApodization->clear(); + FApodization->insertItem( trUtf8("STRONG") ); + FApodization->insertItem( trUtf8("MEDIUM") ); + FApodization->insertItem( trUtf8("WEAK") ); + FApodization->insertItem( trUtf8("NONE") ); FPlot->clear(); FPlot->insertItem( trUtf8("power") ); FPlot->insertItem( trUtf8("real") ); FPlot->insertItem( trUtf8("imag") ); FPlot->insertItem( trUtf8("real_and_imag") ); FPlot->insertItem( trUtf8("phase") ); - FApodization->clear(); - FApodization->insertItem( trUtf8("STRONG") ); - FApodization->insertItem( trUtf8("MEDIUM") ); - FApodization->insertItem( trUtf8("WEAK") ); - FApodization->insertItem( trUtf8("NONE") ); - FApodizationLabel->setText( trUtf8("Apodization") ); - FUnits->clear(); - FUnits->insertItem( trUtf8("MHz") ); - FUnits->insertItem( trUtf8("Gauss") ); - FUnits->insertItem( trUtf8("Mc/s") ); - FPlotLabel->setText( trUtf8("Plot") ); - FUnitsLabel->setText( trUtf8("Units") ); textLabel1->setText( trUtf8("Range: from") ); + textLabel1_3->setText( undef ); + textLabel1_3_5->setText( undef ); + textLabel1_3_2->setText( undef ); + textLabel1_3_6->setText( undef ); textLabel1_2->setText( trUtf8("to") ); + textLabel1_3_3->setText( undef ); + textLabel1_3_7->setText( undef ); + textLabel1_3_4->setText( undef ); + textLabel1_3_8->setText( undef ); musrfit_tabs->changeTab( TabPage_2, trUtf8("Fourier") ); groupHist0->setTitle( undef ); textLabel2->setText( trUtf8("t0") ); @@ -1549,10 +1597,10 @@ sub languageChange Action_2->setText( trUtf8("Unnamed") ); Action_3->setText( trUtf8("Unnamed") ); toolBar->setLabel( trUtf8("Tools") ); - MenuBar->findItem( 2 )->setText( trUtf8("&File") ); - MenuBar->findItem( 3 )->setText( trUtf8("&Edit") ); - MenuBar->findItem( 4 )->setText( trUtf8("Options") ); - MenuBar->findItem( 5 )->setText( trUtf8("&Help") ); + MenuBar->findItem( 3 )->setText( trUtf8("&File") ); + MenuBar->findItem( 4 )->setText( trUtf8("&Edit") ); + MenuBar->findItem( 5 )->setText( trUtf8("Options") ); + MenuBar->findItem( 6 )->setText( trUtf8("&Help") ); } @@ -1587,7 +1635,6 @@ sub fileSave "Choose a filename to save under"); # If the user gave a filename the copy to it - print "file-$file\n"; if ($file ne "") { # TODO: check if the extension is correct, or add it. if (-e $FILENAME) { @@ -2150,6 +2197,7 @@ sub GoPlot my $pid = system($cmd); } else { FitTextOutput->append("Cannot find MSR file!"); + FitTextOutput->append("-----------------------------------------------------------------------------------------------------------------------------"); } return; @@ -2162,8 +2210,12 @@ sub ShowMuSRT0 # Create MSR file and then run musrt0 CallMSRCreate(); my $FILENAME=$All{"FILENAME"}.".msr"; - my $cmd="musrt0 $FILENAME &"; - my $pid = system($cmd); + if (-e $FILENAME) { + my $cmd="musrt0 $FILENAME &"; + my $pid = system($cmd); + } else { + print STDERR "Cannot find MSR file!\n"; + } return; } diff --git a/src/external/MuSRFitGUI/MuSRFit.ui b/src/external/MuSRFitGUI/MuSRFit.ui index 139bf567..57ec3228 100755 --- a/src/external/MuSRFitGUI/MuSRFit.ui +++ b/src/external/MuSRFitGUI/MuSRFit.ui @@ -35,2341 +35,2474 @@ MuSRFitGUI - + - unnamed + textLabel2_2 - + + + 13 + 78 + 55 + 19 + + + + Bg1 + + + + + musrfit_tabs + + + true + + + + 11 + 11 + 560 + 402 + + + + + 7 + 7 + 1 + 1 + + + + + 560 + 400 + + + + + 95 + 32767 + + + - textLabel2_2 + RUNSPage - - Bg1 - - - - - musrfit_tabs - - - true - - - - 7 - 7 - 1 - 1 - - - - - 560 - 400 - - - - - 95 - 32767 - - - + + RUNS + + - RUNSPage + layout24 - - RUNS - - + + + 5 + 1 + 545 + 360 + + + - layout24 + unnamed - - - 5 - 1 - 545 - 360 - - - + - unnamed + TITLELabel - + + + 5 + 5 + 0 + 0 + + + + Enter the label (defaul is run title from the first run) + + + TITLE + + + + + TITLE + + + + 5 + 0 + 1 + 1 + + + + + Title line for MSR file (optional) + + + Title line for MSR file (optional) + + + + + layout17 + + - TITLELabel + unnamed - - - 5 - 5 - 0 - 0 - - - - Enter the label (defaul is run title from the first run) - - - TITLE - - - - - TITLE - - - - 5 - 0 - 1 - 1 - - - - - Title line for MSR file (optional) - - - Title line for MSR file (optional) - - - - - layout17 - - + - unnamed + FILENAMELabel - - - FILENAMELabel - - - Enter [name] for output [name].msr file (optional) - - - FILENAME - - - - - FILENAME - - - - 5 - 0 - 0 - 0 - - - - - - - - layout16 - - + + Enter [name] for output [name].msr file (optional) + + + FILENAME + + + - unnamed + FILENAME - - - RUNSLabel - - - Input the RUN numbers separated with commas - - - RunNumbers - - - - - RunNumbers - - - - 5 - 0 - 0 - 0 - - - - - - + + + 5 + 0 + 0 + 0 + + + + + + + + layout16 + + - layout18 + unnamed - + - unnamed + RUNSLabel - - - BeamLineLabel - - - On beam line - - - - - - LEM - - - - - GPS - - - - - Dolly - - - - - LTF - - - - BeamLine - - - - - YEARLabel - - - Year - - - - - - 2009 - - - - - 2008 - - - - - 2007 - - - - - 2006 - - - - - 2005 - - - - - 2004 - - - - YEAR - - - - - - - ComponentsLabel - - - Chose type of fitting function - - - - - layout19 - - + + Input the RUN numbers separated with commas + + + RunNumbers + + + - unnamed + RunNumbers - - - Comp1Label - - - First Component - - - FitType1 - - - - - Comp3Label - - - Third Component - - - FitType1_2_2 - - - - - - Exponential - - - - - Gaussian - - - - - Stretch Exp. - - - - - Exponential Cos - - - - - Gaussian Cos - - - - - Stretch Cos - - - - - Lorentzian Dynamic KT - - - - - Gaussian Dynamic KT - - - - - Background - - - - - Lorentzian Kubo-Toyabe LF x Exp - - - - - Gaussian Kubo-Toyabe LF x Exp - - - - - Lorentzian Kubo-Toyabe LF x Str Exp - - - - - Gaussian Kubo-Toyabe LF x Str Exp - - - - - Meissner State Model - - - - - None - - - - FitType2 - - - - 5 - 0 - 0 - 0 - - - - 14 - - - - - - Exponential - - - - - Gaussian - - - - - Stretch Exp. - - - - - Exponential Cos - - - - - Gaussian Cos - - - - - Stretch Cos - - - - - Lorentzian Dynamic KT - - - - - Gaussian Dynamic KT - - - - - Background - - - - - Lorentzian Kubo-Toyabe LF x Exp - - - - - Gaussian Kubo-Toyabe LF x Exp - - - - - Lorentzian Kubo-Toyabe LF x Str Exp - - - - - Gaussian Kubo-Toyabe LF x Str Exp - - - - - Meissner State Model - - - - - None - - - - FitType1 - - - - 5 - 0 - 0 - 0 - - - - 20 - - - false - - - false - - - - - - Exponential - - - - - Gaussian - - - - - Stretch Exp. - - - - - Exponential Cos - - - - - Gaussian Cos - - - - - Stretch Cos - - - - - Lorentzian Dynamic KT - - - - - Gaussian Dynamic KT - - - - - Background - - - - - Lorentzian Kubo-Toyabe LF x Exp - - - - - Gaussian Kubo-Toyabe LF x Exp - - - - - Lorentzian Kubo-Toyabe LF x Str Exp - - - - - Gaussian Kubo-Toyabe LF x Str Exp - - - - - Meissner State Model - - - - - None - - - - FitType3 - - - - 5 - 0 - 0 - 0 - - - - 14 - - - - - Comp2Label - - - Second Component - - - FitType1_2 - - - - - + + + 5 + 0 + 0 + 0 + + + + + + + + layout18 + + - layout20 + unnamed - + - unnamed + BeamLineLabel - - - BINS - - - - 5 - 0 - 0 - 0 - - + + On beam line + + + + - 100 - - - - - Tfs - - - - 5 - 0 - 0 - 0 - + LEM + + - 8 - - - - - BINSLabel + GPS + + - Binning Factor - - - BINS - - - - - Tis - - - - 5 - 0 - 0 - 0 - + Dolly + + - 0 - - - - - TfsLabel + LTF + + + BeamLine + + + + + YEARLabel + + + Year + + + + - Final Time - - - Tfs - - - - - TisLabel + 2009 + + - Initial Time + 2008 - - Tis + + + + 2007 - - - - + + + + 2006 + + + + + 2005 + + + + + 2004 + + + + YEAR + + + + + + + ComponentsLabel + + + Chose type of fitting function + + + + + layout19 + + - layout23 + unnamed - + - unnamed + Comp1Label - - - FitAsyTypeLabel - + + First Component + + + FitType1 + + + + + Comp3Label + + + Third Component + + + FitType1_2_2 + + + + - Fit type - - - - - - Asymmetry - - - - - SingleHist - - - - FitAsyType - - - - - LRBFLabel + Exponential + + - Histograms list - - - - - LRBF - - - - 5 - 0 - 0 - 0 - + Gaussian + + - 1,3 + Stretch Exp. - - - - - + + + + Exponential Cos + + + + + Gaussian Cos + + + + + Stretch Cos + + + + + Lorentzian Dynamic KT + + + + + Gaussian Dynamic KT + + + + + Background + + + + + Lorentzian Kubo-Toyabe LF x Exp + + + + + Gaussian Kubo-Toyabe LF x Exp + + + + + Lorentzian Kubo-Toyabe LF x Str Exp + + + + + Gaussian Kubo-Toyabe LF x Str Exp + + + + + Meissner State Model + + + + + None + + + + FitType2 + + + + 5 + 0 + 0 + 0 + + + + 14 + + + + + + Exponential + + + + + Gaussian + + + + + Stretch Exp. + + + + + Exponential Cos + + + + + Gaussian Cos + + + + + Stretch Cos + + + + + Lorentzian Dynamic KT + + + + + Gaussian Dynamic KT + + + + + Background + + + + + Lorentzian Kubo-Toyabe LF x Exp + + + + + Gaussian Kubo-Toyabe LF x Exp + + + + + Lorentzian Kubo-Toyabe LF x Str Exp + + + + + Gaussian Kubo-Toyabe LF x Str Exp + + + + + Meissner State Model + + + + + None + + + + FitType1 + + + + 5 + 0 + 0 + 0 + + + + 20 + + + false + + + false + + + + + + Exponential + + + + + Gaussian + + + + + Stretch Exp. + + + + + Exponential Cos + + + + + Gaussian Cos + + + + + Stretch Cos + + + + + Lorentzian Dynamic KT + + + + + Gaussian Dynamic KT + + + + + Background + + + + + Lorentzian Kubo-Toyabe LF x Exp + + + + + Gaussian Kubo-Toyabe LF x Exp + + + + + Lorentzian Kubo-Toyabe LF x Str Exp + + + + + Gaussian Kubo-Toyabe LF x Str Exp + + + + + Meissner State Model + + + + + None + + + + FitType3 + + + + 5 + 0 + 0 + 0 + + + + 14 + + + + + Comp2Label + + + Second Component + + + FitType1_2 + + + + + + + layout20 + + + + unnamed + + + + BINS + + + + 5 + 0 + 0 + 0 + + + + 100 + + + + + Tfs + + + + 5 + 0 + 0 + 0 + + + + 8 + + + + + BINSLabel + + + Binning Factor + + + BINS + + + + + Tis + + + + 5 + 0 + 0 + 0 + + + + 0 + + + + + TfsLabel + + + Final Time + + + Tfs + + + + + TisLabel + + + Initial Time + + + Tis + + + + + + + layout23 + + + + unnamed + + + + FitAsyTypeLabel + + + Fit type + + + + + + Asymmetry + + + + + SingleHist + + + + FitAsyType + + + + + LRBFLabel + + + Histograms list + + + + + LRBF + + + + 5 + 0 + 0 + 0 + + + + 1,3 + + + + + - + + + + SharingPahe + + + Sharing + + - SharingPahe + buttonGroupSharing + + + + 5 + 5 + 545 + 355 + + + + + 7 + 7 + 0 + 0 + + + + Shared Parameters + + + AlignLeft + + + false - - Sharing - - buttonGroupSharing + SharingComp1 - - - 0 - 0 - 550 - 400 - - - - - 7 - 7 - 0 - 0 - - - - Shared Parameters - - - AlignLeft - - + false - - - SharingComp1 - - - false - - - - 31 - 25 - 162 - 335 - - - - - 5 - 3 - 0 - 0 - - - - 1st Component - - - AlignLeft - - - - Comp1ShLabel - - - - 2 - 30 - 185 - 20 - - - - - 255 - 255 - 127 - - - - FitType1 - - - - - layout14 - - - - 40 - 60 - 81 - 266 - - - - - unnamed - - - 0 - - - 0 - - - - ShParam_1_1 - - - Param1 - - - - - ShParam_1_2 - - - Param2 - - - - - ShParam_1_3 - - - Param3 - - - - - ShParam_1_4 - - - Param4 - - - - - ShParam_1_5 - - - false - - - - 234 - 233 - 232 - - - - Param5 - - - false - - - - - ShParam_1_6 - - - false - - - - 234 - 233 - 232 - - - - Param6 - - - false - - - - - ShParam_1_7 - - - false - - - - 234 - 233 - 232 - - - - Param7 - - - false - - - - - ShParam_1_8 - - - false - - - - 234 - 233 - 232 - - - - Param8 - - - false - - - - - ShParam_1_9 - - - false - - - - 234 - 233 - 232 - - - - Param9 - - - false - - - - - - - - SharingComp2 - - - false - - - - 199 - 25 - 162 - 335 - - - - - 5 - 3 - 0 - 0 - - - - 2nd Component - - - - Comp2ShLabel - - - - 2 - 30 - 185 - 20 - - - - - 255 - 255 - 127 - - - - FitType2 - - - - - layout13 - - - - 40 - 60 - 81 - 266 - - - - - unnamed - - - 0 - - - 0 - - - - ShParam_2_1 - - - Param1 - - - - - ShParam_2_2 - - - Param2 - - - - - ShParam_2_3 - - - Param3 - - - - - ShParam_2_4 - - - Param4 - - - - - ShParam_2_5 - - - Param5 - - - - - ShParam_2_6 - - - false - - - - 234 - 233 - 232 - - - - Param6 - - - false - - - - - ShParam_2_7 - - - false - - - - 234 - 233 - 232 - - - - Param7 - - - false - - - - - ShParam_2_8 - - - false - - - - 234 - 233 - 232 - - - - Param8 - - - false - - - - - ShParam_2_9 - - - false - - - - 234 - 233 - 232 - - - - Param9 - - - false - - - - - - - - SharingComp3 - - - false - - - - 367 - 25 - 162 - 335 - - - - - 5 - 3 - 0 - 0 - - - - 3rd Component - - - AlignJustify|AlignVCenter - - - - Comp3ShLabel - - - - 2 - 30 - 185 - 20 - - - - - 255 - 255 - 127 - - - - FitType3 - - - - - layout15 - - - - 41 - 58 - 81 - 266 - - - - - unnamed - - - - ShParam_3_1 - - - Param1 - - - - - ShParam_3_2 - - - Param2 - - - - - ShParam_3_3 - - - Param3 - - - - - ShParam_3_4 - - - Param4 - - - - - ShParam_3_5 - - - Param5 - - - - - ShParam_3_6 - - - false - - - - 234 - 233 - 232 - - - - Param6 - - - false - - - - - ShParam_3_7 - - - false - - - - 234 - 233 - 232 - - - - Param7 - - - false - - - - - ShParam_3_8 - - - false - - - - 234 - 233 - 232 - - - - Param8 - - - false - - - - - ShParam_3_9 - - - false - - - - 234 - 233 - 232 - - - - Param9 - - - false - - - - - - - - - - InitializationPage - - - Initialization - - - - - Value - - - - - Error - - - - - Min - - - - - Max - - - - InitParamTable - - 5 - 5 - 545 - 355 + 31 + 20 + 162 + 330 5 - 5 + 3 0 0 - - - 32767 - 32767 - + + 1st Component - - TabFocus + + AlignLeft - - PopupPanel + + + Comp1ShLabel + + + + 2 + 30 + 185 + 20 + + + + + 255 + 255 + 127 + + + + FitType1 + + + + + layout14 + + + + 40 + 60 + 81 + 266 + + + + + unnamed + + + 0 + + + 0 + + + + ShParam_1_1 + + + Param1 + + + + + ShParam_1_2 + + + Param2 + + + + + ShParam_1_3 + + + Param3 + + + + + ShParam_1_4 + + + Param4 + + + + + ShParam_1_5 + + + false + + + + 234 + 233 + 232 + + + + Param5 + + + false + + + + + ShParam_1_6 + + + false + + + + 234 + 233 + 232 + + + + Param6 + + + false + + + + + ShParam_1_7 + + + false + + + + 234 + 233 + 232 + + + + Param7 + + + false + + + + + ShParam_1_8 + + + false + + + + 234 + 233 + 232 + + + + Param8 + + + false + + + + + ShParam_1_9 + + + false + + + + 234 + 233 + 232 + + + + Param9 + + + false + + + + + + + + SharingComp2 - - 2 + + false + + + + 199 + 20 + 162 + 330 + + + + + 5 + 3 + 0 + 0 + + + + 2nd Component + + + + Comp2ShLabel + + + + 2 + 30 + 185 + 20 + + + + + 255 + 255 + 127 + + + + FitType2 + + + + + layout13 + + + + 40 + 60 + 81 + 266 + + + + + unnamed + + + 0 + + + 0 + + + + ShParam_2_1 + + + Param1 + + + + + ShParam_2_2 + + + Param2 + + + + + ShParam_2_3 + + + Param3 + + + + + ShParam_2_4 + + + Param4 + + + + + ShParam_2_5 + + + Param5 + + + + + ShParam_2_6 + + + false + + + + 234 + 233 + 232 + + + + Param6 + + + false + + + + + ShParam_2_7 + + + false + + + + 234 + 233 + 232 + + + + Param7 + + + false + + + + + ShParam_2_8 + + + false + + + + 234 + 233 + 232 + + + + Param8 + + + false + + + + + ShParam_2_9 + + + false + + + + 234 + 233 + 232 + + + + Param9 + + + false + + + + + + + + SharingComp3 + + + false + + + + 367 + 20 + 162 + 330 + + + + + 5 + 3 + 0 + 0 + + + + 3rd Component + + + AlignJustify|AlignVCenter + + + + Comp3ShLabel + + + + 2 + 30 + 185 + 20 + + + + + 255 + 255 + 127 + + + + FitType3 + + + + + layout15 + + + + 41 + 58 + 81 + 266 + + + + + unnamed + + + + ShParam_3_1 + + + Param1 + + + + + ShParam_3_2 + + + Param2 + + + + + ShParam_3_3 + + + Param3 + + + + + ShParam_3_4 + + + Param4 + + + + + ShParam_3_5 + + + Param5 + + + + + ShParam_3_6 + + + false + + + + 234 + 233 + 232 + + + + Param6 + + + false + + + + + ShParam_3_7 + + + false + + + + 234 + 233 + 232 + + + + Param7 + + + false + + + + + ShParam_3_8 + + + false + + + + 234 + 233 + 232 + + + + Param8 + + + false + + + + + ShParam_3_9 + + + false + + + + 234 + 233 + 232 + + + + Param9 + + + false + + + + + + + + + + InitializationPage + + + Initialization + + + + + Value + + + + + Error + + + + + Min + + + + + Max + + + + InitParamTable + + + + 5 + 5 + 545 + 355 + + + + + 5 + 5 + 0 + 0 + + + + + 32767 + 32767 + + + + TabFocus + + + PopupPanel + + + 2 + + + 0 + + + 0 + + + Default + + + Auto + + + false + + + 0 + + + 4 + + + true + + + false + + + SpreadSheet + + + + + + FittingPage + + + MSR File + + + + textMSROutput + + + + 5 + 5 + 545 + 355 + + + + true + + + + + + TabPage + + + Fitting + + + + Minimization + + + + 6 + 1 + 200 + 125 + + + + Minimization + + + true + + + true + + + 0 + + + + MINIMIZE + + + + 16 + 30 + 83 + 22 + + + + Minimize + + + true + + + + + MIGRAD + + + + 16 + 59 + 83 + 22 + + + + Migrad + + + + + SIMPLEX + + + + 16 + 88 + 83 + 22 + + + + Simplex + + + + + + ErrorCalc + + + + 208 + 1 + 200 + 125 + + + + Error Calculation + + + AlignTop + + + true + + + true + + + 0 + + + + HESSE + + + + 19 + 30 + 69 + 22 + + + + Hesse + + + true + + + + + MINOS + + + + 19 + 59 + 69 + 22 + + + + Minos + + + + + + layout28 + + + + 418 + 5 + 125 + 120 + + + + + unnamed + + + + go + + + + 7 + 0 + 1 + 0 + + + + + 95 + 30 + + + + + 95 + 30 + + + + Fit + + + false + + + true + + + + + PlotMSR + + + + 7 + 0 + 1 + 0 + + + + + 95 + 30 + + + + + 95 + 30 + + + + Plot + + + false + + + true + + + + + + + FitTextOutput + + + + 5 + 135 + 545 + 230 + + + + true + + + + + + TabPage + + + Fourier + + + + layout33 + + + + 5 + 5 + 545 + 94 + + + + + unnamed + + + + layout26 + + + + unnamed + + + + FUnitsLabel + + + Units + + + + + FApodizationLabel + + + Apodization + + + + + FPlotLabel + + + Plot + + + + + + + layout27 + + + + unnamed + + + + + MHz + + + + + Gauss + + + + + Mc/s + + + + FUnits + + + + 5 + 5 + 0 + 0 + + + + + + + STRONG + + + + + MEDIUM + + + + + WEAK + + + + + NONE + + + + FApodization + + + + 5 + 5 + 0 + 0 + + + + + + + power + + + + + real + + + + + imag + + + + + real_and_imag + + + + + phase + + + + FPlot + + + + 5 + 5 + 0 + 0 + + + + + + + + layout28 + + + + unnamed + + + + textLabel1 + + + Range: from + + + + + textLabel1_3 + + + + + + + + textLabel1_3_5 + + + + + + + + + + layout29 + + + + unnamed + + + + lineEdit28 + + + + 5 + 5 + 0 + 0 + + + + + + textLabel1_3_2 + + + + + + + + textLabel1_3_6 + + + + + + + + + + layout31 + + + + unnamed + + + + textLabel1_2 + + + to + + + + + textLabel1_3_3 + + + + + + + + textLabel1_3_7 + + + + + + + + + + layout32 + + + + unnamed + + + + lineEdit28_2 + + + + 5 + 5 + 0 + 0 + + + + + + textLabel1_3_4 + + + + + + + + textLabel1_3_8 + + + + + + + + + + + + + TabPage + + + t0/Bg Bins + + + + layout27 + + + + 7 + 5 + 540 + 180 + + + + + unnamed 0 - - 0 - - - Default - - - Auto - - - false - - - 0 - - - 4 - - - true - - - false - - - SpreadSheet - - - - - - FittingPage - - - MSR File - - - - textMSROutput - - - - 5 - 5 - 545 - 355 - - - - true - - - - - - TabPage - - - Fitting - - - - FitTextOutput - - - - 5 - 135 - 545 - 230 - - - - true - - - - - Minimization - - - - 6 - 1 - 200 - 125 - - - - Minimization - - - true - - - true - - - 0 - - + - MINIMIZE + groupHist0 - - - 16 - 30 - 83 - 22 - + + + 5 + 5 + 0 + 0 + - - Minimize + + + 0 + 0 + - + + + + + + layout16_2 + + + + 5 + 18 + 100 + 150 + + + + + unnamed_2 + + + + textLabel2 + + + t0 + + + + + textLabel2_2_2_3 + + + Bg1 + + + + + textLabel2_2_2 + + + Bg2 + + + + + textLabel2_2_2_2 + + + Data 1 + + + + + textLabel2_2_2_2_2 + + + Data 2 + + + + + + + + groupHist1 + + + Plain + + + Hist1 + + + + layout18 + + + + 8 + 17 + 75 + 150 + + + + + unnamed + + + 0 + + + 0 + + + + t01 + + + + + Bg11 + + + + + Bg21 + + + + + Data11 + + + + + Data21 + + + + + + + + groupHist2 + + true + + Plain + + + Hist2 + + + + layout18_2 + + + + 8 + 17 + 75 + 150 + + + + + unnamed_2 + + + 0 + + + 0 + + + + t02 + + + + + Bg12 + + + + + Bg22 + + + + + Data12 + + + + + Data22 + + + + - + - MIGRAD + groupHist3 - - - 16 - 59 - 83 - 22 - - - - Migrad - - - - - SIMPLEX - - - - 16 - 88 - 83 - 22 - - - - Simplex - - - - - - ErrorCalc - - - - 208 - 1 - 200 - 125 - - - - Error Calculation - - - AlignTop - - - true - - - true - - - 0 - - - - HESSE - - - - 19 - 30 - 69 - 22 - - - - Hesse - - + true + + Plain + + + Hist3 + + + + layout18_3 + + + + 8 + 17 + 75 + 150 + + + + + unnamed_2 + + + 0 + + + 0 + + + + t03 + + + + + Bg13 + + + + + Bg23 + + + + + Data13 + + + + + Data23 + + + + - + - MINOS + groupHist4 - - - 19 - 59 - 69 - 22 - + + true - - Minos + + Plain + + Hist4 + + + + layout18_4 + + + + 8 + 17 + 75 + 150 + + + + + unnamed_2 + + + 0 + + + 0 + + + + t04 + + + + + Bg14 + + + + + Bg24 + + + + + Data14 + + + + + Data24 + + + + - - - - layout28 - - - - 418 - 5 - 125 - 120 - - - - - unnamed - - - - go - - - - 7 - 0 - 1 - 0 - - - - - 95 - 30 - - - - - 95 - 30 - - - - Fit - - - false - - - true - - - - - PlotMSR - - - - 7 - 0 - 1 - 0 - - - - - 95 - 30 - - - - - 95 - 30 - - - - Plot - - - false - - - true - - - - + - + - TabPage + ShowT0 - - Fourier - - - - layout11 - - - - 8 - 18 - 225 - 105 - - - - - unnamed - - - - - power - - - - - real - - - - - imag - - - - - real_and_imag - - - - - phase - - - - FPlot - - - - 5 - 5 - 0 - 0 - - - - - - - STRONG - - - - - MEDIUM - - - - - WEAK - - - - - NONE - - - - FApodization - - - - 5 - 5 - 0 - 0 - - - - - - FApodizationLabel - - - Apodization - - - - - - MHz - - - - - Gauss - - - - - Mc/s - - - - FUnits - - - - 5 - 5 - 0 - 0 - - - - - - FPlotLabel - - - Plot - - - - - FUnitsLabel - - - Units - - - - - - - layout19 - - - - 250 - 20 - 290 - 40 - - - - - unnamed - - - - textLabel1 - - - Range: from - - - - - lineEdit28 - - - - - textLabel1_2 - - - to - - - - - lineEdit28_2 - - - - - - - - TabPage + + + 451 + 190 + 95 + 30 + + + + + 95 + 30 + + + + + 95 + 30 + + + + Show + + + false + + + true - - t0/Bg Bins - - - - layout27 - - - - 7 - 5 - 540 - 180 - - - - - unnamed - - - 0 - - - - groupHist0 - - - - 5 - 5 - 0 - 0 - - - - - 0 - 0 - - - - - - - - layout16_2 - - - - 5 - 18 - 100 - 150 - - - - - unnamed_2 - - - - textLabel2 - - - t0 - - - - - textLabel2_2_2_3 - - - Bg1 - - - - - textLabel2_2_2 - - - Bg2 - - - - - textLabel2_2_2_2 - - - Data 1 - - - - - textLabel2_2_2_2_2 - - - Data 2 - - - - - - - - groupHist1 - - - Plain - - - Hist1 - - - - layout18 - - - - 8 - 17 - 75 - 150 - - - - - unnamed - - - 0 - - - 0 - - - - t01 - - - - - Bg11 - - - - - Bg21 - - - - - Data11 - - - - - Data21 - - - - - - - - groupHist2 - - - true - - - Plain - - - Hist2 - - - - layout18_2 - - - - 8 - 17 - 75 - 150 - - - - - unnamed_2 - - - 0 - - - 0 - - - - t02 - - - - - Bg12 - - - - - Bg22 - - - - - Data12 - - - - - Data22 - - - - - - - - groupHist3 - - - true - - - Plain - - - Hist3 - - - - layout18_3 - - - - 8 - 17 - 75 - 150 - - - - - unnamed_2 - - - 0 - - - 0 - - - - t03 - - - - - Bg13 - - - - - Bg23 - - - - - Data13 - - - - - Data23 - - - - - - - - groupHist4 - - - true - - - Plain - - - Hist4 - - - - layout18_4 - - - - 8 - 17 - 75 - 150 - - - - - unnamed_2 - - - 0 - - - 0 - - - - t04 - - - - - Bg14 - - - - - Bg24 - - - - - Data14 - - - - - Data24 - - - - - - - - - - ShowT0 - - - - 451 - 190 - 95 - 30 - - - - - 95 - 30 - - - - - 95 - 30 - - - - Show - - - false - - - true - - - + @@ -2378,6 +2511,14 @@ true + + + 0 + 0 + 582 + 27 + + diff --git a/src/external/MuSRFitGUI/MuSRFit.ui.h b/src/external/MuSRFitGUI/MuSRFit.ui.h index 46d59e9a..8775f490 100755 --- a/src/external/MuSRFitGUI/MuSRFit.ui.h +++ b/src/external/MuSRFitGUI/MuSRFit.ui.h @@ -604,6 +604,7 @@ void MuSRFitform::GoPlot() my $pid = system($cmd); } else { FitTextOutput->append("Cannot find MSR file!"); + FitTextOutput->append("-----------------------------------------------------------------------------------------------------------------------------"); } return; } @@ -615,8 +616,12 @@ void MuSRFitform::ShowMuSRT0() # Create MSR file and then run musrt0 CallMSRCreate(); my $FILENAME=$All{"FILENAME"}.".msr"; - my $cmd="musrt0 $FILENAME &"; - my $pid = system($cmd); + if (-e $FILENAME) { + my $cmd="musrt0 $FILENAME &"; + my $pid = system($cmd); + } else { + print STDERR "Cannot find MSR file!\n"; + } return; }