diff --git a/src/external/MuSRFitGUI/MSR.pm b/src/external/MuSRFitGUI/MSR.pm index 8d0d5229..9ed6bfb0 100755 --- a/src/external/MuSRFitGUI/MSR.pm +++ b/src/external/MuSRFitGUI/MSR.pm @@ -360,17 +360,21 @@ FITPARAMETER $PLT = 2; $Hist_Lines = "forward $Hists[0]\nbackward $Hists[1]"; - $Bg_Line = "background 66000 66500 66000 66500"; - $Data_Line = "data 3419 63000 3419 63000"; - - # Omit background and data lines for LTF,GPS and Dolly - if ( $BeamLine eq "Dolly" ) { - $Bg_Line = "background 50 250 50 250"; - $Data_Line ="data 297 8000 294 8000"; - } elsif ( $BeamLine eq "GPS" ) { - $Bg_Line = "background 40 120 40 120"; - $Data_Line = "data 135 8000 135 8000"; -# $Data_Line = "data 135 8000 135 8000"; + + $Bg_Line = "background"; + $Data_Line = "data"; + $NHist=1; + foreach $Hist (@Hists) { + foreach ("t0","Bg1","Bg2","Data1","Data2") { + $Name = "$_$NHist"; +# If empty fill with defaults + if ($All{$Name} eq "") { + $All{$Name}=MSR::T0BgData($_,$Hist,$BeamLine); + } + } + $Bg_Line = $Bg_Line." ".$All{"Bg1$NHist"}." ".$All{"Bg2$NHist"}; + $Data_Line =$Data_Line." ".$All{"Data1$NHist"}." ".$All{"Data2$NHist"}; + $NHist++; } $FRANGE_Line = "fit TINI TFIN"; diff --git a/src/external/MuSRFitGUI/MuSRFit.pl b/src/external/MuSRFitGUI/MuSRFit.pl index e24f61c4..f2449ccb 100755 --- a/src/external/MuSRFitGUI/MuSRFit.pl +++ b/src/external/MuSRFitGUI/MuSRFit.pl @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file 'MuSRFit.ui' # -# Created: Mon Aug 31 10:21:34 2009 +# Created: Mon Aug 31 17:50:38 2009 # by: The PerlQt User Interface Compiler (puic) # # WARNING! All changes made in this file will be lost! @@ -1212,7 +1212,7 @@ sub NEW MenuBar= Qt::MenuBar( this, "MenuBar"); MenuBar->setEnabled( 1 ); - MenuBar->setGeometry( Qt::Rect(0, 0, 575, 27) ); + MenuBar->setGeometry( Qt::Rect(0, 0, 574, 27) ); fileMenu = Qt::PopupMenu( this ); fileOpenAction->addTo( fileMenu ); @@ -1248,7 +1248,7 @@ sub NEW MenuBar->insertSeparator( 7 ); languageChange(); - my $resize = Qt::Size(575, 479); + my $resize = Qt::Size(574, 485); $resize = $resize->expandedTo(minimumSizeHint()); resize( $resize ); clearWState( &Qt::WState_Polished ); @@ -1727,7 +1727,7 @@ sub CreateAllInput child($Name)->setText($All{$Name}); } } - $NHist++ + $NHist++; } # Construct fittypes that can be understood by MSR.pm diff --git a/src/external/MuSRFitGUI/MuSRFit.ui b/src/external/MuSRFitGUI/MuSRFit.ui index 75291fa4..187bc61c 100755 --- a/src/external/MuSRFitGUI/MuSRFit.ui +++ b/src/external/MuSRFitGUI/MuSRFit.ui @@ -8,8 +8,8 @@ 0 0 - 575 - 479 + 574 + 485 @@ -2421,7 +2421,7 @@ 0 0 - 575 + 574 27 diff --git a/src/external/MuSRFitGUI/MuSRFit.ui.h b/src/external/MuSRFitGUI/MuSRFit.ui.h index be6a2404..371113cf 100755 --- a/src/external/MuSRFitGUI/MuSRFit.ui.h +++ b/src/external/MuSRFitGUI/MuSRFit.ui.h @@ -192,7 +192,7 @@ void MuSRFitform::CreateAllInput() child($Name)->setText($All{$Name}); } } - $NHist++ + $NHist++; } # Construct fittypes that can be understood by MSR.pm