From bbb8550f964b9b260d657561fabcf728777faaf6 Mon Sep 17 00:00:00 2001 From: Suter Andreas Date: Wed, 12 Feb 2014 12:43:32 +0100 Subject: [PATCH] since we moved to git, I cleaned up the svn prop's from the sources and added a GIT_REVISION through git-revision.h --- ChangeLog | 2 + INSTALL | 5 +- NEWS | 2 +- README | 2 +- src/Makefile.am | 4 + src/ToDo.txt | 157 ------------------ src/any2many.cpp | 9 +- src/classes/PFitter.cpp | 4 +- src/classes/PFitterFcn.cpp | 4 +- src/classes/PFourier.cpp | 4 +- src/classes/PFunction.cpp | 4 +- src/classes/PFunctionHandler.cpp | 4 +- src/classes/PMsr2Data.cpp | 4 +- src/classes/PMsrHandler.cpp | 4 +- src/classes/PMusr.cpp | 4 +- src/classes/PMusrCanvas.cpp | 4 +- src/classes/PMusrT0.cpp | 4 +- src/classes/PRunAsymmetry.cpp | 4 +- src/classes/PRunBase.cpp | 4 +- src/classes/PRunDataHandler.cpp | 4 +- src/classes/PRunListCollection.cpp | 4 +- src/classes/PRunMuMinus.cpp | 4 +- src/classes/PRunNonMusr.cpp | 4 +- src/classes/PRunSingleHisto.cpp | 4 +- src/classes/PStartupHandler.cpp | 4 +- src/classes/PUserFcn.cpp | 4 +- src/classes/PUserFcnBase.cpp | 4 +- src/dump_header.cpp | 7 +- src/external/BMWtools/BMWIntegrator.cpp | 2 - src/external/BMWtools/BMWIntegrator.h | 2 - src/external/BMWtools/BMWStartupHandler.cpp | 4 +- src/external/BMWtools/BMWStartupHandler.h | 4 +- src/external/BMWtools/Makefile.am | 1 - src/external/BMWtools/TTrimSPDataHandler.cpp | 2 - src/external/BMWtools/TTrimSPDataHandler.h | 2 - src/external/MagProximity/PMPRgeHandler.cpp | 2 - src/external/MagProximity/PMPRgeHandler.h | 2 - .../MagProximity/PMPStartupHandler.cpp | 2 - src/external/MagProximity/PMPStartupHandler.h | 2 - .../MagProximity/PMPStartupHandlerLinkDef.h | 2 - src/external/MagProximity/PMagProximity.h | 2 - .../MagProximity/PMagProximityFitter.h | 2 - .../MagProximity/PMagProximityFitterLinkDef.h | 2 - .../MagProximity/mag_proximity_startup.xml | 2 +- src/external/Makefile.am | 1 - src/external/MusrRoot/Makefile.am | 1 - src/external/MusrRoot/MusrRoot.xsd | 1 - src/external/MusrRoot/MusrRootLEM.xsd | 1 - src/external/MusrRoot/TMusrRunHeader.cpp | 4 +- src/external/MusrRoot/TMusrRunHeader.h | 4 +- src/external/MusrRoot/TMusrRunHeaderLinkDef.h | 4 +- .../Nonlocal/Makefile.libPNL_PippardFitter | 107 ------------ src/external/Nonlocal/PNL_PippardFitter.cpp | 2 - src/external/Nonlocal/PNL_PippardFitter.h | 2 - .../Nonlocal/PNL_PippardFitterLinkDef.h | 2 - src/external/Nonlocal/PNonlocal.h | 2 - src/external/Nonlocal/nonlocal_startup.xml | 2 +- src/external/TLemRunHeader/Makefile.am | 1 - src/external/TLemRunHeader/TLemRunHeader.cxx | 1 - src/external/libCalcMeanFieldsLEM/Makefile.am | 1 - .../TCalcMeanFieldsLEM.cpp | 2 - .../libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h | 2 - .../TCalcMeanFieldsLEMLinkDef.h | 2 - src/external/libCuba/Makefile.am | 2 - src/external/libCuba/README | 1 - src/external/libCuba/src/Makefile.am | 1 - src/external/libCuba/src/common/Makefile.am | 3 +- src/external/libCuba/src/cuhre/Makefile.am | 3 +- src/external/libCuba/src/divonne/Makefile.am | 3 +- src/external/libCuba/src/suave/Makefile.am | 3 +- src/external/libCuba/src/vegas/Makefile.am | 3 +- src/external/libFitPofB/Makefile.am | 2 - src/external/libFitPofB/classes/Makefile.am | 1 - src/external/libFitPofB/classes/TBofZCalc.cpp | 2 - .../classes/TBulkTriVortexFieldCalc.cpp | 2 - .../classes/TFilmTriVortexFieldCalc.cpp | 2 - src/external/libFitPofB/classes/TPofBCalc.cpp | 2 - src/external/libFitPofB/classes/TPofTCalc.cpp | 4 +- .../libFitPofB/classes/TSkewedGss.cpp | 2 - src/external/libFitPofB/classes/TVortex.cpp | 2 - src/external/libFitPofB/include/TBofZCalc.h | 2 - .../include/TBulkTriVortexFieldCalc.h | 2 - .../include/TFilmTriVortexFieldCalc.h | 2 - src/external/libFitPofB/include/TLondon1D.h | 2 - .../libFitPofB/include/TLondon1DLinkDef.h | 2 - src/external/libFitPofB/include/TPofTCalc.h | 2 - src/external/libFitPofB/include/TSkewedGss.h | 2 - .../libFitPofB/include/TSkewedGssLinkDef.h | 2 - src/external/libFitPofB/include/TVortex.h | 2 - .../libFitPofB/include/TVortexLinkDef.h | 2 - src/external/libGapIntegrals/INSTALL | 1 - src/external/libGapIntegrals/Makefile.am | 1 - .../libGapIntegrals/TGapIntegrals.cpp | 2 - src/external/libGapIntegrals/TGapIntegrals.h | 2 - .../libGapIntegrals/TGapIntegralsLinkDef.h | 2 - src/external/libLFRelaxation/Makefile.am | 1 - src/external/libLFRelaxation/README | 2 - .../libLFRelaxation/TLFRelaxation.cpp | 2 - src/external/libLFRelaxation/TLFRelaxation.h | 2 - .../libLFRelaxation/TLFRelaxationLinkDef.h | 2 - src/external/libPhotoMeissner/Makefile.am | 2 - .../libPhotoMeissner/classes/Makefile.am | 1 - .../classes/PPhotoMeissner.cpp | 2 - .../classes/PStartupHandler_PM.cpp | 2 - .../libPhotoMeissner/include/PPhotoMeissner.h | 2 - .../include/PPhotoMeissnerLinkDef.h | 2 - .../include/PStartupHandler_PM.h | 2 - .../include/PStartupHandler_PMLinkDef.h | 2 - .../test/photoMeissner_startup.xml | 2 +- .../libPhotoMeissner/test/photo_meissner.cpp | 2 - .../libPhotoMeissner/test/photo_meissner.pro | 1 - src/external/libSpinValve/Makefile.am | 2 - .../classes/PSkewedLorentzian.cpp | 2 - .../classes/PStartupHandler_SV.cpp | 2 - .../libSpinValve/include/PSkewedLorentzian.h | 2 - .../include/PSkewedLorentzianLinkDef.h | 2 - .../libSpinValve/include/PStartupHandler_SV.h | 2 - .../include/PStartupHandler_SVLinkDef.h | 2 - src/external/libZFRelaxation/Makefile.am | 1 - src/external/libZFRelaxation/ZFRelaxation.cpp | 4 +- src/external/libZFRelaxation/ZFRelaxation.h | 2 - .../libZFRelaxation/ZFRelaxationLinkDef.h | 2 - src/external/mud/Makefile.am | 1 - src/external/mud/src/Makefile.am | 1 - src/external/nexus/Makefile.am | 1 - src/external/nexus/PNeXus.cpp | 6 +- src/external/nexus/PNeXus.h | 6 +- src/include/PFitter.h | 4 +- src/include/PFitterFcn.h | 4 +- src/include/PFourier.h | 4 +- src/include/PFunction.h | 4 +- src/include/PFunctionGrammar.h | 4 +- src/include/PFunctionHandler.h | 4 +- src/include/PMsr2Data.h | 4 +- src/include/PMsrHandler.h | 4 +- src/include/PMusr.h | 4 +- src/include/PMusrCanvas.h | 4 +- src/include/PMusrCanvasLinkDef.h | 4 +- src/include/PMusrT0.h | 4 +- src/include/PMusrT0LinkDef.h | 4 +- src/include/PRunAsymmetry.h | 4 +- src/include/PRunBase.h | 4 +- src/include/PRunDataHandler.h | 4 +- src/include/PRunListCollection.h | 4 +- src/include/PRunMuMinus.h | 4 +- src/include/PRunNonMusr.h | 4 +- src/include/PRunSingleHisto.h | 4 +- src/include/PStartupHandler.h | 4 +- src/include/PStartupHandlerLinkDef.h | 4 +- src/include/PTheory.h | 4 +- src/include/PUserFcn.h | 4 +- src/include/PUserFcnBase.h | 4 +- src/include/PUserFcnBaseLinkDef.h | 4 +- src/msr2data.cpp | 9 +- src/msr2msr.cpp | 4 +- src/musrRootValidation.cpp | 9 +- src/musredit/PAdmin.cpp | 4 +- src/musredit/PAdmin.h | 4 +- src/musredit/PDumpOutputHandler.cpp | 4 +- src/musredit/PDumpOutputHandler.h | 4 +- src/musredit/PFindDialog.cpp | 4 +- src/musredit/PFindDialog.h | 4 +- src/musredit/PFitOutputHandler.cpp | 4 +- src/musredit/PFitOutputHandler.h | 4 +- src/musredit/PGetAsymmetryRunBlockDialog.cpp | 4 +- src/musredit/PGetAsymmetryRunBlockDialog.h | 4 +- src/musredit/PGetDefaultDialog.cpp | 4 +- src/musredit/PGetDefaultDialog.h | 4 +- src/musredit/PGetFourierBlockDialog.cpp | 4 +- src/musredit/PGetFourierBlockDialog.h | 4 +- src/musredit/PGetFunctionsBlockDialog.cpp | 4 +- src/musredit/PGetFunctionsBlockDialog.h | 4 +- src/musredit/PGetNonMusrRunBlockDialog.cpp | 4 +- src/musredit/PGetNonMusrRunBlockDialog.h | 4 +- src/musredit/PGetParameterBlockDialog.cpp | 4 +- src/musredit/PGetParameterBlockDialog.h | 4 +- src/musredit/PGetPlotBlockDialog.cpp | 4 +- src/musredit/PGetPlotBlockDialog.h | 4 +- .../PGetSingleHistoRunBlockDialog.cpp | 4 +- src/musredit/PGetSingleHistoRunBlockDialog.h | 4 +- src/musredit/PGetTheoryBlockDialog.cpp | 4 +- src/musredit/PGetTheoryBlockDialog.h | 4 +- src/musredit/PGetTitleBlockDialog.cpp | 4 +- src/musredit/PGetTitleBlockDialog.h | 4 +- src/musredit/PHelp.cpp | 4 +- src/musredit/PHelp.h | 4 +- src/musredit/PMsr2DataDialog.cpp | 4 +- src/musredit/PMsr2DataDialog.h | 4 +- src/musredit/PMusrEditAbout.cpp | 4 +- src/musredit/PMusrEditAbout.h | 4 +- src/musredit/PPrefsDialog.cpp | 4 +- src/musredit/PPrefsDialog.h | 4 +- src/musredit/PReplaceConfirmationDialog.cpp | 4 +- src/musredit/PReplaceConfirmationDialog.h | 4 +- src/musredit/PReplaceDialog.cpp | 4 +- src/musredit/PReplaceDialog.h | 4 +- src/musredit/PSubTextEdit.cpp | 4 +- src/musredit/PSubTextEdit.h | 4 +- src/musredit/PTextEdit.cpp | 4 +- src/musredit/PTextEdit.h | 4 +- src/musredit/README | 1 - src/musredit/latex_images/internalField.tex | 11 ++ src/musredit/latex_images/internalFieldGK.png | Bin 0 -> 21519 bytes src/musredit/latex_images/internalFieldLL.png | Bin 0 -> 18261 bytes src/musredit/main.cpp | 9 +- src/musredit/musredit.dox | 4 - src/musredit/musredit_startup.xml.in | 25 ++- src/musrfit.cpp | 9 +- src/musrfit_startup.xml | 1 - src/musrgui/PAdmin.cpp | 2 - src/musrgui/PAdmin.h | 2 - src/musrgui/PDumpOutputHandler.cpp | 2 - src/musrgui/PDumpOutputHandler.h | 2 - src/musrgui/PFileWatcher.cpp | 2 - src/musrgui/PFileWatcher.h | 2 - src/musrgui/PFindDialog.cpp | 2 - src/musrgui/PFindDialog.h | 2 - src/musrgui/PFitOutputHandler.cpp | 2 - src/musrgui/PFitOutputHandler.h | 2 - src/musrgui/PGetAsymmetryRunBlockDialog.cpp | 2 - src/musrgui/PGetAsymmetryRunBlockDialog.h | 2 - src/musrgui/PGetDefaultDialog.cpp | 2 - src/musrgui/PGetDefaultDialog.h | 2 - src/musrgui/PGetFourierDialog.cpp | 2 - src/musrgui/PGetFourierDialog.h | 2 - src/musrgui/PGetFunctionsBlockDialog.cpp | 2 - src/musrgui/PGetFunctionsBlockDialog.h | 2 - src/musrgui/PGetNonMusrRunBlockDialog.cpp | 2 - src/musrgui/PGetNonMusrRunBlockDialog.h | 2 - src/musrgui/PGetParameterDialog.cpp | 2 - src/musrgui/PGetParameterDialog.h | 2 - src/musrgui/PGetPlotDialog.cpp | 2 - src/musrgui/PGetPlotDialog.h | 2 - src/musrgui/PGetSingleHistoRunBlockDialog.cpp | 2 - src/musrgui/PGetSingleHistoRunBlockDialog.h | 2 - src/musrgui/PGetTheoryBlockDialog.cpp | 2 - src/musrgui/PGetTheoryBlockDialog.h | 2 - src/musrgui/PMsr2DataDialog.cpp | 2 - src/musrgui/PMsr2DataDialog.h | 2 - src/musrgui/PPrefsDialog.cpp | 2 - src/musrgui/PPrefsDialog.h | 2 - src/musrgui/PReplaceDialog.cpp | 2 - src/musrgui/PReplaceDialog.h | 2 - src/musrgui/PSubTextEdit.cpp | 2 - src/musrgui/PSubTextEdit.h | 2 - src/musrgui/PTextEdit.cpp | 2 - src/musrgui/PTextEdit.h | 2 - src/musrgui/README | 1 - src/musrgui/main.cpp | 2 - src/musrgui/musrgui.h | 2 - src/musrgui/musrgui_startup.xml.in | 1 - src/musrt0.cpp | 9 +- src/musrview.cpp | 9 +- src/write_musrRoot_runHeader.cpp | 9 +- 254 files changed, 185 insertions(+), 864 deletions(-) delete mode 100644 src/ToDo.txt delete mode 100644 src/external/Nonlocal/Makefile.libPNL_PippardFitter create mode 100644 src/musredit/latex_images/internalFieldGK.png create mode 100644 src/musredit/latex_images/internalFieldLL.png diff --git a/ChangeLog b/ChangeLog index de96b601..0a0fef6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,8 @@ FIXED 2012-09-23 fixed wrong chisq output in musrview if expected chisq is present. FIXED 2012-05-30 fixed RRF bug in single histo plotting. FIXED 2012-05-18 fixed wrong forward/backward tag for ROOT-PPC (MUSR-215) +CHANGED 2014-02-12 since we moved to git, I cleaned up the svn prop's from + the sources. CHANGED 2013-12-20 upgrade of cuba to version 3.2. Merge in from BMW CHANGED 2013-12-16 prettyfied the Noakes-Kalvius formulae. Furthermore added a sub-folder with cross checks for these formulae. diff --git a/INSTALL b/INSTALL index ffeb8363..6f9647cc 100644 --- a/INSTALL +++ b/INSTALL @@ -1,13 +1,12 @@ #--------------------------------------------------------------------- # INSTALL -# BMW, 2011/01/27 -# $Id: INSTALL 4013 2009-06-21 +# AS/BMW, 2014/02/11; 2011/01/27 #--------------------------------------------------------------------- To get it all build: sh autogen.sh - ./configure --prefix=/apps/cern/root (or whereever musrfit should be installed) + ./configure --prefix=/opt/cern/root (or where ever musrfit should be installed) make make install (as superuser -- maybe) diff --git a/NEWS b/NEWS index 76aaba72..f38d27d7 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ #--------------------------------------------------------------------- # NEWS # BMW, 2011/01/27 -# $Id: NEWS 4013 2009-06-21 +# AS, 2014/02/12 #--------------------------------------------------------------------- Please check the ChangeLog to see what is new! diff --git a/README b/README index 60090e8c..b0ff8cfa 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ #--------------------------------------------------------------------- # README # BMW, 2011/01/27 -# $Id: README 4013 2009-06-21 +# AS, 2014/02/12 #--------------------------------------------------------------------- musrfit - muSR data analysis package diff --git a/src/Makefile.am b/src/Makefile.am index 2bdcf653..5eb0e3da 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,9 @@ ## Process this file with automake to create Makefile.in +BUILT_SOURCES = git-revision.h +git-revision.h : Makefile + echo \#define GIT_REVISION \"`git log -n 1 --pretty=format:"%ad - %h"`\" > include/git-revision.h + if PNEXUS_ENABLED PNEXUSDIRS = external/nexus endif diff --git a/src/ToDo.txt b/src/ToDo.txt deleted file mode 100644 index 141e8bea..00000000 --- a/src/ToDo.txt +++ /dev/null @@ -1,157 +0,0 @@ -#------------------------------------------------------------------------ -# ToDo.txt -# Andreas Suter, 2007/11/28 -# $Id$ -#------------------------------------------------------------------------ - ---------------------- -short term: ---------------------- - -* dump data and theory after fit (ascii/root): **DONE** for now - done for ascii/root asymmetry && single histo: all the rest is missing -* migrate all typedef's and defines -> PMusr.h **DONE** - -* Since rootcint cannot handle the spirit include files I will try to remove all the - root dictionary related stuff since almost for sure, nobody will use the classes - from the cint interpreter level 2007/12/27 **DONE** - -* begin with the implementation of the FUNCTIONS block - using the spirit parser framework **DONE** - -* 2007/12/30: implement functions in PTheory **DONE** 08-01-02 - -* 2008/01/02: nice function block output needed. **DONE** 08-01-02 - -* write a little standalone program which is converting the old msr-files to - the new ones. **DONE** 08-01-04 - -* implement max.likelihood fits **DONE** 08-02-06 (for Single Histo only. - For the others not clear how to do it.) - -* fix problems in FUNCTIONS of the form (sin(par1)) **DONE** 08-02-18 - -* fix output problems of the mlog files **DONE** 08-02-22 - -* if a parameter is not used at all, minuit is still varying it!! This is stupid. - Check the minuit manual, there must be a function to "remove" these parameters, - i.e. forcing minuit to ignore them. checked the manual: use fix() (see p.31) - **DONE** 08-03-10 - -* implement table based theory functions (LF stuff) - static GKT LF **DONE** 08-03-12 - -* setup startup handler with infos like: data path, symbol list, color list, ... - **DONE** 08-04-04 - -* at the moment that startup handler is looked for in the directory where musrfit/musrview - is executed, this is stupid. Define a place where to look for it. - **DONE** 08-04-08 - -* do I need to cleanup AddText() objects from TPaveText etc myself? -> YES **DONE** 08-04-17 - -* need a CLEAN concept for handling data/theory generation for kView!! **DONE** 08-04-17 - -* something is strange with the coordinate system in TPaveText! **CHECK** - -* something is wrong with lifetimecorrection plot of musrview (up shifted data) **FIXED** 08-05-16 - -* implement access to user-function, i.e. functions not - defined within musrfit, using the ROOT dictionary feature - to look for them and use them. - **DONE** - -* tshift implementation under way. Wrong and needs to be fixed: - **FIXED** 08-06-16 - -* faulty dependency check in the Makefile when handling the PSI-Bin-Class stuff. - Needs to be fixed! **FIXED** 08-06-16 - -* implement NonMuSR stuff **DONE** 08-06-20, some more testing needed - -* nonMusr: db-file format should be added. That this is going to work, in the - RUN block part, a new entry is needed, namely - xy-data. Indices or label are used to pick to proper data - from the db-file. - xy-data T asym <- labels - or - xy-data 3 6 <- indices - **DONE** 08-08-08 - -* Minuit2: name length is now unlimited and hence the 10 char restriction can be lifted. - **DONE** 08-08-08 - -* musrfit: switch "--keep-output-mn2" and "-k" needed. It will rename the MINUIT2.OUTPUT and - MINUIT2.root files to fln-mn2.output and fln-mn2.root. - This is sometimes nice to have. - **DONE** 08-09-01 - -* PFitter.cpp: the value of the parabolic error in the MINUIT2.OUTPUT is wrong (only MIGRAD is - called and neither HESSE nor MINOS). Suspect the problem in the ExecuteSave() routine. - Needs to be checked. - **DONE** 08-09-01 - -* PFitter.cpp: implement HESSE - **DONE** 08-09-01 - -* implement the handling for single side limited boundaries for parameters which is - possible in MINUIT2 - syntax would be: - 0.0 100.0 // lower and upper limit - 0.0 none // lower limit only - none 100.0 // upper limit only - **FIRST IMPLEMENTATION DONE, NEEDS EXTENSIVE TESTING** 08-09-23 - -* CHECK: the normalization for single histo fits should ALWAYS be (1/ns)! (as discussed with Dima) but - I guess it is (1/bin) at the moment. (1/ns) has the advantage that it is really instrument independent! - **CHECKED AND FIXED** 08-11-12 - -* implement FFT with msr-interface - **DONE** 2009-01 - -* implement dynamic LF-KT by using the integral equation representation (Volterra Eq) and an optimzed - implementation of the gauss * sine integral - **START** 2009-01-13 - ---------------------- -intermediate term: ---------------------- - -* start writing docu, i.e. transferring WKM doc from German -> English and - describe new features with examples! -* introduce error numbers with corresponding docu/explanation in the latex-docu. -* implement RRF stuff - ---------------------- -long term: ---------------------- - -* implement ROOT based wkmview, i.e. all the graphical stuff needed - including event handler, etc. -* switch from make to cmake -* add the possibility for cuts to db-files -* add the possibility for variable transformations to db-files - ---------------------- -bugs: ---------------------- -* when having multiple plots: closing some of the plots and finally pressing 'q' will lead to a crash - since root already eliminated the closed canvas plot. - ---------------------- -problems: ---------------------- -* rootcint cannot handle spirit framework includes, hence FUNCTIONS related stuff cannot be included - into a root dictionary. - ---------------------- -fixes: ---------------------- -* Needed to change some part of the Minuit2 source code, otherwise I got a strange linker error message. - In MnMinos.h the constructors (3 overloaded versions) are defined implicitly. When linking against libPMusr.so - which is using libMinuit2Base.so, I got the error message from the linker that is cannot find the reference - to the second constructor. When transferring the implicit definition from the header file to the cxx, the - problem was gone. Since to fiddle in the Minuit2 source code directly is ugly, I should look for a way to - build libPMusr.so which doesn't have this problem. - - -> This problem has been resolved cleanly by using minuit2 delivered with root! diff --git a/src/any2many.cpp b/src/any2many.cpp index 16942245..652b0421 100644 --- a/src/any2many.cpp +++ b/src/any2many.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2012 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * @@ -44,6 +42,7 @@ using namespace std; #include #include +#include "git-revision.h" #include "PMusr.h" #include "PStartupHandler.h" #include "PRunDataHandler.h" @@ -195,9 +194,9 @@ int main(int argc, char *argv[]) any2many_syntax(); else if (strstr(argv[1], "--v")) { #ifdef HAVE_CONFIG_H - cout << endl << "any2many version: " << PACKAGE_VERSION << ", $Id$" << endl << endl; + cout << endl << "any2many version: " << PACKAGE_VERSION << ", git-rev: " << GIT_REVISION << endl << endl; #else - cout << endl << "any2many version: $Id$" << endl << endl; + cout << endl << "any2many git-rev: " << GIT_REVISION << endl << endl; #endif } else { any2many_syntax(); diff --git a/src/classes/PFitter.cpp b/src/classes/PFitter.cpp index d9299b39..fa9b88cb 100644 --- a/src/classes/PFitter.cpp +++ b/src/classes/PFitter.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PFitterFcn.cpp b/src/classes/PFitterFcn.cpp index 4af9fa2d..e67ac505 100644 --- a/src/classes/PFitterFcn.cpp +++ b/src/classes/PFitterFcn.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PFourier.cpp b/src/classes/PFourier.cpp index cff824c2..4d8c9534 100644 --- a/src/classes/PFourier.cpp +++ b/src/classes/PFourier.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PFunction.cpp b/src/classes/PFunction.cpp index 43b9b6c5..35bd9f42 100644 --- a/src/classes/PFunction.cpp +++ b/src/classes/PFunction.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PFunctionHandler.cpp b/src/classes/PFunctionHandler.cpp index 8d7eda26..a7ac7e6b 100644 --- a/src/classes/PFunctionHandler.cpp +++ b/src/classes/PFunctionHandler.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PMsr2Data.cpp b/src/classes/PMsr2Data.cpp index 81d88432..e818e6ff 100644 --- a/src/classes/PMsr2Data.cpp +++ b/src/classes/PMsr2Data.cpp @@ -5,12 +5,10 @@ Author: Bastian M. Wojek / Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2013 by Bastian M. Wojek / Andreas Suter * + * Copyright (C) 2009-2014 by Bastian M. Wojek / Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PMsrHandler.cpp b/src/classes/PMsrHandler.cpp index f0e90195..42dfd9f0 100644 --- a/src/classes/PMsrHandler.cpp +++ b/src/classes/PMsrHandler.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PMusr.cpp b/src/classes/PMusr.cpp index 311c5007..03669cc9 100644 --- a/src/classes/PMusr.cpp +++ b/src/classes/PMusr.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PMusrCanvas.cpp b/src/classes/PMusrCanvas.cpp index 35c4e4ad..1172d7b5 100644 --- a/src/classes/PMusrCanvas.cpp +++ b/src/classes/PMusrCanvas.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PMusrT0.cpp b/src/classes/PMusrT0.cpp index c0796daa..dfedb61d 100644 --- a/src/classes/PMusrT0.cpp +++ b/src/classes/PMusrT0.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PRunAsymmetry.cpp b/src/classes/PRunAsymmetry.cpp index dd16e9a9..7b173222 100644 --- a/src/classes/PRunAsymmetry.cpp +++ b/src/classes/PRunAsymmetry.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PRunBase.cpp b/src/classes/PRunBase.cpp index b7da5d02..265fc86f 100644 --- a/src/classes/PRunBase.cpp +++ b/src/classes/PRunBase.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PRunDataHandler.cpp b/src/classes/PRunDataHandler.cpp index 55662e69..eb438365 100644 --- a/src/classes/PRunDataHandler.cpp +++ b/src/classes/PRunDataHandler.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PRunListCollection.cpp b/src/classes/PRunListCollection.cpp index d2da97d0..1e6ff264 100644 --- a/src/classes/PRunListCollection.cpp +++ b/src/classes/PRunListCollection.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PRunMuMinus.cpp b/src/classes/PRunMuMinus.cpp index e61d5d55..da61bb0e 100644 --- a/src/classes/PRunMuMinus.cpp +++ b/src/classes/PRunMuMinus.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PRunNonMusr.cpp b/src/classes/PRunNonMusr.cpp index 2814ec11..327f4c6d 100644 --- a/src/classes/PRunNonMusr.cpp +++ b/src/classes/PRunNonMusr.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PRunSingleHisto.cpp b/src/classes/PRunSingleHisto.cpp index b18092f3..3023b182 100644 --- a/src/classes/PRunSingleHisto.cpp +++ b/src/classes/PRunSingleHisto.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PStartupHandler.cpp b/src/classes/PStartupHandler.cpp index d22ccf36..9512a08a 100644 --- a/src/classes/PStartupHandler.cpp +++ b/src/classes/PStartupHandler.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PUserFcn.cpp b/src/classes/PUserFcn.cpp index 1a41cfe0..d0ed32a2 100644 --- a/src/classes/PUserFcn.cpp +++ b/src/classes/PUserFcn.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/classes/PUserFcnBase.cpp b/src/classes/PUserFcnBase.cpp index 0e7da468..2257613e 100644 --- a/src/classes/PUserFcnBase.cpp +++ b/src/classes/PUserFcnBase.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/dump_header.cpp b/src/dump_header.cpp index b4c89418..c13f6f4c 100644 --- a/src/dump_header.cpp +++ b/src/dump_header.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** @@ -47,6 +45,7 @@ using namespace std; #include +#include "git-revision.h" #include "TMusrRunHeader.h" #include "TLemRunHeader.h" #include "MuSR_td_PSI_bin.h" @@ -581,9 +580,9 @@ int main(int argc, char *argv[]) return 0; } else if (!strcmp(argv[i], "--version") || !strcmp(argv[i], "-v")) { #ifdef HAVE_CONFIG_H - cout << endl << "dump_header: version " << PACKAGE_VERSION << ", $Id$" << endl << endl; + cout << endl << "dump_header: version " << PACKAGE_VERSION << ", git-rev: " << GIT_REVISION << endl << endl; #else - cout << endl << "dump_header: version $Id$" << endl << endl; + cout << endl << "dump_header: git-rev: " << GIT_REVISION << endl << endl; #endif return 0; } else if (!strcmp(argv[i], "--file_format")) { diff --git a/src/external/BMWtools/BMWIntegrator.cpp b/src/external/BMWtools/BMWIntegrator.cpp index 78af1928..09b9db12 100644 --- a/src/external/BMWtools/BMWIntegrator.cpp +++ b/src/external/BMWtools/BMWIntegrator.cpp @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/BMWtools/BMWIntegrator.h b/src/external/BMWtools/BMWIntegrator.h index 370f8ca3..94da8347 100644 --- a/src/external/BMWtools/BMWIntegrator.h +++ b/src/external/BMWtools/BMWIntegrator.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/BMWtools/BMWStartupHandler.cpp b/src/external/BMWtools/BMWStartupHandler.cpp index 84ec8cb5..6e8e12e0 100644 --- a/src/external/BMWtools/BMWStartupHandler.cpp +++ b/src/external/BMWtools/BMWStartupHandler.cpp @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - based upon: PStartupHandler.cpp by Andreas Suter @@ -13,7 +11,7 @@ ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2008 by Andreas Suter, Bastian M. Wojek * + * Copyright (C) 2007-2014 by Andreas Suter, Bastian M. Wojek * * * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/external/BMWtools/BMWStartupHandler.h b/src/external/BMWtools/BMWStartupHandler.h index 89001940..53fc03d0 100644 --- a/src/external/BMWtools/BMWStartupHandler.h +++ b/src/external/BMWtools/BMWStartupHandler.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - based upon: PStartupHandler.h by Andreas Suter @@ -13,7 +11,7 @@ ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2008 by Andreas Suter, Bastian M. Wojek * + * Copyright (C) 2007-2014 by Andreas Suter, Bastian M. Wojek * * * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/external/BMWtools/Makefile.am b/src/external/BMWtools/Makefile.am index 80bbb696..81b8b494 100644 --- a/src/external/BMWtools/Makefile.am +++ b/src/external/BMWtools/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to create Makefile.in -## $Id$ h_sources = \ BMWStartupHandler.h \ diff --git a/src/external/BMWtools/TTrimSPDataHandler.cpp b/src/external/BMWtools/TTrimSPDataHandler.cpp index c22415cd..2340484c 100644 --- a/src/external/BMWtools/TTrimSPDataHandler.cpp +++ b/src/external/BMWtools/TTrimSPDataHandler.cpp @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/BMWtools/TTrimSPDataHandler.h b/src/external/BMWtools/TTrimSPDataHandler.h index f290a4d1..7b53460b 100644 --- a/src/external/BMWtools/TTrimSPDataHandler.h +++ b/src/external/BMWtools/TTrimSPDataHandler.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/MagProximity/PMPRgeHandler.cpp b/src/external/MagProximity/PMPRgeHandler.cpp index da3847cf..ee23cda9 100644 --- a/src/external/MagProximity/PMPRgeHandler.cpp +++ b/src/external/MagProximity/PMPRgeHandler.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/MagProximity/PMPRgeHandler.h b/src/external/MagProximity/PMPRgeHandler.h index fa8a4ca4..2d4ff158 100644 --- a/src/external/MagProximity/PMPRgeHandler.h +++ b/src/external/MagProximity/PMPRgeHandler.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/MagProximity/PMPStartupHandler.cpp b/src/external/MagProximity/PMPStartupHandler.cpp index 289b5520..abeeccaa 100644 --- a/src/external/MagProximity/PMPStartupHandler.cpp +++ b/src/external/MagProximity/PMPStartupHandler.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/MagProximity/PMPStartupHandler.h b/src/external/MagProximity/PMPStartupHandler.h index f1cb71cb..86cbbd00 100644 --- a/src/external/MagProximity/PMPStartupHandler.h +++ b/src/external/MagProximity/PMPStartupHandler.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/MagProximity/PMPStartupHandlerLinkDef.h b/src/external/MagProximity/PMPStartupHandlerLinkDef.h index 4436ad01..69616f29 100644 --- a/src/external/MagProximity/PMPStartupHandlerLinkDef.h +++ b/src/external/MagProximity/PMPStartupHandlerLinkDef.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/MagProximity/PMagProximity.h b/src/external/MagProximity/PMagProximity.h index bd36983f..30f95d3c 100644 --- a/src/external/MagProximity/PMagProximity.h +++ b/src/external/MagProximity/PMagProximity.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/MagProximity/PMagProximityFitter.h b/src/external/MagProximity/PMagProximityFitter.h index a243c912..d09f09c2 100644 --- a/src/external/MagProximity/PMagProximityFitter.h +++ b/src/external/MagProximity/PMagProximityFitter.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/MagProximity/PMagProximityFitterLinkDef.h b/src/external/MagProximity/PMagProximityFitterLinkDef.h index 9543c516..2ddaa41f 100644 --- a/src/external/MagProximity/PMagProximityFitterLinkDef.h +++ b/src/external/MagProximity/PMagProximityFitterLinkDef.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/MagProximity/mag_proximity_startup.xml b/src/external/MagProximity/mag_proximity_startup.xml index 536b4e71..d23326f3 100644 --- a/src/external/MagProximity/mag_proximity_startup.xml +++ b/src/external/MagProximity/mag_proximity_startup.xml @@ -1,7 +1,7 @@ - $Id$ + contains meta file infromation of the needed trim.sp files. /mnt/home/nemu/analysis/2010/EuS-Co/trimsp2/EuS-Co_E diff --git a/src/external/Makefile.am b/src/external/Makefile.am index 9f5a2f78..360579d1 100644 --- a/src/external/Makefile.am +++ b/src/external/Makefile.am @@ -1,4 +1,3 @@ -## $Id$ if BUILD_ASLIBS ASDIRS = Nonlocal \ diff --git a/src/external/MusrRoot/Makefile.am b/src/external/MusrRoot/Makefile.am index 828a6dc4..b6368e25 100644 --- a/src/external/MusrRoot/Makefile.am +++ b/src/external/MusrRoot/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to create Makefile.in -## $Id$ h_sources = \ TMusrRunHeader.h diff --git a/src/external/MusrRoot/MusrRoot.xsd b/src/external/MusrRoot/MusrRoot.xsd index bd856985..ba09ea37 100644 --- a/src/external/MusrRoot/MusrRoot.xsd +++ b/src/external/MusrRoot/MusrRoot.xsd @@ -8,7 +8,6 @@ Paul Scherrer Institute. Author: Andreas Suter, andreas.suter@psi.ch - $Id: MusrRoot.xsd 5092 2012-03-13 07:47:00Z nemu $ diff --git a/src/external/MusrRoot/MusrRootLEM.xsd b/src/external/MusrRoot/MusrRootLEM.xsd index 6c3077c8..0061296a 100644 --- a/src/external/MusrRoot/MusrRootLEM.xsd +++ b/src/external/MusrRoot/MusrRootLEM.xsd @@ -7,7 +7,6 @@ It is an extension of MusrRoot.xsd and describes the additional LEM specific entries. Author: Andreas Suter, andreas.suter@psi.ch - $Id: MusrRootLEM.xsd 5092 2012-03-13 07:47:00Z nemu $ diff --git a/src/external/MusrRoot/TMusrRunHeader.cpp b/src/external/MusrRoot/TMusrRunHeader.cpp index 11029a2a..6228aaa8 100644 --- a/src/external/MusrRoot/TMusrRunHeader.cpp +++ b/src/external/MusrRoot/TMusrRunHeader.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id: TMusrRunHeader.cpp 5092 2012-03-13 07:47:00Z nemu $ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2012 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/external/MusrRoot/TMusrRunHeader.h b/src/external/MusrRoot/TMusrRunHeader.h index 77211e44..4c935d6a 100644 --- a/src/external/MusrRoot/TMusrRunHeader.h +++ b/src/external/MusrRoot/TMusrRunHeader.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id: TMusrRunHeader.h 5092 2012-03-13 07:47:00Z nemu $ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2012 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/external/MusrRoot/TMusrRunHeaderLinkDef.h b/src/external/MusrRoot/TMusrRunHeaderLinkDef.h index f6d5a358..5d00da6c 100644 --- a/src/external/MusrRoot/TMusrRunHeaderLinkDef.h +++ b/src/external/MusrRoot/TMusrRunHeaderLinkDef.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id: TMusrRunHeaderLinkDef.h 5054 2012-01-18 07:43:50Z suter_a $ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2012 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/external/Nonlocal/Makefile.libPNL_PippardFitter b/src/external/Nonlocal/Makefile.libPNL_PippardFitter deleted file mode 100644 index b20d6939..00000000 --- a/src/external/Nonlocal/Makefile.libPNL_PippardFitter +++ /dev/null @@ -1,107 +0,0 @@ -#--------------------------------------------------- -# Makefile -# -# Author: Andreas Suter -# e-mail: andreas.suter@psi.ch -# -# $Id$ -# -#--------------------------------------------------- - -#--------------------------------------------------- -# get compilation and library flags from root-config - -ROOTCFLAGS = $(shell $(ROOTSYS)/bin/root-config --cflags) -ROOTLIBS = $(shell $(ROOTSYS)/bin/root-config --libs) -ROOTGLIBS = $(shell $(ROOTSYS)/bin/root-config --glibs) - -#--------------------------------------------------- -# depending on the architecture, choose the compiler, -# linker, and the flags to use -# - -OSTYPE = $(shell uname) - -ifeq ($(OSTYPE),Linux) -OS = LINUX -endif -ifeq ($(OSTYPE),Linux-gnu) -OS = LINUX -endif -ifeq ($(OSTYPE),darwin) -OS = DARWIN -endif - -# -- Linux -ifeq ($(OS),LINUX) -CXX = g++ -CXXFLAGS = -Wall -Wno-trigraphs -fPIC -INCLUDES = -I../include -LD = g++ -LDFLAGS = -g -SOFLAGS = -O -shared -endif - -# -- Darwin -ifeq ($(OS),DARWIN) -CXX = g++ -CXXFLAGS = -Wall -Wno-trigraphs -fPIC -INCLUDES = -I../include -LD = g++ -LDFLAGS = -g -SOFLAGS = -dynamic -endif - -# the output from the root-config script: -CXXFLAGS += $(ROOTCFLAGS) -LDFLAGS += - -# the ROOT libraries (G = graphic) -LIBS = $(ROOTLIBS) -lXMLParser -GLIBS = $(ROOTGLIBS) -lXMLParser - -# some definitions: headers (used to generate *Dict* stuff), sources, objects,... -OBJS = -OBJS += PNL_StartupHandler.o PNL_StartupHandlerDict.o -OBJS += PNL_RgeHandler.o -OBJS += PNL_PippardFitter.o PNL_PippardFitterDict.o - -SHLIB = libPNL_PippardFitter.so - -# make the shared lib: -# -all: $(SHLIB) - -$(SHLIB): $(OBJS) - @echo "---> Building shared library $(SHLIB) ..." - /bin/rm -f $(SHLIB) - $(LD) $(OBJS) $(SOFLAGS) -o $(SHLIB) $(LIBS) - @echo "done" - -# clean up: remove all object file (and core files) -# semicolon needed to tell make there is no source -# for this target! -# -clean:; @rm -f $(OBJS) *Dict* core* - @echo "---> removing $(OBJS)" - -# -$(OBJS): %.o: %.cpp - $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< - -PNL_StartupHandlerDict.cpp: PNL_StartupHandler.h PNL_StartupHandlerLinkDef.h - @echo "Generating dictionary $@..." - rootcint -f $@ -c -p $^ - -PNL_PippardFitterDict.cpp: PNL_PippardFitter.h PNL_PippardFitterLinkDef.h - @echo "Generating dictionary $@..." - rootcint -f $@ -c -p $^ - -install: all - @echo "Installing shared lib: libPUserFcn.so ( you must be root ;-) )" -ifeq ($(OS),LINUX) - cp -pv $(SHLIB) $(ROOTSYS)/lib -# cp -pv PNonlocal.h $(ROOTSYS)/include -# cp -pv PNL_StartupHandler.h $(ROOTSYS)/include - cp -pv PNL_PippardFitter.h $(ROOTSYS)/include -endif diff --git a/src/external/Nonlocal/PNL_PippardFitter.cpp b/src/external/Nonlocal/PNL_PippardFitter.cpp index b9110374..0d08fdfc 100644 --- a/src/external/Nonlocal/PNL_PippardFitter.cpp +++ b/src/external/Nonlocal/PNL_PippardFitter.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/Nonlocal/PNL_PippardFitter.h b/src/external/Nonlocal/PNL_PippardFitter.h index d53859e7..02502634 100644 --- a/src/external/Nonlocal/PNL_PippardFitter.h +++ b/src/external/Nonlocal/PNL_PippardFitter.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/Nonlocal/PNL_PippardFitterLinkDef.h b/src/external/Nonlocal/PNL_PippardFitterLinkDef.h index 9438332e..d641a419 100644 --- a/src/external/Nonlocal/PNL_PippardFitterLinkDef.h +++ b/src/external/Nonlocal/PNL_PippardFitterLinkDef.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/Nonlocal/PNonlocal.h b/src/external/Nonlocal/PNonlocal.h index fdb94ab1..ead8e0f3 100644 --- a/src/external/Nonlocal/PNonlocal.h +++ b/src/external/Nonlocal/PNonlocal.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/Nonlocal/nonlocal_startup.xml b/src/external/Nonlocal/nonlocal_startup.xml index aa7e2e25..26eaa87d 100644 --- a/src/external/Nonlocal/nonlocal_startup.xml +++ b/src/external/Nonlocal/nonlocal_startup.xml @@ -1,7 +1,7 @@ - $Id$ + trim.sp meta information 262144 diff --git a/src/external/TLemRunHeader/Makefile.am b/src/external/TLemRunHeader/Makefile.am index f3eb96fd..c9be1fab 100644 --- a/src/external/TLemRunHeader/Makefile.am +++ b/src/external/TLemRunHeader/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to create Makefile.in -## $Id$ h_sources = \ TLemStats.h \ diff --git a/src/external/TLemRunHeader/TLemRunHeader.cxx b/src/external/TLemRunHeader/TLemRunHeader.cxx index 3928cc45..5fdca5ee 100644 --- a/src/external/TLemRunHeader/TLemRunHeader.cxx +++ b/src/external/TLemRunHeader/TLemRunHeader.cxx @@ -3,7 +3,6 @@ // T. Prokscha // 18/06/2006 // -// $Id: TLemRunHeader.cxx 3897 2009-05-01 22:06:11Z l_wojek $ // #include using namespace std; diff --git a/src/external/libCalcMeanFieldsLEM/Makefile.am b/src/external/libCalcMeanFieldsLEM/Makefile.am index 15967c62..b828bd82 100644 --- a/src/external/libCalcMeanFieldsLEM/Makefile.am +++ b/src/external/libCalcMeanFieldsLEM/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to create Makefile.in -## $Id$ h_sources = \ TCalcMeanFieldsLEM.h diff --git a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.cpp b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.cpp index ef9dd304..c71bbb79 100644 --- a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.cpp +++ b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.cpp @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h index f8fa85ea..ba3c234f 100644 --- a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h +++ b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEMLinkDef.h b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEMLinkDef.h index 460f3a46..67fcb059 100644 --- a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEMLinkDef.h +++ b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEMLinkDef.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libCuba/Makefile.am b/src/external/libCuba/Makefile.am index 42fa5f46..af437a64 100644 --- a/src/external/libCuba/Makefile.am +++ b/src/external/libCuba/Makefile.am @@ -1,3 +1 @@ -## $Id$ - SUBDIRS = src diff --git a/src/external/libCuba/README b/src/external/libCuba/README index e14f4c52..04fe0326 100644 --- a/src/external/libCuba/README +++ b/src/external/libCuba/README @@ -1,7 +1,6 @@ #--------------------------------------------------------------------- # README # Bastian M. Wojek, 2011/01/27 -# $Id$ #--------------------------------------------------------------------- This directory contains a subset of the code diff --git a/src/external/libCuba/src/Makefile.am b/src/external/libCuba/src/Makefile.am index afff0736..4a7d8f43 100644 --- a/src/external/libCuba/src/Makefile.am +++ b/src/external/libCuba/src/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to create Makefile.in -## $Id$ SUBDIRS = cuhre divonne suave vegas common diff --git a/src/external/libCuba/src/common/Makefile.am b/src/external/libCuba/src/common/Makefile.am index e21290e0..cdf87141 100644 --- a/src/external/libCuba/src/common/Makefile.am +++ b/src/external/libCuba/src/common/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to create Makefile.in -## $Id: Makefile.am 4808 2011-03-21 14:33:34Z l_wojek $ c_sources = WorkerIni.c @@ -10,4 +9,4 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) noinst_LTLIBRARIES = libworkerini.la libworkerini_la_SOURCES = $(c_sources) -libworkerini_la_LDFLAGS = $(AM_LDFLAGS) \ No newline at end of file +libworkerini_la_LDFLAGS = $(AM_LDFLAGS) diff --git a/src/external/libCuba/src/cuhre/Makefile.am b/src/external/libCuba/src/cuhre/Makefile.am index 5ab6b4eb..572a25bd 100644 --- a/src/external/libCuba/src/cuhre/Makefile.am +++ b/src/external/libCuba/src/cuhre/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to create Makefile.in -## $Id: Makefile.am 4808 2011-03-21 14:33:34Z l_wojek $ c_sources = Cuhre.c @@ -10,4 +9,4 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) noinst_LTLIBRARIES = libcuhre.la libcuhre_la_SOURCES = $(c_sources) -libcuhre_la_LDFLAGS = $(AM_LDFLAGS) \ No newline at end of file +libcuhre_la_LDFLAGS = $(AM_LDFLAGS) diff --git a/src/external/libCuba/src/divonne/Makefile.am b/src/external/libCuba/src/divonne/Makefile.am index 51f30f38..2b93a16f 100644 --- a/src/external/libCuba/src/divonne/Makefile.am +++ b/src/external/libCuba/src/divonne/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to create Makefile.in -## $Id: Makefile.am 4808 2011-03-21 14:33:34Z l_wojek $ c_sources = Divonne.c @@ -10,4 +9,4 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) noinst_LTLIBRARIES = libdivonne.la libdivonne_la_SOURCES = $(c_sources) -libdivonne_la_LDFLAGS = $(AM_LDFLAGS) \ No newline at end of file +libdivonne_la_LDFLAGS = $(AM_LDFLAGS) diff --git a/src/external/libCuba/src/suave/Makefile.am b/src/external/libCuba/src/suave/Makefile.am index 22fbfaea..9951b0b7 100644 --- a/src/external/libCuba/src/suave/Makefile.am +++ b/src/external/libCuba/src/suave/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to create Makefile.in -## $Id: Makefile.am 4808 2011-03-21 14:33:34Z l_wojek $ c_sources = Suave.c @@ -10,4 +9,4 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) noinst_LTLIBRARIES = libsuave.la libsuave_la_SOURCES = $(c_sources) -libsuave_la_LDFLAGS = $(AM_LDFLAGS) \ No newline at end of file +libsuave_la_LDFLAGS = $(AM_LDFLAGS) diff --git a/src/external/libCuba/src/vegas/Makefile.am b/src/external/libCuba/src/vegas/Makefile.am index 85bbb378..b2bbcd20 100644 --- a/src/external/libCuba/src/vegas/Makefile.am +++ b/src/external/libCuba/src/vegas/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to create Makefile.in -## $Id: Makefile.am 4808 2011-03-21 14:33:34Z l_wojek $ c_sources = Vegas.c @@ -10,4 +9,4 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) noinst_LTLIBRARIES = libvegas.la libvegas_la_SOURCES = $(c_sources) -libvegas_la_LDFLAGS = $(AM_LDFLAGS) \ No newline at end of file +libvegas_la_LDFLAGS = $(AM_LDFLAGS) diff --git a/src/external/libFitPofB/Makefile.am b/src/external/libFitPofB/Makefile.am index 69292210..be500d10 100644 --- a/src/external/libFitPofB/Makefile.am +++ b/src/external/libFitPofB/Makefile.am @@ -1,3 +1 @@ -## $Id$ - SUBDIRS = classes diff --git a/src/external/libFitPofB/classes/Makefile.am b/src/external/libFitPofB/classes/Makefile.am index dd1a776c..1e881298 100644 --- a/src/external/libFitPofB/classes/Makefile.am +++ b/src/external/libFitPofB/classes/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to create Makefile.in -## $Id$ h_sources = \ ../include/TBofZCalc.h \ diff --git a/src/external/libFitPofB/classes/TBofZCalc.cpp b/src/external/libFitPofB/classes/TBofZCalc.cpp index e256ed56..002a1b34 100644 --- a/src/external/libFitPofB/classes/TBofZCalc.cpp +++ b/src/external/libFitPofB/classes/TBofZCalc.cpp @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libFitPofB/classes/TBulkTriVortexFieldCalc.cpp b/src/external/libFitPofB/classes/TBulkTriVortexFieldCalc.cpp index bff8fb47..9154635f 100644 --- a/src/external/libFitPofB/classes/TBulkTriVortexFieldCalc.cpp +++ b/src/external/libFitPofB/classes/TBulkTriVortexFieldCalc.cpp @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libFitPofB/classes/TFilmTriVortexFieldCalc.cpp b/src/external/libFitPofB/classes/TFilmTriVortexFieldCalc.cpp index 973490a5..fc7c0009 100644 --- a/src/external/libFitPofB/classes/TFilmTriVortexFieldCalc.cpp +++ b/src/external/libFitPofB/classes/TFilmTriVortexFieldCalc.cpp @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libFitPofB/classes/TPofBCalc.cpp b/src/external/libFitPofB/classes/TPofBCalc.cpp index d37ed24b..cc8451f7 100644 --- a/src/external/libFitPofB/classes/TPofBCalc.cpp +++ b/src/external/libFitPofB/classes/TPofBCalc.cpp @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libFitPofB/classes/TPofTCalc.cpp b/src/external/libFitPofB/classes/TPofTCalc.cpp index 768cda83..775e9863 100644 --- a/src/external/libFitPofB/classes/TPofTCalc.cpp +++ b/src/external/libFitPofB/classes/TPofTCalc.cpp @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** @@ -15,7 +13,7 @@ ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2008-2009 by Bastian M. Wojek, Andreas Suter * + * Copyright (C) 2008-2014 by Bastian M. Wojek, Andreas Suter * * * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/external/libFitPofB/classes/TSkewedGss.cpp b/src/external/libFitPofB/classes/TSkewedGss.cpp index 94de644b..39d2c2da 100644 --- a/src/external/libFitPofB/classes/TSkewedGss.cpp +++ b/src/external/libFitPofB/classes/TSkewedGss.cpp @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libFitPofB/classes/TVortex.cpp b/src/external/libFitPofB/classes/TVortex.cpp index 6ba5f572..a1eef5ad 100644 --- a/src/external/libFitPofB/classes/TVortex.cpp +++ b/src/external/libFitPofB/classes/TVortex.cpp @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libFitPofB/include/TBofZCalc.h b/src/external/libFitPofB/include/TBofZCalc.h index 7f08cf43..77e00c45 100644 --- a/src/external/libFitPofB/include/TBofZCalc.h +++ b/src/external/libFitPofB/include/TBofZCalc.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h b/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h index 2a2bd17d..1488b203 100644 --- a/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h +++ b/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h b/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h index 70f46d3a..24de60a9 100644 --- a/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h +++ b/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libFitPofB/include/TLondon1D.h b/src/external/libFitPofB/include/TLondon1D.h index 1a712b92..4c38bdd5 100644 --- a/src/external/libFitPofB/include/TLondon1D.h +++ b/src/external/libFitPofB/include/TLondon1D.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libFitPofB/include/TLondon1DLinkDef.h b/src/external/libFitPofB/include/TLondon1DLinkDef.h index ba6cbce0..ccd6acff 100644 --- a/src/external/libFitPofB/include/TLondon1DLinkDef.h +++ b/src/external/libFitPofB/include/TLondon1DLinkDef.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libFitPofB/include/TPofTCalc.h b/src/external/libFitPofB/include/TPofTCalc.h index f6e6894c..be0bb3da 100644 --- a/src/external/libFitPofB/include/TPofTCalc.h +++ b/src/external/libFitPofB/include/TPofTCalc.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libFitPofB/include/TSkewedGss.h b/src/external/libFitPofB/include/TSkewedGss.h index 661dce14..4023f610 100644 --- a/src/external/libFitPofB/include/TSkewedGss.h +++ b/src/external/libFitPofB/include/TSkewedGss.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libFitPofB/include/TSkewedGssLinkDef.h b/src/external/libFitPofB/include/TSkewedGssLinkDef.h index 578eac91..b542dd71 100644 --- a/src/external/libFitPofB/include/TSkewedGssLinkDef.h +++ b/src/external/libFitPofB/include/TSkewedGssLinkDef.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libFitPofB/include/TVortex.h b/src/external/libFitPofB/include/TVortex.h index ba3d2768..c97ed883 100644 --- a/src/external/libFitPofB/include/TVortex.h +++ b/src/external/libFitPofB/include/TVortex.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libFitPofB/include/TVortexLinkDef.h b/src/external/libFitPofB/include/TVortexLinkDef.h index 6a27e6fe..d892874c 100644 --- a/src/external/libFitPofB/include/TVortexLinkDef.h +++ b/src/external/libFitPofB/include/TVortexLinkDef.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libGapIntegrals/INSTALL b/src/external/libGapIntegrals/INSTALL index a03772ae..427a963e 100644 --- a/src/external/libGapIntegrals/INSTALL +++ b/src/external/libGapIntegrals/INSTALL @@ -1,6 +1,5 @@ #--------------------------------------------------------------------- # INSTALL -# $Id$ #--------------------------------------------------------------------- Installation of the musrfit-plugin "libGapIntegrals" diff --git a/src/external/libGapIntegrals/Makefile.am b/src/external/libGapIntegrals/Makefile.am index 15ab5e5d..a99bab75 100644 --- a/src/external/libGapIntegrals/Makefile.am +++ b/src/external/libGapIntegrals/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to create Makefile.in -## $Id$ h_sources = \ TGapIntegrals.h diff --git a/src/external/libGapIntegrals/TGapIntegrals.cpp b/src/external/libGapIntegrals/TGapIntegrals.cpp index 69363bc4..448556d3 100644 --- a/src/external/libGapIntegrals/TGapIntegrals.cpp +++ b/src/external/libGapIntegrals/TGapIntegrals.cpp @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libGapIntegrals/TGapIntegrals.h b/src/external/libGapIntegrals/TGapIntegrals.h index da8fb39a..53835148 100644 --- a/src/external/libGapIntegrals/TGapIntegrals.h +++ b/src/external/libGapIntegrals/TGapIntegrals.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libGapIntegrals/TGapIntegralsLinkDef.h b/src/external/libGapIntegrals/TGapIntegralsLinkDef.h index 2058d6e9..1deab362 100644 --- a/src/external/libGapIntegrals/TGapIntegralsLinkDef.h +++ b/src/external/libGapIntegrals/TGapIntegralsLinkDef.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libLFRelaxation/Makefile.am b/src/external/libLFRelaxation/Makefile.am index d80e2e52..c4a085ca 100644 --- a/src/external/libLFRelaxation/Makefile.am +++ b/src/external/libLFRelaxation/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to create Makefile.in -## $Id$ h_sources = \ TLFRelaxation.h diff --git a/src/external/libLFRelaxation/README b/src/external/libLFRelaxation/README index 31bc1de7..d8bddc0e 100644 --- a/src/external/libLFRelaxation/README +++ b/src/external/libLFRelaxation/README @@ -2,8 +2,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ Implementation of a userFcn-interface to Gaussian and Lorentzian static and dynamic LF relaxation functions. diff --git a/src/external/libLFRelaxation/TLFRelaxation.cpp b/src/external/libLFRelaxation/TLFRelaxation.cpp index c4f1fbad..cc876f8d 100644 --- a/src/external/libLFRelaxation/TLFRelaxation.cpp +++ b/src/external/libLFRelaxation/TLFRelaxation.cpp @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libLFRelaxation/TLFRelaxation.h b/src/external/libLFRelaxation/TLFRelaxation.h index abb6b34e..7defba45 100644 --- a/src/external/libLFRelaxation/TLFRelaxation.h +++ b/src/external/libLFRelaxation/TLFRelaxation.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libLFRelaxation/TLFRelaxationLinkDef.h b/src/external/libLFRelaxation/TLFRelaxationLinkDef.h index c1490c9e..acc86ce7 100644 --- a/src/external/libLFRelaxation/TLFRelaxationLinkDef.h +++ b/src/external/libLFRelaxation/TLFRelaxationLinkDef.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libPhotoMeissner/Makefile.am b/src/external/libPhotoMeissner/Makefile.am index 69292210..be500d10 100644 --- a/src/external/libPhotoMeissner/Makefile.am +++ b/src/external/libPhotoMeissner/Makefile.am @@ -1,3 +1 @@ -## $Id$ - SUBDIRS = classes diff --git a/src/external/libPhotoMeissner/classes/Makefile.am b/src/external/libPhotoMeissner/classes/Makefile.am index 2edc03ce..38c8e8df 100644 --- a/src/external/libPhotoMeissner/classes/Makefile.am +++ b/src/external/libPhotoMeissner/classes/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to create Makefile.in -# $Id$ h_sources = \ ../include/PStartupHandler_PM.h \ diff --git a/src/external/libPhotoMeissner/classes/PPhotoMeissner.cpp b/src/external/libPhotoMeissner/classes/PPhotoMeissner.cpp index ab6b1847..4eab5d46 100644 --- a/src/external/libPhotoMeissner/classes/PPhotoMeissner.cpp +++ b/src/external/libPhotoMeissner/classes/PPhotoMeissner.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libPhotoMeissner/classes/PStartupHandler_PM.cpp b/src/external/libPhotoMeissner/classes/PStartupHandler_PM.cpp index 83d042e9..30530b29 100644 --- a/src/external/libPhotoMeissner/classes/PStartupHandler_PM.cpp +++ b/src/external/libPhotoMeissner/classes/PStartupHandler_PM.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libPhotoMeissner/include/PPhotoMeissner.h b/src/external/libPhotoMeissner/include/PPhotoMeissner.h index f3fb487f..4ac1cc65 100644 --- a/src/external/libPhotoMeissner/include/PPhotoMeissner.h +++ b/src/external/libPhotoMeissner/include/PPhotoMeissner.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libPhotoMeissner/include/PPhotoMeissnerLinkDef.h b/src/external/libPhotoMeissner/include/PPhotoMeissnerLinkDef.h index 284f5cbc..6a3e6c7f 100644 --- a/src/external/libPhotoMeissner/include/PPhotoMeissnerLinkDef.h +++ b/src/external/libPhotoMeissner/include/PPhotoMeissnerLinkDef.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libPhotoMeissner/include/PStartupHandler_PM.h b/src/external/libPhotoMeissner/include/PStartupHandler_PM.h index 45fab5e3..e7d90a14 100644 --- a/src/external/libPhotoMeissner/include/PStartupHandler_PM.h +++ b/src/external/libPhotoMeissner/include/PStartupHandler_PM.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libPhotoMeissner/include/PStartupHandler_PMLinkDef.h b/src/external/libPhotoMeissner/include/PStartupHandler_PMLinkDef.h index ff077346..8ddcea34 100644 --- a/src/external/libPhotoMeissner/include/PStartupHandler_PMLinkDef.h +++ b/src/external/libPhotoMeissner/include/PStartupHandler_PMLinkDef.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libPhotoMeissner/test/photoMeissner_startup.xml b/src/external/libPhotoMeissner/test/photoMeissner_startup.xml index 12adb55e..535389aa 100644 --- a/src/external/libPhotoMeissner/test/photoMeissner_startup.xml +++ b/src/external/libPhotoMeissner/test/photoMeissner_startup.xml @@ -1,7 +1,7 @@ - $Id$ + contains the needed trim.sp meta-file information ./trimsp/YBCO_E diff --git a/src/external/libPhotoMeissner/test/photo_meissner.cpp b/src/external/libPhotoMeissner/test/photo_meissner.cpp index 3fca8df9..f8a4a81d 100644 --- a/src/external/libPhotoMeissner/test/photo_meissner.cpp +++ b/src/external/libPhotoMeissner/test/photo_meissner.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libPhotoMeissner/test/photo_meissner.pro b/src/external/libPhotoMeissner/test/photo_meissner.pro index c3cbdcba..cf6ae5c5 100644 --- a/src/external/libPhotoMeissner/test/photo_meissner.pro +++ b/src/external/libPhotoMeissner/test/photo_meissner.pro @@ -1,7 +1,6 @@ # photo_meissner.pro # Author: Andreas Suter # e-mail: andreas.suter@psi.ch -# $Id$ SOURCES = photo_meissner.cpp diff --git a/src/external/libSpinValve/Makefile.am b/src/external/libSpinValve/Makefile.am index 69292210..be500d10 100644 --- a/src/external/libSpinValve/Makefile.am +++ b/src/external/libSpinValve/Makefile.am @@ -1,3 +1 @@ -## $Id$ - SUBDIRS = classes diff --git a/src/external/libSpinValve/classes/PSkewedLorentzian.cpp b/src/external/libSpinValve/classes/PSkewedLorentzian.cpp index 05e89dc6..e76b9de6 100644 --- a/src/external/libSpinValve/classes/PSkewedLorentzian.cpp +++ b/src/external/libSpinValve/classes/PSkewedLorentzian.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libSpinValve/classes/PStartupHandler_SV.cpp b/src/external/libSpinValve/classes/PStartupHandler_SV.cpp index 2c3c7961..9252f5a1 100644 --- a/src/external/libSpinValve/classes/PStartupHandler_SV.cpp +++ b/src/external/libSpinValve/classes/PStartupHandler_SV.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libSpinValve/include/PSkewedLorentzian.h b/src/external/libSpinValve/include/PSkewedLorentzian.h index 4379d434..92b14ecd 100644 --- a/src/external/libSpinValve/include/PSkewedLorentzian.h +++ b/src/external/libSpinValve/include/PSkewedLorentzian.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libSpinValve/include/PSkewedLorentzianLinkDef.h b/src/external/libSpinValve/include/PSkewedLorentzianLinkDef.h index 2da1feb5..bde07766 100644 --- a/src/external/libSpinValve/include/PSkewedLorentzianLinkDef.h +++ b/src/external/libSpinValve/include/PSkewedLorentzianLinkDef.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libSpinValve/include/PStartupHandler_SV.h b/src/external/libSpinValve/include/PStartupHandler_SV.h index 547a150c..59730a04 100644 --- a/src/external/libSpinValve/include/PStartupHandler_SV.h +++ b/src/external/libSpinValve/include/PStartupHandler_SV.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libSpinValve/include/PStartupHandler_SVLinkDef.h b/src/external/libSpinValve/include/PStartupHandler_SVLinkDef.h index 5753623c..b279dd80 100644 --- a/src/external/libSpinValve/include/PStartupHandler_SVLinkDef.h +++ b/src/external/libSpinValve/include/PStartupHandler_SVLinkDef.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libZFRelaxation/Makefile.am b/src/external/libZFRelaxation/Makefile.am index c5aebf23..287d097f 100644 --- a/src/external/libZFRelaxation/Makefile.am +++ b/src/external/libZFRelaxation/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to create Makefile.in -## $Id$ h_sources = \ ZFRelaxation.h diff --git a/src/external/libZFRelaxation/ZFRelaxation.cpp b/src/external/libZFRelaxation/ZFRelaxation.cpp index 2424de94..7bd774ce 100644 --- a/src/external/libZFRelaxation/ZFRelaxation.cpp +++ b/src/external/libZFRelaxation/ZFRelaxation.cpp @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** @@ -153,4 +151,4 @@ double UniaxialStatGssKT::operator()(double t, const vector &par) const return sinSqTh*(0.5 + sqrtOnePlusEps*fIntSecond->IntegrateFunc(0.0, 1.0, intParam)) + cosSqTh*(avg + sqrtOnePlusEps*fIntFirst->IntegrateFunc(0.0, 1.0, intParam)); -} \ No newline at end of file +} diff --git a/src/external/libZFRelaxation/ZFRelaxation.h b/src/external/libZFRelaxation/ZFRelaxation.h index 5c0d89e9..fa4ee7be 100644 --- a/src/external/libZFRelaxation/ZFRelaxation.h +++ b/src/external/libZFRelaxation/ZFRelaxation.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/libZFRelaxation/ZFRelaxationLinkDef.h b/src/external/libZFRelaxation/ZFRelaxationLinkDef.h index ec4eca65..e4021eb8 100644 --- a/src/external/libZFRelaxation/ZFRelaxationLinkDef.h +++ b/src/external/libZFRelaxation/ZFRelaxationLinkDef.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/mud/Makefile.am b/src/external/mud/Makefile.am index 42fa5f46..2cad62a2 100644 --- a/src/external/mud/Makefile.am +++ b/src/external/mud/Makefile.am @@ -1,3 +1,2 @@ -## $Id$ SUBDIRS = src diff --git a/src/external/mud/src/Makefile.am b/src/external/mud/src/Makefile.am index 6ab04971..4faa5b9e 100644 --- a/src/external/mud/src/Makefile.am +++ b/src/external/mud/src/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to create Makefile.in -## $Id$ h_sources = mud.h cpp_sources = mud_all.c \ diff --git a/src/external/nexus/Makefile.am b/src/external/nexus/Makefile.am index 5e8b6911..31ea2254 100644 --- a/src/external/nexus/Makefile.am +++ b/src/external/nexus/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to create Makefile.in -## $Id$ h_sources = \ PNeXus.h diff --git a/src/external/nexus/PNeXus.cpp b/src/external/nexus/PNeXus.cpp index f954318c..dc4a5a46 100644 --- a/src/external/nexus/PNeXus.cpp +++ b/src/external/nexus/PNeXus.cpp @@ -5,13 +5,11 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2012 by Andreas Suter * - * andreas.suter@psi.ch * + * Copyright (C) 2007-2014 by Andreas Suter * + * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/src/external/nexus/PNeXus.h b/src/external/nexus/PNeXus.h index 8e9ac219..e93378f2 100644 --- a/src/external/nexus/PNeXus.h +++ b/src/external/nexus/PNeXus.h @@ -5,13 +5,11 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2012 by Andreas Suter * - * andreas.suter@psi.ch * + * Copyright (C) 2007-2014 by Andreas Suter * + * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/src/include/PFitter.h b/src/include/PFitter.h index e0738bfa..8445468c 100644 --- a/src/include/PFitter.h +++ b/src/include/PFitter.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PFitterFcn.h b/src/include/PFitterFcn.h index fef60a2a..1c2d846f 100644 --- a/src/include/PFitterFcn.h +++ b/src/include/PFitterFcn.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PFourier.h b/src/include/PFourier.h index 663149b2..f2905f3c 100644 --- a/src/include/PFourier.h +++ b/src/include/PFourier.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PFunction.h b/src/include/PFunction.h index 94d02cc4..b4b60934 100644 --- a/src/include/PFunction.h +++ b/src/include/PFunction.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PFunctionGrammar.h b/src/include/PFunctionGrammar.h index 63be92ef..10c0c9f0 100644 --- a/src/include/PFunctionGrammar.h +++ b/src/include/PFunctionGrammar.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PFunctionHandler.h b/src/include/PFunctionHandler.h index d6fafbb2..cd68390e 100644 --- a/src/include/PFunctionHandler.h +++ b/src/include/PFunctionHandler.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PMsr2Data.h b/src/include/PMsr2Data.h index 48daacc8..292dc8c9 100644 --- a/src/include/PMsr2Data.h +++ b/src/include/PMsr2Data.h @@ -5,12 +5,10 @@ Author: Bastian M. Wojek / Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2013 by Bastian M. Wojek / Andreas Suter * + * Copyright (C) 2009-2014 by Bastian M. Wojek / Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PMsrHandler.h b/src/include/PMsrHandler.h index 5741085d..92f5e257 100644 --- a/src/include/PMsrHandler.h +++ b/src/include/PMsrHandler.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PMusr.h b/src/include/PMusr.h index 800f014b..81c57fc1 100644 --- a/src/include/PMusr.h +++ b/src/include/PMusr.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PMusrCanvas.h b/src/include/PMusrCanvas.h index d8b6f47a..92676d1c 100644 --- a/src/include/PMusrCanvas.h +++ b/src/include/PMusrCanvas.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PMusrCanvasLinkDef.h b/src/include/PMusrCanvasLinkDef.h index aff25b7f..cf6b7dd3 100644 --- a/src/include/PMusrCanvasLinkDef.h +++ b/src/include/PMusrCanvasLinkDef.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PMusrT0.h b/src/include/PMusrT0.h index 1d3e16e1..91acf97f 100644 --- a/src/include/PMusrT0.h +++ b/src/include/PMusrT0.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PMusrT0LinkDef.h b/src/include/PMusrT0LinkDef.h index 36655faf..a14248fd 100644 --- a/src/include/PMusrT0LinkDef.h +++ b/src/include/PMusrT0LinkDef.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PRunAsymmetry.h b/src/include/PRunAsymmetry.h index 048f1836..39aa8cbc 100644 --- a/src/include/PRunAsymmetry.h +++ b/src/include/PRunAsymmetry.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PRunBase.h b/src/include/PRunBase.h index d2065d3c..3f73f3cf 100644 --- a/src/include/PRunBase.h +++ b/src/include/PRunBase.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PRunDataHandler.h b/src/include/PRunDataHandler.h index fb5b82aa..ca7e4e79 100644 --- a/src/include/PRunDataHandler.h +++ b/src/include/PRunDataHandler.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PRunListCollection.h b/src/include/PRunListCollection.h index 86f3b82d..8a741416 100644 --- a/src/include/PRunListCollection.h +++ b/src/include/PRunListCollection.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PRunMuMinus.h b/src/include/PRunMuMinus.h index a9c1fb37..7d2fd9ed 100644 --- a/src/include/PRunMuMinus.h +++ b/src/include/PRunMuMinus.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PRunNonMusr.h b/src/include/PRunNonMusr.h index b27df2ce..c9904df4 100644 --- a/src/include/PRunNonMusr.h +++ b/src/include/PRunNonMusr.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PRunSingleHisto.h b/src/include/PRunSingleHisto.h index 8c114cd6..2640f0be 100644 --- a/src/include/PRunSingleHisto.h +++ b/src/include/PRunSingleHisto.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PStartupHandler.h b/src/include/PStartupHandler.h index 36a94832..f91dc679 100644 --- a/src/include/PStartupHandler.h +++ b/src/include/PStartupHandler.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PStartupHandlerLinkDef.h b/src/include/PStartupHandlerLinkDef.h index a2297bf4..dd099371 100644 --- a/src/include/PStartupHandlerLinkDef.h +++ b/src/include/PStartupHandlerLinkDef.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PTheory.h b/src/include/PTheory.h index 6228bad1..7baa44bc 100644 --- a/src/include/PTheory.h +++ b/src/include/PTheory.h @@ -191,10 +191,10 @@ static PTheoDataBase fgTheoDataBase[THEORY_MAX] = { "internFld", "if", "(fraction phase frequency Trate Lrate)", "(fraction phase frequency Trate Lrate tshift)"}, {THEORY_INTERNAL_FIELD_KORNILOV, THEORY_PARAM_INTERNAL_FIELD_KORNILOV, false, - "internFldGK", "ifgk", "(fraction phase frequency Trate Lrate)", "(fraction phase frequency Trate Lrate tshift)"}, + "internFldGK", "ifgk", "(fraction frequency Trate Lrate beta)", "(fraction frequency Trate Lrate beta tshift)"}, {THEORY_INTERNAL_FIELD_LARKIN, THEORY_PARAM_INTERNAL_FIELD_LARKIN, false, - "internFldLL", "ifll", "(fraction phase frequency Trate Lrate)", "(fraction phase frequency Trate Lrate tshift)"}, + "internFldLL", "ifll", "(fraction frequency Trate Lrate)", "(fraction frequency Trate Lrate tshift)"}, {THEORY_BESSEL, THEORY_PARAM_BESSEL, false, "bessel", "b", "(phase frequency)", "(phase frequency tshift)"}, diff --git a/src/include/PUserFcn.h b/src/include/PUserFcn.h index df210e32..0c5c1fa6 100644 --- a/src/include/PUserFcn.h +++ b/src/include/PUserFcn.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PUserFcnBase.h b/src/include/PUserFcnBase.h index 3d25f3f4..558c8c41 100644 --- a/src/include/PUserFcnBase.h +++ b/src/include/PUserFcnBase.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/include/PUserFcnBaseLinkDef.h b/src/include/PUserFcnBaseLinkDef.h index 8bb4099e..5f78c800 100644 --- a/src/include/PUserFcnBaseLinkDef.h +++ b/src/include/PUserFcnBaseLinkDef.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2013 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/msr2data.cpp b/src/msr2data.cpp index 32645ac3..ec2d43ba 100644 --- a/src/msr2data.cpp +++ b/src/msr2data.cpp @@ -5,12 +5,10 @@ Author: Bastian M. Wojek / Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2013 by Bastian M. Wojek / Andreas Suter * + * Copyright (C) 2009-2014 by Bastian M. Wojek / Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * @@ -38,6 +36,7 @@ #include "config.h" #endif +#include "git-revision.h" #include "PMsr2Data.h" #include @@ -391,9 +390,9 @@ int main(int argc, char *argv[]) return 0; } else if (!strcmp(argv[1], "--version")) { #ifdef HAVE_CONFIG_H - cout << endl << "msr2data version: " << PACKAGE_VERSION << ", $Id$" << endl << endl; + cout << endl << "msr2data version: " << PACKAGE_VERSION << ", git-rev: " << GIT_REVISION << endl << endl; #else - cout << endl << "msr2data version: $Id$" << endl << endl; + cout << endl << "msr2data git-rev: " << GIT_REVISION << endl << endl; #endif return 0; } else { diff --git a/src/msr2msr.cpp b/src/msr2msr.cpp index 0ab9bf1e..769528e0 100644 --- a/src/msr2msr.cpp +++ b/src/msr2msr.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musrRootValidation.cpp b/src/musrRootValidation.cpp index b2b6f345..eb551442 100644 --- a/src/musrRootValidation.cpp +++ b/src/musrRootValidation.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2012 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * @@ -51,6 +49,7 @@ using namespace std; #include #include +#include "git-revision.h" #include "PMusr.h" //----------------------------------------------------------------------- @@ -576,9 +575,9 @@ int main(int argc, char *argv[]) } else if (argc==2) { if (!strcmp(argv[1], "--version")) { #ifdef HAVE_CONFIG_H - cout << endl << "musrRootValidation version: " << PACKAGE_VERSION << ", $Id$" << endl << endl; + cout << endl << "musrRootValidation version: " << PACKAGE_VERSION << ", git-rev: " << GIT_REVISION << endl << endl; #else - cout << endl << "musrRootValidation version: $Id$" << endl << endl; + cout << endl << "musrRootValidation git-rev: " << GIT_REVISION << endl << endl; #endif return 0; } else { diff --git a/src/musredit/PAdmin.cpp b/src/musredit/PAdmin.cpp index 047fb336..a94b3d70 100644 --- a/src/musredit/PAdmin.cpp +++ b/src/musredit/PAdmin.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2014 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 6d8799fd..2fae7258 100644 --- a/src/musredit/PAdmin.h +++ b/src/musredit/PAdmin.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2014 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 17643663..cec0692c 100644 --- a/src/musredit/PDumpOutputHandler.cpp +++ b/src/musredit/PDumpOutputHandler.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2012 by Andreas Suter * + * Copyright (C) 2012-2014 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 e5295c25..2d639cda 100644 --- a/src/musredit/PDumpOutputHandler.h +++ b/src/musredit/PDumpOutputHandler.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2012 by Andreas Suter * + * Copyright (C) 2012-2014 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 e6a599d4..a60428d7 100644 --- a/src/musredit/PFindDialog.cpp +++ b/src/musredit/PFindDialog.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 ae3b932a..a31837a9 100644 --- a/src/musredit/PFindDialog.h +++ b/src/musredit/PFindDialog.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2014 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 6cced051..a2ede92d 100644 --- a/src/musredit/PFitOutputHandler.cpp +++ b/src/musredit/PFitOutputHandler.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 e1c694ae..9aac5c7b 100644 --- a/src/musredit/PFitOutputHandler.h +++ b/src/musredit/PFitOutputHandler.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2014 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 4153afae..9dfdede6 100644 --- a/src/musredit/PGetAsymmetryRunBlockDialog.cpp +++ b/src/musredit/PGetAsymmetryRunBlockDialog.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 53c83ff4..9d3c34de 100644 --- a/src/musredit/PGetAsymmetryRunBlockDialog.h +++ b/src/musredit/PGetAsymmetryRunBlockDialog.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 1764afb4..48fd8646 100644 --- a/src/musredit/PGetDefaultDialog.cpp +++ b/src/musredit/PGetDefaultDialog.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 d46534bc..fb7392d2 100644 --- a/src/musredit/PGetDefaultDialog.h +++ b/src/musredit/PGetDefaultDialog.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2014 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 93fc4d9c..4a454562 100644 --- a/src/musredit/PGetFourierBlockDialog.cpp +++ b/src/musredit/PGetFourierBlockDialog.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 cb09c8ee..fa00c245 100644 --- a/src/musredit/PGetFourierBlockDialog.h +++ b/src/musredit/PGetFourierBlockDialog.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 1561b1ec..2959e871 100644 --- a/src/musredit/PGetFunctionsBlockDialog.cpp +++ b/src/musredit/PGetFunctionsBlockDialog.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 03044dc7..6246f9dd 100644 --- a/src/musredit/PGetFunctionsBlockDialog.h +++ b/src/musredit/PGetFunctionsBlockDialog.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 39e9e3cf..3b22c252 100644 --- a/src/musredit/PGetNonMusrRunBlockDialog.cpp +++ b/src/musredit/PGetNonMusrRunBlockDialog.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 ca78ce11..a009101b 100644 --- a/src/musredit/PGetNonMusrRunBlockDialog.h +++ b/src/musredit/PGetNonMusrRunBlockDialog.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 68352ed5..8924c636 100644 --- a/src/musredit/PGetParameterBlockDialog.cpp +++ b/src/musredit/PGetParameterBlockDialog.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 61e9971a..3dd8a183 100644 --- a/src/musredit/PGetParameterBlockDialog.h +++ b/src/musredit/PGetParameterBlockDialog.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 d2f1bc03..671e646f 100644 --- a/src/musredit/PGetPlotBlockDialog.cpp +++ b/src/musredit/PGetPlotBlockDialog.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 3bd39e60..8035e8d5 100644 --- a/src/musredit/PGetPlotBlockDialog.h +++ b/src/musredit/PGetPlotBlockDialog.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 ac5a8d98..f4c36556 100644 --- a/src/musredit/PGetSingleHistoRunBlockDialog.cpp +++ b/src/musredit/PGetSingleHistoRunBlockDialog.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 7eaae8e7..c8d4ee89 100644 --- a/src/musredit/PGetSingleHistoRunBlockDialog.h +++ b/src/musredit/PGetSingleHistoRunBlockDialog.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 fcf4673c..9c5f0ea7 100644 --- a/src/musredit/PGetTheoryBlockDialog.cpp +++ b/src/musredit/PGetTheoryBlockDialog.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 1762a61e..46b1441c 100644 --- a/src/musredit/PGetTheoryBlockDialog.h +++ b/src/musredit/PGetTheoryBlockDialog.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 96ecb12c..f80d0e6f 100644 --- a/src/musredit/PGetTitleBlockDialog.cpp +++ b/src/musredit/PGetTitleBlockDialog.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2014 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 21acb6af..6b2767eb 100644 --- a/src/musredit/PGetTitleBlockDialog.h +++ b/src/musredit/PGetTitleBlockDialog.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2014 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 7f099403..0607a9a8 100644 --- a/src/musredit/PHelp.cpp +++ b/src/musredit/PHelp.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2014 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 fb2fbc8a..82acea8a 100644 --- a/src/musredit/PHelp.h +++ b/src/musredit/PHelp.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2014 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 b3b7469f..aa47a50f 100644 --- a/src/musredit/PMsr2DataDialog.cpp +++ b/src/musredit/PMsr2DataDialog.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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.h b/src/musredit/PMsr2DataDialog.h index 59dacdc6..7892e2ea 100644 --- a/src/musredit/PMsr2DataDialog.h +++ b/src/musredit/PMsr2DataDialog.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2014 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 4f6de382..ad6789fb 100644 --- a/src/musredit/PMusrEditAbout.cpp +++ b/src/musredit/PMusrEditAbout.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2014 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 2ab26db3..0efde479 100644 --- a/src/musredit/PMusrEditAbout.h +++ b/src/musredit/PMusrEditAbout.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2014 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 5cc88ce5..fb18d832 100644 --- a/src/musredit/PPrefsDialog.cpp +++ b/src/musredit/PPrefsDialog.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 fc53f77c..7bf6d89f 100644 --- a/src/musredit/PPrefsDialog.h +++ b/src/musredit/PPrefsDialog.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2014 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 b9b3985c..c00f8ac4 100644 --- a/src/musredit/PReplaceConfirmationDialog.cpp +++ b/src/musredit/PReplaceConfirmationDialog.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2014 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 e6c0402f..edb46d26 100644 --- a/src/musredit/PReplaceConfirmationDialog.h +++ b/src/musredit/PReplaceConfirmationDialog.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2014 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 8c9a9a33..bc82843f 100644 --- a/src/musredit/PReplaceDialog.cpp +++ b/src/musredit/PReplaceDialog.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 15781ade..1e3a053c 100644 --- a/src/musredit/PReplaceDialog.h +++ b/src/musredit/PReplaceDialog.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2014 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 1e257e7e..7732fbe3 100644 --- a/src/musredit/PSubTextEdit.cpp +++ b/src/musredit/PSubTextEdit.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 0df7dd0e..9d8234c4 100644 --- a/src/musredit/PSubTextEdit.h +++ b/src/musredit/PSubTextEdit.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009 by Andreas Suter * + * Copyright (C) 2009-2014 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 939c102e..08cc9e18 100644 --- a/src/musredit/PTextEdit.cpp +++ b/src/musredit/PTextEdit.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2013 by Andreas Suter * + * Copyright (C) 2010-2014 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.h b/src/musredit/PTextEdit.h index 6a3e9b2e..f565ed61 100644 --- a/src/musredit/PTextEdit.h +++ b/src/musredit/PTextEdit.h @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit/README b/src/musredit/README index 9dea71a1..5a3b86d1 100644 --- a/src/musredit/README +++ b/src/musredit/README @@ -1,7 +1,6 @@ #--------------------------------------------------------------------- # README # Andreas Suter, 2010/06/20 -# $Id$ #--------------------------------------------------------------------- musredit requires Qt 4.6.x or newer. If you have Qt 3.x.y only, use musrgui instead. diff --git a/src/musredit/latex_images/internalField.tex b/src/musredit/latex_images/internalField.tex index 8c41729a..57606995 100644 --- a/src/musredit/latex_images/internalField.tex +++ b/src/musredit/latex_images/internalField.tex @@ -2,8 +2,19 @@ \pagestyle{empty} \begin{document} +% internal field, delta-B \begin{displaymath} \alpha \cos\left(2\pi\nu t + \phi\pi/180\right) e^{-\lambda_{\rm T} t} + (1-\alpha) e^{-\lambda_{\rm L} t} \end{displaymath} +% internal field, Gaussian broadened +\begin{displaymath} +\alpha \left[\cos(2\pi\nu t) -\frac{\sigma^2 t}{2\pi\nu}\sin(2\pi\nu t)\right] e^{-(\sigma t)^2/2} + (1-\alpha) e^{-(\lambda t)^\beta} +\end{displaymath} + +% internal field, Lorentzian broadened +\begin{displaymath} +\alpha \left[\cos(2\pi\nu t) -\frac{a}{2\pi\nu}\sin(2\pi\nu t)\right] e^{-a t} + (1-\alpha) e^{-\lambda t} +\end{displaymath} + \end{document} \ No newline at end of file diff --git a/src/musredit/latex_images/internalFieldGK.png b/src/musredit/latex_images/internalFieldGK.png new file mode 100644 index 0000000000000000000000000000000000000000..3a8462e2cb6c4cdde4b5623aafafa9ee59f399d3 GIT binary patch literal 21519 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 literal 0 HcmV?d00001 diff --git a/src/musredit/latex_images/internalFieldLL.png b/src/musredit/latex_images/internalFieldLL.png new file mode 100644 index 0000000000000000000000000000000000000000..72bff3e08f8b91e36ef62ba202bee9b2fe74cdd5 GIT binary patch literal 18261 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 literal 0 HcmV?d00001 diff --git a/src/musredit/main.cpp b/src/musredit/main.cpp index 053f43bb..bddfa487 100644 --- a/src/musredit/main.cpp +++ b/src/musredit/main.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010 by Andreas Suter * + * Copyright (C) 2010-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * @@ -34,6 +32,7 @@ using namespace std; #include +#include "../include/git-revision.h" #include "PTextEdit.h" #include "PFitOutputHandler.h" @@ -43,8 +42,6 @@ using namespace std; * *

