Added addition of histograms option in CGI script
This commit is contained in:
12
src/external/MuSRFitGUI/MSR.pm
vendored
12
src/external/MuSRFitGUI/MSR.pm
vendored
@ -1075,16 +1075,19 @@ sub T0BgData {
|
|||||||
|
|
||||||
my %RV=();
|
my %RV=();
|
||||||
|
|
||||||
|
# If multiple histograms (sum or difference) take the first histogram only
|
||||||
|
my @Hists=split(/ /,$Hist);
|
||||||
|
|
||||||
if ($BeamLine eq "LEM") {
|
if ($BeamLine eq "LEM") {
|
||||||
my $HistParams=$LEM{$Hist};
|
my $HistParams=$LEM{$Hists[0]};
|
||||||
($RV{"t0"},$RV{"Bg1"},$RV{"Bg2"},$RV{"Data1"},$RV{"Data2"})=split(/,/,$HistParams);
|
($RV{"t0"},$RV{"Bg1"},$RV{"Bg2"},$RV{"Data1"},$RV{"Data2"})=split(/,/,$HistParams);
|
||||||
}
|
}
|
||||||
elsif ($BeamLine eq "Dolly") {
|
elsif ($BeamLine eq "Dolly") {
|
||||||
my $HistParams=$Dolly{$Hist};
|
my $HistParams=$Dolly{$Hists[0]};
|
||||||
($RV{"t0"},$RV{"Bg1"},$RV{"Bg2"},$RV{"Data1"},$RV{"Data2"})=split(/,/,$HistParams);
|
($RV{"t0"},$RV{"Bg1"},$RV{"Bg2"},$RV{"Data1"},$RV{"Data2"})=split(/,/,$HistParams);
|
||||||
}
|
}
|
||||||
elsif ($BeamLine eq "GPS") {
|
elsif ($BeamLine eq "GPS") {
|
||||||
my $HistParams=$GPS{$Hist};
|
my $HistParams=$GPS{$Hists[0]};
|
||||||
($RV{"t0"},$RV{"Bg1"},$RV{"Bg2"},$RV{"Data1"},$RV{"Data2"})=split(/,/,$HistParams);
|
($RV{"t0"},$RV{"Bg1"},$RV{"Bg2"},$RV{"Data1"},$RV{"Data2"})=split(/,/,$HistParams);
|
||||||
}
|
}
|
||||||
return $RV{$Name};
|
return $RV{$Name};
|
||||||
@ -1565,7 +1568,8 @@ sub RUNFileNameAuto {
|
|||||||
$RUNFILE = "$DATADIR/$YEAR/$RUN_File_Name";
|
$RUNFILE = "$DATADIR/$YEAR/$RUN_File_Name";
|
||||||
}
|
}
|
||||||
elsif ( $BeamLine eq "GPS" ) {
|
elsif ( $BeamLine eq "GPS" ) {
|
||||||
$RUN_File_Name = "deltat_pta_gps_" . $RUNtmp;
|
# $RUN_File_Name = "deltat_pta_gps_" . $RUNtmp;
|
||||||
|
$RUN_File_Name = "deltat_tdc_gps_" . $RUNtmp;
|
||||||
if ( $YEAR == $current_year ) {
|
if ( $YEAR == $current_year ) {
|
||||||
$RUNFILE = "$DATADIR/$RUN_File_Name";
|
$RUNFILE = "$DATADIR/$RUN_File_Name";
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user