From bb1f6b113b7c168dd6617e0f0353565df0101fa4 Mon Sep 17 00:00:00 2001 From: Suter Andreas Date: Thu, 28 Apr 2016 13:05:39 +0200 Subject: [PATCH] updated licence info and added paramList to the GUI. --- ChangeLog | 2 + src/musredit/PAdmin.cpp | 2 +- src/musredit/PAdmin.h | 2 +- src/musredit/PDumpOutputHandler.cpp | 2 +- src/musredit/PDumpOutputHandler.h | 2 +- src/musredit/PFindDialog.cpp | 2 +- src/musredit/PFindDialog.h | 2 +- src/musredit/PFitOutputHandler.cpp | 2 +- src/musredit/PFitOutputHandler.h | 2 +- src/musredit/PGetAsymmetryRunBlockDialog.cpp | 2 +- src/musredit/PGetAsymmetryRunBlockDialog.h | 2 +- src/musredit/PGetDefaultDialog.cpp | 2 +- src/musredit/PGetDefaultDialog.h | 2 +- src/musredit/PGetFourierBlockDialog.cpp | 2 +- src/musredit/PGetFourierBlockDialog.h | 2 +- src/musredit/PGetFunctionsBlockDialog.cpp | 2 +- src/musredit/PGetFunctionsBlockDialog.h | 2 +- src/musredit/PGetMusrFTOptionsDialog.cpp | 2 +- src/musredit/PGetMusrFTOptionsDialog.h | 2 +- src/musredit/PGetNonMusrRunBlockDialog.cpp | 2 +- src/musredit/PGetNonMusrRunBlockDialog.h | 2 +- src/musredit/PGetParameterBlockDialog.cpp | 2 +- src/musredit/PGetParameterBlockDialog.h | 2 +- src/musredit/PGetPlotBlockDialog.cpp | 2 +- src/musredit/PGetPlotBlockDialog.h | 2 +- .../PGetSingleHistoRunBlockDialog.cpp | 2 +- src/musredit/PGetSingleHistoRunBlockDialog.h | 2 +- src/musredit/PGetTheoryBlockDialog.cpp | 2 +- src/musredit/PGetTheoryBlockDialog.h | 2 +- src/musredit/PGetTitleBlockDialog.cpp | 2 +- src/musredit/PGetTitleBlockDialog.h | 2 +- src/musredit/PHelp.cpp | 2 +- src/musredit/PHelp.h | 2 +- src/musredit/PMsr2DataDialog.cpp | 7 +- src/musredit/PMsr2DataDialog.h | 2 +- src/musredit/PMusrEditAbout.cpp | 2 +- src/musredit/PMusrEditAbout.h | 2 +- src/musredit/PPrefsDialog.cpp | 2 +- src/musredit/PPrefsDialog.h | 2 +- src/musredit/PReplaceConfirmationDialog.cpp | 2 +- src/musredit/PReplaceConfirmationDialog.h | 2 +- src/musredit/PReplaceDialog.cpp | 2 +- src/musredit/PReplaceDialog.h | 2 +- src/musredit/PSubTextEdit.cpp | 2 +- src/musredit/PSubTextEdit.h | 2 +- src/musredit/PTextEdit.cpp | 10 +- src/musredit/PTextEdit.h | 2 +- src/musredit/forms/PMsr2DataDialog.ui | 152 ++++++++++++++++-- src/musredit/main.cpp | 2 +- src/musredit/musredit.h | 5 +- src/musredit_qt5/PAdmin.cpp | 2 +- src/musredit_qt5/PAdmin.h | 2 +- src/musredit_qt5/PDumpOutputHandler.cpp | 2 +- src/musredit_qt5/PDumpOutputHandler.h | 2 +- src/musredit_qt5/PFindDialog.cpp | 2 +- src/musredit_qt5/PFindDialog.h | 2 +- src/musredit_qt5/PFitOutputHandler.cpp | 2 +- src/musredit_qt5/PFitOutputHandler.h | 2 +- .../PGetAsymmetryRunBlockDialog.cpp | 2 +- .../PGetAsymmetryRunBlockDialog.h | 2 +- src/musredit_qt5/PGetDefaultDialog.cpp | 2 +- src/musredit_qt5/PGetDefaultDialog.h | 2 +- src/musredit_qt5/PGetFourierBlockDialog.cpp | 2 +- src/musredit_qt5/PGetFourierBlockDialog.h | 2 +- src/musredit_qt5/PGetFunctionsBlockDialog.cpp | 2 +- src/musredit_qt5/PGetFunctionsBlockDialog.h | 2 +- src/musredit_qt5/PGetMusrFTOptionsDialog.cpp | 2 +- src/musredit_qt5/PGetMusrFTOptionsDialog.h | 2 +- .../PGetNonMusrRunBlockDialog.cpp | 2 +- src/musredit_qt5/PGetNonMusrRunBlockDialog.h | 2 +- src/musredit_qt5/PGetParameterBlockDialog.cpp | 2 +- src/musredit_qt5/PGetParameterBlockDialog.h | 2 +- src/musredit_qt5/PGetPlotBlockDialog.cpp | 2 +- src/musredit_qt5/PGetPlotBlockDialog.h | 2 +- .../PGetSingleHistoRunBlockDialog.cpp | 2 +- .../PGetSingleHistoRunBlockDialog.h | 2 +- src/musredit_qt5/PGetTheoryBlockDialog.cpp | 2 +- src/musredit_qt5/PGetTheoryBlockDialog.h | 2 +- src/musredit_qt5/PGetTitleBlockDialog.cpp | 2 +- src/musredit_qt5/PGetTitleBlockDialog.h | 2 +- src/musredit_qt5/PHelp.cpp | 2 +- src/musredit_qt5/PHelp.h | 2 +- src/musredit_qt5/PMsr2DataDialog.cpp | 7 +- src/musredit_qt5/PMsr2DataDialog.h | 2 +- src/musredit_qt5/PMusrEditAbout.cpp | 2 +- src/musredit_qt5/PMusrEditAbout.h | 2 +- src/musredit_qt5/PPrefsDialog.cpp | 2 +- src/musredit_qt5/PPrefsDialog.h | 2 +- .../PReplaceConfirmationDialog.cpp | 2 +- src/musredit_qt5/PReplaceConfirmationDialog.h | 2 +- src/musredit_qt5/PReplaceDialog.cpp | 2 +- src/musredit_qt5/PReplaceDialog.h | 2 +- src/musredit_qt5/PSubTextEdit.cpp | 2 +- src/musredit_qt5/PSubTextEdit.h | 2 +- src/musredit_qt5/PTextEdit.cpp | 10 +- src/musredit_qt5/PTextEdit.h | 2 +- src/musredit_qt5/forms/PMsr2DataDialog.ui | 128 +++++++++++++-- src/musredit_qt5/main.cpp | 2 +- src/musredit_qt5/musredit.h | 5 +- 99 files changed, 382 insertions(+), 124 deletions(-) diff --git a/ChangeLog b/ChangeLog index a13791ba..267c0dd2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ changes since 0.17.0 =================================== +NEW 2016-04-28 updated licence info in musredit and added paramList + feature to the msr2data GUI. NEW 2016-04-28 msr2data gets a new option: paramList which allows to extract a subset of all the parameters of a collection of msr-files. diff --git a/src/musredit/PAdmin.cpp b/src/musredit/PAdmin.cpp index 0d6af6da..d4368c2c 100644 --- a/src/musredit/PAdmin.cpp +++ b/src/musredit/PAdmin.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PAdmin.h b/src/musredit/PAdmin.h index d2e84db2..861dde15 100644 --- a/src/musredit/PAdmin.h +++ b/src/musredit/PAdmin.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PDumpOutputHandler.cpp b/src/musredit/PDumpOutputHandler.cpp index cec0692c..69cb11e4 100644 --- a/src/musredit/PDumpOutputHandler.cpp +++ b/src/musredit/PDumpOutputHandler.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2012-2014 by Andreas Suter * + * Copyright (C) 2012-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PDumpOutputHandler.h b/src/musredit/PDumpOutputHandler.h index 2d639cda..fa9813b4 100644 --- a/src/musredit/PDumpOutputHandler.h +++ b/src/musredit/PDumpOutputHandler.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2012-2014 by Andreas Suter * + * Copyright (C) 2012-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PFindDialog.cpp b/src/musredit/PFindDialog.cpp index a60428d7..ef91999a 100644 --- a/src/musredit/PFindDialog.cpp +++ b/src/musredit/PFindDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PFindDialog.h b/src/musredit/PFindDialog.h index a31837a9..9b575ee2 100644 --- a/src/musredit/PFindDialog.h +++ b/src/musredit/PFindDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PFitOutputHandler.cpp b/src/musredit/PFitOutputHandler.cpp index a2ede92d..28ca0298 100644 --- a/src/musredit/PFitOutputHandler.cpp +++ b/src/musredit/PFitOutputHandler.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PFitOutputHandler.h b/src/musredit/PFitOutputHandler.h index 9aac5c7b..a04a02d8 100644 --- a/src/musredit/PFitOutputHandler.h +++ b/src/musredit/PFitOutputHandler.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetAsymmetryRunBlockDialog.cpp b/src/musredit/PGetAsymmetryRunBlockDialog.cpp index 9dfdede6..b4503eb8 100644 --- a/src/musredit/PGetAsymmetryRunBlockDialog.cpp +++ b/src/musredit/PGetAsymmetryRunBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetAsymmetryRunBlockDialog.h b/src/musredit/PGetAsymmetryRunBlockDialog.h index 9d3c34de..836274ab 100644 --- a/src/musredit/PGetAsymmetryRunBlockDialog.h +++ b/src/musredit/PGetAsymmetryRunBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetDefaultDialog.cpp b/src/musredit/PGetDefaultDialog.cpp index 48fd8646..ae0da191 100644 --- a/src/musredit/PGetDefaultDialog.cpp +++ b/src/musredit/PGetDefaultDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetDefaultDialog.h b/src/musredit/PGetDefaultDialog.h index fb7392d2..404021d2 100644 --- a/src/musredit/PGetDefaultDialog.h +++ b/src/musredit/PGetDefaultDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetFourierBlockDialog.cpp b/src/musredit/PGetFourierBlockDialog.cpp index 4a454562..121635e5 100644 --- a/src/musredit/PGetFourierBlockDialog.cpp +++ b/src/musredit/PGetFourierBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetFourierBlockDialog.h b/src/musredit/PGetFourierBlockDialog.h index fa00c245..3006c2e7 100644 --- a/src/musredit/PGetFourierBlockDialog.h +++ b/src/musredit/PGetFourierBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetFunctionsBlockDialog.cpp b/src/musredit/PGetFunctionsBlockDialog.cpp index 2959e871..7d706578 100644 --- a/src/musredit/PGetFunctionsBlockDialog.cpp +++ b/src/musredit/PGetFunctionsBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetFunctionsBlockDialog.h b/src/musredit/PGetFunctionsBlockDialog.h index 6246f9dd..ead1e2f0 100644 --- a/src/musredit/PGetFunctionsBlockDialog.h +++ b/src/musredit/PGetFunctionsBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetMusrFTOptionsDialog.cpp b/src/musredit/PGetMusrFTOptionsDialog.cpp index cdf15e3f..169ef191 100644 --- a/src/musredit/PGetMusrFTOptionsDialog.cpp +++ b/src/musredit/PGetMusrFTOptionsDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2015 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetMusrFTOptionsDialog.h b/src/musredit/PGetMusrFTOptionsDialog.h index bea14f7f..e00366e3 100644 --- a/src/musredit/PGetMusrFTOptionsDialog.h +++ b/src/musredit/PGetMusrFTOptionsDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2015 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetNonMusrRunBlockDialog.cpp b/src/musredit/PGetNonMusrRunBlockDialog.cpp index 3b22c252..c8814c40 100644 --- a/src/musredit/PGetNonMusrRunBlockDialog.cpp +++ b/src/musredit/PGetNonMusrRunBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetNonMusrRunBlockDialog.h b/src/musredit/PGetNonMusrRunBlockDialog.h index a009101b..7faa842d 100644 --- a/src/musredit/PGetNonMusrRunBlockDialog.h +++ b/src/musredit/PGetNonMusrRunBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetParameterBlockDialog.cpp b/src/musredit/PGetParameterBlockDialog.cpp index 8924c636..e5f4abbe 100644 --- a/src/musredit/PGetParameterBlockDialog.cpp +++ b/src/musredit/PGetParameterBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetParameterBlockDialog.h b/src/musredit/PGetParameterBlockDialog.h index 3dd8a183..c8c74ee6 100644 --- a/src/musredit/PGetParameterBlockDialog.h +++ b/src/musredit/PGetParameterBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetPlotBlockDialog.cpp b/src/musredit/PGetPlotBlockDialog.cpp index 671e646f..d2df92a4 100644 --- a/src/musredit/PGetPlotBlockDialog.cpp +++ b/src/musredit/PGetPlotBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetPlotBlockDialog.h b/src/musredit/PGetPlotBlockDialog.h index 8035e8d5..cf662945 100644 --- a/src/musredit/PGetPlotBlockDialog.h +++ b/src/musredit/PGetPlotBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetSingleHistoRunBlockDialog.cpp b/src/musredit/PGetSingleHistoRunBlockDialog.cpp index f4c36556..9e9b369e 100644 --- a/src/musredit/PGetSingleHistoRunBlockDialog.cpp +++ b/src/musredit/PGetSingleHistoRunBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetSingleHistoRunBlockDialog.h b/src/musredit/PGetSingleHistoRunBlockDialog.h index c8d4ee89..0fd094cd 100644 --- a/src/musredit/PGetSingleHistoRunBlockDialog.h +++ b/src/musredit/PGetSingleHistoRunBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetTheoryBlockDialog.cpp b/src/musredit/PGetTheoryBlockDialog.cpp index 9c5f0ea7..1683c78a 100644 --- a/src/musredit/PGetTheoryBlockDialog.cpp +++ b/src/musredit/PGetTheoryBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetTheoryBlockDialog.h b/src/musredit/PGetTheoryBlockDialog.h index 46b1441c..163893e8 100644 --- a/src/musredit/PGetTheoryBlockDialog.h +++ b/src/musredit/PGetTheoryBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetTitleBlockDialog.cpp b/src/musredit/PGetTitleBlockDialog.cpp index f80d0e6f..3ecf4a98 100644 --- a/src/musredit/PGetTitleBlockDialog.cpp +++ b/src/musredit/PGetTitleBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PGetTitleBlockDialog.h b/src/musredit/PGetTitleBlockDialog.h index 6b2767eb..a9a6fd04 100644 --- a/src/musredit/PGetTitleBlockDialog.h +++ b/src/musredit/PGetTitleBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PHelp.cpp b/src/musredit/PHelp.cpp index 0607a9a8..9d24063d 100644 --- a/src/musredit/PHelp.cpp +++ b/src/musredit/PHelp.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PHelp.h b/src/musredit/PHelp.h index 82acea8a..ae0bfb7a 100644 --- a/src/musredit/PHelp.h +++ b/src/musredit/PHelp.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PMsr2DataDialog.cpp b/src/musredit/PMsr2DataDialog.cpp index aa47a50f..b2c52a48 100644 --- a/src/musredit/PMsr2DataDialog.cpp +++ b/src/musredit/PMsr2DataDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * @@ -88,6 +88,10 @@ PMsr2DataDialog::PMsr2DataDialog(PMsr2DataParam *msr2DataParam, const QString he fDataOutputFileName_lineEdit->setText(fMsr2DataParam->dbOutputFileName); } + if (!fMsr2DataParam->paramList.isEmpty()) { + fParamList_lineEdit->setText(fMsr2DataParam->paramList); + } + fWriteDataHeader_checkBox->setChecked(fMsr2DataParam->writeDbHeader); fIgnoreDataHeaderInfo_checkBox->setChecked(fMsr2DataParam->ignoreDataHeaderInfo); fKeepMinuit2Output_checkBox->setChecked(fMsr2DataParam->keepMinuit2Output); @@ -129,6 +133,7 @@ PMsr2DataParam* PMsr2DataDialog::getMsr2DataParam() } else { fMsr2DataParam->templateRunNo = fTemplateRunNumber_lineEdit->text().toInt(); } + fMsr2DataParam->paramList = fParamList_lineEdit->text(); fMsr2DataParam->dbOutputFileName = fDataOutputFileName_lineEdit->text(); fMsr2DataParam->writeDbHeader = fWriteDataHeader_checkBox->isChecked(); fMsr2DataParam->ignoreDataHeaderInfo = fIgnoreDataHeaderInfo_checkBox->isChecked(); diff --git a/src/musredit/PMsr2DataDialog.h b/src/musredit/PMsr2DataDialog.h index 7892e2ea..06eeaf11 100644 --- a/src/musredit/PMsr2DataDialog.h +++ b/src/musredit/PMsr2DataDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PMusrEditAbout.cpp b/src/musredit/PMusrEditAbout.cpp index ad6789fb..471a43d9 100644 --- a/src/musredit/PMusrEditAbout.cpp +++ b/src/musredit/PMusrEditAbout.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PMusrEditAbout.h b/src/musredit/PMusrEditAbout.h index 0efde479..f9456c60 100644 --- a/src/musredit/PMusrEditAbout.h +++ b/src/musredit/PMusrEditAbout.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PPrefsDialog.cpp b/src/musredit/PPrefsDialog.cpp index a6fb9ca3..c876a12f 100644 --- a/src/musredit/PPrefsDialog.cpp +++ b/src/musredit/PPrefsDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PPrefsDialog.h b/src/musredit/PPrefsDialog.h index 5f113eb1..7543c0a8 100644 --- a/src/musredit/PPrefsDialog.h +++ b/src/musredit/PPrefsDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PReplaceConfirmationDialog.cpp b/src/musredit/PReplaceConfirmationDialog.cpp index c00f8ac4..9cf2cf42 100644 --- a/src/musredit/PReplaceConfirmationDialog.cpp +++ b/src/musredit/PReplaceConfirmationDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PReplaceConfirmationDialog.h b/src/musredit/PReplaceConfirmationDialog.h index edb46d26..a213c830 100644 --- a/src/musredit/PReplaceConfirmationDialog.h +++ b/src/musredit/PReplaceConfirmationDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PReplaceDialog.cpp b/src/musredit/PReplaceDialog.cpp index bc82843f..1ab29e5d 100644 --- a/src/musredit/PReplaceDialog.cpp +++ b/src/musredit/PReplaceDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PReplaceDialog.h b/src/musredit/PReplaceDialog.h index 1e3a053c..8f8ab8a5 100644 --- a/src/musredit/PReplaceDialog.h +++ b/src/musredit/PReplaceDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PSubTextEdit.cpp b/src/musredit/PSubTextEdit.cpp index 7732fbe3..5c47c10e 100644 --- a/src/musredit/PSubTextEdit.cpp +++ b/src/musredit/PSubTextEdit.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PSubTextEdit.h b/src/musredit/PSubTextEdit.h index 9d8234c4..cf8ca495 100644 --- a/src/musredit/PSubTextEdit.h +++ b/src/musredit/PSubTextEdit.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/PTextEdit.cpp b/src/musredit/PTextEdit.cpp index d22e4294..b5ab871d 100644 --- a/src/musredit/PTextEdit.cpp +++ b/src/musredit/PTextEdit.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * @@ -1963,6 +1963,14 @@ void PTextEdit::musrMsr2Data() // options + // parameter export list + if (!fMsr2DataParam->paramList.isEmpty()) { + cmd.append("paramList"); + QStringList list = fMsr2DataParam->paramList.split(' '); + for (int i=0; iwriteDbHeader) cmd.append("noheader"); diff --git a/src/musredit/PTextEdit.h b/src/musredit/PTextEdit.h index a4e3a4e5..d7e9b9de 100644 --- a/src/musredit/PTextEdit.h +++ b/src/musredit/PTextEdit.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/forms/PMsr2DataDialog.ui b/src/musredit/forms/PMsr2DataDialog.ui index 1e34b16a..fa56570f 100644 --- a/src/musredit/forms/PMsr2DataDialog.ui +++ b/src/musredit/forms/PMsr2DataDialog.ui @@ -10,7 +10,7 @@ 0 0 552 - 551 + 599 @@ -64,7 +64,14 @@ - + + + start run number + + + start run number + + @@ -90,7 +97,14 @@ - + + + end run number + + + end run number + + @@ -130,7 +144,19 @@ - + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The run list consists of a collection of run number. Accepted input formats are:</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(i) &lt;run0&gt; &lt;run1&gt; ... &lt;runN&gt;, e.g. 124 126 129</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(ii) &lt;run0&gt;-&lt;runN&gt;, e.g. 124-126, i.e. 124 125 126</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(iii) &lt;run0&gt;:&lt;runN&gt;:&lt;step&gt;, e.g 124:128:2, i.e. 124 126 128</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">or combination of those three.</p></body></html> + + @@ -170,7 +196,16 @@ - + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">an ASCII file containing a list of run numbers and optional external parameters is passed to msr2data. </p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">For details see the online documentation.</p></body></html> + + @@ -236,7 +271,11 @@ - + + + the extension will be used together with the run number to generate the msr-file name. For example: the run number being 123 and the extension _tf_h13, an msr-file name 123_tf_h13.msr will result. + + @@ -284,10 +323,22 @@ - + + + the run number given here will be used as a msr-file template number to generate/fit the run's given in the 'Run List Input'. + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">unselected means: all msr-files generated and fitted will start from the given template.</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">selected means: the msr-files generated and fitted will use the previously fitted msr-file as an input. This makes sense if the run list given has continously changing parameters, e.g. as function of the temperature.</p></body></html> + Chain Fit @@ -339,7 +390,11 @@ - + + + db- or dat-output file name for the parameter files. + + @@ -366,7 +421,7 @@ 0 360 551 - 141 + 172 @@ -386,6 +441,9 @@ + + For db-files, a Data Header will be written. + Write Data Header @@ -393,6 +451,13 @@ + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This tag is used in conjunction with LEM. If <span style=" font-weight:600;">not</span> selected, it will try to extract experiment specific parameters from the data file like implantation energy, transport HV settings, etc.</p></body></html> + Ignore Data Header Info @@ -400,6 +465,9 @@ + + selected: for each run fitted, two additional files will be written, namely a <msr-filename>-mn2.output and <msr-filename>-mn2.root, which contain a richer set of information about fit, i.e. the covariance matrix, the correlation coefficients, etc. + Keep Minuit2 Output @@ -411,6 +479,14 @@ + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">unselected: the output parameter file is written in so called db-format.</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">selected: the output parameter file is written in column like ascii-format.</p></body></html> + Write Column Data @@ -418,6 +494,14 @@ + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">unselected: if the parameter output file already exists, the parameters will be appended.</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">selected: if the parameter output file already exists: it will be deleted and a new one will be written.</p></body></html> + Recreate Data File @@ -425,6 +509,9 @@ + + selected: the newly generated msr-files will be opened in musredit after the fit took place. + Open Files after Fitting @@ -436,6 +523,9 @@ + + if selected: the run title of the generated msr-file will be the one given in the muSR data file. + Take Data File Title @@ -443,6 +533,13 @@ + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">if selected: the msr-files will be created, but <span style=" font-weight:600;">no </span>fitting will take place.</p></body></html> + Create msr-File only @@ -450,6 +547,9 @@ + + selected: it is assumed that the msr-files already exist, and only musrfit is called. + Fit Only @@ -459,6 +559,9 @@ + + selected: will generate a msr-file for a global fit. Please check the online documentation for further details. + Global @@ -466,6 +569,9 @@ + + selected: will generate a msr-file for a global fit. The difference between Global and Global+ is that for Global+ the input parameters of the msr-file are originating from the single run fits. Please check the online documentation for further details. + Global+ @@ -477,12 +583,38 @@ + + + + 10 + 143 + 161 + 17 + + + + Parameter Export List + + + + + + 170 + 140 + 371 + 23 + + + + parameter numbers to be exported, e.g. 1-16, or 1 3-7, etc. + + 5 - 500 + 540 541 51 diff --git a/src/musredit/main.cpp b/src/musredit/main.cpp index bddfa487..8948dca1 100644 --- a/src/musredit/main.cpp +++ b/src/musredit/main.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/musredit.h b/src/musredit/musredit.h index 42b06152..ffc06cd5 100644 --- a/src/musredit/musredit.h +++ b/src/musredit/musredit.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * @@ -49,6 +47,7 @@ typedef struct { QString runListFileName; ///< run list filename (usage 4 of msr2data) QString msrFileExtension; ///< msr filename extension, e.g. '0100_h13.msr' -> '_h13' int templateRunNo; ///< fit template run number + QString paramList; ///< parameter list to be exported. QString dbOutputFileName; ///< output file name for the generated (trumf-like) db-file. bool writeDbHeader; ///< flag indicating if a db header shall be generated (== !noheader in msr2data) bool ignoreDataHeaderInfo; ///< flag indicating if data header info (like temp.) shall be ignored (== nosummary in msr2data) diff --git a/src/musredit_qt5/PAdmin.cpp b/src/musredit_qt5/PAdmin.cpp index 581b0757..2f6b1bc4 100644 --- a/src/musredit_qt5/PAdmin.cpp +++ b/src/musredit_qt5/PAdmin.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PAdmin.h b/src/musredit_qt5/PAdmin.h index de9b54b6..ef9abfc3 100644 --- a/src/musredit_qt5/PAdmin.h +++ b/src/musredit_qt5/PAdmin.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PDumpOutputHandler.cpp b/src/musredit_qt5/PDumpOutputHandler.cpp index cec0692c..69cb11e4 100644 --- a/src/musredit_qt5/PDumpOutputHandler.cpp +++ b/src/musredit_qt5/PDumpOutputHandler.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2012-2014 by Andreas Suter * + * Copyright (C) 2012-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PDumpOutputHandler.h b/src/musredit_qt5/PDumpOutputHandler.h index 2d639cda..fa9813b4 100644 --- a/src/musredit_qt5/PDumpOutputHandler.h +++ b/src/musredit_qt5/PDumpOutputHandler.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2012-2014 by Andreas Suter * + * Copyright (C) 2012-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PFindDialog.cpp b/src/musredit_qt5/PFindDialog.cpp index a60428d7..ef91999a 100644 --- a/src/musredit_qt5/PFindDialog.cpp +++ b/src/musredit_qt5/PFindDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PFindDialog.h b/src/musredit_qt5/PFindDialog.h index a31837a9..9b575ee2 100644 --- a/src/musredit_qt5/PFindDialog.h +++ b/src/musredit_qt5/PFindDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PFitOutputHandler.cpp b/src/musredit_qt5/PFitOutputHandler.cpp index a2ede92d..28ca0298 100644 --- a/src/musredit_qt5/PFitOutputHandler.cpp +++ b/src/musredit_qt5/PFitOutputHandler.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PFitOutputHandler.h b/src/musredit_qt5/PFitOutputHandler.h index 9aac5c7b..a04a02d8 100644 --- a/src/musredit_qt5/PFitOutputHandler.h +++ b/src/musredit_qt5/PFitOutputHandler.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetAsymmetryRunBlockDialog.cpp b/src/musredit_qt5/PGetAsymmetryRunBlockDialog.cpp index 9dfdede6..b4503eb8 100644 --- a/src/musredit_qt5/PGetAsymmetryRunBlockDialog.cpp +++ b/src/musredit_qt5/PGetAsymmetryRunBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetAsymmetryRunBlockDialog.h b/src/musredit_qt5/PGetAsymmetryRunBlockDialog.h index 9d3c34de..836274ab 100644 --- a/src/musredit_qt5/PGetAsymmetryRunBlockDialog.h +++ b/src/musredit_qt5/PGetAsymmetryRunBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetDefaultDialog.cpp b/src/musredit_qt5/PGetDefaultDialog.cpp index 48fd8646..ae0da191 100644 --- a/src/musredit_qt5/PGetDefaultDialog.cpp +++ b/src/musredit_qt5/PGetDefaultDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetDefaultDialog.h b/src/musredit_qt5/PGetDefaultDialog.h index fb7392d2..404021d2 100644 --- a/src/musredit_qt5/PGetDefaultDialog.h +++ b/src/musredit_qt5/PGetDefaultDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetFourierBlockDialog.cpp b/src/musredit_qt5/PGetFourierBlockDialog.cpp index 4a454562..121635e5 100644 --- a/src/musredit_qt5/PGetFourierBlockDialog.cpp +++ b/src/musredit_qt5/PGetFourierBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetFourierBlockDialog.h b/src/musredit_qt5/PGetFourierBlockDialog.h index fa00c245..3006c2e7 100644 --- a/src/musredit_qt5/PGetFourierBlockDialog.h +++ b/src/musredit_qt5/PGetFourierBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetFunctionsBlockDialog.cpp b/src/musredit_qt5/PGetFunctionsBlockDialog.cpp index 2959e871..7d706578 100644 --- a/src/musredit_qt5/PGetFunctionsBlockDialog.cpp +++ b/src/musredit_qt5/PGetFunctionsBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetFunctionsBlockDialog.h b/src/musredit_qt5/PGetFunctionsBlockDialog.h index 6246f9dd..ead1e2f0 100644 --- a/src/musredit_qt5/PGetFunctionsBlockDialog.h +++ b/src/musredit_qt5/PGetFunctionsBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetMusrFTOptionsDialog.cpp b/src/musredit_qt5/PGetMusrFTOptionsDialog.cpp index 5be9bc08..3e63c666 100644 --- a/src/musredit_qt5/PGetMusrFTOptionsDialog.cpp +++ b/src/musredit_qt5/PGetMusrFTOptionsDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2015 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetMusrFTOptionsDialog.h b/src/musredit_qt5/PGetMusrFTOptionsDialog.h index bea14f7f..e00366e3 100644 --- a/src/musredit_qt5/PGetMusrFTOptionsDialog.h +++ b/src/musredit_qt5/PGetMusrFTOptionsDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2015 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetNonMusrRunBlockDialog.cpp b/src/musredit_qt5/PGetNonMusrRunBlockDialog.cpp index 3b22c252..c8814c40 100644 --- a/src/musredit_qt5/PGetNonMusrRunBlockDialog.cpp +++ b/src/musredit_qt5/PGetNonMusrRunBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetNonMusrRunBlockDialog.h b/src/musredit_qt5/PGetNonMusrRunBlockDialog.h index a009101b..7faa842d 100644 --- a/src/musredit_qt5/PGetNonMusrRunBlockDialog.h +++ b/src/musredit_qt5/PGetNonMusrRunBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetParameterBlockDialog.cpp b/src/musredit_qt5/PGetParameterBlockDialog.cpp index 8924c636..e5f4abbe 100644 --- a/src/musredit_qt5/PGetParameterBlockDialog.cpp +++ b/src/musredit_qt5/PGetParameterBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetParameterBlockDialog.h b/src/musredit_qt5/PGetParameterBlockDialog.h index 3dd8a183..c8c74ee6 100644 --- a/src/musredit_qt5/PGetParameterBlockDialog.h +++ b/src/musredit_qt5/PGetParameterBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetPlotBlockDialog.cpp b/src/musredit_qt5/PGetPlotBlockDialog.cpp index 671e646f..d2df92a4 100644 --- a/src/musredit_qt5/PGetPlotBlockDialog.cpp +++ b/src/musredit_qt5/PGetPlotBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetPlotBlockDialog.h b/src/musredit_qt5/PGetPlotBlockDialog.h index 8035e8d5..cf662945 100644 --- a/src/musredit_qt5/PGetPlotBlockDialog.h +++ b/src/musredit_qt5/PGetPlotBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetSingleHistoRunBlockDialog.cpp b/src/musredit_qt5/PGetSingleHistoRunBlockDialog.cpp index f4c36556..9e9b369e 100644 --- a/src/musredit_qt5/PGetSingleHistoRunBlockDialog.cpp +++ b/src/musredit_qt5/PGetSingleHistoRunBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetSingleHistoRunBlockDialog.h b/src/musredit_qt5/PGetSingleHistoRunBlockDialog.h index c8d4ee89..0fd094cd 100644 --- a/src/musredit_qt5/PGetSingleHistoRunBlockDialog.h +++ b/src/musredit_qt5/PGetSingleHistoRunBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetTheoryBlockDialog.cpp b/src/musredit_qt5/PGetTheoryBlockDialog.cpp index 9c5f0ea7..1683c78a 100644 --- a/src/musredit_qt5/PGetTheoryBlockDialog.cpp +++ b/src/musredit_qt5/PGetTheoryBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetTheoryBlockDialog.h b/src/musredit_qt5/PGetTheoryBlockDialog.h index 46b1441c..163893e8 100644 --- a/src/musredit_qt5/PGetTheoryBlockDialog.h +++ b/src/musredit_qt5/PGetTheoryBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetTitleBlockDialog.cpp b/src/musredit_qt5/PGetTitleBlockDialog.cpp index f80d0e6f..3ecf4a98 100644 --- a/src/musredit_qt5/PGetTitleBlockDialog.cpp +++ b/src/musredit_qt5/PGetTitleBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PGetTitleBlockDialog.h b/src/musredit_qt5/PGetTitleBlockDialog.h index 6b2767eb..a9a6fd04 100644 --- a/src/musredit_qt5/PGetTitleBlockDialog.h +++ b/src/musredit_qt5/PGetTitleBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PHelp.cpp b/src/musredit_qt5/PHelp.cpp index 8fd2b966..d8069257 100644 --- a/src/musredit_qt5/PHelp.cpp +++ b/src/musredit_qt5/PHelp.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PHelp.h b/src/musredit_qt5/PHelp.h index 85b961cd..cc66bb02 100644 --- a/src/musredit_qt5/PHelp.h +++ b/src/musredit_qt5/PHelp.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2015 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PMsr2DataDialog.cpp b/src/musredit_qt5/PMsr2DataDialog.cpp index aa47a50f..b2c52a48 100644 --- a/src/musredit_qt5/PMsr2DataDialog.cpp +++ b/src/musredit_qt5/PMsr2DataDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * @@ -88,6 +88,10 @@ PMsr2DataDialog::PMsr2DataDialog(PMsr2DataParam *msr2DataParam, const QString he fDataOutputFileName_lineEdit->setText(fMsr2DataParam->dbOutputFileName); } + if (!fMsr2DataParam->paramList.isEmpty()) { + fParamList_lineEdit->setText(fMsr2DataParam->paramList); + } + fWriteDataHeader_checkBox->setChecked(fMsr2DataParam->writeDbHeader); fIgnoreDataHeaderInfo_checkBox->setChecked(fMsr2DataParam->ignoreDataHeaderInfo); fKeepMinuit2Output_checkBox->setChecked(fMsr2DataParam->keepMinuit2Output); @@ -129,6 +133,7 @@ PMsr2DataParam* PMsr2DataDialog::getMsr2DataParam() } else { fMsr2DataParam->templateRunNo = fTemplateRunNumber_lineEdit->text().toInt(); } + fMsr2DataParam->paramList = fParamList_lineEdit->text(); fMsr2DataParam->dbOutputFileName = fDataOutputFileName_lineEdit->text(); fMsr2DataParam->writeDbHeader = fWriteDataHeader_checkBox->isChecked(); fMsr2DataParam->ignoreDataHeaderInfo = fIgnoreDataHeaderInfo_checkBox->isChecked(); diff --git a/src/musredit_qt5/PMsr2DataDialog.h b/src/musredit_qt5/PMsr2DataDialog.h index 7892e2ea..06eeaf11 100644 --- a/src/musredit_qt5/PMsr2DataDialog.h +++ b/src/musredit_qt5/PMsr2DataDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PMusrEditAbout.cpp b/src/musredit_qt5/PMusrEditAbout.cpp index ad6789fb..471a43d9 100644 --- a/src/musredit_qt5/PMusrEditAbout.cpp +++ b/src/musredit_qt5/PMusrEditAbout.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PMusrEditAbout.h b/src/musredit_qt5/PMusrEditAbout.h index 0efde479..f9456c60 100644 --- a/src/musredit_qt5/PMusrEditAbout.h +++ b/src/musredit_qt5/PMusrEditAbout.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PPrefsDialog.cpp b/src/musredit_qt5/PPrefsDialog.cpp index a6fb9ca3..c876a12f 100644 --- a/src/musredit_qt5/PPrefsDialog.cpp +++ b/src/musredit_qt5/PPrefsDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PPrefsDialog.h b/src/musredit_qt5/PPrefsDialog.h index 5f113eb1..7543c0a8 100644 --- a/src/musredit_qt5/PPrefsDialog.h +++ b/src/musredit_qt5/PPrefsDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PReplaceConfirmationDialog.cpp b/src/musredit_qt5/PReplaceConfirmationDialog.cpp index c00f8ac4..9cf2cf42 100644 --- a/src/musredit_qt5/PReplaceConfirmationDialog.cpp +++ b/src/musredit_qt5/PReplaceConfirmationDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PReplaceConfirmationDialog.h b/src/musredit_qt5/PReplaceConfirmationDialog.h index edb46d26..a213c830 100644 --- a/src/musredit_qt5/PReplaceConfirmationDialog.h +++ b/src/musredit_qt5/PReplaceConfirmationDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PReplaceDialog.cpp b/src/musredit_qt5/PReplaceDialog.cpp index bc82843f..1ab29e5d 100644 --- a/src/musredit_qt5/PReplaceDialog.cpp +++ b/src/musredit_qt5/PReplaceDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PReplaceDialog.h b/src/musredit_qt5/PReplaceDialog.h index 1e3a053c..8f8ab8a5 100644 --- a/src/musredit_qt5/PReplaceDialog.h +++ b/src/musredit_qt5/PReplaceDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PSubTextEdit.cpp b/src/musredit_qt5/PSubTextEdit.cpp index eabe8724..0d0cd836 100644 --- a/src/musredit_qt5/PSubTextEdit.cpp +++ b/src/musredit_qt5/PSubTextEdit.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PSubTextEdit.h b/src/musredit_qt5/PSubTextEdit.h index 9d8234c4..cf8ca495 100644 --- a/src/musredit_qt5/PSubTextEdit.h +++ b/src/musredit_qt5/PSubTextEdit.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2014 by Andreas Suter * + * Copyright (C) 2009-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/PTextEdit.cpp b/src/musredit_qt5/PTextEdit.cpp index a31bc17e..cf98f1f6 100644 --- a/src/musredit_qt5/PTextEdit.cpp +++ b/src/musredit_qt5/PTextEdit.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * @@ -1961,6 +1961,14 @@ void PTextEdit::musrMsr2Data() // options + // parameter export list + if (!fMsr2DataParam->paramList.isEmpty()) { + cmd.append("paramList"); + QStringList list = fMsr2DataParam->paramList.split(' '); + for (int i=0; iwriteDbHeader) cmd.append("noheader"); diff --git a/src/musredit_qt5/PTextEdit.h b/src/musredit_qt5/PTextEdit.h index a4e3a4e5..d7e9b9de 100644 --- a/src/musredit_qt5/PTextEdit.h +++ b/src/musredit_qt5/PTextEdit.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/forms/PMsr2DataDialog.ui b/src/musredit_qt5/forms/PMsr2DataDialog.ui index 1e34b16a..4c5c2703 100644 --- a/src/musredit_qt5/forms/PMsr2DataDialog.ui +++ b/src/musredit_qt5/forms/PMsr2DataDialog.ui @@ -10,14 +10,14 @@ 0 0 552 - 551 + 594 msr2data input - + :/images/musrmsr2data.xpm:/images/musrmsr2data.xpm @@ -64,7 +64,14 @@ - + + + start run number + + + start run number + + @@ -90,7 +97,14 @@ - + + + end run number + + + end run number + + @@ -130,7 +144,11 @@ - + + + <html><head/><body><p>The run list consists of a collection of run number. Accepted input formats are:</p><p>(i) &lt;run0&gt; &lt;run1&gt; ... &lt;runN&gt;, e.g. 124 126 129</p><p>(ii) &lt;run0&gt;-&lt;runN&gt;, e.g. 124-126, i.e. 124 125 126</p><p>(iii) &lt;run0&gt;:&lt;runN&gt;:&lt;step&gt;, e.g 124:128:2, i.e. 124 126 128</p><p>or combination of those three.</p></body></html> + + @@ -170,7 +188,11 @@ - + + + <html><head/><body><p>an ASCII file containing a list of run numbers and optional external parameters is passed to msr2data. </p><p>For details see the online documentation.</p></body></html> + + @@ -236,7 +258,11 @@ - + + + <html><head/><body><p>the extension will be used together with the run number to generate the msr-file name. For example: the run number being 123 and the extension _tf_h13, an msr-file name 123_tf_h13.msr will result.</p></body></html> + + @@ -284,10 +310,17 @@ - + + + <html><head/><body><p>the run number given here will be used as a msr-file template number to generate/fit the run's given in the 'Run List Input'.</p></body></html> + + + + <html><head/><body><p>unselected means: all msr-files generated and fitted will start from the given template.</p><p>selected means: the msr-files generated and fitted will use the previously fitted msr-file as an input. This makes sense if the run list given has continously changing parameters, e.g. as function of the temperature.</p></body></html> + Chain Fit @@ -319,7 +352,7 @@ - Data Output File Name + Parameter Output File Name @@ -334,12 +367,16 @@ - Data Output File Name + Parameters Output File Name - + + + <html><head/><body><p>db- or dat-output file name for the parameter files.</p></body></html> + + @@ -366,7 +403,7 @@ 0 360 551 - 141 + 171 @@ -386,6 +423,9 @@ + + <html><head/><body><p>For db-files, a Data Header will be written.</p></body></html> + Write Data Header @@ -393,6 +433,9 @@ + + <html><head/><body><p>This tag is used in conjunction with LEM. If <span style=" font-weight:600;">not</span> selected, it will try to extract experiment specific parameters from the data file like implantation energy, transport HV settings, etc.</p></body></html> + Ignore Data Header Info @@ -400,6 +443,9 @@ + + <html><head/><body><p>selected: for each run fitted, two additional files will be written, namely a &lt;msr-filename&gt;-mn2.output and &lt;msr-filename&gt;-mn2.root, which contain a richer set of information about fit, i.e. the covariance matrix, the correlation coefficients, etc.</p></body></html> + Keep Minuit2 Output @@ -411,6 +457,9 @@ + + <html><head/><body><p>unselected: the output parameter file is written in so called db-format.</p><p>selected: the output parameter file is written in column like ascii-format.</p></body></html> + Write Column Data @@ -418,6 +467,9 @@ + + <html><head/><body><p>unselected: if the parameter output file already exists, the parameters will be appended.</p><p>selected: if the parameter output file already exists: it will be deleted and a new one will be written.</p></body></html> + Recreate Data File @@ -425,6 +477,9 @@ + + <html><head/><body><p>selected: the newly generated msr-files will be opened in musredit after the fit took place.</p></body></html> + Open Files after Fitting @@ -436,6 +491,9 @@ + + <html><head/><body><p>if selected: the run title of the generated msr-file will be the one given in the muSR data file.</p></body></html> + Take Data File Title @@ -443,6 +501,9 @@ + + <html><head/><body><p>if selected: the msr-files will be created, but <span style=" font-weight:600;">no </span>fitting will take place.</p></body></html> + Create msr-File only @@ -450,6 +511,9 @@ + + <html><head/><body><p>selected: it is assumed that the msr-files already exist, and only musrfit is called.</p></body></html> + Fit Only @@ -459,6 +523,9 @@ + + <html><head/><body><p>selected: will generate a msr-file for a global fit. Please check the online documentation for further details.</p></body></html> + Global @@ -466,6 +533,9 @@ + + <html><head/><body><p>selected: will generate a msr-file for a global fit. The difference between Global and Global+ is that for Global+ the input parameters of the msr-file are originating from the single run fits. Please check the online documentation for further details.</p></body></html> + Global+ @@ -477,12 +547,41 @@ + + + + 9 + 143 + 141 + 16 + + + + <html><head/><body><p>parameter numbers to be exported, e.g. 1-16, or 1 3-7, etc.</p></body></html> + + + Parameter Export List + + + + + + 150 + 140 + 395 + 23 + + + + <html><head/><body><p>parameter numbers to be exported, e.g. 1-16, or 1 3-7, etc.</p></body></html> + + 5 - 500 + 540 541 51 @@ -556,9 +655,10 @@ fFitOnly_checkBox fGlobal_checkBox fGlobalPlus_checkBox - fOk_pushButton + fParamList_lineEdit fCancel_pushButton fHelp_pushButton + fOk_pushButton diff --git a/src/musredit_qt5/main.cpp b/src/musredit_qt5/main.cpp index bddfa487..8948dca1 100644 --- a/src/musredit_qt5/main.cpp +++ b/src/musredit_qt5/main.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2014 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit.h b/src/musredit_qt5/musredit.h index 42b06152..ffc06cd5 100644 --- a/src/musredit_qt5/musredit.h +++ b/src/musredit_qt5/musredit.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2016 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * @@ -49,6 +47,7 @@ typedef struct { QString runListFileName; ///< run list filename (usage 4 of msr2data) QString msrFileExtension; ///< msr filename extension, e.g. '0100_h13.msr' -> '_h13' int templateRunNo; ///< fit template run number + QString paramList; ///< parameter list to be exported. QString dbOutputFileName; ///< output file name for the generated (trumf-like) db-file. bool writeDbHeader; ///< flag indicating if a db header shall be generated (== !noheader in msr2data) bool ignoreDataHeaderInfo; ///< flag indicating if data header info (like temp.) shall be ignored (== nosummary in msr2data)