diff --git a/src/external/MuSRFitGUI/MSR.pm b/src/external/MuSRFitGUI/MSR.pm index d699a0c4..738672b5 100755 --- a/src/external/MuSRFitGUI/MSR.pm +++ b/src/external/MuSRFitGUI/MSR.pm @@ -14,10 +14,10 @@ my %DATADIRS = ( "GPD", "/afs/psi.ch/project/bulkmusr/data/gpd" ); -my %BeamLines = ( "LEM", "MUE4", "GPS", "PIM3", "LTF", "PIM3", "Dolly", "PIE1", "GPD", "PIE1" ); +my %BeamLines = ( "LEM", "MUE4", "LEM (PPC)", "MUE4", "GPS", "PIM3", "LTF", "PIM3", "Dolly", "PIE1", "GPD", "PIE1" ); my %Def_Format = - ( "LEM", "ROOT-NPP", "GPS", "PSI-BIN", "LTF", "PSI-BIN", "Dolly", "PSI-BIN" , "GPD", "PSI-BIN"); + ( "LEM", "ROOT-NPP", "LEM (PPC)", "ROOT-PPC", "GPS", "PSI-BIN", "LTF", "PSI-BIN", "Dolly", "PSI-BIN" , "GPD", "PSI-BIN"); # Additional information to extract run properties from database # For LEM use summary files @@ -1636,7 +1636,7 @@ sub RUNFileNameAuto { localtime( time() ); my $current_year = $year + 1900; - if ( $BeamLine eq "LEM" ) { + if ( $BeamLine eq "LEM" || $BeamLine eq "LEM (PPC)") { $RUN_File_Name = "lem" . substr( $YEAR, 2 ) . "_his_" . $RUNtmp; $RUNFILE = "$DATADIR/$YEAR/$RUN_File_Name"; } @@ -1659,7 +1659,6 @@ sub RUNFileNameAuto { my $RUN_Line = join( $SPACE, "RUN", $RUNFILE, $BeamLines{$BeamLine}, "PSI", $Def_Format{$BeamLine} ); - return $RUN_Line; } diff --git a/src/external/MuSRFitGUI/MuSRFit.pl b/src/external/MuSRFitGUI/MuSRFit.pl index bf92c9d9..8d8bd5c7 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: Wed May 4 16:51:35 2011 +# Created: Wed May 25 16:46:00 2011 # by: The PerlQt User Interface Compiler (puic) # # WARNING! All changes made in this file will be lost! @@ -3200,6 +3200,7 @@ sub languageChange BeamLine->insertItem( trUtf8("GPS") ); BeamLine->insertItem( trUtf8("Dolly") ); BeamLine->insertItem( trUtf8("LTF") ); + BeamLine->insertItem( trUtf8("LEM (PPC)") ); BeamLineLabel->setText( trUtf8("On beam line") ); YEARLabel->setText( trUtf8("Year") ); RUNSMan->setTitle( trUtf8("RUN Files") ); @@ -3878,6 +3879,9 @@ sub CreateAllInput # Construct a default filename if empty if ( $All{"FILENAME"} eq "" && !$All{"RUNSType"}) { $All{"FILENAME"}=$RUNS[0]."_".$All{"BeamLine"}."_".$All{"YEAR"}; + if ($All{"BeamLine"} eq "LEM (PPC)") { + $All{"FILENAME"}=$RUNS[0]."_LEM_".$All{"YEAR"}; + } } else { $All{"FILENAME"}="TMP"; } @@ -4416,9 +4420,9 @@ sub t0UpdateClicked # First T0s while ($FinHist) { my $counter=0; -# (my $tmp,my @SplitT0) = split( /\s+/, $T0s[$counter]); + (my $tmp,my @SplitT0) = split( /\s+/, $T0s[$counter]); (my $tmp,my @SplitBg) = split( /\s+/, $Bgs[$counter]); -# (my $tmp,my @SplitData) = split( /\s+/, $Datas[$counter]); + (my $tmp,my @SplitData) = split( /\s+/, $Datas[$counter]); if ($#SplitBg>0) { foreach (@SplitBg) { print $_."\n"; diff --git a/src/external/MuSRFitGUI/MuSRFit.ui b/src/external/MuSRFitGUI/MuSRFit.ui index c7c6afde..5aaf27a2 100755 --- a/src/external/MuSRFitGUI/MuSRFit.ui +++ b/src/external/MuSRFitGUI/MuSRFit.ui @@ -161,6 +161,11 @@ LTF + + + LEM (PPC) + + BeamLine diff --git a/src/external/MuSRFitGUI/MuSRFit.ui.h b/src/external/MuSRFitGUI/MuSRFit.ui.h index 99939140..e8d9c919 100755 --- a/src/external/MuSRFitGUI/MuSRFit.ui.h +++ b/src/external/MuSRFitGUI/MuSRFit.ui.h @@ -412,6 +412,9 @@ void MuSRFitform::CreateAllInput() # Construct a default filename if empty if ( $All{"FILENAME"} eq "" && !$All{"RUNSType"}) { $All{"FILENAME"}=$RUNS[0]."_".$All{"BeamLine"}."_".$All{"YEAR"}; + if ($All{"BeamLine"} eq "LEM (PPC)") { + $All{"FILENAME"}=$RUNS[0]."_LEM_".$All{"YEAR"}; + } } else { $All{"FILENAME"}="TMP"; }