From 90823c9f8473a2b0829bfad0c181d6144fd37814 Mon Sep 17 00:00:00 2001 From: Zaher Salman Date: Thu, 27 Aug 2009 07:05:56 +0000 Subject: [PATCH] Begining of implementation of Fourier transform. --- src/external/MuSRFitGUI/MSR.pm | 22 ++++++++++++++++++++-- src/external/MuSRFitGUI/MuSRFit.pl | 4 ++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/external/MuSRFitGUI/MSR.pm b/src/external/MuSRFitGUI/MSR.pm index 704fec18..023a0d4e 100755 --- a/src/external/MuSRFitGUI/MSR.pm +++ b/src/external/MuSRFitGUI/MSR.pm @@ -443,6 +443,15 @@ runs $RUNS_Line $PRANGE_Line $logxy"; + $FOURIER_Block= + "################################################################### +FOURIER +units MHz # units either 'Gauss', 'MHz', or 'Mc/s' +fourier_power 12 +apodization STRONG # NONE, WEAK, MEDIUM, STRONG +plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE +phase 8.50"; + # Don't know why but it is needed initially $STAT_Block = "############################################################### @@ -450,7 +459,7 @@ STATISTIC --- 0000-00-00 00:00:00 *** FIT DID NOT CONVERGE ***"; # Empty line at the end of each block - my $FullMSRFile = "$TitleLine$FitParaBlk\n$Full_T_Block\n$RUN_Block\n$COMMANDS_Block\n$PLOT_Block\n$STAT_Block\n"; + my $FullMSRFile = "$TitleLine$FitParaBlk\n$Full_T_Block\n$RUN_Block\n$COMMANDS_Block\n$PLOT_Block\n$FOURIER_Block\n$STAT_Block\n"; # Open output file FILENAME.msr open( OUTF,q{>},"$FILENAME.msr" ); @@ -872,6 +881,15 @@ runs $RUNS_Line $PRANGE_Line $logxy"; + $FOURIER_Block= + "################################################################### +FOURIER +units MHz # units either 'Gauss', 'MHz', or 'Mc/s' +fourier_power 12 +apodization STRONG # NONE, WEAK, MEDIUM, STRONG +plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE +phase 8.50"; + # Don't know why but it is needed initially $STAT_Block = "############################################################### @@ -879,7 +897,7 @@ STATISTIC --- 0000-00-00 00:00:00 *** FIT DID NOT CONVERGE ***"; # Empty line at the end of each block - my $FullMSRFile = "$TitleLine$FitParaBlk\n$Full_T_Block\n$RUN_Block\n$COMMANDS_Block\n$PLOT_Block\n$STAT_Block\n"; + my $FullMSRFile = "$TitleLine$FitParaBlk\n$Full_T_Block\n$RUN_Block\n$COMMANDS_Block\n$PLOT_Block\n$FOURIER_Block\n$STAT_Block\n"; # Open output file FILENAME.msr open( OUTF,q{>},"$FILENAME.msr" ); diff --git a/src/external/MuSRFitGUI/MuSRFit.pl b/src/external/MuSRFitGUI/MuSRFit.pl index a5f2c81d..1c80c717 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 Aug 26 17:07:14 2009 +# Created: Thu Aug 27 09:03:25 2009 # by: The PerlQt User Interface Compiler (puic) # # WARNING! All changes made in this file will be lost! @@ -1009,7 +1009,7 @@ sub NEW Qt::Object::connect(fileChangeDirAction, SIGNAL "activated()", this, SLOT "fileChangeDir()"); Qt::Object::connect(musrfit_tabs, SIGNAL "selected(const QString&)", this, SLOT "TabChanged()"); Qt::Object::connect(go, SIGNAL "clicked()", this, SLOT "GoFit()"); - Qt::Object::connect(InitParamTable, SIGNAL "valueChanged(int,int)", this, SLOT "UpdeateTable()"); + Qt::Object::connect(InitParamTable, SIGNAL "valueChanged(int,int)", this, SLOT "UpdateMSRFileInitTable()"); setTabOrder(musrfit_tabs, TITLE); setTabOrder(TITLE, FILENAME);