From e2fb81f7b74cb389cf5a76a214a2a76039679f69 Mon Sep 17 00:00:00 2001 From: Zaher Salman Date: Thu, 14 Jun 2012 14:15:51 +0000 Subject: [PATCH] Go back to internal sharing for now until new method is stabilized. --- src/external/MuSRFitGUI/MuSRFit.pl | 5 +++-- src/external/MuSRFitGUI/MuSRFit.ui.h | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/external/MuSRFitGUI/MuSRFit.pl b/src/external/MuSRFitGUI/MuSRFit.pl index ec6383ef..5d81eb0e 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 Jun 6 14:00:51 2012 +# Created: Thu Jun 14 14:52:06 2012 # by: The PerlQt User Interface Compiler (puic) # # WARNING! All changes made in this file will be lost! @@ -3947,7 +3947,8 @@ sub CallMSRCreate if ($All{"RUNSType"}) { my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateMSR(\%All); } else { - my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateMSRSh(\%All); +# my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateMSRSh(\%All); + my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateMSR(\%All); # if it is multiple runs then the produced file is a template my $FILENAME=$All{"FILENAME"}.".msr"; my $Extension = "_".$All{"BeamLine"}."_".$All{"YEAR"}; diff --git a/src/external/MuSRFitGUI/MuSRFit.ui.h b/src/external/MuSRFitGUI/MuSRFit.ui.h index 72e3d309..0b416b8c 100755 --- a/src/external/MuSRFitGUI/MuSRFit.ui.h +++ b/src/external/MuSRFitGUI/MuSRFit.ui.h @@ -478,7 +478,8 @@ void MuSRFitform::CallMSRCreate() if ($All{"RUNSType"}) { my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateMSR(\%All); } else { - my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateMSRSh(\%All); +# my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateMSRSh(\%All); + my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateMSR(\%All); # if it is multiple runs then the produced file is a template my $FILENAME=$All{"FILENAME"}.".msr"; my $Extension = "_".$All{"BeamLine"}."_".$All{"YEAR"};