Fix bug for runnumbers > 1000
This commit is contained in:
parent
cd9b76a35e
commit
284c0a7f28
4
src/external/MuSRFitGUI/MSR.pm
vendored
4
src/external/MuSRFitGUI/MSR.pm
vendored
@ -221,6 +221,7 @@ sub CreateMSR {
|
|||||||
# Also for Imaginaryand and Real for RRF fits
|
# Also for Imaginaryand and Real for RRF fits
|
||||||
|
|
||||||
$RUN = $RUNS[ $iRun - 1 ];
|
$RUN = $RUNS[ $iRun - 1 ];
|
||||||
|
print "RUN=$RUN\n";
|
||||||
|
|
||||||
if ($All{"RUNSType"}) {
|
if ($All{"RUNSType"}) {
|
||||||
$RUN_Line = MSR::RUNFileNameMan($RUN);
|
$RUN_Line = MSR::RUNFileNameMan($RUN);
|
||||||
@ -228,6 +229,8 @@ sub CreateMSR {
|
|||||||
$RUN_Line = MSR::RUNFileNameAuto($RUN,$YEAR,$BeamLine);
|
$RUN_Line = MSR::RUNFileNameAuto($RUN,$YEAR,$BeamLine);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
print "Line=$RUN_Line\n";
|
||||||
|
|
||||||
$Type_Line = "fittype 2";
|
$Type_Line = "fittype 2";
|
||||||
$PLT = 2;
|
$PLT = 2;
|
||||||
$Hist_Lines =
|
$Hist_Lines =
|
||||||
@ -1243,6 +1246,7 @@ sub RUNFileNameAuto {
|
|||||||
if ( $RUN < 10 ) { $RUNtmp = "000" . $RUN; }
|
if ( $RUN < 10 ) { $RUNtmp = "000" . $RUN; }
|
||||||
elsif ( $RUN < 100 ) { $RUNtmp = "00" . $RUN; }
|
elsif ( $RUN < 100 ) { $RUNtmp = "00" . $RUN; }
|
||||||
elsif ( $RUN < 1000 ) { $RUNtmp = "0" . $RUN; }
|
elsif ( $RUN < 1000 ) { $RUNtmp = "0" . $RUN; }
|
||||||
|
else { $RUNtmp=$RUN; }
|
||||||
|
|
||||||
# Get current year
|
# Get current year
|
||||||
my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) =
|
my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) =
|
||||||
|
2
src/external/MuSRFitGUI/MuSRFit.pl
vendored
2
src/external/MuSRFitGUI/MuSRFit.pl
vendored
@ -1,6 +1,6 @@
|
|||||||
# Form implementation generated from reading ui file 'MuSRFit.ui'
|
# Form implementation generated from reading ui file 'MuSRFit.ui'
|
||||||
#
|
#
|
||||||
# Created: Fri Sep 4 16:09:38 2009
|
# Created: Fri Sep 4 16:24:16 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!
|
||||||
|
Loading…
x
Reference in New Issue
Block a user