LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Fix merge conflic manually

Browse Source
This commit is contained in:
salman 2018-03-27 22:51:09 +02:00
commit 02b05825b2
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/classes/PMusrCanvas.cpp
View File

@ -1014,8 +1014,13 @@ void PMusrCanvas::HandleCmdKey(Int_t event, Int_t x, Int_t y, TObject *selected)
if (event != kKeyPress)
return;
if (fBatchMode)
if (fBatchMode) {
if (fStartWithAvg) { // this is needed to get the averaging in the batch mode
HandleAverage();
PlotAverage(true);
}
return;
}
// handle keys and popup menu entries
enum eKeySwitch {kNotRelevant, kData, kDiffData, kFourier, kDiffFourier, kFourierDiff};
@ -1553,6 +1558,9 @@ void PMusrCanvas::SaveGraphicsAndQuit(Char_t *fileName, Char_t *graphicsFormat)
return;
}
if (fStartWithFourier)
sprintf(ext, "_%d_F", fPlotNumber);
else
sprintf(ext, "_%d", fPlotNumber);
str.Replace(idx, size, ext, strlen(ext));
idx += strlen(ext);

2
src/external/MuSRFitGUI/MSR.pm vendored
View File

@ -278,6 +278,7 @@ sub CreateMSRUni {
}
if ($All{"Data1$NHist"} ne $EMPTY && $All{"Data2$NHist"} ne $EMPTY) {
$Data_Line =$Data_Line." ".$All{"Data1$NHist"}." ".$All{"Data2$NHist"};
<<<<<<< HEAD
}
if ($All{"t0$NHist"} ne $EMPTY) {
$T0_Line=$T0_Line." ".$All{"t0$NHist"};
@ -1262,7 +1263,6 @@ sub ExportParams {
push( @FitTypes, $All{"FitType$i"} );
}
}
# Get theory block to determine the size of the table
my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateTheory(@FitTypes);
# For now the line below does not work. Why?

4
src/musredit_qt5/musredit/PTextEdit.cpp
View File

@ -706,8 +706,8 @@ void PTextEdit::setupMusrActions()
iconName = QString(":/icons/msr2data-dark.svg");
else
iconName = QString(":/icons/msr2data-plain.svg");
a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Msr2Data" ), this );
a->setShortcut( tr("Alt+M") );
a = new QAction( QIcon( QPixmap(iconName) ), tr( "Msr&2Data" ), this );
a->setShortcut( tr("Alt+2") );
a->setStatusTip( tr("Start msr2data interface") );
connect( a, SIGNAL( triggered() ), this, SLOT( musrMsr2Data() ) );
menu->addAction(a);