From 0af373d6b74e3be71962b80d3ea621cfe3075cd5 Mon Sep 17 00:00:00 2001 From: Zaher Salman Date: Fri, 13 May 2011 12:44:38 +0000 Subject: [PATCH] Transfer new features into development branch. --- src/external/MuSRFitGUI/devel/MSR.pm | 179 +- src/external/MuSRFitGUI/devel/MuSRFit.pl | 1018 ++- src/external/MuSRFitGUI/devel/MuSRFit.ui | 9088 ++++++++++---------- src/external/MuSRFitGUI/devel/MuSRFit.ui.h | 137 +- 4 files changed, 5391 insertions(+), 5031 deletions(-) diff --git a/src/external/MuSRFitGUI/devel/MSR.pm b/src/external/MuSRFitGUI/devel/MSR.pm index 8e12977f..d699a0c4 100755 --- a/src/external/MuSRFitGUI/devel/MSR.pm +++ b/src/external/MuSRFitGUI/devel/MSR.pm @@ -93,6 +93,14 @@ sub CreateMSR { } 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, No, NBg, Phi, Asy + my @TiVals = split( /,/, $All{"Tis"} ); my @TfVals = split( /,/, $All{"Tfs"} ); my @BINVals = split( /,/, $All{"BINS"} ); @@ -159,6 +167,7 @@ FUNCTIONS } # $shcount is a counter for shared parameters + # msr2data \[1363 1365 1366\] _Dolly_2010 msr-1363 global if ( $#RUNS == 0 ) { my $shcount = 1; } else { @@ -286,28 +295,40 @@ FUNCTIONS foreach ("t0","Bg1","Bg2","Data1","Data2") { $Name = "$_$NHist"; # If empty fill with defaults - if ($All{$Name} eq $EMPTY) { - $All{$Name}=MSR::T0BgData($_,$Hist,$BeamLine); - } +# if ($All{$Name} eq $EMPTY) { +# $All{$Name}=MSR::T0BgData($_,$Hist,$BeamLine); +# } + } +# If empty skip lines + if ($All{"Bg1$NHist"} ne $EMPTY && $All{"Bg2$NHist"} ne $EMPTY) { + $Bg_Line = $Bg_Line." ".$All{"Bg1$NHist"}." ".$All{"Bg2$NHist"}; + } + if ($All{"Data1$NHist"} ne $EMPTY && $All{"Data2$NHist"} ne $EMPTY) { + $Data_Line =$Data_Line." ".$All{"Data1$NHist"}." ".$All{"Data2$NHist"}; } - $Bg_Line = $Bg_Line." ".$All{"Bg1$NHist"}." ".$All{"Bg2$NHist"}; - $Data_Line =$Data_Line." ".$All{"Data1$NHist"}." ".$All{"Data2$NHist"}; if ($All{"t0$NHist"} ne $EMPTY) { - $T0_Line=$T0_Line." ".$All{"Data1$NHist"}; + $T0_Line=$T0_Line." ".$All{"t0$NHist"}; } $NHist++; } +# Put T0_Line Bg_Line and Data_Line together if not empty + my $T0DataBg=$EMPTY; + if ($T0_Line ne "t0") { + $T0DataBg = $T0DataBg."\n".$T0_Line; + } + if ($Bg_Line ne "background") { + $T0DataBg = $T0DataBg."\n".$Bg_Line; + } + if ($Data_Line ne "data") { + $T0DataBg = $T0DataBg."\n".$Data_Line; + } + $FRANGE_Line = "fit TINI TFIN"; $PAC_Line = "packing BINNING"; - - if ($T0_Line ne "t0") { - $Data_Line= $Data_Line."\n".$T0_Line; - } - $Single_RUN = -"$RUN_Line\n$Type_Line\n$Alpha_Line$Hist_Lines\n$Bg_Line\n$Data_Line\n$MAP_Line\n$FRANGE_Line\n$PAC_Line\n\n"; +"$RUN_Line\n$Type_Line\n$Alpha_Line$Hist_Lines\n$T0DataBg\n$MAP_Line\n$FRANGE_Line\n$PAC_Line\n\n"; # Now add the appropriate values of fit range and packing my $Range_Min = 8; @@ -396,12 +417,16 @@ SAVE # } } + $VIEWBIN_Line =""; + if ( $All{"ViewBin"}!=0 ) { $VIEWBIN_Line = "view_packing ".$All{"ViewBin"};} + my $RRFBlock=MSR::CreateRRFBlock(\%All); $PLOT_Block = "############################################################### PLOT $PLT runs $RUNS_Line $PRANGE_Line +$VIEWBIN_Line $RRFBlock $logxy"; @@ -443,9 +468,9 @@ STATISTIC --- 0000-00-00 00:00:00 return($Full_T_Block,\@Paramcomp); } -######################## +########################################################################## # CreateMSRSingleHist -######################## +########################################################################## sub CreateMSRSingleHist { my %All = %{$_[0]}; @@ -525,7 +550,7 @@ FUNCTIONS if ( $#RUNS == 0 && $#Hists == 0) { my $shcount = 1; } else { - if ( $All{"Sh_N0"} == 1 ) { + if ( $All{"Sh_No"} == 1 ) { my $shcount = 1; } elsif ( $All{"Sh_NBg"} == 1 ) { my $shcount = 1; @@ -540,6 +565,7 @@ FUNCTIONS # range order my $Range_Order = 1; + my $iHist = 0; foreach my $RUN (@RUNS) { ####################################################################### # For a single histogram fit we basically need to repeat this for each hist @@ -561,24 +587,26 @@ FUNCTIONS # How many non-shared parameter for this RUN? my $nonsh = 0; - # Prepeare N0/NBg line for the RUN block. Empty initially. - my $N0Bg_Line = $EMPTY; + # Prepeare No/NBg line for the RUN block. Empty initially. + my $NoBg_Line = $EMPTY; # Loop over all components in the fit foreach my $FitType (@FitTypes) { ++$component; my $Parameters = $Paramcomp[ $component - 1 ]; my @Params = split( /\s+/, $Parameters ); + # Only the first histiograms has new physical parameters + # the others keep only Phi if they have it - # For the first component we need N0 and NBg for SingleHist fits - if ( $component == 1 && $All{"FitAsyType"} eq "SingleHist" ) { - unshift( @Params, ( "N0", "NBg" ) ); + # For the first component we need No and NBg for SingleHist fits + if ( $component == 1 ) { + unshift( @Params, ( "No", "NBg" ) ); } foreach $Param (@Params) { $Param_ORG = $Param; $Param=$Param.$Hist; - if ( ($#FitTypes != 0) && ( $Param ne "N0" && $Param ne "NBg" ) ) { + if ( ($#FitTypes != 0) && !( $Param_ORG =~ m/^(No|NBg)/ ) ) { $Param = join( $EMPTY, $Param, "_", "$component" ); } @@ -591,35 +619,35 @@ FUNCTIONS $Shared = $All{"Sh_$Param"}; } - # N0 and NBg Lines + # No and NBg Lines # - # If you encounter N0 in the parameters list make sure + # If you encounter No in the parameters list make sure # to fill this line for the RUN block. - if ( $Param_ORG eq "N0" ) { + if ( $Param_ORG eq "No" ) { if ($Shared) { - $N0Bg_Line = "norm 1\n"; + $NoBg_Line = "norm 1\n"; } else { - $N0Bg_Line = "norm $PCount\n"; + $NoBg_Line = "norm $PCount\n"; } # Optional - add lifetime correction for SingleHist fits if ( $All{"ltc"} eq "y" ) { - $N0Bg_Line = $N0Bg_Line . "lifetimecorrection\n"; + $NoBg_Line = $NoBg_Line . "lifetimecorrection\n"; } } # If you encounter NBg in the parameters list make sure # to fill this line for the RUN block. elsif ( $Param_ORG eq "NBg" ) { if ($Shared) { - $N0Bg_Line = $N0Bg_Line . "backgr.fit 2\n"; + $NoBg_Line = $NoBg_Line . "backgr.fit 2\n"; } else { - $N0Bg_Line = $N0Bg_Line . "backgr.fit $PCount\n"; + $NoBg_Line = $NoBg_Line . "backgr.fit $PCount\n"; } } - # End of N0 and NBg Lines + # End of No and NBg Lines #################################################################################################### # Start preparing the parameters block @@ -633,7 +661,7 @@ FUNCTIONS } 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)) { + if ( !( $Param_ORG =~ m/^(No|NBg)/ ) && ($#RUNS != 0 || $#Hist != 0)) { ++$nonsh; $Full_T_Block =~ s/$Param_ORG/map$nonsh/; $MAP_Line = join( ' ', $MAP_Line, $PCount ); @@ -649,7 +677,7 @@ FUNCTIONS # For each defined range we need a block in the RUN-Block # Also for each histogram in Single Histograms fits - # Also for Imaginaryand and Real for RRF fits + # Also for Imaginary and and Real for RRF fits $RUN = $RUNS[ $iRun - 1 ]; @@ -686,7 +714,7 @@ FUNCTIONS $Tmp_Hist_Line = $Hist_Lines; $Tmp_Hist_Line =~ s/HIST/$Hist/g; $Single_RUN = $Single_RUN - . "$RUN_Line\n$Type_Line\n$N0Bg_Line$Tmp_Hist_Line\n$Data_Line\n$MAP_Line\n$FRANGE_Line\n$PAC_Line\n\n"; + . "$RUN_Line\n$Type_Line\n$NoBg_Line$Tmp_Hist_Line\n$Data_Line\n$MAP_Line\n$FRANGE_Line\n$PAC_Line\n\n"; # Now add the appropriate values of fit range and packing my $Range_Min = 8; @@ -707,6 +735,7 @@ FUNCTIONS ++$k; ++$Range_Order; } + ++$iHist; } ++$iRun; } @@ -843,8 +872,8 @@ sub CreateTheory { "generExpo", "Lam Bet", "simpleGss", "Sgm", "statGssKT", "Sgm", - "statGssKTLF", "Frq Sgm", - "dynGssKTLF", "Frq Sgm Lam", + "statGssKTLF", "Frqg Sgm", + "dynGssKTLF", "Frql Sgm Lam", "statExpKT", "Lam", "statExpKTLF", "Frq Aa", "dynExpKTLF", "Frq Aa Lam", @@ -1011,6 +1040,18 @@ sub CreateTheory { $Parameters = join( $SPACE, $Parameters, $THEORY{'statGssKTLF'} ); } + # Lorentzian or Gaussian KT LF multiplied by stretched exponential + elsif ( $FitType eq "MolMag" ) { + $T_Block = $T_Block . "\n" . "generExpo " . $THEORY{'generExpo'}; + $Parameters = join( $SPACE, $Parameters, $THEORY{'generExpo'} ); + $T_Block = + $T_Block . "\n" . "statExpKTLF " . $THEORY{'statExpKTLF'}; + $Parameters = join( $SPACE, $Parameters, $THEORY{'statExpKTLF'} ); + $T_Block = + $T_Block . "\n" . "statGssKTLF " . $THEORY{'statGssKTLF'}; + $Parameters = join( $SPACE, $Parameters, $THEORY{'statGssKTLF'} ); + } + # Meissner state model elsif ( $FitType eq "Meissner" ) { $T_Block = $T_Block . "\n" . "simpleGss " . $THEORY{'simpleGss'}; @@ -1068,7 +1109,7 @@ sub ExtractBlks { my @Param=split(/\s+/,$line); } - return(\@TBlock,\@FPBlock) + return(\@TBlock,\@FPBlock); } @@ -1092,15 +1133,15 @@ sub T0BgData { "3",",66000,66500,3419,63000", "4",",66000,66500,3419,63000"); - my %GPS=("1",",40,120,135,8000", - "2",",40,120,135,8000", - "3",",40,120,135,8000", - "4",",40,120,135,8000"); +# my %GPS=("1",",40,120,135,8000", +# "2",",40,120,135,8000", +# "3",",40,120,135,8000", +# "4",",40,120,135,8000"); - my %Dolly=("1",",50,250,297,8000", - "2",",50,250,297,8000", - "3",",50,250,297,8000", - "4",",50,250,297,8000"); +# my %Dolly=("1",",50,250,297,8000", +# "2",",50,250,297,8000", +# "3",",50,250,297,8000", +# "4",",50,250,297,8000"); my %RV=(); @@ -1137,8 +1178,8 @@ sub PrepParamTable { "Asy_min", "0", "Asy_max", "0", "Alpha", "1.0", "dAlpha", "0.01", "Alpha_min", "0", "Alpha_max", "0", - "N0", "300.0", "dN0", "0.01", - "N0_min", "0", "N0_max", "0", + "No", "300.0", "dNo", "0.01", + "No_min", "0", "No_max", "0", "NBg", "30.0", "dNBg", "0.01", "NBg_min", "0", "NBg_max", "0", "Lam", "1.0", "dLam", "0.01", @@ -1248,6 +1289,7 @@ sub PrepParamTable { # We can remove it from the MSR module later... # Or keep in the MSR as function ?? + # We have two options here, either take default values or take values of previous # run if available # $ParamPrev =~ s/$iRun-1/$iRun/g; @@ -1273,7 +1315,7 @@ sub PrepParamTable { my $Parameters=$Paramcomp[$Component-1]; my @Params = split( /\s+/, $Parameters ); if ( $Component == 1 ) { - unshift( @Params, ( "N0", "NBg" ) ); + unshift( @Params, ( "No", "NBg" ) ); } # This is the counter for parameters of this component @@ -1282,8 +1324,10 @@ sub PrepParamTable { # Change state/label of parameters foreach my $Param (@Params) { my $Param_ORG = $Param; + # If multiple histograms (sum or difference) take the first histogram only + ($Hist,$tmp) = split(/ /,$Hist); $Param=$Param.$Hist; - if ( $#FitTypes != 0 && ( $Param_ORG ne "N0" && $Param_ORG ne "NBg" ) ){ + if ( $#FitTypes != 0 && ( $Param_ORG ne "No" && $Param_ORG ne "NBg" ) ){ $Param = join( $EMPTY, $Param, "_", "$Component" ); } @@ -1433,7 +1477,7 @@ sub ExportParams { my $Parameters=$Paramcomp[$Component-1]; my @Params = split( /\s+/, $Parameters ); if ( $Component == 1 ) { - unshift( @Params, ( "N0", "NBg" ) ); + unshift( @Params, ( "No", "NBg" ) ); } # This is the counter for parameters of this component @@ -1443,7 +1487,7 @@ sub ExportParams { foreach my $Param (@Params) { my $Param_ORG = $Param; $Param=$Param.$Hist; - if ( $#FitTypes != 0 && ( $Param_ORG ne "N0" && $Param_ORG ne "NBg" ) ){ + if ( $#FitTypes != 0 && ( $Param_ORG ne "No" && $Param_ORG ne "NBg" ) ){ $Param = join( $EMPTY, $Param, "_", "$Component" ); } @@ -1597,41 +1641,20 @@ sub RUNFileNameAuto { $RUNFILE = "$DATADIR/$YEAR/$RUN_File_Name"; } elsif ( $BeamLine eq "GPS" ) { -# $RUN_File_Name = "deltat_pta_gps_" . $RUNtmp; $RUN_File_Name = "deltat_tdc_gps_" . $RUNtmp; - if ( $YEAR == $current_year ) { - $RUNFILE = "$DATADIR/$RUN_File_Name"; - } - else { - $RUNFILE = "$DATADIR/d$YEAR/pta/$RUN_File_Name"; - } + $RUNFILE = "$DATADIR/d$YEAR/tdc/$RUN_File_Name"; } elsif ( $BeamLine eq "LTF" ) { - $RUN_File_Name = "deltat_pta_ltf_" . $RUNtmp; - if ( $YEAR == $current_year ) { - $RUNFILE = "$DATADIR/$RUN_File_Name"; - } - else { - $RUNFILE = "$DATADIR/d$YEAR/pta/$RUN_File_Name"; - } + $RUN_File_Name = "deltat_tdc_ltf_" . $RUNtmp; + $RUNFILE = "$DATADIR/d$YEAR/tdc/$RUN_File_Name"; } elsif ( $BeamLine eq "Dolly" ) { - $RUN_File_Name = "deltat_pta_dolly_" . $RUNtmp; - if ( $YEAR == $current_year ) { - $RUNFILE = "$DATADIR/$RUN_File_Name"; - } - else { - $RUNFILE = "$DATADIR/d$YEAR/pta/$RUN_File_Name"; - } + $RUN_File_Name = "deltat_tdc_dolly_" . $RUNtmp; + $RUNFILE = "$DATADIR/d$YEAR/tdc/$RUN_File_Name"; } elsif ( $BeamLine eq "GPD" ) { - $RUN_File_Name = "deltat_pta_gpd_" . $RUNtmp; - if ( $YEAR == $current_year ) { - $RUNFILE = "$DATADIR/$RUN_File_Name"; - } - else { - $RUNFILE = "$DATADIR/d$YEAR/pta/$RUN_File_Name"; - } + $RUN_File_Name = "deltat_tdc_gpd_" . $RUNtmp; + $RUNFILE = "$DATADIR/d$YEAR/tdc/$RUN_File_Name"; } my $RUN_Line = join( $SPACE, "RUN", $RUNFILE, $BeamLines{$BeamLine}, "PSI", diff --git a/src/external/MuSRFitGUI/devel/MuSRFit.pl b/src/external/MuSRFitGUI/devel/MuSRFit.pl index 7e400597..6371b0ce 100755 --- a/src/external/MuSRFitGUI/devel/MuSRFit.pl +++ b/src/external/MuSRFitGUI/devel/MuSRFit.pl @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file 'MuSRFit.ui' # -# Created: Fri Jun 11 09:45:46 2010 +# Created: Fri May 13 14:43:52 2011 # by: The PerlQt User Interface Compiler (puic) # # WARNING! All changes made in this file will be lost! @@ -44,10 +44,20 @@ use Qt::slots fileBrowse => [], AppendToFunctions => [], InitializeFunctions => [], - optionCustromize => []; + optionConfigure => [], + t0UpdateClicked => []; use Qt::attributes qw( musrfit_tabs RUNSPage + RUNSAuto + RunNumbers + BeamLine + BeamLineLabel + YEAR + YEARLabel + RUNSMan + RunFiles + Browse groupBox7 FitType2 TfsLabel @@ -65,41 +75,23 @@ use Qt::attributes qw( FitAsyType LRBFLabel LRBF - RUNSAuto - YEARLabel - BeamLine - BeamLineLabel - YEAR - RunNumbers - RUNSMan - RunFiles - Browse FittingPage - Minimization - textLabel1_4 - Yf - textLabel1_5_2 - Xi - textLabel1_4_2 - ErrorCalc - textLabel1_5 Yi + Minimization + Xi + textLabel1_4_2_2 Xf + textLabel1_5 + textLabel1_4_2 + ViewBin + Yf + ErrorCalc ltc + textLabel1_5_2 + textLabel1_4 FitTextOutput SharingPage buttonGroupSharing - SharingComp1 - ShParam_1_1 - ShParam_1_2 - ShParam_1_3 - ShParam_1_4 - ShParam_1_5 - ShParam_1_6 - ShParam_1_7 - ShParam_1_8 - ShParam_1_9 - Comp1ShLabel SharingComp2 Comp2ShLabel ShParam_2_1 @@ -122,6 +114,17 @@ use Qt::attributes qw( ShParam_3_7 ShParam_3_8 ShParam_3_9 + SharingComp1 + ShParam_1_1 + ShParam_1_2 + ShParam_1_3 + ShParam_1_4 + ShParam_1_5 + ShParam_1_6 + ShParam_1_7 + ShParam_1_8 + ShParam_1_9 + Comp1ShLabel InitializationPage InitParamTable MSRPage @@ -192,6 +195,7 @@ use Qt::attributes qw( Bg24 Data14 Data24 + t0Update TabPage TheoryBlock_Label TheoryBlock @@ -241,7 +245,7 @@ use Qt::attributes qw( T0 optionsFourier optionsT0 - optionsCustomise + optionsConfigure ); @@ -1705,26 +1709,108 @@ sub NEW { setName("MuSRFitform" ); } - setSizePolicy(Qt::SizePolicy(3, 3, 1, 1, this->sizePolicy()->hasHeightForWidth()) ); - setMinimumSize(Qt::Size(21, 275) ); + setSizePolicy(Qt::SizePolicy(7, 7, 1, 1, this->sizePolicy()->hasHeightForWidth()) ); + setMinimumSize(Qt::Size(582, 502) ); setIcon($image0 ); setCentralWidget(Qt::Widget(this, "qt_central_widget")); + my $MuSRFitformLayout = Qt::GridLayout(centralWidget(), 1, 1, 11, 6, '$MuSRFitformLayout'); musrfit_tabs = Qt::TabWidget(centralWidget(), "musrfit_tabs"); musrfit_tabs->setEnabled( 1 ); - musrfit_tabs->setGeometry( Qt::Rect(10, 10, 560, 400) ); 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) ); + musrfit_tabs->setMaximumSize( Qt::Size(32767, 32767) ); RUNSPage = Qt::Widget(musrfit_tabs, "RUNSPage"); + my $RUNSPageLayout = Qt::GridLayout(RUNSPage, 1, 1, 11, 6, '$RUNSPageLayout'); - my $LayoutWidget = Qt::Widget(RUNSPage, '$LayoutWidget'); - $LayoutWidget->setGeometry( Qt::Rect(3, 100, 545, 203) ); - my $layout26 = Qt::VBoxLayout($LayoutWidget, 5, 6, '$layout26'); + my $layout37 = Qt::VBoxLayout(undef, 0, 6, '$layout37'); - groupBox7 = Qt::GroupBox($LayoutWidget, "groupBox7"); + RUNSAuto = Qt::GroupBox(RUNSPage, "RUNSAuto"); + RUNSAuto->setSizePolicy( Qt::SizePolicy(7, 7, 1, 1, RUNSAuto->sizePolicy()->hasHeightForWidth()) ); + RUNSAuto->setMargin( int(5) ); + RUNSAuto->setColumnLayout( 0, &Vertical ); + RUNSAuto->layout()->setSpacing(6); + RUNSAuto->layout()->setMargin(11); + my $RUNSAutoLayout = Qt::GridLayout(RUNSAuto->layout() ); + $RUNSAutoLayout->setAlignment( &AlignTop ); + + my $layout32 = Qt::GridLayout(undef, 1, 1, 0, 6, '$layout32'); + + RunNumbers = Qt::LineEdit(RUNSAuto, "RunNumbers"); + RunNumbers->setSizePolicy( Qt::SizePolicy(7, 0, 0, 0, RunNumbers->sizePolicy()->hasHeightForWidth()) ); + RunNumbers->setMinimumSize( Qt::Size(0, 23) ); + + $layout32->addMultiCellWidget(RunNumbers, 0, 0, 0, 4); + + BeamLine = Qt::ComboBox(0, RUNSAuto, "BeamLine"); + BeamLine->setSizePolicy( Qt::SizePolicy(0, 5, 0, 0, BeamLine->sizePolicy()->hasHeightForWidth()) ); + BeamLine->setMinimumSize( Qt::Size(0, 20) ); + + $layout32->addWidget(BeamLine, 1, 2); + + BeamLineLabel = Qt::Label(RUNSAuto, "BeamLineLabel"); + BeamLineLabel->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, BeamLineLabel->sizePolicy()->hasHeightForWidth()) ); + BeamLineLabel->setMinimumSize( Qt::Size(0, 20) ); + + $layout32->addWidget(BeamLineLabel, 1, 1); + my $spacer = Qt::SpacerItem(181, 21, &Qt::SizePolicy::Expanding, &Qt::SizePolicy::Minimum); + $layout32->addItem($spacer, 1, 0); + + YEAR = Qt::ComboBox(0, RUNSAuto, "YEAR"); + YEAR->setSizePolicy( Qt::SizePolicy(0, 5, 0, 0, YEAR->sizePolicy()->hasHeightForWidth()) ); + YEAR->setMinimumSize( Qt::Size(0, 20) ); + YEAR->setEditable( 0 ); + YEAR->setSizeLimit( int(16) ); + YEAR->setInsertionPolicy( &Qt::ComboBox::AtTop() ); + YEAR->setAutoCompletion( 1 ); + YEAR->setDuplicatesEnabled( 0 ); + + $layout32->addWidget(YEAR, 1, 4); + + YEARLabel = Qt::Label(RUNSAuto, "YEARLabel"); + YEARLabel->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, YEARLabel->sizePolicy()->hasHeightForWidth()) ); + YEARLabel->setMinimumSize( Qt::Size(0, 20) ); + + $layout32->addWidget(YEARLabel, 1, 3); + + $RUNSAutoLayout->addLayout($layout32, 0, 0); + $layout37->addWidget(RUNSAuto); + + RUNSMan = Qt::GroupBox(RUNSPage, "RUNSMan"); + RUNSMan->setEnabled( 1 ); + RUNSMan->setSizePolicy( Qt::SizePolicy(7, 7, 1, 1, RUNSMan->sizePolicy()->hasHeightForWidth()) ); + RUNSMan->setMargin( int(5) ); + RUNSMan->setColumnLayout( 0, &Vertical ); + RUNSMan->layout()->setSpacing(6); + RUNSMan->layout()->setMargin(11); + my $RUNSManLayout = Qt::GridLayout(RUNSMan->layout() ); + $RUNSManLayout->setAlignment( &AlignTop ); + + my $layout33 = Qt::GridLayout(undef, 1, 1, 0, 6, '$layout33'); + my $spacer_2 = Qt::SpacerItem(411, 21, &Qt::SizePolicy::Expanding, &Qt::SizePolicy::Minimum); + $layout33->addItem($spacer_2, 1, 0); + + RunFiles = Qt::LineEdit(RUNSMan, "RunFiles"); + RunFiles->setEnabled( 1 ); + RunFiles->setSizePolicy( Qt::SizePolicy(7, 0, 0, 0, RunFiles->sizePolicy()->hasHeightForWidth()) ); + RunFiles->setMinimumSize( Qt::Size(0, 23) ); + + $layout33->addMultiCellWidget(RunFiles, 0, 0, 0, 1); + + Browse = Qt::PushButton(RUNSMan, "Browse"); + Browse->setEnabled( 1 ); + Browse->setSizePolicy( Qt::SizePolicy(0, 5, 0, 0, Browse->sizePolicy()->hasHeightForWidth()) ); + Browse->setMinimumSize( Qt::Size(0, 20) ); + + $layout33->addWidget(Browse, 1, 1); + + $RUNSManLayout->addLayout($layout33, 0, 0); + $layout37->addWidget(RUNSMan); + + groupBox7 = Qt::GroupBox(RUNSPage, "groupBox7"); + groupBox7->setSizePolicy( Qt::SizePolicy(7, 7, 1, 1, groupBox7->sizePolicy()->hasHeightForWidth()) ); my $pal = Qt::Palette(); my $cg = Qt::ColorGroup(); $cg->setColor(&Qt::ColorGroup::Foreground, &black); @@ -1783,24 +1869,27 @@ sub NEW groupBox7->setFrameShape( &Qt::GroupBox::GroupBoxPanel() ); groupBox7->setFrameShadow( &Qt::GroupBox::Sunken() ); groupBox7->setLineWidth( int(1) ); - groupBox7->setMargin( int(0) ); + groupBox7->setMargin( int(3) ); groupBox7->setAlignment( int(&Qt::GroupBox::AlignTop) ); + groupBox7->setColumnLayout( 0, &Vertical ); + groupBox7->layout()->setSpacing(6); + groupBox7->layout()->setMargin(11); + my $groupBox7Layout = Qt::GridLayout(groupBox7->layout() ); + $groupBox7Layout->setAlignment( &AlignTop ); - my $LayoutWidget_2 = Qt::Widget(groupBox7, '$LayoutWidget_2'); - $LayoutWidget_2->setGeometry( Qt::Rect(8, 21, 520, 125) ); - my $layout42 = Qt::GridLayout($LayoutWidget_2, 1, 1, 5, 6, '$layout42'); + my $layout42 = Qt::GridLayout(undef, 1, 1, 5, 6, '$layout42'); - FitType2 = Qt::ComboBox(0, $LayoutWidget_2, "FitType2"); + FitType2 = Qt::ComboBox(0, groupBox7, "FitType2"); FitType2->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, FitType2->sizePolicy()->hasHeightForWidth()) ); $layout42->addWidget(FitType2, 1, 1); - TfsLabel = Qt::Label($LayoutWidget_2, "TfsLabel"); + TfsLabel = Qt::Label(groupBox7, "TfsLabel"); TfsLabel->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, TfsLabel->sizePolicy()->hasHeightForWidth()) ); $layout42->addWidget(TfsLabel, 2, 1); - FitType1 = Qt::ComboBox(0, $LayoutWidget_2, "FitType1"); + FitType1 = Qt::ComboBox(0, groupBox7, "FitType1"); FitType1->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, FitType1->sizePolicy()->hasHeightForWidth()) ); FitType1->setSizeLimit( int(20) ); FitType1->setAutoCompletion( 0 ); @@ -1808,12 +1897,12 @@ sub NEW $layout42->addWidget(FitType1, 1, 0); - BINS = Qt::LineEdit($LayoutWidget_2, "BINS"); + BINS = Qt::LineEdit(groupBox7, "BINS"); BINS->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, BINS->sizePolicy()->hasHeightForWidth()) ); $layout42->addWidget(BINS, 3, 2); - Comp3Label = Qt::Label($LayoutWidget_2, "Comp3Label"); + Comp3Label = Qt::Label(groupBox7, "Comp3Label"); $cg->setColor(&Qt::ColorGroup::Foreground, &black); $cg->setColor(&Qt::ColorGroup::Button, Qt::Color(230,240,249)); $cg->setColor(&Qt::ColorGroup::Light, &white); @@ -1869,17 +1958,17 @@ sub NEW $layout42->addWidget(Comp3Label, 0, 2); - Tis = Qt::LineEdit($LayoutWidget_2, "Tis"); + Tis = Qt::LineEdit(groupBox7, "Tis"); Tis->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, Tis->sizePolicy()->hasHeightForWidth()) ); $layout42->addWidget(Tis, 3, 0); - Tfs = Qt::LineEdit($LayoutWidget_2, "Tfs"); + Tfs = Qt::LineEdit(groupBox7, "Tfs"); Tfs->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, Tfs->sizePolicy()->hasHeightForWidth()) ); $layout42->addWidget(Tfs, 3, 1); - Comp1Label = Qt::Label($LayoutWidget_2, "Comp1Label"); + Comp1Label = Qt::Label(groupBox7, "Comp1Label"); $cg->setColor(&Qt::ColorGroup::Foreground, &black); $cg->setColor(&Qt::ColorGroup::Button, Qt::Color(230,240,249)); $cg->setColor(&Qt::ColorGroup::Light, &white); @@ -1935,22 +2024,22 @@ sub NEW $layout42->addWidget(Comp1Label, 0, 0); - BINSLabel = Qt::Label($LayoutWidget_2, "BINSLabel"); + BINSLabel = Qt::Label(groupBox7, "BINSLabel"); BINSLabel->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, BINSLabel->sizePolicy()->hasHeightForWidth()) ); $layout42->addWidget(BINSLabel, 2, 2); - TisLabel = Qt::Label($LayoutWidget_2, "TisLabel"); + TisLabel = Qt::Label(groupBox7, "TisLabel"); TisLabel->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, TisLabel->sizePolicy()->hasHeightForWidth()) ); $layout42->addWidget(TisLabel, 2, 0); - FitType3 = Qt::ComboBox(0, $LayoutWidget_2, "FitType3"); + FitType3 = Qt::ComboBox(0, groupBox7, "FitType3"); FitType3->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, FitType3->sizePolicy()->hasHeightForWidth()) ); $layout42->addWidget(FitType3, 1, 2); - Comp2Label = Qt::Label($LayoutWidget_2, "Comp2Label"); + Comp2Label = Qt::Label(groupBox7, "Comp2Label"); $cg->setColor(&Qt::ColorGroup::Foreground, &black); $cg->setColor(&Qt::ColorGroup::Button, Qt::Color(230,240,249)); $cg->setColor(&Qt::ColorGroup::Light, &white); @@ -2005,199 +2094,110 @@ sub NEW Comp2Label->setPalette( $pal ); $layout42->addWidget(Comp2Label, 0, 1); - $layout26->addWidget(groupBox7); - my $layout23 = Qt::HBoxLayout(undef, 0, 3, '$layout23'); + $groupBox7Layout->addLayout($layout42, 0, 0); + $layout37->addWidget(groupBox7); - FitAsyTypeLabel = Qt::Label($LayoutWidget, "FitAsyTypeLabel"); + my $layout34 = Qt::HBoxLayout(undef, 0, 6, '$layout34'); + my $spacer_3 = Qt::SpacerItem(81, 21, &Qt::SizePolicy::Expanding, &Qt::SizePolicy::Minimum); + $layout34->addItem($spacer_3); + + FitAsyTypeLabel = Qt::Label(RUNSPage, "FitAsyTypeLabel"); FitAsyTypeLabel->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, FitAsyTypeLabel->sizePolicy()->hasHeightForWidth()) ); - $layout23->addWidget(FitAsyTypeLabel); + $layout34->addWidget(FitAsyTypeLabel); - FitAsyType = Qt::ComboBox(0, $LayoutWidget, "FitAsyType"); + FitAsyType = Qt::ComboBox(0, RUNSPage, "FitAsyType"); FitAsyType->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, FitAsyType->sizePolicy()->hasHeightForWidth()) ); - $layout23->addWidget(FitAsyType); + $layout34->addWidget(FitAsyType); - LRBFLabel = Qt::Label($LayoutWidget, "LRBFLabel"); + LRBFLabel = Qt::Label(RUNSPage, "LRBFLabel"); LRBFLabel->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, LRBFLabel->sizePolicy()->hasHeightForWidth()) ); - $layout23->addWidget(LRBFLabel); + $layout34->addWidget(LRBFLabel); - LRBF = Qt::LineEdit($LayoutWidget, "LRBF"); + LRBF = Qt::LineEdit(RUNSPage, "LRBF"); LRBF->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, LRBF->sizePolicy()->hasHeightForWidth()) ); - $layout23->addWidget(LRBF); - $layout26->addLayout($layout23); + $layout34->addWidget(LRBF); + $layout37->addLayout($layout34); - my $LayoutWidget_3 = Qt::Widget(RUNSPage, '$LayoutWidget_3'); - $LayoutWidget_3->setGeometry( Qt::Rect(3, 3, 545, 95) ); - my $layout43 = Qt::VBoxLayout($LayoutWidget_3, 5, 6, '$layout43'); - - RUNSAuto = Qt::GroupBox($LayoutWidget_3, "RUNSAuto"); - RUNSAuto->setSizePolicy( Qt::SizePolicy(5, 7, 0, 0, RUNSAuto->sizePolicy()->hasHeightForWidth()) ); - RUNSAuto->setMargin( int(5) ); - - YEARLabel = Qt::Label(RUNSAuto, "YEARLabel"); - YEARLabel->setGeometry( Qt::Rect(361, 55, 55, 26) ); - YEARLabel->setMinimumSize( Qt::Size(0, 20) ); - - BeamLine = Qt::ComboBox(0, RUNSAuto, "BeamLine"); - BeamLine->setGeometry( Qt::Rect(232, 55, 100, 26) ); - BeamLine->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, BeamLine->sizePolicy()->hasHeightForWidth()) ); - BeamLine->setMinimumSize( Qt::Size(0, 20) ); - - BeamLineLabel = Qt::Label(RUNSAuto, "BeamLineLabel"); - BeamLineLabel->setGeometry( Qt::Rect(127, 55, 99, 26) ); - BeamLineLabel->setMinimumSize( Qt::Size(0, 20) ); - - YEAR = Qt::ComboBox(0, RUNSAuto, "YEAR"); - YEAR->setGeometry( Qt::Rect(420, 55, 100, 26) ); - YEAR->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, YEAR->sizePolicy()->hasHeightForWidth()) ); - YEAR->setMinimumSize( Qt::Size(0, 20) ); - - RunNumbers = Qt::LineEdit(RUNSAuto, "RunNumbers"); - RunNumbers->setGeometry( Qt::Rect(15, 25, 505, 26) ); - RunNumbers->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, RunNumbers->sizePolicy()->hasHeightForWidth()) ); - RunNumbers->setMinimumSize( Qt::Size(0, 23) ); - $layout43->addWidget(RUNSAuto); - - RUNSMan = Qt::GroupBox($LayoutWidget_3, "RUNSMan"); - RUNSMan->setEnabled( 1 ); - RUNSMan->setMargin( int(5) ); - - RunFiles = Qt::LineEdit(RUNSMan, "RunFiles"); - RunFiles->setEnabled( 1 ); - RunFiles->setGeometry( Qt::Rect(15, 25, 505, 26) ); - RunFiles->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, RunFiles->sizePolicy()->hasHeightForWidth()) ); - RunFiles->setMinimumSize( Qt::Size(0, 23) ); - - Browse = Qt::PushButton(RUNSMan, "Browse"); - Browse->setEnabled( 1 ); - Browse->setGeometry( Qt::Rect(420, 55, 100, 26) ); - Browse->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, Browse->sizePolicy()->hasHeightForWidth()) ); - Browse->setMinimumSize( Qt::Size(0, 20) ); - $layout43->addWidget(RUNSMan); + $RUNSPageLayout->addLayout($layout37, 0, 0); musrfit_tabs->insertTab( RUNSPage, "" ); FittingPage = Qt::Widget(musrfit_tabs, "FittingPage"); + my $FittingPageLayout = Qt::GridLayout(FittingPage, 1, 1, 11, 6, '$FittingPageLayout'); - my $LayoutWidget_4 = Qt::Widget(FittingPage, '$LayoutWidget_4'); - $LayoutWidget_4->setGeometry( Qt::Rect(5, 10, 545, 350) ); - my $layout34 = Qt::VBoxLayout($LayoutWidget_4, 11, 6, '$layout34'); + my $layout28 = Qt::VBoxLayout(undef, 0, 6, '$layout28'); - my $layout33 = Qt::GridLayout(undef, 1, 1, 0, 6, '$layout33'); + my $layout27 = Qt::GridLayout(undef, 1, 1, 0, 6, '$layout27'); - Minimization = Qt::ComboBox(0, $LayoutWidget_4, "Minimization"); + Yi = Qt::LineEdit(FittingPage, "Yi"); - $layout33->addWidget(Minimization, 0, 1); + $layout27->addWidget(Yi, 1, 3); - textLabel1_4 = Qt::Label($LayoutWidget_4, "textLabel1_4"); + Minimization = Qt::ComboBox(0, FittingPage, "Minimization"); - $layout33->addWidget(textLabel1_4, 0, 2); + $layout27->addWidget(Minimization, 0, 1); - Yf = Qt::LineEdit($LayoutWidget_4, "Yf"); + Xi = Qt::LineEdit(FittingPage, "Xi"); - $layout33->addWidget(Yf, 1, 4); + $layout27->addWidget(Xi, 0, 3); - textLabel1_5_2 = Qt::Label($LayoutWidget_4, "textLabel1_5_2"); + textLabel1_4_2_2 = Qt::Label(FittingPage, "textLabel1_4_2_2"); - $layout33->addWidget(textLabel1_5_2, 1, 0); + $layout27->addWidget(textLabel1_4_2_2, 2, 3); - Xi = Qt::LineEdit($LayoutWidget_4, "Xi"); + Xf = Qt::LineEdit(FittingPage, "Xf"); - $layout33->addWidget(Xi, 0, 3); + $layout27->addWidget(Xf, 0, 4); - textLabel1_4_2 = Qt::Label($LayoutWidget_4, "textLabel1_4_2"); + textLabel1_5 = Qt::Label(FittingPage, "textLabel1_5"); - $layout33->addWidget(textLabel1_4_2, 1, 2); + $layout27->addWidget(textLabel1_5, 0, 0); - ErrorCalc = Qt::ComboBox(0, $LayoutWidget_4, "ErrorCalc"); + textLabel1_4_2 = Qt::Label(FittingPage, "textLabel1_4_2"); - $layout33->addWidget(ErrorCalc, 1, 1); + $layout27->addWidget(textLabel1_4_2, 1, 2); - textLabel1_5 = Qt::Label($LayoutWidget_4, "textLabel1_5"); + ViewBin = Qt::LineEdit(FittingPage, "ViewBin"); - $layout33->addWidget(textLabel1_5, 0, 0); + $layout27->addWidget(ViewBin, 2, 4); - Yi = Qt::LineEdit($LayoutWidget_4, "Yi"); + Yf = Qt::LineEdit(FittingPage, "Yf"); - $layout33->addWidget(Yi, 1, 3); + $layout27->addWidget(Yf, 1, 4); - Xf = Qt::LineEdit($LayoutWidget_4, "Xf"); + ErrorCalc = Qt::ComboBox(0, FittingPage, "ErrorCalc"); - $layout33->addWidget(Xf, 0, 4); + $layout27->addWidget(ErrorCalc, 1, 1); - ltc = Qt::CheckBox($LayoutWidget_4, "ltc"); + ltc = Qt::CheckBox(FittingPage, "ltc"); ltc->setChecked( 1 ); - $layout33->addMultiCellWidget(ltc, 2, 2, 0, 1); - $layout34->addLayout($layout33); + $layout27->addMultiCellWidget(ltc, 2, 2, 0, 1); - FitTextOutput = Qt::TextEdit($LayoutWidget_4, "FitTextOutput"); + textLabel1_5_2 = Qt::Label(FittingPage, "textLabel1_5_2"); + + $layout27->addWidget(textLabel1_5_2, 1, 0); + + textLabel1_4 = Qt::Label(FittingPage, "textLabel1_4"); + + $layout27->addWidget(textLabel1_4, 0, 2); + $layout28->addLayout($layout27); + + FitTextOutput = Qt::TextEdit(FittingPage, "FitTextOutput"); FitTextOutput->setOverwriteMode( 1 ); - $layout34->addWidget(FitTextOutput); + $layout28->addWidget(FitTextOutput); + + $FittingPageLayout->addLayout($layout28, 0, 0); musrfit_tabs->insertTab( FittingPage, "" ); SharingPage = Qt::Widget(musrfit_tabs, "SharingPage"); + my $SharingPageLayout = Qt::GridLayout(SharingPage, 1, 1, 11, 6, '$SharingPageLayout'); buttonGroupSharing = Qt::ButtonGroup(SharingPage, "buttonGroupSharing"); - 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, 20, 162, 330) ); - SharingComp1->setSizePolicy( Qt::SizePolicy(5, 3, 0, 0, SharingComp1->sizePolicy()->hasHeightForWidth()) ); - SharingComp1->setAlignment( int(&Qt::ButtonGroup::AlignLeft) ); - - my $LayoutWidget_5 = Qt::Widget(SharingComp1, '$LayoutWidget_5'); - $LayoutWidget_5->setGeometry( Qt::Rect(40, 60, 81, 266) ); - my $layout14 = Qt::VBoxLayout($LayoutWidget_5, 0, 0, '$layout14'); - - ShParam_1_1 = Qt::CheckBox($LayoutWidget_5, "ShParam_1_1"); - $layout14->addWidget(ShParam_1_1); - - ShParam_1_2 = Qt::CheckBox($LayoutWidget_5, "ShParam_1_2"); - $layout14->addWidget(ShParam_1_2); - - ShParam_1_3 = Qt::CheckBox($LayoutWidget_5, "ShParam_1_3"); - $layout14->addWidget(ShParam_1_3); - - ShParam_1_4 = Qt::CheckBox($LayoutWidget_5, "ShParam_1_4"); - $layout14->addWidget(ShParam_1_4); - - ShParam_1_5 = Qt::CheckBox($LayoutWidget_5, "ShParam_1_5"); - ShParam_1_5->setEnabled( 0 ); - ShParam_1_5->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); - ShParam_1_5->setTristate( 0 ); - $layout14->addWidget(ShParam_1_5); - - ShParam_1_6 = Qt::CheckBox($LayoutWidget_5, "ShParam_1_6"); - ShParam_1_6->setEnabled( 0 ); - ShParam_1_6->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); - ShParam_1_6->setTristate( 0 ); - $layout14->addWidget(ShParam_1_6); - - ShParam_1_7 = Qt::CheckBox($LayoutWidget_5, "ShParam_1_7"); - ShParam_1_7->setEnabled( 0 ); - ShParam_1_7->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); - ShParam_1_7->setTristate( 0 ); - $layout14->addWidget(ShParam_1_7); - - ShParam_1_8 = Qt::CheckBox($LayoutWidget_5, "ShParam_1_8"); - ShParam_1_8->setEnabled( 0 ); - ShParam_1_8->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); - ShParam_1_8->setTristate( 0 ); - $layout14->addWidget(ShParam_1_8); - - ShParam_1_9 = Qt::CheckBox($LayoutWidget_5, "ShParam_1_9"); - ShParam_1_9->setEnabled( 0 ); - ShParam_1_9->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); - ShParam_1_9->setTristate( 0 ); - $layout14->addWidget(ShParam_1_9); - - Comp1ShLabel = Qt::Label(SharingComp1, "Comp1ShLabel"); - Comp1ShLabel->setGeometry( Qt::Rect(2, 30, 185, 20) ); - Comp1ShLabel->setPaletteBackgroundColor( Qt::Color(255, 255, 127) ); + buttonGroupSharing->setCheckable( 1 ); + buttonGroupSharing->setChecked( 0 ); SharingComp2 = Qt::ButtonGroup(buttonGroupSharing, "SharingComp2"); SharingComp2->setEnabled( 0 ); @@ -2208,44 +2208,44 @@ sub NEW Comp2ShLabel->setGeometry( Qt::Rect(2, 30, 185, 20) ); Comp2ShLabel->setPaletteBackgroundColor( Qt::Color(255, 255, 127) ); - my $LayoutWidget_6 = Qt::Widget(SharingComp2, '$LayoutWidget_6'); - $LayoutWidget_6->setGeometry( Qt::Rect(40, 60, 81, 266) ); - my $layout13 = Qt::VBoxLayout($LayoutWidget_6, 0, 0, '$layout13'); + my $LayoutWidget = Qt::Widget(SharingComp2, '$LayoutWidget'); + $LayoutWidget->setGeometry( Qt::Rect(40, 60, 81, 266) ); + my $layout13 = Qt::VBoxLayout($LayoutWidget, 0, 0, '$layout13'); - ShParam_2_1 = Qt::CheckBox($LayoutWidget_6, "ShParam_2_1"); + ShParam_2_1 = Qt::CheckBox($LayoutWidget, "ShParam_2_1"); $layout13->addWidget(ShParam_2_1); - ShParam_2_2 = Qt::CheckBox($LayoutWidget_6, "ShParam_2_2"); + ShParam_2_2 = Qt::CheckBox($LayoutWidget, "ShParam_2_2"); $layout13->addWidget(ShParam_2_2); - ShParam_2_3 = Qt::CheckBox($LayoutWidget_6, "ShParam_2_3"); + ShParam_2_3 = Qt::CheckBox($LayoutWidget, "ShParam_2_3"); $layout13->addWidget(ShParam_2_3); - ShParam_2_4 = Qt::CheckBox($LayoutWidget_6, "ShParam_2_4"); + ShParam_2_4 = Qt::CheckBox($LayoutWidget, "ShParam_2_4"); $layout13->addWidget(ShParam_2_4); - ShParam_2_5 = Qt::CheckBox($LayoutWidget_6, "ShParam_2_5"); + ShParam_2_5 = Qt::CheckBox($LayoutWidget, "ShParam_2_5"); $layout13->addWidget(ShParam_2_5); - ShParam_2_6 = Qt::CheckBox($LayoutWidget_6, "ShParam_2_6"); + ShParam_2_6 = Qt::CheckBox($LayoutWidget, "ShParam_2_6"); ShParam_2_6->setEnabled( 0 ); ShParam_2_6->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); ShParam_2_6->setTristate( 0 ); $layout13->addWidget(ShParam_2_6); - ShParam_2_7 = Qt::CheckBox($LayoutWidget_6, "ShParam_2_7"); + ShParam_2_7 = Qt::CheckBox($LayoutWidget, "ShParam_2_7"); ShParam_2_7->setEnabled( 0 ); ShParam_2_7->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); ShParam_2_7->setTristate( 0 ); $layout13->addWidget(ShParam_2_7); - ShParam_2_8 = Qt::CheckBox($LayoutWidget_6, "ShParam_2_8"); + ShParam_2_8 = Qt::CheckBox($LayoutWidget, "ShParam_2_8"); ShParam_2_8->setEnabled( 0 ); ShParam_2_8->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); ShParam_2_8->setTristate( 0 ); $layout13->addWidget(ShParam_2_8); - ShParam_2_9 = Qt::CheckBox($LayoutWidget_6, "ShParam_2_9"); + ShParam_2_9 = Qt::CheckBox($LayoutWidget, "ShParam_2_9"); ShParam_2_9->setEnabled( 0 ); ShParam_2_9->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); ShParam_2_9->setTristate( 0 ); @@ -2261,51 +2261,110 @@ sub NEW Comp3ShLabel->setGeometry( Qt::Rect(2, 30, 185, 20) ); Comp3ShLabel->setPaletteBackgroundColor( Qt::Color(255, 255, 127) ); - my $LayoutWidget_7 = Qt::Widget(SharingComp3, '$LayoutWidget_7'); - $LayoutWidget_7->setGeometry( Qt::Rect(41, 58, 81, 266) ); - my $layout15 = Qt::VBoxLayout($LayoutWidget_7, 11, 6, '$layout15'); + my $LayoutWidget_2 = Qt::Widget(SharingComp3, '$LayoutWidget_2'); + $LayoutWidget_2->setGeometry( Qt::Rect(41, 58, 81, 266) ); + my $layout15 = Qt::VBoxLayout($LayoutWidget_2, 11, 6, '$layout15'); - ShParam_3_1 = Qt::CheckBox($LayoutWidget_7, "ShParam_3_1"); + ShParam_3_1 = Qt::CheckBox($LayoutWidget_2, "ShParam_3_1"); $layout15->addWidget(ShParam_3_1); - ShParam_3_2 = Qt::CheckBox($LayoutWidget_7, "ShParam_3_2"); + ShParam_3_2 = Qt::CheckBox($LayoutWidget_2, "ShParam_3_2"); $layout15->addWidget(ShParam_3_2); - ShParam_3_3 = Qt::CheckBox($LayoutWidget_7, "ShParam_3_3"); + ShParam_3_3 = Qt::CheckBox($LayoutWidget_2, "ShParam_3_3"); $layout15->addWidget(ShParam_3_3); - ShParam_3_4 = Qt::CheckBox($LayoutWidget_7, "ShParam_3_4"); + ShParam_3_4 = Qt::CheckBox($LayoutWidget_2, "ShParam_3_4"); $layout15->addWidget(ShParam_3_4); - ShParam_3_5 = Qt::CheckBox($LayoutWidget_7, "ShParam_3_5"); + ShParam_3_5 = Qt::CheckBox($LayoutWidget_2, "ShParam_3_5"); $layout15->addWidget(ShParam_3_5); - ShParam_3_6 = Qt::CheckBox($LayoutWidget_7, "ShParam_3_6"); + ShParam_3_6 = Qt::CheckBox($LayoutWidget_2, "ShParam_3_6"); ShParam_3_6->setEnabled( 0 ); ShParam_3_6->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); ShParam_3_6->setTristate( 0 ); $layout15->addWidget(ShParam_3_6); - ShParam_3_7 = Qt::CheckBox($LayoutWidget_7, "ShParam_3_7"); + ShParam_3_7 = Qt::CheckBox($LayoutWidget_2, "ShParam_3_7"); ShParam_3_7->setEnabled( 0 ); ShParam_3_7->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); ShParam_3_7->setTristate( 0 ); $layout15->addWidget(ShParam_3_7); - ShParam_3_8 = Qt::CheckBox($LayoutWidget_7, "ShParam_3_8"); + ShParam_3_8 = Qt::CheckBox($LayoutWidget_2, "ShParam_3_8"); ShParam_3_8->setEnabled( 0 ); ShParam_3_8->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); ShParam_3_8->setTristate( 0 ); $layout15->addWidget(ShParam_3_8); - ShParam_3_9 = Qt::CheckBox($LayoutWidget_7, "ShParam_3_9"); + ShParam_3_9 = Qt::CheckBox($LayoutWidget_2, "ShParam_3_9"); ShParam_3_9->setEnabled( 0 ); ShParam_3_9->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); ShParam_3_9->setTristate( 0 ); $layout15->addWidget(ShParam_3_9); + + SharingComp1 = Qt::ButtonGroup(buttonGroupSharing, "SharingComp1"); + SharingComp1->setEnabled( 0 ); + 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) ); + + my $LayoutWidget_3 = Qt::Widget(SharingComp1, '$LayoutWidget_3'); + $LayoutWidget_3->setGeometry( Qt::Rect(40, 60, 81, 266) ); + my $layout14 = Qt::VBoxLayout($LayoutWidget_3, 0, 0, '$layout14'); + + ShParam_1_1 = Qt::CheckBox($LayoutWidget_3, "ShParam_1_1"); + $layout14->addWidget(ShParam_1_1); + + ShParam_1_2 = Qt::CheckBox($LayoutWidget_3, "ShParam_1_2"); + $layout14->addWidget(ShParam_1_2); + + ShParam_1_3 = Qt::CheckBox($LayoutWidget_3, "ShParam_1_3"); + $layout14->addWidget(ShParam_1_3); + + ShParam_1_4 = Qt::CheckBox($LayoutWidget_3, "ShParam_1_4"); + $layout14->addWidget(ShParam_1_4); + + ShParam_1_5 = Qt::CheckBox($LayoutWidget_3, "ShParam_1_5"); + ShParam_1_5->setEnabled( 0 ); + ShParam_1_5->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); + ShParam_1_5->setTristate( 0 ); + $layout14->addWidget(ShParam_1_5); + + ShParam_1_6 = Qt::CheckBox($LayoutWidget_3, "ShParam_1_6"); + ShParam_1_6->setEnabled( 0 ); + ShParam_1_6->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); + ShParam_1_6->setTristate( 0 ); + $layout14->addWidget(ShParam_1_6); + + ShParam_1_7 = Qt::CheckBox($LayoutWidget_3, "ShParam_1_7"); + ShParam_1_7->setEnabled( 0 ); + ShParam_1_7->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); + ShParam_1_7->setTristate( 0 ); + $layout14->addWidget(ShParam_1_7); + + ShParam_1_8 = Qt::CheckBox($LayoutWidget_3, "ShParam_1_8"); + ShParam_1_8->setEnabled( 0 ); + ShParam_1_8->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); + ShParam_1_8->setTristate( 0 ); + $layout14->addWidget(ShParam_1_8); + + ShParam_1_9 = Qt::CheckBox($LayoutWidget_3, "ShParam_1_9"); + ShParam_1_9->setEnabled( 0 ); + ShParam_1_9->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); + ShParam_1_9->setTristate( 0 ); + $layout14->addWidget(ShParam_1_9); + + Comp1ShLabel = Qt::Label(SharingComp1, "Comp1ShLabel"); + Comp1ShLabel->setGeometry( Qt::Rect(2, 30, 185, 20) ); + Comp1ShLabel->setPaletteBackgroundColor( Qt::Color(255, 255, 127) ); + + $SharingPageLayout->addWidget(buttonGroupSharing, 0, 0); musrfit_tabs->insertTab( SharingPage, "" ); InitializationPage = Qt::Widget(musrfit_tabs, "InitializationPage"); + my $InitializationPageLayout = Qt::GridLayout(InitializationPage, 1, 1, 11, 6, '$InitializationPageLayout'); InitParamTable = Qt::Table(InitializationPage, "InitParamTable"); InitParamTable->setNumCols(InitParamTable->numCols() + 1); @@ -2316,7 +2375,6 @@ sub NEW InitParamTable->horizontalHeader()->setLabel(InitParamTable->numCols() - 1, trUtf8("Min")); InitParamTable->setNumCols(InitParamTable->numCols() + 1); InitParamTable->horizontalHeader()->setLabel(InitParamTable->numCols() - 1, trUtf8("Max")); - InitParamTable->setGeometry( Qt::Rect(5, 5, 545, 355) ); InitParamTable->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, InitParamTable->sizePolicy()->hasHeightForWidth()) ); InitParamTable->setMaximumSize( Qt::Size(32767, 32767) ); InitParamTable->setFocusPolicy( &Qt::Table::TabFocus() ); @@ -2332,312 +2390,341 @@ sub NEW InitParamTable->setShowGrid( 1 ); InitParamTable->setRowMovingEnabled( 0 ); InitParamTable->setFocusStyle( &Qt::Table::SpreadSheet() ); + + $InitializationPageLayout->addWidget(InitParamTable, 0, 0); musrfit_tabs->insertTab( InitializationPage, "" ); MSRPage = Qt::Widget(musrfit_tabs, "MSRPage"); + my $MSRPageLayout = Qt::GridLayout(MSRPage, 1, 1, 11, 6, '$MSRPageLayout'); - my $LayoutWidget_8 = Qt::Widget(MSRPage, '$LayoutWidget_8'); - $LayoutWidget_8->setGeometry( Qt::Rect(5, 5, 545, 355) ); - my $layout25 = Qt::VBoxLayout($LayoutWidget_8, 0, 6, '$layout25'); + my $layout25 = Qt::VBoxLayout(undef, 0, 6, '$layout25'); - groupTitle = Qt::GroupBox($LayoutWidget_8, "groupTitle"); + groupTitle = Qt::GroupBox(MSRPage, "groupTitle"); + groupTitle->setSizePolicy( Qt::SizePolicy(7, 0, 0, 0, groupTitle->sizePolicy()->hasHeightForWidth()) ); groupTitle->setMargin( int(5) ); + groupTitle->setColumnLayout( 0, &Vertical ); + groupTitle->layout()->setSpacing(6); + groupTitle->layout()->setMargin(11); + my $groupTitleLayout = Qt::GridLayout(groupTitle->layout() ); + $groupTitleLayout->setAlignment( &AlignTop ); - my $LayoutWidget_9 = Qt::Widget(groupTitle, '$LayoutWidget_9'); - $LayoutWidget_9->setGeometry( Qt::Rect(6, 8, 515, 100) ); - my $layout25_2 = Qt::VBoxLayout($LayoutWidget_9, 11, 6, '$layout25_2'); + my $layout25_2 = Qt::VBoxLayout(undef, 0, 6, '$layout25_2'); - TITLELabel = Qt::Label($LayoutWidget_9, "TITLELabel"); + TITLELabel = Qt::Label(groupTitle, "TITLELabel"); TITLELabel->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, TITLELabel->sizePolicy()->hasHeightForWidth()) ); $layout25_2->addWidget(TITLELabel); - TITLE = Qt::LineEdit($LayoutWidget_9, "TITLE"); - TITLE->setSizePolicy( Qt::SizePolicy(5, 0, 1, 1, TITLE->sizePolicy()->hasHeightForWidth()) ); + TITLE = Qt::LineEdit(groupTitle, "TITLE"); + TITLE->setSizePolicy( Qt::SizePolicy(7, 0, 1, 1, TITLE->sizePolicy()->hasHeightForWidth()) ); $layout25_2->addWidget(TITLE); my $layout17 = Qt::HBoxLayout(undef, 0, 6, '$layout17'); - FILENAMELabel = Qt::Label($LayoutWidget_9, "FILENAMELabel"); + FILENAMELabel = Qt::Label(groupTitle, "FILENAMELabel"); $layout17->addWidget(FILENAMELabel); - FILENAME = Qt::LineEdit($LayoutWidget_9, "FILENAME"); - FILENAME->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, FILENAME->sizePolicy()->hasHeightForWidth()) ); + FILENAME = Qt::LineEdit(groupTitle, "FILENAME"); + FILENAME->setSizePolicy( Qt::SizePolicy(7, 0, 0, 0, FILENAME->sizePolicy()->hasHeightForWidth()) ); $layout17->addWidget(FILENAME); $layout25_2->addLayout($layout17); + + $groupTitleLayout->addLayout($layout25_2, 0, 0); $layout25->addWidget(groupTitle); - textMSROutput = Qt::TextEdit($LayoutWidget_8, "textMSROutput"); + textMSROutput = Qt::TextEdit(MSRPage, "textMSROutput"); textMSROutput->setOverwriteMode( 1 ); $layout25->addWidget(textMSROutput); + + $MSRPageLayout->addLayout($layout25, 0, 0); musrfit_tabs->insertTab( MSRPage, "" ); FourierPage = Qt::Widget(musrfit_tabs, "FourierPage"); + my $FourierPageLayout = Qt::GridLayout(FourierPage, 1, 1, 11, 6, '$FourierPageLayout'); FourierBox = Qt::GroupBox(FourierPage, "FourierBox"); - FourierBox->setGeometry( Qt::Rect(6, 6, 547, 125) ); + FourierBox->setSizePolicy( Qt::SizePolicy(7, 0, 0, 0, FourierBox->sizePolicy()->hasHeightForWidth()) ); - my $LayoutWidget_10 = Qt::Widget(FourierBox, '$LayoutWidget_10'); - $LayoutWidget_10->setGeometry( Qt::Rect(12, 19, 525, 100) ); - my $layout34_2 = Qt::GridLayout($LayoutWidget_10, 1, 1, 5, 5, '$layout34_2'); + my $LayoutWidget_4 = Qt::Widget(FourierBox, '$LayoutWidget_4'); + $LayoutWidget_4->setGeometry( Qt::Rect(12, 19, 510, 100) ); + my $layout34_2 = Qt::GridLayout($LayoutWidget_4, 1, 1, 5, 5, '$layout34_2'); - FrqMin = Qt::LineEdit($LayoutWidget_10, "FrqMin"); + FrqMin = Qt::LineEdit($LayoutWidget_4, "FrqMin"); FrqMin->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FrqMin->sizePolicy()->hasHeightForWidth()) ); $layout34_2->addWidget(FrqMin, 0, 3); - textLabel1_3_4 = Qt::Label($LayoutWidget_10, "textLabel1_3_4"); + textLabel1_3_4 = Qt::Label($LayoutWidget_4, "textLabel1_3_4"); $layout34_2->addWidget(textLabel1_3_4, 1, 5); - textLabel1_7 = Qt::Label($LayoutWidget_10, "textLabel1_7"); + textLabel1_7 = Qt::Label($LayoutWidget_4, "textLabel1_7"); $layout34_2->addWidget(textLabel1_7, 1, 2); - textLabel1_3_5 = Qt::Label($LayoutWidget_10, "textLabel1_3_5"); + textLabel1_3_5 = Qt::Label($LayoutWidget_4, "textLabel1_3_5"); $layout34_2->addWidget(textLabel1_3_5, 2, 2); - FUnits = Qt::ComboBox(0, $LayoutWidget_10, "FUnits"); + FUnits = Qt::ComboBox(0, $LayoutWidget_4, "FUnits"); FUnits->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FUnits->sizePolicy()->hasHeightForWidth()) ); $layout34_2->addWidget(FUnits, 0, 1); - textLabel1_3_6 = Qt::Label($LayoutWidget_10, "textLabel1_3_6"); + textLabel1_3_6 = Qt::Label($LayoutWidget_4, "textLabel1_3_6"); $layout34_2->addWidget(textLabel1_3_6, 2, 3); - FApodization = Qt::ComboBox(0, $LayoutWidget_10, "FApodization"); + FApodization = Qt::ComboBox(0, $LayoutWidget_4, "FApodization"); FApodization->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FApodization->sizePolicy()->hasHeightForWidth()) ); $layout34_2->addWidget(FApodization, 1, 1); - FrqMax = Qt::LineEdit($LayoutWidget_10, "FrqMax"); + FrqMax = Qt::LineEdit($LayoutWidget_4, "FrqMax"); FrqMax->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FrqMax->sizePolicy()->hasHeightForWidth()) ); $layout34_2->addWidget(FrqMax, 0, 5); - FPlot = Qt::ComboBox(0, $LayoutWidget_10, "FPlot"); + FPlot = Qt::ComboBox(0, $LayoutWidget_4, "FPlot"); FPlot->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FPlot->sizePolicy()->hasHeightForWidth()) ); $layout34_2->addWidget(FPlot, 2, 1); - FUnitsLabel = Qt::Label($LayoutWidget_10, "FUnitsLabel"); + FUnitsLabel = Qt::Label($LayoutWidget_4, "FUnitsLabel"); $layout34_2->addWidget(FUnitsLabel, 0, 0); - textLabel1_3_8 = Qt::Label($LayoutWidget_10, "textLabel1_3_8"); + textLabel1_3_8 = Qt::Label($LayoutWidget_4, "textLabel1_3_8"); $layout34_2->addWidget(textLabel1_3_8, 2, 5); - textLabel1_3_7 = Qt::Label($LayoutWidget_10, "textLabel1_3_7"); + textLabel1_3_7 = Qt::Label($LayoutWidget_4, "textLabel1_3_7"); $layout34_2->addWidget(textLabel1_3_7, 2, 4); - FPlotLabel = Qt::Label($LayoutWidget_10, "FPlotLabel"); + FPlotLabel = Qt::Label($LayoutWidget_4, "FPlotLabel"); $layout34_2->addWidget(FPlotLabel, 2, 0); - textLabel1_2 = Qt::Label($LayoutWidget_10, "textLabel1_2"); + textLabel1_2 = Qt::Label($LayoutWidget_4, "textLabel1_2"); $layout34_2->addWidget(textLabel1_2, 0, 4); - FApodizationLabel = Qt::Label($LayoutWidget_10, "FApodizationLabel"); + FApodizationLabel = Qt::Label($LayoutWidget_4, "FApodizationLabel"); $layout34_2->addWidget(FApodizationLabel, 1, 0); - textLabel1_3_3 = Qt::Label($LayoutWidget_10, "textLabel1_3_3"); + textLabel1_3_3 = Qt::Label($LayoutWidget_4, "textLabel1_3_3"); $layout34_2->addWidget(textLabel1_3_3, 1, 4); - FPHASE = Qt::LineEdit($LayoutWidget_10, "FPHASE"); + FPHASE = Qt::LineEdit($LayoutWidget_4, "FPHASE"); FPHASE->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FPHASE->sizePolicy()->hasHeightForWidth()) ); $layout34_2->addWidget(FPHASE, 1, 3); - textLabel1 = Qt::Label($LayoutWidget_10, "textLabel1"); + textLabel1 = Qt::Label($LayoutWidget_4, "textLabel1"); $layout34_2->addWidget(textLabel1, 0, 2); + $FourierPageLayout->addWidget(FourierBox, 0, 0); + RRFBox = Qt::GroupBox(FourierPage, "RRFBox"); - RRFBox->setGeometry( Qt::Rect(6, 135, 547, 125) ); + RRFBox->setSizePolicy( Qt::SizePolicy(7, 0, 0, 0, RRFBox->sizePolicy()->hasHeightForWidth()) ); - my $LayoutWidget_11 = Qt::Widget(RRFBox, '$LayoutWidget_11'); - $LayoutWidget_11->setGeometry( Qt::Rect(10, 18, 265, 100) ); - my $layout35 = Qt::GridLayout($LayoutWidget_11, 1, 1, 5, 5, '$layout35'); + my $LayoutWidget_5 = Qt::Widget(RRFBox, '$LayoutWidget_5'); + $LayoutWidget_5->setGeometry( Qt::Rect(10, 18, 265, 100) ); + my $layout35 = Qt::GridLayout($LayoutWidget_5, 1, 1, 5, 5, '$layout35'); - textLabel1_6_2_2 = Qt::Label($LayoutWidget_11, "textLabel1_6_2_2"); + textLabel1_6_2_2 = Qt::Label($LayoutWidget_5, "textLabel1_6_2_2"); $layout35->addWidget(textLabel1_6_2_2, 2, 0); - textLabel1_6 = Qt::Label($LayoutWidget_11, "textLabel1_6"); + textLabel1_6 = Qt::Label($LayoutWidget_5, "textLabel1_6"); $layout35->addWidget(textLabel1_6, 0, 0); - textLabel1_6_2_4 = Qt::Label($LayoutWidget_11, "textLabel1_6_2_4"); + textLabel1_6_2_4 = Qt::Label($LayoutWidget_5, "textLabel1_6_2_4"); $layout35->addWidget(textLabel1_6_2_4, 2, 2); - RRFFrq = Qt::LineEdit($LayoutWidget_11, "RRFFrq"); + RRFFrq = Qt::LineEdit($LayoutWidget_5, "RRFFrq"); $layout35->addWidget(RRFFrq, 0, 1); - textLabel1_6_2_3 = Qt::Label($LayoutWidget_11, "textLabel1_6_2_3"); + textLabel1_6_2_3 = Qt::Label($LayoutWidget_5, "textLabel1_6_2_3"); $layout35->addWidget(textLabel1_6_2_3, 1, 2); - RRFPack = Qt::LineEdit($LayoutWidget_11, "RRFPack"); + RRFPack = Qt::LineEdit($LayoutWidget_5, "RRFPack"); $layout35->addWidget(RRFPack, 1, 1); - textLabel1_6_2 = Qt::Label($LayoutWidget_11, "textLabel1_6_2"); + textLabel1_6_2 = Qt::Label($LayoutWidget_5, "textLabel1_6_2"); $layout35->addWidget(textLabel1_6_2, 1, 0); - RRFUnits = Qt::ComboBox(0, $LayoutWidget_11, "RRFUnits"); + RRFUnits = Qt::ComboBox(0, $LayoutWidget_5, "RRFUnits"); $layout35->addWidget(RRFUnits, 0, 2); - RRFPhase = Qt::LineEdit($LayoutWidget_11, "RRFPhase"); + RRFPhase = Qt::LineEdit($LayoutWidget_5, "RRFPhase"); $layout35->addWidget(RRFPhase, 2, 1); + + $FourierPageLayout->addWidget(RRFBox, 1, 0); musrfit_tabs->insertTab( FourierPage, "" ); T0Page = Qt::Widget(musrfit_tabs, "T0Page"); my $T0PageLayout = Qt::GridLayout(T0Page, 1, 1, 11, 6, '$T0PageLayout'); - my $layout27 = Qt::HBoxLayout(undef, 0, 6, '$layout27'); + my $layout25_3 = Qt::HBoxLayout(undef, 0, 6, '$layout25_3'); groupHist0 = Qt::GroupBox(T0Page, "groupHist0"); - groupHist0->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, groupHist0->sizePolicy()->hasHeightForWidth()) ); + groupHist0->setSizePolicy( Qt::SizePolicy(7, 7, 1, 1, groupHist0->sizePolicy()->hasHeightForWidth()) ); groupHist0->setMinimumSize( Qt::Size(0, 0) ); - my $LayoutWidget_12 = Qt::Widget(groupHist0, '$LayoutWidget_12'); - $LayoutWidget_12->setGeometry( Qt::Rect(5, 18, 100, 150) ); - my $layout16_2 = Qt::VBoxLayout($LayoutWidget_12, 11, 6, '$layout16_2'); + my $LayoutWidget_6 = Qt::Widget(groupHist0, '$LayoutWidget_6'); + $LayoutWidget_6->setGeometry( Qt::Rect(5, 18, 100, 150) ); + my $layout16_2 = Qt::VBoxLayout($LayoutWidget_6, 11, 6, '$layout16_2'); - textLabel2 = Qt::Label($LayoutWidget_12, "textLabel2"); + textLabel2 = Qt::Label($LayoutWidget_6, "textLabel2"); $layout16_2->addWidget(textLabel2); - textLabel2_2_2_3 = Qt::Label($LayoutWidget_12, "textLabel2_2_2_3"); + textLabel2_2_2_3 = Qt::Label($LayoutWidget_6, "textLabel2_2_2_3"); $layout16_2->addWidget(textLabel2_2_2_3); - textLabel2_2_2 = Qt::Label($LayoutWidget_12, "textLabel2_2_2"); + textLabel2_2_2 = Qt::Label($LayoutWidget_6, "textLabel2_2_2"); $layout16_2->addWidget(textLabel2_2_2); - textLabel2_2_2_2 = Qt::Label($LayoutWidget_12, "textLabel2_2_2_2"); + textLabel2_2_2_2 = Qt::Label($LayoutWidget_6, "textLabel2_2_2_2"); $layout16_2->addWidget(textLabel2_2_2_2); - textLabel2_2_2_2_2 = Qt::Label($LayoutWidget_12, "textLabel2_2_2_2_2"); + textLabel2_2_2_2_2 = Qt::Label($LayoutWidget_6, "textLabel2_2_2_2_2"); $layout16_2->addWidget(textLabel2_2_2_2_2); - $layout27->addWidget(groupHist0); + $layout25_3->addWidget(groupHist0); groupHist1 = Qt::GroupBox(T0Page, "groupHist1"); + groupHist1->setSizePolicy( Qt::SizePolicy(7, 7, 1, 1, groupHist1->sizePolicy()->hasHeightForWidth()) ); + groupHist1->setMinimumSize( Qt::Size(0, 0) ); groupHist1->setFrameShadow( &Qt::GroupBox::Plain() ); - my $LayoutWidget_13 = Qt::Widget(groupHist1, '$LayoutWidget_13'); - $LayoutWidget_13->setGeometry( Qt::Rect(8, 17, 75, 150) ); - my $layout18 = Qt::VBoxLayout($LayoutWidget_13, 0, 0, '$layout18'); + my $LayoutWidget_7 = Qt::Widget(groupHist1, '$LayoutWidget_7'); + $LayoutWidget_7->setGeometry( Qt::Rect(8, 17, 75, 150) ); + my $layout18 = Qt::VBoxLayout($LayoutWidget_7, 0, 0, '$layout18'); - t01 = Qt::LineEdit($LayoutWidget_13, "t01"); + t01 = Qt::LineEdit($LayoutWidget_7, "t01"); $layout18->addWidget(t01); - Bg11 = Qt::LineEdit($LayoutWidget_13, "Bg11"); + Bg11 = Qt::LineEdit($LayoutWidget_7, "Bg11"); $layout18->addWidget(Bg11); - Bg21 = Qt::LineEdit($LayoutWidget_13, "Bg21"); + Bg21 = Qt::LineEdit($LayoutWidget_7, "Bg21"); $layout18->addWidget(Bg21); - Data11 = Qt::LineEdit($LayoutWidget_13, "Data11"); + Data11 = Qt::LineEdit($LayoutWidget_7, "Data11"); $layout18->addWidget(Data11); - Data21 = Qt::LineEdit($LayoutWidget_13, "Data21"); + Data21 = Qt::LineEdit($LayoutWidget_7, "Data21"); $layout18->addWidget(Data21); - $layout27->addWidget(groupHist1); + $layout25_3->addWidget(groupHist1); groupHist2 = Qt::GroupBox(T0Page, "groupHist2"); groupHist2->setEnabled( 1 ); + groupHist2->setSizePolicy( Qt::SizePolicy(7, 7, 1, 1, groupHist2->sizePolicy()->hasHeightForWidth()) ); groupHist2->setFrameShadow( &Qt::GroupBox::Plain() ); - my $LayoutWidget_14 = Qt::Widget(groupHist2, '$LayoutWidget_14'); - $LayoutWidget_14->setGeometry( Qt::Rect(8, 17, 75, 150) ); - my $layout18_2 = Qt::VBoxLayout($LayoutWidget_14, 0, 0, '$layout18_2'); + my $LayoutWidget_8 = Qt::Widget(groupHist2, '$LayoutWidget_8'); + $LayoutWidget_8->setGeometry( Qt::Rect(8, 17, 75, 150) ); + my $layout18_2 = Qt::VBoxLayout($LayoutWidget_8, 0, 0, '$layout18_2'); - t02 = Qt::LineEdit($LayoutWidget_14, "t02"); + t02 = Qt::LineEdit($LayoutWidget_8, "t02"); $layout18_2->addWidget(t02); - Bg12 = Qt::LineEdit($LayoutWidget_14, "Bg12"); + Bg12 = Qt::LineEdit($LayoutWidget_8, "Bg12"); $layout18_2->addWidget(Bg12); - Bg22 = Qt::LineEdit($LayoutWidget_14, "Bg22"); + Bg22 = Qt::LineEdit($LayoutWidget_8, "Bg22"); $layout18_2->addWidget(Bg22); - Data12 = Qt::LineEdit($LayoutWidget_14, "Data12"); + Data12 = Qt::LineEdit($LayoutWidget_8, "Data12"); $layout18_2->addWidget(Data12); - Data22 = Qt::LineEdit($LayoutWidget_14, "Data22"); + Data22 = Qt::LineEdit($LayoutWidget_8, "Data22"); $layout18_2->addWidget(Data22); - $layout27->addWidget(groupHist2); + $layout25_3->addWidget(groupHist2); groupHist3 = Qt::GroupBox(T0Page, "groupHist3"); groupHist3->setEnabled( 1 ); + groupHist3->setSizePolicy( Qt::SizePolicy(7, 7, 1, 1, groupHist3->sizePolicy()->hasHeightForWidth()) ); groupHist3->setFrameShadow( &Qt::GroupBox::Plain() ); - my $LayoutWidget_15 = Qt::Widget(groupHist3, '$LayoutWidget_15'); - $LayoutWidget_15->setGeometry( Qt::Rect(8, 17, 75, 150) ); - my $layout18_3 = Qt::VBoxLayout($LayoutWidget_15, 0, 0, '$layout18_3'); + my $LayoutWidget_9 = Qt::Widget(groupHist3, '$LayoutWidget_9'); + $LayoutWidget_9->setGeometry( Qt::Rect(8, 17, 75, 150) ); + my $layout18_3 = Qt::VBoxLayout($LayoutWidget_9, 0, 0, '$layout18_3'); - t03 = Qt::LineEdit($LayoutWidget_15, "t03"); + t03 = Qt::LineEdit($LayoutWidget_9, "t03"); $layout18_3->addWidget(t03); - Bg13 = Qt::LineEdit($LayoutWidget_15, "Bg13"); + Bg13 = Qt::LineEdit($LayoutWidget_9, "Bg13"); $layout18_3->addWidget(Bg13); - Bg23 = Qt::LineEdit($LayoutWidget_15, "Bg23"); + Bg23 = Qt::LineEdit($LayoutWidget_9, "Bg23"); $layout18_3->addWidget(Bg23); - Data13 = Qt::LineEdit($LayoutWidget_15, "Data13"); + Data13 = Qt::LineEdit($LayoutWidget_9, "Data13"); $layout18_3->addWidget(Data13); - Data23 = Qt::LineEdit($LayoutWidget_15, "Data23"); + Data23 = Qt::LineEdit($LayoutWidget_9, "Data23"); $layout18_3->addWidget(Data23); - $layout27->addWidget(groupHist3); + $layout25_3->addWidget(groupHist3); groupHist4 = Qt::GroupBox(T0Page, "groupHist4"); groupHist4->setEnabled( 1 ); + groupHist4->setSizePolicy( Qt::SizePolicy(7, 7, 1, 1, groupHist4->sizePolicy()->hasHeightForWidth()) ); groupHist4->setFrameShadow( &Qt::GroupBox::Plain() ); - my $LayoutWidget_16 = Qt::Widget(groupHist4, '$LayoutWidget_16'); - $LayoutWidget_16->setGeometry( Qt::Rect(8, 17, 75, 150) ); - my $layout18_4 = Qt::VBoxLayout($LayoutWidget_16, 0, 0, '$layout18_4'); + my $LayoutWidget_10 = Qt::Widget(groupHist4, '$LayoutWidget_10'); + $LayoutWidget_10->setGeometry( Qt::Rect(8, 17, 75, 150) ); + my $layout18_4 = Qt::VBoxLayout($LayoutWidget_10, 0, 0, '$layout18_4'); - t04 = Qt::LineEdit($LayoutWidget_16, "t04"); + t04 = Qt::LineEdit($LayoutWidget_10, "t04"); $layout18_4->addWidget(t04); - Bg14 = Qt::LineEdit($LayoutWidget_16, "Bg14"); + Bg14 = Qt::LineEdit($LayoutWidget_10, "Bg14"); $layout18_4->addWidget(Bg14); - Bg24 = Qt::LineEdit($LayoutWidget_16, "Bg24"); + Bg24 = Qt::LineEdit($LayoutWidget_10, "Bg24"); $layout18_4->addWidget(Bg24); - Data14 = Qt::LineEdit($LayoutWidget_16, "Data14"); + Data14 = Qt::LineEdit($LayoutWidget_10, "Data14"); $layout18_4->addWidget(Data14); - Data24 = Qt::LineEdit($LayoutWidget_16, "Data24"); + Data24 = Qt::LineEdit($LayoutWidget_10, "Data24"); $layout18_4->addWidget(Data24); - $layout27->addWidget(groupHist4); + $layout25_3->addWidget(groupHist4); - $T0PageLayout->addLayout($layout27, 0, 0); + $T0PageLayout->addLayout($layout25_3, 0, 0); + + my $layout29 = Qt::HBoxLayout(undef, 0, 6, '$layout29'); + my $spacer_4 = Qt::SpacerItem(461, 20, &Qt::SizePolicy::Expanding, &Qt::SizePolicy::Minimum); + $layout29->addItem($spacer_4); + + t0Update = Qt::PushButton(T0Page, "t0Update"); + t0Update->setEnabled( 0 ); + t0Update->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, t0Update->sizePolicy()->hasHeightForWidth()) ); + $layout29->addWidget(t0Update); + + $T0PageLayout->addLayout($layout29, 1, 0); musrfit_tabs->insertTab( T0Page, "" ); TabPage = Qt::Widget(musrfit_tabs, "TabPage"); + my $TabPageLayout = Qt::GridLayout(TabPage, 1, 1, 11, 6, '$TabPageLayout'); - my $LayoutWidget_17 = Qt::Widget(TabPage, '$LayoutWidget_17'); - $LayoutWidget_17->setGeometry( Qt::Rect(11, 6, 540, 360) ); - my $layout34_2_2 = Qt::VBoxLayout($LayoutWidget_17, 11, 6, '$layout34_2_2'); + my $layout34_2_2 = Qt::VBoxLayout(undef, 0, 6, '$layout34_2_2'); my $layout33_2 = Qt::GridLayout(undef, 1, 1, 0, 6, '$layout33_2'); - TheoryBlock_Label = Qt::Label($LayoutWidget_17, "TheoryBlock_Label"); + TheoryBlock_Label = Qt::Label(TabPage, "TheoryBlock_Label"); $cg->setColor(&Qt::ColorGroup::Foreground, &black); $cg->setColor(&Qt::ColorGroup::Button, Qt::Color(230,240,249)); $cg->setColor(&Qt::ColorGroup::Light, &white); @@ -2693,12 +2780,12 @@ sub NEW $layout33_2->addWidget(TheoryBlock_Label, 0, 0); - TheoryBlock = Qt::TextEdit($LayoutWidget_17, "TheoryBlock"); + TheoryBlock = Qt::TextEdit(TabPage, "TheoryBlock"); TheoryBlock->setEnabled( 1 ); $layout33_2->addWidget(TheoryBlock, 1, 0); - ParametersList_Label = Qt::Label($LayoutWidget_17, "ParametersList_Label"); + ParametersList_Label = Qt::Label(TabPage, "ParametersList_Label"); $cg->setColor(&Qt::ColorGroup::Foreground, &black); $cg->setColor(&Qt::ColorGroup::Button, Qt::Color(230,240,249)); $cg->setColor(&Qt::ColorGroup::Light, &white); @@ -2754,7 +2841,7 @@ sub NEW $layout33_2->addWidget(ParametersList_Label, 0, 1); - ParametersList = Qt::TextEdit($LayoutWidget_17, "ParametersList"); + ParametersList = Qt::TextEdit(TabPage, "ParametersList"); ParametersList->setEnabled( 1 ); $layout33_2->addWidget(ParametersList, 1, 1); @@ -2762,24 +2849,25 @@ sub NEW my $layout25_6 = Qt::HBoxLayout(undef, 0, 6, '$layout25_6'); - CParamsCombo = Qt::ComboBox(0, $LayoutWidget_17, "CParamsCombo"); - CParamsCombo->setSizePolicy( Qt::SizePolicy(0, 7, 0, 0, CParamsCombo->sizePolicy()->hasHeightForWidth()) ); + CParamsCombo = Qt::ComboBox(0, TabPage, "CParamsCombo"); + CParamsCombo->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, CParamsCombo->sizePolicy()->hasHeightForWidth()) ); $layout25_6->addWidget(CParamsCombo); - textLabel1_4_6 = Qt::Label($LayoutWidget_17, "textLabel1_4_6"); + textLabel1_4_6 = Qt::Label(TabPage, "textLabel1_4_6"); + textLabel1_4_6->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, textLabel1_4_6->sizePolicy()->hasHeightForWidth()) ); $layout25_6->addWidget(textLabel1_4_6); - ConstraintLine = Qt::LineEdit($LayoutWidget_17, "ConstraintLine"); - ConstraintLine->setSizePolicy( Qt::SizePolicy(7, 7, 0, 0, ConstraintLine->sizePolicy()->hasHeightForWidth()) ); + ConstraintLine = Qt::LineEdit(TabPage, "ConstraintLine"); + ConstraintLine->setSizePolicy( Qt::SizePolicy(7, 0, 0, 0, ConstraintLine->sizePolicy()->hasHeightForWidth()) ); ConstraintLine->setMinimumSize( Qt::Size(0, 25) ); $layout25_6->addWidget(ConstraintLine); - AddConstraint = Qt::PushButton($LayoutWidget_17, "AddConstraint"); - AddConstraint->setSizePolicy( Qt::SizePolicy(0, 7, 0, 0, AddConstraint->sizePolicy()->hasHeightForWidth()) ); + AddConstraint = Qt::PushButton(TabPage, "AddConstraint"); + AddConstraint->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, AddConstraint->sizePolicy()->hasHeightForWidth()) ); $layout25_6->addWidget(AddConstraint); $layout34_2_2->addLayout($layout25_6); - textLabel2_2_3_4 = Qt::Label($LayoutWidget_17, "textLabel2_2_3_4"); + textLabel2_2_3_4 = Qt::Label(TabPage, "textLabel2_2_3_4"); $cg->setColor(&Qt::ColorGroup::Foreground, &black); $cg->setColor(&Qt::ColorGroup::Button, Qt::Color(230,240,249)); $cg->setColor(&Qt::ColorGroup::Light, &white); @@ -2834,20 +2922,24 @@ sub NEW textLabel2_2_3_4->setPalette( $pal ); $layout34_2_2->addWidget(textLabel2_2_3_4); - FunctionsBlock = Qt::TextEdit($LayoutWidget_17, "FunctionsBlock"); + FunctionsBlock = Qt::TextEdit(TabPage, "FunctionsBlock"); $layout34_2_2->addWidget(FunctionsBlock); my $layout30 = Qt::HBoxLayout(undef, 0, 6, '$layout30'); - textLabel1_6_3 = Qt::Label($LayoutWidget_17, "textLabel1_6_3"); + textLabel1_6_3 = Qt::Label(TabPage, "textLabel1_6_3"); $layout30->addWidget(textLabel1_6_3); - ResetFunc = Qt::PushButton($LayoutWidget_17, "ResetFunc"); + ResetFunc = Qt::PushButton(TabPage, "ResetFunc"); ResetFunc->setMaximumSize( Qt::Size(100, 32767) ); $layout30->addWidget(ResetFunc); $layout34_2_2->addLayout($layout30); + + $TabPageLayout->addLayout($layout34_2_2, 0, 0); musrfit_tabs->insertTab( TabPage, "" ); + $MuSRFitformLayout->addWidget(musrfit_tabs, 0, 0); + fileNewAction= Qt::Action(this, "fileNewAction"); fileNewAction->setIconSet( Qt::IconSet($image3) ); fileOpenAction= Qt::Action(this, "fileOpenAction"); @@ -2911,7 +3003,7 @@ sub NEW optionsFourier->setToggleAction( 1 ); optionsT0= Qt::Action(this, "optionsT0"); optionsT0->setToggleAction( 1 ); - optionsCustomise= Qt::Action(this, "optionsCustomise"); + optionsConfigure= Qt::Action(this, "optionsConfigure"); FileToolBar = Qt::ToolBar("", this, &DockTop); @@ -2969,7 +3061,7 @@ sub NEW ManualFile->addTo( Options ); optionsFourier->addTo( Options ); optionsT0->addTo( Options ); - optionsCustomise->addTo( Options ); + optionsConfigure->addTo( Options ); MenuBar->insertItem( "", Options, 6 ); helpMenu = Qt::PopupMenu( this ); @@ -2982,7 +3074,7 @@ sub NEW MenuBar->insertSeparator( 8 ); languageChange(); - my $resize = Qt::Size(583, 501); + my $resize = Qt::Size(582, 502); $resize = $resize->expandedTo(minimumSizeHint()); resize( $resize ); clearWState( &Qt::WState_Polished ); @@ -2990,10 +3082,6 @@ sub NEW Qt::Object::connect(Fit, SIGNAL "activated()", this, SLOT "GoFit()"); Qt::Object::connect(parametersAppend_ToAction, SIGNAL "activated()", this, SLOT "parametersAppend()"); Qt::Object::connect(parametersExport_AsAction, SIGNAL "activated()", this, SLOT "parametersExport()"); - Qt::Object::connect(BeamLine, SIGNAL "activated(int)", this, SLOT "T0Update()"); - Qt::Object::connect(Browse, SIGNAL "clicked()", this, SLOT "fileBrowse()"); - Qt::Object::connect(InitParamTable, SIGNAL "valueChanged(int,int)", this, SLOT "CallMSRCreate()"); - Qt::Object::connect(musrfit_tabs, SIGNAL "selected(const QString&)", this, SLOT "TabChanged()"); Qt::Object::connect(fileChangeDirAction, SIGNAL "activated()", this, SLOT "fileChangeDir()"); Qt::Object::connect(fileOpenAction, SIGNAL "activated()", this, SLOT "fileOpen()"); Qt::Object::connect(fileSaveAction, SIGNAL "activated()", this, SLOT "fileSave()"); @@ -3011,11 +3099,17 @@ sub NEW Qt::Object::connect(Plot, SIGNAL "activated()", this, SLOT "GoPlot()"); Qt::Object::connect(ManualFile, SIGNAL "toggled(bool)", this, SLOT "RunSelectionToggle()"); Qt::Object::connect(ResetFunc, SIGNAL "clicked()", this, SLOT "InitializeFunctions()"); + Qt::Object::connect(AddConstraint, SIGNAL "clicked()", this, SLOT "AppendToFunctions()"); + Qt::Object::connect(InitParamTable, SIGNAL "valueChanged(int,int)", this, SLOT "CallMSRCreate()"); + Qt::Object::connect(buttonGroupSharing, SIGNAL "toggled(bool)", this, SLOT "ActivateShComp()"); + Qt::Object::connect(Browse, SIGNAL "clicked()", this, SLOT "fileBrowse()"); + Qt::Object::connect(BeamLine, SIGNAL "activated(int)", this, SLOT "T0Update()"); + Qt::Object::connect(FitType3, SIGNAL "activated(const QString&)", this, SLOT "InitializeFunctions()"); Qt::Object::connect(FitType1, SIGNAL "activated(const QString&)", this, SLOT "InitializeFunctions()"); Qt::Object::connect(FitType2, SIGNAL "activated(const QString&)", this, SLOT "InitializeFunctions()"); - Qt::Object::connect(FitType3, SIGNAL "activated(const QString&)", this, SLOT "InitializeFunctions()"); - Qt::Object::connect(AddConstraint, SIGNAL "clicked()", this, SLOT "AppendToFunctions()"); - Qt::Object::connect(optionsCustomise, SIGNAL "activated()", this, SLOT "optionCustromize()"); + Qt::Object::connect(musrfit_tabs, SIGNAL "selected(const QString&)", this, SLOT "TabChanged()"); + Qt::Object::connect(t0Update, SIGNAL "clicked()", this, SLOT "t0UpdateClicked()"); + Qt::Object::connect(buttonGroupSharing, SIGNAL "toggled(bool)", this, SLOT "ActivateShComp()"); setTabOrder(musrfit_tabs, RunNumbers); setTabOrder(RunNumbers, BeamLine); @@ -3104,6 +3198,22 @@ sub languageChange { setCaption(trUtf8("MuSRFit GUI") ); setIconText(trUtf8("MuSRFitGUI") ); + RUNSAuto->setTitle( trUtf8("RUN Numbers") ); + Qt::ToolTip::add(RunNumbers, trUtf8("Numbers of RUNs to fit. Multiple runs are comma separated.")); + Qt::WhatsThis::add(RunNumbers, trUtf8("Numbers of RUNs to fit. Multiple runs are comma separated.")); + BeamLine->clear(); + BeamLine->insertItem( trUtf8("LEM") ); + BeamLine->insertItem( trUtf8("GPS") ); + BeamLine->insertItem( trUtf8("Dolly") ); + BeamLine->insertItem( trUtf8("LTF") ); + BeamLineLabel->setText( trUtf8("On beam line") ); + YEARLabel->setText( trUtf8("Year") ); + RUNSMan->setTitle( trUtf8("RUN Files") ); + Qt::ToolTip::add(RunFiles, trUtf8("Names of data files to be fit. Multiple data files are comma separated.")); + Qt::WhatsThis::add(RunFiles, trUtf8("Names of data files to be fit. Multiple data files are comma separated.")); + Browse->setText( trUtf8("Browse") ); + Qt::ToolTip::add(Browse, trUtf8("Browse to select data files for fitting.")); + Qt::WhatsThis::add(Browse, trUtf8("Browse to select data files for fitting.")); groupBox7->setTitle( trUtf8("Theory Function") ); FitType2->clear(); FitType2->insertItem( trUtf8("Exponential") ); @@ -3119,9 +3229,10 @@ sub languageChange FitType2->insertItem( trUtf8("Gaussian Kubo-Toyabe LF x Exp") ); FitType2->insertItem( trUtf8("Lorentzian Kubo-Toyabe LF x Str Exp") ); FitType2->insertItem( trUtf8("Gaussian Kubo-Toyabe LF x Str Exp") ); + FitType2->insertItem( trUtf8("MolMag") ); FitType2->insertItem( trUtf8("Meissner State Model") ); FitType2->insertItem( trUtf8("None") ); - FitType2->setCurrentItem( int(14) ); + FitType2->setCurrentItem( int(15) ); TfsLabel->setText( trUtf8("Final Time") ); FitType1->clear(); FitType1->insertItem( trUtf8("Exponential") ); @@ -3137,8 +3248,8 @@ sub languageChange FitType1->insertItem( trUtf8("Gaussian Kubo-Toyabe LF x Exp") ); FitType1->insertItem( trUtf8("Lorentzian Kubo-Toyabe LF x Str Exp") ); FitType1->insertItem( trUtf8("Gaussian Kubo-Toyabe LF x Str Exp") ); + FitType1->insertItem( trUtf8("MolMag") ); FitType1->insertItem( trUtf8("Meissner State Model") ); - FitType1->insertItem( trUtf8("None") ); BINS->setText( trUtf8("100") ); Comp3Label->setText( trUtf8("Third Component") ); Tis->setText( trUtf8("0") ); @@ -3160,9 +3271,10 @@ sub languageChange FitType3->insertItem( trUtf8("Gaussian Kubo-Toyabe LF x Exp") ); FitType3->insertItem( trUtf8("Lorentzian Kubo-Toyabe LF x Str Exp") ); FitType3->insertItem( trUtf8("Gaussian Kubo-Toyabe LF x Str Exp") ); + FitType3->insertItem( trUtf8("MolMag") ); FitType3->insertItem( trUtf8("Meissner State Model") ); FitType3->insertItem( trUtf8("None") ); - FitType3->setCurrentItem( int(14) ); + FitType3->setCurrentItem( int(15) ); Comp2Label->setText( trUtf8("Second Component") ); FitAsyTypeLabel->setText( trUtf8("Fit type") ); FitAsyType->clear(); @@ -3170,56 +3282,22 @@ sub languageChange FitAsyType->insertItem( $image2, trUtf8("SingleHist") ); LRBFLabel->setText( trUtf8("Histograms list") ); LRBF->setText( trUtf8("1,3") ); - RUNSAuto->setTitle( trUtf8("RUN Numbers") ); - YEARLabel->setText( trUtf8("Year") ); - BeamLine->clear(); - BeamLine->insertItem( trUtf8("LEM") ); - BeamLine->insertItem( trUtf8("GPS") ); - BeamLine->insertItem( trUtf8("Dolly") ); - BeamLine->insertItem( trUtf8("LTF") ); - BeamLineLabel->setText( trUtf8("On beam line") ); - YEAR->clear(); - YEAR->insertItem( trUtf8("2010") ); - YEAR->insertItem( trUtf8("2009") ); - YEAR->insertItem( trUtf8("2008") ); - YEAR->insertItem( trUtf8("2007") ); - YEAR->insertItem( trUtf8("2006") ); - YEAR->insertItem( trUtf8("2005") ); - YEAR->insertItem( trUtf8("2004") ); - Qt::ToolTip::add(RunNumbers, trUtf8("Numbers of RUNs to fit. Multiple runs are comma separated.")); - Qt::WhatsThis::add(RunNumbers, trUtf8("Numbers of RUNs to fit. Multiple runs are comma separated.")); - RUNSMan->setTitle( trUtf8("RUN Files") ); - Qt::ToolTip::add(RunFiles, trUtf8("Names of data files to be fit. Multiple data files are comma separated.")); - Qt::WhatsThis::add(RunFiles, trUtf8("Names of data files to be fit. Multiple data files are comma separated.")); - Browse->setText( trUtf8("Browse") ); - Qt::ToolTip::add(Browse, trUtf8("Browse to select data files for fitting.")); - Qt::WhatsThis::add(Browse, trUtf8("Browse to select data files for fitting.")); musrfit_tabs->changeTab( RUNSPage, trUtf8("RUNS") ); Minimization->clear(); Minimization->insertItem( trUtf8("MINIMIZE") ); Minimization->insertItem( trUtf8("MIGRAD") ); Minimization->insertItem( trUtf8("SIMPLEX") ); - textLabel1_4->setText( trUtf8("X Range") ); - textLabel1_5_2->setText( trUtf8("Error estimation") ); + textLabel1_4_2_2->setText( trUtf8("View Binning") ); + textLabel1_5->setText( trUtf8("Minimization type") ); textLabel1_4_2->setText( trUtf8("Y Range") ); ErrorCalc->clear(); ErrorCalc->insertItem( trUtf8("HESSE") ); ErrorCalc->insertItem( trUtf8("MINOS") ); - textLabel1_5->setText( trUtf8("Minimization type") ); ltc->setText( trUtf8("Life time correction") ); + textLabel1_5_2->setText( trUtf8("Error estimation") ); + textLabel1_4->setText( trUtf8("X Range") ); musrfit_tabs->changeTab( FittingPage, trUtf8("Fitting") ); buttonGroupSharing->setTitle( trUtf8("Shared parameters among different runs") ); - SharingComp1->setTitle( trUtf8("1st Component") ); - ShParam_1_1->setText( trUtf8("Param1") ); - ShParam_1_2->setText( trUtf8("Param2") ); - ShParam_1_3->setText( trUtf8("Param3") ); - ShParam_1_4->setText( trUtf8("Param4") ); - ShParam_1_5->setText( trUtf8("Param5") ); - ShParam_1_6->setText( trUtf8("Param6") ); - ShParam_1_7->setText( trUtf8("Param7") ); - ShParam_1_8->setText( trUtf8("Param8") ); - ShParam_1_9->setText( trUtf8("Param9") ); - Comp1ShLabel->setText( trUtf8("FitType1") ); SharingComp2->setTitle( trUtf8("2nd Component") ); Comp2ShLabel->setText( trUtf8("FitType2") ); ShParam_2_1->setText( trUtf8("Param1") ); @@ -3242,6 +3320,17 @@ sub languageChange ShParam_3_7->setText( trUtf8("Param7") ); ShParam_3_8->setText( trUtf8("Param8") ); ShParam_3_9->setText( trUtf8("Param9") ); + SharingComp1->setTitle( trUtf8("1st Component") ); + ShParam_1_1->setText( trUtf8("Param1") ); + ShParam_1_2->setText( trUtf8("Param2") ); + ShParam_1_3->setText( trUtf8("Param3") ); + ShParam_1_4->setText( trUtf8("Param4") ); + ShParam_1_5->setText( trUtf8("Param5") ); + ShParam_1_6->setText( trUtf8("Param6") ); + ShParam_1_7->setText( trUtf8("Param7") ); + ShParam_1_8->setText( trUtf8("Param8") ); + ShParam_1_9->setText( trUtf8("Param9") ); + Comp1ShLabel->setText( trUtf8("FitType1") ); musrfit_tabs->changeTab( SharingPage, trUtf8("Sharing") ); InitParamTable->horizontalHeader()->setLabel( 0, trUtf8("Value") ); InitParamTable->horizontalHeader()->setLabel( 1, trUtf8("Error") ); @@ -3309,6 +3398,8 @@ sub languageChange groupHist2->setTitle( trUtf8("Hist2") ); groupHist3->setTitle( trUtf8("Hist3") ); groupHist4->setTitle( trUtf8("Hist4") ); + t0Update->setText( trUtf8("Update") ); + Qt::ToolTip::add(t0Update, trUtf8("Use musrt0 to set values")); musrfit_tabs->changeTab( T0Page, trUtf8("t0/Bg") ); TheoryBlock_Label->setText( trUtf8("THEORY Block") ); ParametersList_Label->setText( trUtf8("Parameters List") ); @@ -3393,8 +3484,8 @@ sub languageChange optionsFourier->setMenuText( trUtf8("Fourier") ); optionsT0->setText( trUtf8("T0 and Bg bins") ); optionsT0->setMenuText( trUtf8("T0 and Bg bins") ); - optionsCustomise->setText( trUtf8("Customise") ); - optionsCustomise->setMenuText( trUtf8("Customise") ); + optionsConfigure->setText( trUtf8("Configure") ); + optionsConfigure->setMenuText( trUtf8("Configure") ); FileToolBar->setLabel( trUtf8("File Menu") ); ActionsToolBar->setLabel( trUtf8("Actions Menu") ); MenuBar->findItem( 2 )->setText( trUtf8("&File") ); @@ -3595,7 +3686,6 @@ sub helpAbout sub CreateAllInput { -# TODO: Need to automatically generage years list depending on beamline my %All=(); # From RUNS Tab @@ -3607,6 +3697,14 @@ sub CreateAllInput $All{"optionsFourier"} = optionsFourier->isOn(); $All{"optionsT0"} = optionsT0->isOn(); $All{"YEAR"} =YEAR->currentText; + if ($All{"YEAR"} eq "") { +# If year combobox is empty fill it up from 2004 up to current year + my ($second, $minute, $hour, $dayOfMonth, $month, $yearOffset, $dayOfWeek, $dayOfYear, $daylightSavings) = localtime(); + my $current_year = 1900 + $yearOffset; + for (my $i=$current_year;$i>=2004;$i--) { + YEAR->insertItem($i,-1); + } + } # Time range and BINS $All{"Tis"} = Tis->text; $All{"Tfs"} = Tfs->text; @@ -3628,6 +3726,7 @@ sub CreateAllInput $All{"Xf"}=Xf->text; $All{"Yi"}=Yi->text; $All{"Yf"}=Yf->text; + $All{"ViewBin"}=ViewBin->text; # Life time correction if (ltc->isChecked()) { $All{"ltc"}="y"; @@ -3703,8 +3802,9 @@ sub CreateAllInput 10,"GLFExp", 11,"LLFSExp", 12,"GLFSExp", - 13,"Meissner", - 14,"None" + 13,"MolMag", + 14,"Meissner", + 15,"None" ); my $FT1=FitType1->currentItem; @@ -3733,6 +3833,8 @@ sub CreateAllInput $All{"Func_T_Block"}=TheoryBlock->text; # Shared settings are detected here + $All{"EnableSharing"} = buttonGroupSharing->isChecked(); + my $Shared = 0; my $PCount =0; my $Component=1; @@ -3744,7 +3846,7 @@ sub CreateAllInput unshift( @Params, "Alpha" ); } elsif ( $Component == 1 && $All{"FitAsyType"} eq "SingleHist" ) { - unshift( @Params, ( "N0", "NBg" ) ); + unshift( @Params, ( "No", "NBg" ) ); } # This is the counter for parameters of this component @@ -3757,7 +3859,7 @@ sub CreateAllInput if ( $All{"FitAsyType"} eq "SingleHist" ) { $Param=$Param.$Hists[0]; } - if ( $#FitTypes != 0 && ( $Param ne "Alpha" && $Param ne "N0" && $Param ne "NBg" ) ){ + if ( $#FitTypes != 0 && ( $Param ne "Alpha" && $Param ne "No" && $Param ne "NBg" ) ){ $Param = join( "", $Param, "_", $Component); } @@ -3973,44 +4075,48 @@ sub ActivateShComp 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 ); +# Possible to share only if sharing is enabled altogether + my $EnableSharing = $All{"EnableSharing"}; + if ($EnableSharing) { + 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" ) ); - } + if ( $Component == 1 && $All{"FitAsyType"} eq "Asymmetry" ) { + unshift( @Params, "Alpha" ); + } + elsif ( $Component == 1 && $All{"FitAsyType"} eq "SingleHist" ) { + unshift( @Params, ( "No", "NBg" ) ); + } # Make the component appear first (only if we have multiple runs) - my $ShCompG="SharingComp".$Component; - my $ShCG = child($ShCompG); - if ($#RUNS>0) { - $ShCG->setHidden(0); - $ShCG->setEnabled(1); - } - my $CompShLabel = "Comp".$Component."ShLabel"; - my $CompShL = child($CompShLabel); - $CompShL->setText($All{"FitType$Component"}); + my $ShCompG="SharingComp".$Component; + my $ShCG = child($ShCompG); + if ($#RUNS>0) { + $ShCG->setHidden(0); + $ShCG->setEnabled(1); + } + my $CompShLabel = "Comp".$Component."ShLabel"; + my $CompShL = child($CompShLabel); + $CompShL->setText($All{"FitType$Component"}); # Change state/label of parameters - for (my $i=1; $i<=9;$i++) { - my $ParamChkBx="ShParam_".$Component."_".$i; - my $ChkBx = child($ParamChkBx); - if ($Params[$i-1] ne "") { - $ChkBx->setHidden(0); - $ChkBx->setEnabled(1); - $ChkBx ->setText($Params[$i-1]); - } else { - $ChkBx->setHidden(1); + for (my $i=1; $i<=9;$i++) { + my $ParamChkBx="ShParam_".$Component."_".$i; + my $ChkBx = child($ParamChkBx); + if ($Params[$i-1] ne "") { + $ChkBx->setHidden(0); + $ChkBx->setEnabled(1); + $ChkBx ->setText($Params[$i-1]); + } else { + $ChkBx->setHidden(1); + } } + $Component++; } - $Component++; - } + } } @@ -4041,6 +4147,8 @@ sub InitializeTab # Fill the table with labels and values of parametr for (my $PCount=0;$PCount<$NParam;$PCount++) { my ($Param,$value,$error,$minvalue,$maxvalue,$RUN) = split(/,/,$PTable{$PCount}); +# Now make sure we have no nans + if ($error eq "nan") { $error=0.1;} # If you use this then reading the parameters from the table is a problem # You need to extract the correct parameter name from the row label # InitParamTable->verticalHeader()->setLabel( $PCount,"$RUN: $Param"); @@ -4062,6 +4170,7 @@ sub TabChanged # First make sure we have sharing initialized ActivateShComp(); +# Here we need to apply sharing if selected... InitializeTab(); UpdateMSRFileInitTable(); # And also setup T0 and Bg bins @@ -4136,6 +4245,7 @@ sub ShowMuSRT0 if (-e $FILENAME) { my $cmd="musrt0 $FILENAME &"; my $pid = system($cmd); + t0Update->setEnabled(1) } else { print STDERR "Cannot find MSR file!\n"; } @@ -4275,19 +4385,19 @@ sub InitializeFunctions my $Parameters=$Paramcomp[$Component-1]; my @Params = split( /\s+/, $Parameters ); -# Alpha, N0 and NBg are counted in the parameters +# Alpha, No and NBg are counted in the parameters if ( $Component == 1 && $All{"FitAsyType"} eq "Asymmetry" ) { unshift( @Params, "Alpha" ); } elsif ( $Component == 1 && $All{"FitAsyType"} eq "SingleHist" ) { - unshift( @Params, ( "N0", "NBg" ) ); + unshift( @Params, ( "No", "NBg" ) ); } # 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 "" ) { - if ($Params[$i-1] ne "Alpha" && $Params[$i-1] ne "N0" && $Params[$i-1] ne "NBg") { + if ($Params[$i-1] ne "Alpha" && $Params[$i-1] ne "No" && $Params[$i-1] ne "NBg") { CParamsCombo->insertItem($CParam,-1); $Full_T_Block=~ s/\b$Params[$i-1]\b/$CParam/; } @@ -4307,11 +4417,11 @@ sub InitializeFunctions } -sub optionCustromize +sub optionConfigure { use Customize; - + my $Customize = Qt::Dialog(this); my $w = Customize; $w->setModal(1); @@ -4319,7 +4429,47 @@ sub optionCustromize # $Customize->setMainWidget($w); # $w->show; # exit $Customize->exec; + +} + +sub t0UpdateClicked +{ + +# Read MSR file and get new values of t0,Bg and Data + my %All=CreateAllInput(); + my $FILENAME=$All{"FILENAME"}; + open (MSRF,q{<},"$FILENAME.msr" ); + my @lines = ; + close(IFILE); + + my @T0s = grep {/t0 /} @lines; + my @Bgs = grep {/background /} @lines; + my @Datas = grep {/data /} @lines; + + my @Hists = split(/,/, $All{"LRBF"} ); + my $NHist = $#Hists+1; + print "Histograms: $NHist\n"; + + my $FinHist = 1; +# First T0s + while ($FinHist) { + my $counter=0; + (my $tmp,my @SplitT0) = split( /\s+/, $T0s[$counter]); + (my $tmp,my @SplitBg) = split( /\s+/, $Bgs[$counter]); + (my $tmp,my @SplitData) = split( /\s+/, $Datas[$counter]); + if ($#SplitBg>0) { + foreach (@SplitBg) { + print $_."\n"; + } + } + $counter++; + if ($counter>=$#Bgs) {$FinHist=0;} + } + +# Finally, disable the update button + t0Update->setEnabled(0); +# t0Update->setText("musrt0") } diff --git a/src/external/MuSRFitGUI/devel/MuSRFit.ui b/src/external/MuSRFitGUI/devel/MuSRFit.ui index 9f209ef4..c04bd86d 100755 --- a/src/external/MuSRFitGUI/devel/MuSRFit.ui +++ b/src/external/MuSRFitGUI/devel/MuSRFit.ui @@ -8,22 +8,22 @@ 0 0 - 583 - 501 + 582 + 502 - 3 - 3 + 7 + 7 1 1 - 21 - 275 + 582 + 502 @@ -35,3503 +35,2195 @@ MuSRFitGUI - + - musrfit_tabs + unnamed - - true - - - - 10 - 10 - 560 - 400 - - - - - 7 - 7 - 1 - 1 - - - - - 560 - 400 - - - - - 95 - 32767 - - - + - RUNSPage + musrfit_tabs - - RUNS - - + + true + + + + 7 + 7 + 1 + 1 + + + + + 560 + 400 + + + + + 32767 + 32767 + + + - layout26 + RUNSPage - - - 3 - 100 - 545 - 203 - - - + + RUNS + + unnamed - - 5 - - + - groupBox7 + layout37 - - - - - 0 - 0 - 0 - - - 239 - 243 - 247 - - - 255 - 255 - 255 - - - 247 - 249 - 251 - - - 119 - 121 - 123 - - - 159 - 161 - 164 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 173 - 176 - 179 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - - - 128 - 128 - 128 - - - 239 - 243 - 247 - - - 255 - 255 - 255 - - - 255 - 255 - 255 - - - 119 - 121 - 123 - - - 159 - 161 - 164 - - - 128 - 128 - 128 - - - 255 - 255 - 255 - - - 128 - 128 - 128 - - - 255 - 255 - 255 - - - 173 - 176 - 179 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 192 - - - 128 - 0 - 128 - - - - - 0 - 0 - 0 - - - 239 - 243 - 247 - - - 255 - 255 - 255 - - - 255 - 255 - 255 - - - 119 - 121 - 123 - - - 159 - 161 - 164 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 173 - 176 - 179 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 192 - - - 128 - 0 - 128 - - - - - - AncestorOrigin - - - GroupBoxPanel - - - Sunken - - - 1 - - - 0 - - - Theory Function - - - AlignTop - - + - layout42 + unnamed - - - 8 - 21 - 520 - 125 - - - + - unnamed + RUNSAuto + + + + 7 + 7 + 1 + 1 + 5 - - - - 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 - - + + RUN Numbers + + - FitType2 + unnamed - - - 5 - 0 - 0 - 0 - - - - 14 - - - + + + layout32 + + + + unnamed + + + + RunNumbers + + + + 7 + 0 + 0 + 0 + + + + + 0 + 23 + + + + Numbers of RUNs to fit. Multiple runs are comma separated. + + + Numbers of RUNs to fit. Multiple runs are comma separated. + + + + + + LEM + + + + + GPS + + + + + Dolly + + + + + LTF + + + + BeamLine + + + + 0 + 5 + 0 + 0 + + + + + 0 + 20 + + + + + + BeamLineLabel + + + + 5 + 5 + 0 + 0 + + + + + 0 + 20 + + + + On beam line + + + + + spacer2 + + + Horizontal + + + Expanding + + + + 181 + 21 + + + + + + YEAR + + + + 0 + 5 + 0 + 0 + + + + + 0 + 20 + + + + false + + + 16 + + + AtTop + + + true + + + false + + + + + YEARLabel + + + + 5 + 5 + 0 + 0 + + + + + 0 + 20 + + + + Year + + + + + + + + + RUNSMan + + + true + + + + 7 + 7 + 1 + 1 + + + + 5 + + + RUN Files + + - TfsLabel + unnamed - - - 5 - 0 - 0 - 0 - - - - Final Time - - - Tfs - - - - - - Exponential + + + layout33 - - - - 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 - - + + + unnamed + + + + spacer3 + + + Horizontal + + + Expanding + + + + 411 + 21 + + + + + + RunFiles + + + true + + + + 7 + 0 + 0 + 0 + + + + + 0 + 23 + + + + Names of data files to be fit. Multiple data files are comma separated. + + + Names of data files to be fit. Multiple data files are comma separated. + + + + + Browse + + + true + + + + 0 + 5 + 0 + 0 + + + + + 0 + 20 + + + + Browse + + + Browse to select data files for fitting. + + + Browse to select data files for fitting. + + + + + + + + + groupBox7 + + + + 7 + 7 + 1 + 1 + + + + + + + 0 + 0 + 0 + + + 239 + 243 + 247 + + + 255 + 255 + 255 + + + 247 + 249 + 251 + + + 119 + 121 + 123 + + + 159 + 161 + 164 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 173 + 176 + 179 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + + + 128 + 128 + 128 + + + 239 + 243 + 247 + + + 255 + 255 + 255 + + + 255 + 255 + 255 + + + 119 + 121 + 123 + + + 159 + 161 + 164 + + + 128 + 128 + 128 + + + 255 + 255 + 255 + + + 128 + 128 + 128 + + + 255 + 255 + 255 + + + 173 + 176 + 179 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 192 + + + 128 + 0 + 128 + + + + + 0 + 0 + 0 + + + 239 + 243 + 247 + + + 255 + 255 + 255 + + + 255 + 255 + 255 + + + 119 + 121 + 123 + + + 159 + 161 + 164 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 173 + 176 + 179 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 192 + + + 128 + 0 + 128 + + + + + + AncestorOrigin + + + GroupBoxPanel + + + Sunken + + + 1 + + + 3 + + + Theory Function + + + AlignTop + + - FitType1 + unnamed - - - 5 - 0 - 0 - 0 - - - - 20 - - - false - - - false - - - + + + layout42 + + + + unnamed + + + 5 + + + + + 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 + + + + + MolMag + + + + + Meissner State Model + + + + + None + + + + FitType2 + + + + 5 + 0 + 0 + 0 + + + + 15 + + + + + TfsLabel + + + + 5 + 0 + 0 + 0 + + + + Final Time + + + Tfs + + + + + + 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 + + + + + MolMag + + + + + Meissner State Model + + + + FitType1 + + + + 5 + 0 + 0 + 0 + + + + 20 + + + false + + + false + + + + + BINS + + + + 5 + 0 + 0 + 0 + + + + 100 + + + + + Comp3Label + + + + + + 0 + 0 + 0 + + + 230 + 240 + 249 + + + 255 + 255 + 255 + + + 242 + 247 + 252 + + + 115 + 120 + 124 + + + 154 + 160 + 166 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 255 + 255 + 127 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + + + 128 + 128 + 128 + + + 230 + 240 + 249 + + + 255 + 255 + 255 + + + 255 + 255 + 255 + + + 115 + 120 + 124 + + + 154 + 160 + 166 + + + 128 + 128 + 128 + + + 255 + 255 + 255 + + + 128 + 128 + 128 + + + 255 + 255 + 255 + + + 255 + 255 + 127 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 238 + + + 82 + 24 + 139 + + + + + 0 + 0 + 0 + + + 230 + 240 + 249 + + + 255 + 255 + 255 + + + 255 + 255 + 255 + + + 115 + 120 + 124 + + + 154 + 160 + 166 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 255 + 255 + 127 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 238 + + + 82 + 24 + 139 + + + + + + Third Component + + + FitType1_2_2 + + + + + Tis + + + + 5 + 0 + 0 + 0 + + + + 0 + + + + + Tfs + + + + 5 + 0 + 0 + 0 + + + + 8 + + + + + Comp1Label + + + + + + 0 + 0 + 0 + + + 230 + 240 + 249 + + + 255 + 255 + 255 + + + 242 + 247 + 252 + + + 115 + 120 + 124 + + + 154 + 160 + 166 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 255 + 255 + 127 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + + + 128 + 128 + 128 + + + 230 + 240 + 249 + + + 255 + 255 + 255 + + + 255 + 255 + 255 + + + 115 + 120 + 124 + + + 154 + 160 + 166 + + + 128 + 128 + 128 + + + 255 + 255 + 255 + + + 128 + 128 + 128 + + + 255 + 255 + 255 + + + 255 + 255 + 127 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 238 + + + 82 + 24 + 139 + + + + + 0 + 0 + 0 + + + 230 + 240 + 249 + + + 255 + 255 + 255 + + + 255 + 255 + 255 + + + 115 + 120 + 124 + + + 154 + 160 + 166 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 255 + 255 + 127 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 238 + + + 82 + 24 + 139 + + + + + + First Component + + + FitType1 + + + + + BINSLabel + + + + 5 + 0 + 0 + 0 + + + + Binning Factor + + + BINS + + + + + TisLabel + + + + 5 + 0 + 0 + 0 + + + + Initial Time + + + Tis + + + + + + 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 + + + + + MolMag + + + + + Meissner State Model + + + + + None + + + + FitType3 + + + + 5 + 0 + 0 + 0 + + + + 15 + + + + + Comp2Label + + + + + + 0 + 0 + 0 + + + 230 + 240 + 249 + + + 255 + 255 + 255 + + + 242 + 247 + 252 + + + 115 + 120 + 124 + + + 154 + 160 + 166 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 255 + 255 + 127 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + + + 128 + 128 + 128 + + + 230 + 240 + 249 + + + 255 + 255 + 255 + + + 255 + 255 + 255 + + + 115 + 120 + 124 + + + 154 + 160 + 166 + + + 128 + 128 + 128 + + + 255 + 255 + 255 + + + 128 + 128 + 128 + + + 255 + 255 + 255 + + + 255 + 255 + 127 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 238 + + + 82 + 24 + 139 + + + + + 0 + 0 + 0 + + + 230 + 240 + 249 + + + 255 + 255 + 255 + + + 255 + 255 + 255 + + + 115 + 120 + 124 + + + 154 + 160 + 166 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 255 + 255 + 127 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 238 + + + 82 + 24 + 139 + + + + + + Second Component + + + FitType1_2 + + + + + + + + + layout34 + + - BINS + unnamed - - - 5 - 0 - 0 - 0 - - - - 100 - - - - - Comp3Label - - - - - - 0 - 0 - 0 - - - 230 - 240 - 249 - - - 255 - 255 - 255 - - - 242 - 247 - 252 - - - 115 - 120 - 124 - - - 154 - 160 - 166 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 255 - 255 - 127 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - - - 128 - 128 - 128 - - - 230 - 240 - 249 - - - 255 - 255 - 255 - - - 255 - 255 - 255 - - - 115 - 120 - 124 - - - 154 - 160 - 166 - - - 128 - 128 - 128 - - - 255 - 255 - 255 - - - 128 - 128 - 128 - - - 255 - 255 - 255 - - - 255 - 255 - 127 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 238 - - - 82 - 24 - 139 - - - - - 0 - 0 - 0 - - - 230 - 240 - 249 - - - 255 - 255 - 255 - - - 255 - 255 - 255 - - - 115 - 120 - 124 - - - 154 - 160 - 166 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 255 - 255 - 127 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 238 - - - 82 - 24 - 139 - - - - - - Third Component - - - FitType1_2_2 - - - - - Tis - - - - 5 - 0 - 0 - 0 - - - - 0 - - - - - Tfs - - - - 5 - 0 - 0 - 0 - - - - 8 - - - - - Comp1Label - - - - - - 0 - 0 - 0 - - - 230 - 240 - 249 - - - 255 - 255 - 255 - - - 242 - 247 - 252 - - - 115 - 120 - 124 - - - 154 - 160 - 166 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 255 - 255 - 127 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - - - 128 - 128 - 128 - - - 230 - 240 - 249 - - - 255 - 255 - 255 - - - 255 - 255 - 255 - - - 115 - 120 - 124 - - - 154 - 160 - 166 - - - 128 - 128 - 128 - - - 255 - 255 - 255 - - - 128 - 128 - 128 - - - 255 - 255 - 255 - - - 255 - 255 - 127 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 238 - - - 82 - 24 - 139 - - - - - 0 - 0 - 0 - - - 230 - 240 - 249 - - - 255 - 255 - 255 - - - 255 - 255 - 255 - - - 115 - 120 - 124 - - - 154 - 160 - 166 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 255 - 255 - 127 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 238 - - - 82 - 24 - 139 - - - - - - First Component - - - FitType1 - - - - - BINSLabel - - - - 5 - 0 - 0 - 0 - - - - Binning Factor - - - BINS - - - - - TisLabel - - - - 5 - 0 - 0 - 0 - - - - Initial Time - - - Tis - - - - - - Exponential + + + spacer4 - - - - Gaussian + + Horizontal - - - - Stretch Exp. + + Expanding - - - - Exponential Cos + + + 81 + 21 + - - - - Gaussian Cos + + + + FitAsyTypeLabel - - - - Stretch Cos + + + 5 + 0 + 0 + 0 + - - - Lorentzian Dynamic KT + Fit type + + + + + + Asymmetry + + + image1 + + + + + SingleHist + + + image2 + + + + FitAsyType + + + + 5 + 0 + 0 + 0 + + + + + + LRBFLabel + + + + 5 + 0 + 0 + 0 + - - - Gaussian Dynamic KT + Histograms list + + + + + LRBF + + + + 5 + 0 + 0 + 0 + - - - Background + 1,3 - - - - 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 - - - - - - 0 - 0 - 0 - - - 230 - 240 - 249 - - - 255 - 255 - 255 - - - 242 - 247 - 252 - - - 115 - 120 - 124 - - - 154 - 160 - 166 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 255 - 255 - 127 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - - - 128 - 128 - 128 - - - 230 - 240 - 249 - - - 255 - 255 - 255 - - - 255 - 255 - 255 - - - 115 - 120 - 124 - - - 154 - 160 - 166 - - - 128 - 128 - 128 - - - 255 - 255 - 255 - - - 128 - 128 - 128 - - - 255 - 255 - 255 - - - 255 - 255 - 127 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 238 - - - 82 - 24 - 139 - - - - - 0 - 0 - 0 - - - 230 - 240 - 249 - - - 255 - 255 - 255 - - - 255 - 255 - 255 - - - 115 - 120 - 124 - - - 154 - 160 - 166 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 255 - 255 - 127 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 238 - - - 82 - 24 - 139 - - - - - - Second Component - - - FitType1_2 - - - - + + + + - - - layout23 - - - - unnamed - - - 0 - - - 3 - - - - FitAsyTypeLabel - - - - 5 - 0 - 0 - 0 - - - - Fit type - - - - - - Asymmetry - - - image1 - - - - - SingleHist - - - image2 - - - - FitAsyType - - - - 5 - 0 - 0 - 0 - - - - - - LRBFLabel - - - - 5 - 0 - 0 - 0 - - - - Histograms list - - - - - LRBF - - - - 5 - 0 - 0 - 0 - - - - 1,3 - - - - - + - + - layout43 + FittingPage - - - 3 - 3 - 545 - 95 - - - + + Fitting + + unnamed - - 5 - - + - RUNSAuto + layout28 + + + + unnamed + + + + layout27 + + + + unnamed + + + + Yi + + + + + + MINIMIZE + + + + + MIGRAD + + + + + SIMPLEX + + + + Minimization + + + + + Xi + + + + + textLabel1_4_2_2 + + + View Binning + + + + + Xf + + + + + textLabel1_5 + + + Minimization type + + + + + textLabel1_4_2 + + + Y Range + + + + + ViewBin + + + + + Yf + + + + + + HESSE + + + + + MINOS + + + + ErrorCalc + + + + + ltc + + + Life time correction + + + true + + + + + textLabel1_5_2 + + + Error estimation + + + + + textLabel1_4 + + + X Range + + + + + + + FitTextOutput + + + true + + + + + + + + + SharingPage + + + Sharing + + + + unnamed + + + + buttonGroupSharing - 5 + 7 7 0 0 - - 5 - - RUN Numbers + Shared parameters among different runs - - - YEARLabel - - - - 361 - 55 - 55 - 26 - - - - - 0 - 20 - - - - Year - - - - - - LEM - - - - - GPS - - - - - Dolly - - - - - LTF - - - - BeamLine - - - - 232 - 55 - 100 - 26 - - - - - 0 - 0 - 0 - 0 - - - - - 0 - 20 - - - - - - BeamLineLabel - - - - 127 - 55 - 99 - 26 - - - - - 0 - 20 - - - - On beam line - - - - - - 2010 - - - - - 2009 - - - - - 2008 - - - - - 2007 - - - - - 2006 - - - - - 2005 - - - - - 2004 - - - - YEAR - - - - 420 - 55 - 100 - 26 - - - - - 0 - 0 - 0 - 0 - - - - - 0 - 20 - - - - - - RunNumbers - - - - 15 - 25 - 505 - 26 - - - - - 0 - 0 - 0 - 0 - - - - - 0 - 23 - - - - Numbers of RUNs to fit. Multiple runs are comma separated. - - - Numbers of RUNs to fit. Multiple runs are comma separated. - - - - - - RUNSMan + + AlignLeft - + true - - 5 + + false - - RUN Files - - + - RunFiles + SharingComp2 - true + false - 15 - 25 - 505 - 26 + 199 + 20 + 162 + 330 - - - 0 - 0 - 0 - 0 - - - - - 0 - 23 - - - - Names of data files to be fit. Multiple data files are comma separated. - - - Names of data files to be fit. Multiple data files are comma separated. - - - - - Browse - - - true - - - - 420 - 55 - 100 - 26 - - - - - 0 - 0 - 0 - 0 - - - - - 0 - 20 - - - - Browse - - - Browse to select data files for fitting. - - - Browse to select data files for fitting. - - - - - - - - - FittingPage - - - Fitting - - - - layout34 - - - - 5 - 10 - 545 - 350 - - - - - unnamed - - - - layout33 - - - - unnamed - - - - - MINIMIZE - - - - - MIGRAD - - - - - SIMPLEX - - - - Minimization - - - - - textLabel1_4 - - - X Range - - - - - Yf - - - - - textLabel1_5_2 - - - Error estimation - - - - - Xi - - - - - textLabel1_4_2 - - - Y Range - - - - - - HESSE - - - - - MINOS - - - - ErrorCalc - - - - - textLabel1_5 - - - Minimization type - - - - - Yi - - - - - Xf - - - - - ltc - - - Life time correction - - - true - - - - - - - FitTextOutput - - - true - - - - - - - - SharingPage - - - Sharing - - - - buttonGroupSharing - - - - 5 - 5 - 545 - 355 - - - - - 7 - 7 - 0 - 0 - - - - Shared parameters among different runs - - - AlignLeft - - - false - - - - SharingComp1 - - - false - - - - 31 - 20 - 162 - 330 - - - - - 5 - 3 - 0 - 0 - - - - 1st Component - - - AlignLeft - - - - 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 - - - - - - - Comp1ShLabel - - - - 2 - 30 - 185 - 20 - - - - - 255 - 255 - 127 - - - - FitType1 - - - - - - SharingComp2 - - - 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 - - - - - - MSRPage - - - MSR File - - - - layout25 - - - - 5 - 5 - 545 - 355 - - - - - unnamed - - - 0 - - - - groupTitle - - - 5 - - - - - - - layout25 - - - - 6 - 8 - 515 - 100 - - - - - unnamed_2 - - - - 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) - - - Title line for MSR file (optional) - - - - - layout17 - - - - unnamed_2 - - - - FILENAMELabel - - - Enter [name] for output [name].msr file (optional) - - - FILENAME - - - - - FILENAME - - - - 5 - 0 - 0 - 0 - - - - Name of the produced MSR file (optional) - - - Name of the produced MSR file (optional) - - - - - - - - - - textMSROutput - - - true - - - - - - - - FourierPage - - - FFT/RRF - - - - FourierBox - - - - 6 - 6 - 547 - 125 - - - - Fourier transform parameters - - - - layout34 - - - - 12 - 19 - 525 - 100 - - - - - unnamed - - - 5 - - - 5 - - - - FrqMin - 5 - 5 + 3 0 0 - - - - textLabel1_3_4 - - - - - - - - textLabel1_7 - - - Phase: - - - - - textLabel1_3_5 - - - - - - - - - MHz - - - - - Gauss - - - - - Mc/s - - - - FUnits - - - - 5 - 5 - 0 - 0 - - - - - - textLabel1_3_6 - - - - - - - - - STRONG - - - - - MEDIUM - - - - - WEAK - - - - - NONE - - - - FApodization - - - - 5 - 5 - 0 - 0 - - - - - - FrqMax - - - - 5 - 5 - 0 - 0 - - - - - - - power - - - - - real - - - - - imag - - - - - real_and_imag - - - - - phase - - - - FPlot - - - - 5 - 5 - 0 - 0 - - - - - - FUnitsLabel - - - Units - - - - - textLabel1_3_8 - - - - - - - - textLabel1_3_7 - - - - - - - - FPlotLabel - - - Plot - - - - - textLabel1_2 - - - to - - - - - FApodizationLabel - - - Apodization - - - - - textLabel1_3_3 - - - - - - - - FPHASE - - - - 5 - 5 - 0 - 0 - - - - - - textLabel1 - - - Range: from - - - - - - - - RRFBox - - - - 6 - 135 - 547 - 125 - - - - Rotatting reference frame (RRF) parameters - - - - layout35 - - - - 10 - 18 - 265 - 100 - - - - - unnamed - - - 5 - - - 5 - - - - textLabel1_6_2_2 - - - Phase - - - - - textLabel1_6 - - - Frequency - - - - - textLabel1_6_2_4 - - - - - - - - RRFFrq - - - - - - - - textLabel1_6_2_3 - - - - - - - - RRFPack - - - - - textLabel1_6_2 - - - Packing - - - - - - MHz - - - - - kHz - - - - - Mc/s - - - - - G - - - - - T - - - - RRFUnits - - - - - RRFPhase - - - - - - - - - T0Page - - - t0/Bg - - - - unnamed - - - - layout27 - - - - unnamed - - - 0 - - - - groupHist0 - - - - 5 - 5 - 0 - 0 - - - - - 0 - 0 - - - + 2nd Component - + - layout16_2 + Comp2ShLabel - 5 - 18 - 100 - 150 + 2 + 30 + 185 + 20 - - - 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 - - - + + + 255 + 255 + 127 + + + + FitType2 + - - - - groupHist1 - - - Plain - - - Hist1 - - layout18 + layout13 - 8 - 17 - 75 - 150 + 40 + 60 + 81 + 266 @@ -3544,1157 +2236,2576 @@ 0 - + - t01 + ShParam_2_1 + + + Param1 - + - Bg11 + ShParam_2_2 + + + Param2 - + - Bg21 + ShParam_2_3 + + + Param3 - + - Data11 + ShParam_2_4 + + + Param4 - + - Data21 + 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 - + - groupHist2 + SharingComp3 - true + false - - Plain + + + 367 + 20 + 162 + 330 + + + + + 5 + 3 + 0 + 0 + - Hist2 + 3rd Component - + + AlignJustify|AlignVCenter + + - layout18_2 + Comp3ShLabel - 8 - 17 - 75 - 150 + 2 + 30 + 185 + 20 - - - 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 - - - - - - - - - - - - TabPage - - - Constraints - - - - layout34_2 - - - - 11 - 6 - 540 - 360 - - - - - unnamed_2 - - - - layout33_2 - - - - unnamed_2 - - - - TheoryBlock_Label - - - - - - 0 - 0 - 0 - - - 230 - 240 - 249 - - - 255 - 255 - 255 - - - 242 - 247 - 252 - - - 115 - 120 - 124 - - - 154 - 160 - 166 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 255 - 255 - 127 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - - - 128 - 128 - 128 - - - 230 - 240 - 249 - - - 255 - 255 - 255 - - - 255 - 255 - 255 - - - 115 - 120 - 124 - - - 154 - 160 - 166 - - - 128 - 128 - 128 - - - 255 - 255 - 255 - - - 128 - 128 - 128 - - - 255 - 255 - 255 - - - 255 - 255 - 127 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 238 - - - 82 - 24 - 139 - - - - - 0 - 0 - 0 - - - 230 - 240 - 249 - - - 255 - 255 - 255 - - - 255 - 255 - 255 - - - 115 - 120 - 124 - - - 154 - 160 - 166 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 255 - 255 - 127 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 238 - - - 82 - 24 - 139 - - - + + + 255 + 255 + 127 + - THEORY Block + FitType3 - + - TheoryBlock + layout15 - - true + + + 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 + + + - + + + + SharingComp1 + + + false + + + + 31 + 20 + 162 + 330 + + + + + 5 + 3 + 0 + 0 + + + + 1st Component + + + AlignLeft + + - ParametersList_Label + 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 + + - 0 - 0 - 0 + 234 + 233 + 232 + + + Param5 + + + false + + + + + ShParam_1_6 + + + false + + - 230 - 240 - 249 + 234 + 233 + 232 + + + Param6 + + + false + + + + + ShParam_1_7 + + + false + + - 255 - 255 - 255 + 234 + 233 + 232 + + + Param7 + + + false + + + + + ShParam_1_8 + + + false + + - 242 - 247 - 252 + 234 + 233 + 232 + + + Param8 + + + false + + + + + ShParam_1_9 + + + false + + - 115 - 120 - 124 + 234 + 233 + 232 - - 154 - 160 - 166 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 255 - 255 - 127 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - - - 128 - 128 - 128 - - - 230 - 240 - 249 - - - 255 - 255 - 255 - - - 255 - 255 - 255 - - - 115 - 120 - 124 - - - 154 - 160 - 166 - - - 128 - 128 - 128 - - - 255 - 255 - 255 - - - 128 - 128 - 128 - - - 255 - 255 - 255 - - - 255 - 255 - 127 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 238 - - - 82 - 24 - 139 - - - - - 0 - 0 - 0 - - - 230 - 240 - 249 - - - 255 - 255 - 255 - - - 255 - 255 - 255 - - - 115 - 120 - 124 - - - 154 - 160 - 166 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 255 - 255 - 127 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 238 - - - 82 - 24 - 139 - - - + + + Param9 + + + false + + + + + + + Comp1ShLabel + + + + 2 + 30 + 185 + 20 + + + + + 255 + 255 + 127 + - Parameters List + FitType1 - - - ParametersList - - - true - - - + - - - layout25_6 - - - - unnamed_2 + + + + + InitializationPage + + + Initialization + + + + unnamed + + + + + Value - + + + + Error + + + + + Min + + + + + Max + + + + InitParamTable + + + + 5 + 5 + 0 + 0 + + + + + 32767 + 32767 + + + + TabFocus + + + PopupPanel + + + 2 + + + 0 + + + 0 + + + Default + + + Auto + + + false + + + 0 + + + 4 + + + true + + + false + + + SpreadSheet + + + + + + + MSRPage + + + MSR File + + + + unnamed + + + + layout25 + + + + unnamed + + + 0 + + - CParamsCombo + groupTitle - 0 - 7 + 7 + 0 0 0 - - - - textLabel1_4_6 + + 5 - - = + + + + + + unnamed + + + + layout25 + + + + unnamed_2 + + + + TITLELabel + + + + 5 + 5 + 0 + 0 + + + + Enter the label (defaul is run title from the first run) + + + TITLE + + + + + TITLE + + + + 7 + 0 + 1 + 1 + + + + + Title line for MSR file (optional) + + + Title line for MSR file (optional) + + + Title line for MSR file (optional) + + + + + layout17 + + + + unnamed_2 + + + + FILENAMELabel + + + Enter [name] for output [name].msr file (optional) + + + FILENAME + + + + + FILENAME + + + + 7 + 0 + 0 + 0 + + + + Name of the produced MSR file (optional) + + + Name of the produced MSR file (optional) + + + + + + + + + + + textMSROutput + + + true - + + + + + + + FourierPage + + + FFT/RRF + + + + unnamed + + + + FourierBox + + + + 7 + 0 + 0 + 0 + + + + Fourier transform parameters + + + + layout34 + + + + 12 + 19 + 510 + 100 + + + - ConstraintLine + unnamed + + + 5 + + + 5 + + + + FrqMin + + + + 5 + 5 + 0 + 0 + + + + + + textLabel1_3_4 + + + + + + + + textLabel1_7 + + + Phase: + + + + + textLabel1_3_5 + + + + + + + + + MHz + + + + + Gauss + + + + + Mc/s + + + + FUnits + + + + 5 + 5 + 0 + 0 + + + + + + textLabel1_3_6 + + + + + + + + + STRONG + + + + + MEDIUM + + + + + WEAK + + + + + NONE + + + + FApodization + + + + 5 + 5 + 0 + 0 + + + + + + FrqMax + + + + 5 + 5 + 0 + 0 + + + + + + + power + + + + + real + + + + + imag + + + + + real_and_imag + + + + + phase + + + + FPlot + + + + 5 + 5 + 0 + 0 + + + + + + FUnitsLabel + + + Units + + + + + textLabel1_3_8 + + + + + + + + textLabel1_3_7 + + + + + + + + FPlotLabel + + + Plot + + + + + textLabel1_2 + + + to + + + + + FApodizationLabel + + + Apodization + + + + + textLabel1_3_3 + + + + + + + + FPHASE + + + + 5 + 5 + 0 + 0 + + + + + + textLabel1 + + + Range: from + + + + + + + + RRFBox + + + + 7 + 0 + 0 + 0 + + + + Rotatting reference frame (RRF) parameters + + + + layout35 + + + + 10 + 18 + 265 + 100 + + + + + unnamed + + + 5 + + + 5 + + + + textLabel1_6_2_2 + + + Phase + + + + + textLabel1_6 + + + Frequency + + + + + textLabel1_6_2_4 + + + + + + + + RRFFrq + + + + + + + + textLabel1_6_2_3 + + + + + + + + RRFPack + + + + + textLabel1_6_2 + + + Packing + + + + + + MHz + + + + + kHz + + + + + Mc/s + + + + + G + + + + + T + + + + RRFUnits + + + + + RRFPhase + + + + + + + + + + T0Page + + + t0/Bg + + + + unnamed + + + + layout25 + + + + unnamed + + + + groupHist0 7 7 - 0 - 0 + 1 + 1 0 - 25 + 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 + + + + 7 + 7 + 1 + 1 + + + + + 0 + 0 + + + + Plain + + + Hist1 + + + + layout18 + + + + 8 + 17 + 75 + 150 + + + + + unnamed + + + 0 + + + 0 + + + + t01 + + + + + Bg11 + + + + + Bg21 + + + + + Data11 + + + + + Data21 + + + + + + + + groupHist2 + + + true + + + + 7 + 7 + 1 + 1 + + + + Plain + + + Hist2 + + + + layout18_2 + + + + 8 + 17 + 75 + 150 + + + + + unnamed_2 + + + 0 + + + 0 + + + + t02 + + + + + Bg12 + + + + + Bg22 + + + + + Data12 + + + + + Data22 + + + + + + + + groupHist3 + + + true + + + + 7 + 7 + 1 + 1 + + + + Plain + + + Hist3 + + + + layout18_3 + + + + 8 + 17 + 75 + 150 + + + + + unnamed_2 + + + 0 + + + 0 + + + + t03 + + + + + Bg13 + + + + + Bg23 + + + + + Data13 + + + + + Data23 + + + + + + + + groupHist4 + + + true + + + + 7 + 7 + 1 + 1 + + + + Plain + + + Hist4 + + + + layout18_4 + + + + 8 + 17 + 75 + 150 + + + + + unnamed_2 + + + 0 + + + 0 + + + + t04 + + + + + Bg14 + + + + + Bg24 + + + + + Data14 + + + + + Data24 + + + + + + + + + + layout29 + + + + unnamed + + + + spacer1 + + + Horizontal + + + Expanding + + + + 461 + 20 + + + - AddConstraint + t0Update + + + false 0 - 7 + 0 0 0 - Add + Update + + + Use musrt0 to set values - + + + + + TabPage + + + Constraints + + + + unnamed + + - textLabel2_2_3_4 + layout34_2 - - - - - 0 - 0 - 0 - - - 230 - 240 - 249 - - - 255 - 255 - 255 - - - 242 - 247 - 252 - - - 115 - 120 - 124 - - - 154 - 160 - 166 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 255 - 255 - 127 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - - - 128 - 128 - 128 - - - 230 - 240 - 249 - - - 255 - 255 - 255 - - - 255 - 255 - 255 - - - 115 - 120 - 124 - - - 154 - 160 - 166 - - - 128 - 128 - 128 - - - 255 - 255 - 255 - - - 128 - 128 - 128 - - - 255 - 255 - 255 - - - 255 - 255 - 127 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 238 - - - 82 - 24 - 139 - - - - - 0 - 0 - 0 - - - 230 - 240 - 249 - - - 255 - 255 - 255 - - - 255 - 255 - 255 - - - 115 - 120 - 124 - - - 154 - 160 - 166 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 255 - 255 - 127 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 238 - - - 82 - 24 - 139 - - - - - - FUNCTIONS Block - - - - - FunctionsBlock - - - - - layout30 - - + unnamed_2 + + + layout33_2 + + + + unnamed_2 + + + + TheoryBlock_Label + + + + + + 0 + 0 + 0 + + + 230 + 240 + 249 + + + 255 + 255 + 255 + + + 242 + 247 + 252 + + + 115 + 120 + 124 + + + 154 + 160 + 166 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 255 + 255 + 127 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + + + 128 + 128 + 128 + + + 230 + 240 + 249 + + + 255 + 255 + 255 + + + 255 + 255 + 255 + + + 115 + 120 + 124 + + + 154 + 160 + 166 + + + 128 + 128 + 128 + + + 255 + 255 + 255 + + + 128 + 128 + 128 + + + 255 + 255 + 255 + + + 255 + 255 + 127 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 238 + + + 82 + 24 + 139 + + + + + 0 + 0 + 0 + + + 230 + 240 + 249 + + + 255 + 255 + 255 + + + 255 + 255 + 255 + + + 115 + 120 + 124 + + + 154 + 160 + 166 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 255 + 255 + 127 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 238 + + + 82 + 24 + 139 + + + + + + THEORY Block + + + + + TheoryBlock + + + true + + + + + ParametersList_Label + + + + + + 0 + 0 + 0 + + + 230 + 240 + 249 + + + 255 + 255 + 255 + + + 242 + 247 + 252 + + + 115 + 120 + 124 + + + 154 + 160 + 166 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 255 + 255 + 127 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + + + 128 + 128 + 128 + + + 230 + 240 + 249 + + + 255 + 255 + 255 + + + 255 + 255 + 255 + + + 115 + 120 + 124 + + + 154 + 160 + 166 + + + 128 + 128 + 128 + + + 255 + 255 + 255 + + + 128 + 128 + 128 + + + 255 + 255 + 255 + + + 255 + 255 + 127 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 238 + + + 82 + 24 + 139 + + + + + 0 + 0 + 0 + + + 230 + 240 + 249 + + + 255 + 255 + 255 + + + 255 + 255 + 255 + + + 115 + 120 + 124 + + + 154 + 160 + 166 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 255 + 255 + 127 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 238 + + + 82 + 24 + 139 + + + + + + Parameters List + + + + + ParametersList + + + true + + + + + + + layout25_6 + + + + unnamed_2 + + + + CParamsCombo + + + + 0 + 0 + 0 + 0 + + + + + + textLabel1_4_6 + + + + 0 + 0 + 0 + 0 + + + + = + + + + + ConstraintLine + + + + 7 + 0 + 0 + 0 + + + + + 0 + 25 + + + + + + AddConstraint + + + + 0 + 0 + 0 + 0 + + + + Add + + + + - textLabel1_6_3 + textLabel2_2_3_4 + + + + + + 0 + 0 + 0 + + + 230 + 240 + 249 + + + 255 + 255 + 255 + + + 242 + 247 + 252 + + + 115 + 120 + 124 + + + 154 + 160 + 166 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 255 + 255 + 127 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + + + 128 + 128 + 128 + + + 230 + 240 + 249 + + + 255 + 255 + 255 + + + 255 + 255 + 255 + + + 115 + 120 + 124 + + + 154 + 160 + 166 + + + 128 + 128 + 128 + + + 255 + 255 + 255 + + + 128 + 128 + 128 + + + 255 + 255 + 255 + + + 255 + 255 + 127 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 238 + + + 82 + 24 + 139 + + + + + 0 + 0 + 0 + + + 230 + 240 + 249 + + + 255 + 255 + 255 + + + 255 + 255 + 255 + + + 115 + 120 + 124 + + + 154 + 160 + 166 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 0 + 0 + 0 + + + 255 + 255 + 255 + + + 255 + 255 + 127 + + + 0 + 0 + 0 + + + 0 + 0 + 128 + + + 255 + 255 + 255 + + + 0 + 0 + 238 + + + 82 + 24 + 139 + + + - + FUNCTIONS Block - + - ResetFunc - - - - 100 - 32767 - - - - Reset + FunctionsBlock - + + + layout30 + + + + unnamed_2 + + + + textLabel1_6_3 + + + + + + + + ResetFunc + + + + 100 + 32767 + + + + Reset + + + + + - + - + @@ -5343,30 +5454,6 @@ MuSRFitform parametersExport() - - BeamLine - activated(int) - MuSRFitform - T0Update() - - - Browse - clicked() - MuSRFitform - fileBrowse() - - - InitParamTable - valueChanged(int,int) - MuSRFitform - CallMSRCreate() - - - musrfit_tabs - selected(const QString&) - MuSRFitform - TabChanged() - fileChangeDirAction activated() @@ -5469,6 +5556,42 @@ MuSRFitform InitializeFunctions() + + AddConstraint + clicked() + MuSRFitform + AppendToFunctions() + + + InitParamTable + valueChanged(int,int) + MuSRFitform + CallMSRCreate() + + + buttonGroupSharing + toggled(bool) + MuSRFitform + ActivateShComp() + + + Browse + clicked() + MuSRFitform + fileBrowse() + + + BeamLine + activated(int) + MuSRFitform + T0Update() + + + FitType3 + activated(const QString&) + MuSRFitform + InitializeFunctions() + FitType1 activated(const QString&) @@ -5482,16 +5605,22 @@ InitializeFunctions() - FitType3 - activated(const QString&) + musrfit_tabs + selected(const QString&) MuSRFitform - InitializeFunctions() + TabChanged() - AddConstraint + t0Update clicked() MuSRFitform - AppendToFunctions() + t0UpdateClicked() + + + buttonGroupSharing + toggled(bool) + MuSRFitform + ActivateShComp() @@ -5602,6 +5731,7 @@ AppendToFunctions() InitializeFunctions() optionConfigure() + t0UpdateClicked() diff --git a/src/external/MuSRFitGUI/devel/MuSRFit.ui.h b/src/external/MuSRFitGUI/devel/MuSRFit.ui.h index 72e0b60a..05222123 100755 --- a/src/external/MuSRFitGUI/devel/MuSRFit.ui.h +++ b/src/external/MuSRFitGUI/devel/MuSRFit.ui.h @@ -212,7 +212,6 @@ void MuSRFitMenu::helpAbout() void MuSRFitform::CreateAllInput() { -# TODO: Need to automatically generage years list depending on beamline my %All=(); # From RUNS Tab @@ -224,6 +223,14 @@ void MuSRFitform::CreateAllInput() $All{"optionsFourier"} = optionsFourier->isOn(); $All{"optionsT0"} = optionsT0->isOn(); $All{"YEAR"} =YEAR->currentText; + if ($All{"YEAR"} eq "") { +# If year combobox is empty fill it up from 2004 up to current year + my ($second, $minute, $hour, $dayOfMonth, $month, $yearOffset, $dayOfWeek, $dayOfYear, $daylightSavings) = localtime(); + my $current_year = 1900 + $yearOffset; + for (my $i=$current_year;$i>=2004;$i--) { + YEAR->insertItem($i,-1); + } + } # Time range and BINS $All{"Tis"} = Tis->text; $All{"Tfs"} = Tfs->text; @@ -245,6 +252,7 @@ void MuSRFitform::CreateAllInput() $All{"Xf"}=Xf->text; $All{"Yi"}=Yi->text; $All{"Yf"}=Yf->text; + $All{"ViewBin"}=ViewBin->text; # Life time correction if (ltc->isChecked()) { $All{"ltc"}="y"; @@ -320,8 +328,9 @@ void MuSRFitform::CreateAllInput() 10,"GLFExp", 11,"LLFSExp", 12,"GLFSExp", - 13,"Meissner", - 14,"None" + 13,"MolMag", + 14,"Meissner", + 15,"None" ); my $FT1=FitType1->currentItem; @@ -350,6 +359,8 @@ void MuSRFitform::CreateAllInput() $All{"Func_T_Block"}=TheoryBlock->text; # Shared settings are detected here + $All{"EnableSharing"} = buttonGroupSharing->isChecked(); + my $Shared = 0; my $PCount =0; my $Component=1; @@ -361,7 +372,7 @@ void MuSRFitform::CreateAllInput() unshift( @Params, "Alpha" ); } elsif ( $Component == 1 && $All{"FitAsyType"} eq "SingleHist" ) { - unshift( @Params, ( "N0", "NBg" ) ); + unshift( @Params, ( "No", "NBg" ) ); } # This is the counter for parameters of this component @@ -374,7 +385,7 @@ void MuSRFitform::CreateAllInput() if ( $All{"FitAsyType"} eq "SingleHist" ) { $Param=$Param.$Hists[0]; } - if ( $#FitTypes != 0 && ( $Param ne "Alpha" && $Param ne "N0" && $Param ne "NBg" ) ){ + if ( $#FitTypes != 0 && ( $Param ne "Alpha" && $Param ne "No" && $Param ne "NBg" ) ){ $Param = join( "", $Param, "_", $Component); } @@ -582,44 +593,48 @@ void MuSRFitform::ActivateShComp() 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 ); +# Possible to share only if sharing is enabled altogether + my $EnableSharing = $All{"EnableSharing"}; + if ($EnableSharing) { + 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" ) ); - } + if ( $Component == 1 && $All{"FitAsyType"} eq "Asymmetry" ) { + unshift( @Params, "Alpha" ); + } + elsif ( $Component == 1 && $All{"FitAsyType"} eq "SingleHist" ) { + unshift( @Params, ( "No", "NBg" ) ); + } # Make the component appear first (only if we have multiple runs) - my $ShCompG="SharingComp".$Component; - my $ShCG = child($ShCompG); - if ($#RUNS>0) { - $ShCG->setHidden(0); - $ShCG->setEnabled(1); - } - my $CompShLabel = "Comp".$Component."ShLabel"; - my $CompShL = child($CompShLabel); - $CompShL->setText($All{"FitType$Component"}); + my $ShCompG="SharingComp".$Component; + my $ShCG = child($ShCompG); + if ($#RUNS>0) { + $ShCG->setHidden(0); + $ShCG->setEnabled(1); + } + my $CompShLabel = "Comp".$Component."ShLabel"; + my $CompShL = child($CompShLabel); + $CompShL->setText($All{"FitType$Component"}); # Change state/label of parameters - for (my $i=1; $i<=9;$i++) { - my $ParamChkBx="ShParam_".$Component."_".$i; - my $ChkBx = child($ParamChkBx); - if ($Params[$i-1] ne "") { - $ChkBx->setHidden(0); - $ChkBx->setEnabled(1); - $ChkBx ->setText($Params[$i-1]); - } else { - $ChkBx->setHidden(1); + for (my $i=1; $i<=9;$i++) { + my $ParamChkBx="ShParam_".$Component."_".$i; + my $ChkBx = child($ParamChkBx); + if ($Params[$i-1] ne "") { + $ChkBx->setHidden(0); + $ChkBx->setEnabled(1); + $ChkBx ->setText($Params[$i-1]); + } else { + $ChkBx->setHidden(1); + } } + $Component++; } - $Component++; - } + } } void MuSRFitform::InitializeTab() @@ -648,6 +663,8 @@ void MuSRFitform::InitializeTab() # Fill the table with labels and values of parametr for (my $PCount=0;$PCount<$NParam;$PCount++) { my ($Param,$value,$error,$minvalue,$maxvalue,$RUN) = split(/,/,$PTable{$PCount}); +# Now make sure we have no nans + if ($error eq "nan") { $error=0.1;} # If you use this then reading the parameters from the table is a problem # You need to extract the correct parameter name from the row label # InitParamTable->verticalHeader()->setLabel( $PCount,"$RUN: $Param"); @@ -667,6 +684,7 @@ void MuSRFitform::TabChanged() # First make sure we have sharing initialized ActivateShComp(); +# Here we need to apply sharing if selected... InitializeTab(); UpdateMSRFileInitTable(); # And also setup T0 and Bg bins @@ -737,6 +755,7 @@ void MuSRFitform::ShowMuSRT0() if (-e $FILENAME) { my $cmd="musrt0 $FILENAME &"; my $pid = system($cmd); + t0Update->setEnabled(1) } else { print STDERR "Cannot find MSR file!\n"; } @@ -868,19 +887,19 @@ void MuSRFitform::InitializeFunctions() my $Parameters=$Paramcomp[$Component-1]; my @Params = split( /\s+/, $Parameters ); -# Alpha, N0 and NBg are counted in the parameters +# Alpha, No and NBg are counted in the parameters if ( $Component == 1 && $All{"FitAsyType"} eq "Asymmetry" ) { unshift( @Params, "Alpha" ); } elsif ( $Component == 1 && $All{"FitAsyType"} eq "SingleHist" ) { - unshift( @Params, ( "N0", "NBg" ) ); + unshift( @Params, ( "No", "NBg" ) ); } # 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 "" ) { - if ($Params[$i-1] ne "Alpha" && $Params[$i-1] ne "N0" && $Params[$i-1] ne "NBg") { + if ($Params[$i-1] ne "Alpha" && $Params[$i-1] ne "No" && $Params[$i-1] ne "NBg") { CParamsCombo->insertItem($CParam,-1); $Full_T_Block=~ s/\b$Params[$i-1]\b/$CParam/; } @@ -903,7 +922,7 @@ void MuSRFitform::InitializeFunctions() void MuSRFitform::optionConfigure() { use Customize; - + my $Customize = Qt::Dialog(this); my $w = Customize; $w->setModal(1); @@ -911,5 +930,43 @@ void MuSRFitform::optionConfigure() # $Customize->setMainWidget($w); # $w->show; # exit $Customize->exec; - + +} + +void MuSRFitform::t0UpdateClicked() +{ +# Read MSR file and get new values of t0,Bg and Data + my %All=CreateAllInput(); + my $FILENAME=$All{"FILENAME"}; + open (MSRF,q{<},"$FILENAME.msr" ); + my @lines = ; + close(IFILE); + + my @T0s = grep {/t0 /} @lines; + my @Bgs = grep {/background /} @lines; + my @Datas = grep {/data /} @lines; + + my @Hists = split(/,/, $All{"LRBF"} ); + my $NHist = $#Hists+1; + print "Histograms: $NHist\n"; + + my $FinHist = 1; +# First T0s + while ($FinHist) { + my $counter=0; + (my $tmp,my @SplitT0) = split( /\s+/, $T0s[$counter]); + (my $tmp,my @SplitBg) = split( /\s+/, $Bgs[$counter]); + (my $tmp,my @SplitData) = split( /\s+/, $Datas[$counter]); + if ($#SplitBg>0) { + foreach (@SplitBg) { + print $_."\n"; + } + } + $counter++; + if ($counter>=$#Bgs) {$FinHist=0;} + } + +# Finally, disable the update button + t0Update->setEnabled(0); +# t0Update->setText("musrt0") }