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

MSR module now uses defaul t0,Bg and Data.

Browse Source
This commit is contained in:
salman
2009-08-31 16:07:48 +00:00
parent 75d1447c3c
commit 9cb6a6dc33
4 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,17 +360,21 @@ FITPARAMETER
$PLT = 2; $PLT = 2;
$Hist_Lines = $Hist_Lines =
"forward $Hists[0]\nbackward $Hists[1]"; "forward $Hists[0]\nbackward $Hists[1]";
$Bg_Line = "background 66000 66500 66000 66500";
$Data_Line = "data 3419 63000 3419 63000"; $Bg_Line = "background";
$Data_Line = "data";
# Omit background and data lines for LTF,GPS and Dolly $NHist=1;
if ( $BeamLine eq "Dolly" ) { foreach $Hist (@Hists) {
$Bg_Line = "background 50 250 50 250"; foreach ("t0","Bg1","Bg2","Data1","Data2") {
$Data_Line ="data 297 8000 294 8000"; $Name = "$_$NHist";
} elsif ( $BeamLine eq "GPS" ) { # If empty fill with defaults
$Bg_Line = "background 40 120 40 120"; if ($All{$Name} eq "") {
$Data_Line = "data 135 8000 135 8000"; $All{$Name}=MSR::T0BgData($_,$Hist,$BeamLine);
# $Data_Line = "data 135 8000 135 8000"; }
}
$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"; $FRANGE_Line = "fit TINI TFIN";

8
src/external/MuSRFitGUI/MuSRFit.pl vendored
View File

@ -1,6 +1,6 @@
# Form implementation generated from reading ui file 'MuSRFit.ui' # 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) # by: The PerlQt User Interface Compiler (puic)
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!
@ -1212,7 +1212,7 @@ sub NEW
MenuBar= Qt::MenuBar( this, "MenuBar"); MenuBar= Qt::MenuBar( this, "MenuBar");
MenuBar->setEnabled( 1 ); MenuBar->setEnabled( 1 );
MenuBar->setGeometry( Qt::Rect(0, 0, 575, 27) ); MenuBar->setGeometry( Qt::Rect(0, 0, 574, 27) );
fileMenu = Qt::PopupMenu( this ); fileMenu = Qt::PopupMenu( this );
fileOpenAction->addTo( fileMenu ); fileOpenAction->addTo( fileMenu );
@ -1248,7 +1248,7 @@ sub NEW
MenuBar->insertSeparator( 7 ); MenuBar->insertSeparator( 7 );
languageChange(); languageChange();
my $resize = Qt::Size(575, 479); my $resize = Qt::Size(574, 485);
$resize = $resize->expandedTo(minimumSizeHint()); $resize = $resize->expandedTo(minimumSizeHint());
resize( $resize ); resize( $resize );
clearWState( &Qt::WState_Polished ); clearWState( &Qt::WState_Polished );
@ -1727,7 +1727,7 @@ sub CreateAllInput
child($Name)->setText($All{$Name}); child($Name)->setText($All{$Name});
} }
} }
$NHist++ $NHist++;
} }
# Construct fittypes that can be understood by MSR.pm # Construct fittypes that can be understood by MSR.pm

6
src/external/MuSRFitGUI/MuSRFit.ui vendored
View File

@ -8,8 +8,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>575</width> <width>574</width>
<height>479</height> <height>485</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -2421,7 +2421,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>575</width> <width>574</width>
<height>27</height> <height>27</height>
</rect> </rect>
</property> </property>

2
src/external/MuSRFitGUI/MuSRFit.ui.h vendored
View File

@ -192,7 +192,7 @@ void MuSRFitform::CreateAllInput()
child($Name)->setText($All{$Name}); child($Name)->setText($All{$Name});
} }
} }
$NHist++ $NHist++;
} }
# Construct fittypes that can be understood by MSR.pm # Construct fittypes that can be understood by MSR.pm