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 00000000..3a8462e2 Binary files /dev/null and b/src/musredit/latex_images/internalFieldGK.png differ diff --git a/src/musredit/latex_images/internalFieldLL.png b/src/musredit/latex_images/internalFieldLL.png new file mode 100644 index 00000000..72bff3e0 Binary files /dev/null and b/src/musredit/latex_images/internalFieldLL.png differ 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; }