musredit is free software liensenced under GPL 2 or later (for detail license informations see * http://www.gnu.org/licenses). - * - *

The source code can be downloaded from http://savannah.psi.ch/viewcvs/trunk/analysis/musrfit/src/musredit/?root=nemu%2Flem. */ int main( int argc, char ** argv ) { @@ -56,7 +53,7 @@ int main( int argc, char ** argv ) cout << endl << endl; return 0; } else if (!strcmp(argv[1], "--version") || !strcmp(argv[1], "-v")) { - cout << endl << "musredit version: $Id$"; + cout << endl << "musredit git-rev: " << GIT_REVISION; cout << endl << endl; return 0; } diff --git a/src/musredit/musredit.dox b/src/musredit/musredit.dox index 34095c65..c0445291 100644 --- a/src/musredit/musredit.dox +++ b/src/musredit/musredit.dox @@ -6,8 +6,6 @@ content: Description of musredit. - $Id$ - **********************************************************************************************/ /** @@ -20,6 +18,4 @@ of Nokia (http://qt.nokia.com).

musredit is free software liensenced under GPL 2 or later (for detail license informations see http://www.gnu.org/licenses). -

The source code can be downloaded from http://savannah.psi.ch/viewcvs/trunk/analysis/musrfit/src/musredit/?root=nemu%2Flem. - */ diff --git a/src/musredit/musredit_startup.xml.in b/src/musredit/musredit_startup.xml.in index d76207fc..a921d10f 100644 --- a/src/musredit/musredit_startup.xml.in +++ b/src/musredit/musredit_startup.xml.in @@ -1,7 +1,6 @@ - $Id: musredit_startup.xml 4949 2011-07-15 05:43:41Z nemu $ This is handling default setting parameters for the musredit. @@ -163,6 +162,13 @@ abragam.png 2 + + TFieldCos + (phase frequency) + + tfCos.png + 2 + internFld (fraction phase frequency Trate Lrate) @@ -171,11 +177,18 @@ 5 - TFieldCos - (phase frequency) - - tfCos.png - 2 + internFldGK + (fraction frequency Trate Lrate beta) + + internalFieldGK.png + 5 + + + internFldLL + (fraction frequency Trate Lrate) + + internalFieldLL.png + 4 bessel diff --git a/src/musrfit.cpp b/src/musrfit.cpp index f15c33b2..e1f303d2 100644 --- a/src/musrfit.cpp +++ b/src/musrfit.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2012 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * @@ -53,6 +51,7 @@ using namespace std; #include #include +#include "git-revision.h" #include "PMusr.h" #include "PStartupHandler.h" #include "PMsrHandler.h" @@ -408,9 +407,9 @@ int main(int argc, char *argv[]) if (argc == 2) { if (!strcmp(argv[1], "--version")) { #ifdef HAVE_CONFIG_H - cout << endl << "musrfit version: " << PACKAGE_VERSION << ", $Id$" << endl << endl; + cout << endl << "musrfit version: " << PACKAGE_VERSION << ", git-rev: " << GIT_REVISION << endl << endl; #else - cout << endl << "musrfit version: $Id$" << endl << endl; + cout << endl << "musrfit git-rev: " << GIT_REVISION << endl << endl; #endif return PMUSR_SUCCESS; } diff --git a/src/musrfit_startup.xml b/src/musrfit_startup.xml index efc05df6..e35450e9 100644 --- a/src/musrfit_startup.xml +++ b/src/musrfit_startup.xml @@ -1,7 +1,6 @@ - $Id$ Defines default settings for the musrfit package /mnt/data/nemu/his diff --git a/src/musrgui/PAdmin.cpp b/src/musrgui/PAdmin.cpp index 20f8ed86..c1925573 100644 --- a/src/musrgui/PAdmin.cpp +++ b/src/musrgui/PAdmin.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PAdmin.h b/src/musrgui/PAdmin.h index da0c1a18..7e7475da 100644 --- a/src/musrgui/PAdmin.h +++ b/src/musrgui/PAdmin.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PDumpOutputHandler.cpp b/src/musrgui/PDumpOutputHandler.cpp index d62cd7e8..f905f109 100644 --- a/src/musrgui/PDumpOutputHandler.cpp +++ b/src/musrgui/PDumpOutputHandler.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PDumpOutputHandler.h b/src/musrgui/PDumpOutputHandler.h index bc0c6df7..a813e752 100644 --- a/src/musrgui/PDumpOutputHandler.h +++ b/src/musrgui/PDumpOutputHandler.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PFileWatcher.cpp b/src/musrgui/PFileWatcher.cpp index 4785d8af..5e62769b 100644 --- a/src/musrgui/PFileWatcher.cpp +++ b/src/musrgui/PFileWatcher.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PFileWatcher.h b/src/musrgui/PFileWatcher.h index 79b23ec5..9555257c 100644 --- a/src/musrgui/PFileWatcher.h +++ b/src/musrgui/PFileWatcher.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PFindDialog.cpp b/src/musrgui/PFindDialog.cpp index 6bae60ba..c7ab327d 100644 --- a/src/musrgui/PFindDialog.cpp +++ b/src/musrgui/PFindDialog.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PFindDialog.h b/src/musrgui/PFindDialog.h index 7e8e41f8..33690f31 100644 --- a/src/musrgui/PFindDialog.h +++ b/src/musrgui/PFindDialog.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PFitOutputHandler.cpp b/src/musrgui/PFitOutputHandler.cpp index 41fbf27d..a0098493 100644 --- a/src/musrgui/PFitOutputHandler.cpp +++ b/src/musrgui/PFitOutputHandler.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PFitOutputHandler.h b/src/musrgui/PFitOutputHandler.h index 8f139998..7353be7a 100644 --- a/src/musrgui/PFitOutputHandler.h +++ b/src/musrgui/PFitOutputHandler.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PGetAsymmetryRunBlockDialog.cpp b/src/musrgui/PGetAsymmetryRunBlockDialog.cpp index fe9b028c..df54e608 100644 --- a/src/musrgui/PGetAsymmetryRunBlockDialog.cpp +++ b/src/musrgui/PGetAsymmetryRunBlockDialog.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PGetAsymmetryRunBlockDialog.h b/src/musrgui/PGetAsymmetryRunBlockDialog.h index 94c96fe1..32e48ad5 100644 --- a/src/musrgui/PGetAsymmetryRunBlockDialog.h +++ b/src/musrgui/PGetAsymmetryRunBlockDialog.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PGetDefaultDialog.cpp b/src/musrgui/PGetDefaultDialog.cpp index ac1d8096..d2e3290d 100644 --- a/src/musrgui/PGetDefaultDialog.cpp +++ b/src/musrgui/PGetDefaultDialog.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PGetDefaultDialog.h b/src/musrgui/PGetDefaultDialog.h index c89a2fc5..50661e8c 100644 --- a/src/musrgui/PGetDefaultDialog.h +++ b/src/musrgui/PGetDefaultDialog.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PGetFourierDialog.cpp b/src/musrgui/PGetFourierDialog.cpp index d0555754..a2cf2517 100644 --- a/src/musrgui/PGetFourierDialog.cpp +++ b/src/musrgui/PGetFourierDialog.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PGetFourierDialog.h b/src/musrgui/PGetFourierDialog.h index 8ed153f5..834afe21 100644 --- a/src/musrgui/PGetFourierDialog.h +++ b/src/musrgui/PGetFourierDialog.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PGetFunctionsBlockDialog.cpp b/src/musrgui/PGetFunctionsBlockDialog.cpp index d3357aab..a6d99524 100644 --- a/src/musrgui/PGetFunctionsBlockDialog.cpp +++ b/src/musrgui/PGetFunctionsBlockDialog.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PGetFunctionsBlockDialog.h b/src/musrgui/PGetFunctionsBlockDialog.h index 18577385..55426030 100644 --- a/src/musrgui/PGetFunctionsBlockDialog.h +++ b/src/musrgui/PGetFunctionsBlockDialog.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PGetNonMusrRunBlockDialog.cpp b/src/musrgui/PGetNonMusrRunBlockDialog.cpp index 660fb365..e620f5da 100644 --- a/src/musrgui/PGetNonMusrRunBlockDialog.cpp +++ b/src/musrgui/PGetNonMusrRunBlockDialog.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PGetNonMusrRunBlockDialog.h b/src/musrgui/PGetNonMusrRunBlockDialog.h index abac55be..7bcfec1b 100644 --- a/src/musrgui/PGetNonMusrRunBlockDialog.h +++ b/src/musrgui/PGetNonMusrRunBlockDialog.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PGetParameterDialog.cpp b/src/musrgui/PGetParameterDialog.cpp index ec26ed7f..a4c0ed37 100644 --- a/src/musrgui/PGetParameterDialog.cpp +++ b/src/musrgui/PGetParameterDialog.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PGetParameterDialog.h b/src/musrgui/PGetParameterDialog.h index 1f305dcc..fc90d8cc 100644 --- a/src/musrgui/PGetParameterDialog.h +++ b/src/musrgui/PGetParameterDialog.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PGetPlotDialog.cpp b/src/musrgui/PGetPlotDialog.cpp index 1ad4f87b..c2f748cc 100644 --- a/src/musrgui/PGetPlotDialog.cpp +++ b/src/musrgui/PGetPlotDialog.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PGetPlotDialog.h b/src/musrgui/PGetPlotDialog.h index 222d99aa..3ae36c87 100644 --- a/src/musrgui/PGetPlotDialog.h +++ b/src/musrgui/PGetPlotDialog.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PGetSingleHistoRunBlockDialog.cpp b/src/musrgui/PGetSingleHistoRunBlockDialog.cpp index 83e3e6d8..96a9a526 100644 --- a/src/musrgui/PGetSingleHistoRunBlockDialog.cpp +++ b/src/musrgui/PGetSingleHistoRunBlockDialog.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PGetSingleHistoRunBlockDialog.h b/src/musrgui/PGetSingleHistoRunBlockDialog.h index 72a497c0..b55a6ff3 100644 --- a/src/musrgui/PGetSingleHistoRunBlockDialog.h +++ b/src/musrgui/PGetSingleHistoRunBlockDialog.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PGetTheoryBlockDialog.cpp b/src/musrgui/PGetTheoryBlockDialog.cpp index fe4a789f..c9113726 100644 --- a/src/musrgui/PGetTheoryBlockDialog.cpp +++ b/src/musrgui/PGetTheoryBlockDialog.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PGetTheoryBlockDialog.h b/src/musrgui/PGetTheoryBlockDialog.h index c85f57fb..bac98f76 100644 --- a/src/musrgui/PGetTheoryBlockDialog.h +++ b/src/musrgui/PGetTheoryBlockDialog.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PMsr2DataDialog.cpp b/src/musrgui/PMsr2DataDialog.cpp index 38c5758c..82144c65 100644 --- a/src/musrgui/PMsr2DataDialog.cpp +++ b/src/musrgui/PMsr2DataDialog.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PMsr2DataDialog.h b/src/musrgui/PMsr2DataDialog.h index c0cd3551..66ca3df8 100644 --- a/src/musrgui/PMsr2DataDialog.h +++ b/src/musrgui/PMsr2DataDialog.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PPrefsDialog.cpp b/src/musrgui/PPrefsDialog.cpp index 6633a35c..d991956b 100644 --- a/src/musrgui/PPrefsDialog.cpp +++ b/src/musrgui/PPrefsDialog.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PPrefsDialog.h b/src/musrgui/PPrefsDialog.h index e20b72cb..d9fd06dd 100644 --- a/src/musrgui/PPrefsDialog.h +++ b/src/musrgui/PPrefsDialog.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PReplaceDialog.cpp b/src/musrgui/PReplaceDialog.cpp index fcd000fe..407d5ce0 100644 --- a/src/musrgui/PReplaceDialog.cpp +++ b/src/musrgui/PReplaceDialog.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PReplaceDialog.h b/src/musrgui/PReplaceDialog.h index 1c122dcb..3a55848b 100644 --- a/src/musrgui/PReplaceDialog.h +++ b/src/musrgui/PReplaceDialog.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PSubTextEdit.cpp b/src/musrgui/PSubTextEdit.cpp index a3f93971..a240a35d 100644 --- a/src/musrgui/PSubTextEdit.cpp +++ b/src/musrgui/PSubTextEdit.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PSubTextEdit.h b/src/musrgui/PSubTextEdit.h index 48edff74..6e5baec0 100644 --- a/src/musrgui/PSubTextEdit.h +++ b/src/musrgui/PSubTextEdit.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PTextEdit.cpp b/src/musrgui/PTextEdit.cpp index 25d25d04..85a3641b 100644 --- a/src/musrgui/PTextEdit.cpp +++ b/src/musrgui/PTextEdit.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/PTextEdit.h b/src/musrgui/PTextEdit.h index 408165ae..77f50261 100644 --- a/src/musrgui/PTextEdit.h +++ b/src/musrgui/PTextEdit.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/README b/src/musrgui/README index 30046896..3f479383 100644 --- a/src/musrgui/README +++ b/src/musrgui/README @@ -1,7 +1,6 @@ #--------------------------------------------------------------------- # README # Andreas Suter, 2010/10/06 -# $Id$ #--------------------------------------------------------------------- musrgui requires >= Qt 3.3.x and < Qt 4. If you have Qt 4.6.y or newer, diff --git a/src/musrgui/main.cpp b/src/musrgui/main.cpp index d2b62503..a17fb914 100644 --- a/src/musrgui/main.cpp +++ b/src/musrgui/main.cpp @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/musrgui.h b/src/musrgui/musrgui.h index bc2a30a4..8dd03033 100644 --- a/src/musrgui/musrgui.h +++ b/src/musrgui/musrgui.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - *****************************************************************************/ /*************************************************************************** diff --git a/src/musrgui/musrgui_startup.xml.in b/src/musrgui/musrgui_startup.xml.in index 53b8da9c..bdf2f8f4 100644 --- a/src/musrgui/musrgui_startup.xml.in +++ b/src/musrgui/musrgui_startup.xml.in @@ -1,7 +1,6 @@ - $Id: musrgui_startup.xml 4949 2011-07-15 05:43:41Z nemu $ This is handling default setting parameters for the musrgui. diff --git a/src/musrt0.cpp b/src/musrt0.cpp index 2f2bb91d..12796911 100644 --- a/src/musrt0.cpp +++ b/src/musrt0.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2012 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * @@ -45,6 +43,7 @@ using namespace std; #include #include +#include "git-revision.h" #include "PMusr.h" #include "PStartupHandler.h" #include "PMsrHandler.h" @@ -232,9 +231,9 @@ Int_t main(Int_t argc, Char_t *argv[]) for (int i=1; i> musrt0 version: " << PACKAGE_VERSION << ", $Id$" << endl << endl; + cout << endl << ">> musrt0 version: " << PACKAGE_VERSION << ", git-rev: " << GIT_REVISION << endl << endl; #else - cout << endl << ">> musrt0 version: $Id$" << endl << endl; + cout << endl << ">> musrt0 git-rev: " << GIT_REVISION << endl << endl; #endif return PMUSR_SUCCESS; } else if (!strcmp(argv[i], "--help")) { diff --git a/src/musrview.cpp b/src/musrview.cpp index bcffb38b..cd347899 100644 --- a/src/musrview.cpp +++ b/src/musrview.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2012 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * @@ -44,6 +42,7 @@ using namespace std; #include #include +#include "git-revision.h" #include "PMusr.h" #include "PStartupHandler.h" #include "PMsrHandler.h" @@ -122,9 +121,9 @@ int main(int argc, char *argv[]) } } else if (!strcmp(argv[i], "--version")) { #ifdef HAVE_CONFIG_H - cout << endl << "musrview version: " << PACKAGE_VERSION << ", $Id$" << endl << endl; + cout << endl << "musrview version: " << PACKAGE_VERSION << ", git-rev: " << GIT_REVISION << endl << endl; #else - cout << endl << "musrview version: $Id$" << endl << endl; + cout << endl << "musrview git-rev: " << GIT_REVISION << endl << endl; #endif return PMUSR_SUCCESS; } else if (!strcmp(argv[i], "--help")) { diff --git a/src/write_musrRoot_runHeader.cpp b/src/write_musrRoot_runHeader.cpp index 972b9f55..b5c5380d 100644 --- a/src/write_musrRoot_runHeader.cpp +++ b/src/write_musrRoot_runHeader.cpp @@ -5,12 +5,10 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2012 by Andreas Suter * + * Copyright (C) 2007-2014 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * @@ -44,6 +42,7 @@ using namespace std; #include #include +#include "git-revision.h" #include "PMusr.h" #include "TMusrRunHeader.h" @@ -63,9 +62,9 @@ int main(int argc, char *argv[]) if (!strcmp(argv[1], "--version")) { #ifdef HAVE_CONFIG_H - cout << endl << "write_musrRoot_runHeader version: " << PACKAGE_VERSION << ", $Id$" << endl << endl; + cout << endl << "write_musrRoot_runHeader version: " << PACKAGE_VERSION << ", git-rev: " << GIT_REVISION << endl << endl; #else - cout << endl << "write_musrRoot_runHeader version: $Id$" << endl << endl; + cout << endl << "write_musrRoot_runHeader git-rev: " << GIT_REVISION << endl << endl; #endif return 0; }