From cb2ab44b638e9e2881780b6ea817862274bde00a Mon Sep 17 00:00:00 2001 From: "Bastian M. Wojek" Date: Thu, 17 Mar 2011 13:57:10 +0000 Subject: [PATCH] Minor fixes --- configure.ac | 6 ++--- .../BMWStartupHandler/BMWStartupHandler.cpp | 2 +- .../BMWStartupHandler/BMWStartupHandler.h | 2 +- src/external/MagProximity/Makefile.am | 8 +++---- .../TCalcMeanFieldsLEM.cpp | 22 +++++++++---------- .../libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h | 2 +- .../TCalcMeanFieldsLEMLinkDef.h | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac index da4488f5..2f1234fa 100644 --- a/configure.ac +++ b/configure.ac @@ -8,9 +8,9 @@ dnl ----------------------------------------------- dnl Check if pkg-config is installed dnl ----------------------------------------------- -PKG_PROG_PKG_CONFIG([0.10]) -#The above macro still needs to be tested under Cygwin without pkg-config---but it is promising to be a better solution than the macro below. -#m4_ifdef([PKG_CHECK_MODULES],[],AC_MSG_ERROR([Please install pkg-config before configuring musrfit!])) +#PKG_PROG_PKG_CONFIG([0.9]) +#The above macro does not work if pkg-config is not installed, therefore, for the moment we stay with the solution below: +m4_ifdef([PKG_CHECK_MODULES],[],AC_MSG_ERROR([Please install pkg-config before configuring musrfit!])) dnl ----------------------------------------------- dnl Package names and version numbers diff --git a/src/external/BMWStartupHandler/BMWStartupHandler.cpp b/src/external/BMWStartupHandler/BMWStartupHandler.cpp index a2639088..18232b50 100644 --- a/src/external/BMWStartupHandler/BMWStartupHandler.cpp +++ b/src/external/BMWStartupHandler/BMWStartupHandler.cpp @@ -8,7 +8,7 @@ $Id$ based upon: - $Id$ + PStartupHandler.cpp by Andreas Suter ***************************************************************************/ diff --git a/src/external/BMWStartupHandler/BMWStartupHandler.h b/src/external/BMWStartupHandler/BMWStartupHandler.h index d77e68c5..541e0add 100644 --- a/src/external/BMWStartupHandler/BMWStartupHandler.h +++ b/src/external/BMWStartupHandler/BMWStartupHandler.h @@ -8,7 +8,7 @@ $Id$ based upon: - $Id$ + PStartupHandler.h by Andreas Suter ***************************************************************************/ diff --git a/src/external/MagProximity/Makefile.am b/src/external/MagProximity/Makefile.am index e5a97a11..08d4474c 100644 --- a/src/external/MagProximity/Makefile.am +++ b/src/external/MagProximity/Makefile.am @@ -51,14 +51,14 @@ libPMagProximityFitter_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -rel if IS_DARWIN install-exec-hook: - $(LN_S) $(libdir)/libPMagProximityFitter.dylib $(libdir)/libPMagProximityFitter.so + $(LN_S) $(libdir)/libPMagProximityFitter.dylib $(libdir)/libPMagProximityFitter.so uninstall-hook: - rm -f $(libdir)/libPMagProximityFitter.so + rm -f $(libdir)/libPMagProximityFitter.so endif if IS_CYGWIN install-exec-hook: - $(LN_S) $(bindir)/cygPMagProximityFitter-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libPMagProximityFitter.so + $(LN_S) $(bindir)/cygPMagProximityFitter-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libPMagProximityFitter.so uninstall-hook: - rm -f $(libdir)/libPMagProximityFitter.so + rm -f $(libdir)/libPMagProximityFitter.so endif diff --git a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.cpp b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.cpp index 8f9a046a..69047c24 100644 --- a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.cpp +++ b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.cpp @@ -5,7 +5,7 @@ Author: Bastian M. Wojek e-mail: bastian.wojek@psi.ch - 2009/11/27 + $Id$ ***************************************************************************/ @@ -51,7 +51,7 @@ ClassImp(TMeanFieldsForScTrilayer) TMeanFieldsForScHalfSpace::TMeanFieldsForScHalfSpace() { // read startup file - string startup_path_name("TFitPofB_startup.xml"); + string startup_path_name("BMW_startup.xml"); TSAXParser *saxParser = new TSAXParser(); BMWStartupHandler *startupHandler = new BMWStartupHandler(); @@ -59,7 +59,7 @@ TMeanFieldsForScHalfSpace::TMeanFieldsForScHalfSpace() { int status (saxParser->ParseFile(startup_path_name.c_str())); // check for parse errors if (status) { // error - cerr << endl << "**ERROR** reading/parsing TFitPofB_startup.xml failed." \ + cerr << endl << "**ERROR** reading/parsing " << startup_path_name << " failed." \ << endl << "**ERROR** Please make sure that the file exists in the local directory and it is set up correctly!" \ << endl; assert(false); @@ -142,7 +142,7 @@ double TMeanFieldsForScHalfSpace::CalcMeanB (double E, const TLondon1D_HS& BofZ) TMeanFieldsForScSingleLayer::TMeanFieldsForScSingleLayer() { // read startup file - string startup_path_name("TFitPofB_startup.xml"); + string startup_path_name("BMW_startup.xml"); TSAXParser *saxParser = new TSAXParser(); BMWStartupHandler *startupHandler = new BMWStartupHandler(); @@ -150,7 +150,7 @@ TMeanFieldsForScSingleLayer::TMeanFieldsForScSingleLayer() { int status (saxParser->ParseFile(startup_path_name.c_str())); // check for parse errors if (status) { // error - cerr << endl << "**ERROR** reading/parsing TFitPofB_startup.xml failed." \ + cerr << endl << "**ERROR** reading/parsing " << startup_path_name << " failed." \ << endl << "**ERROR** Please make sure that the file exists in the local directory and it is set up correctly!" \ << endl; assert(false); @@ -241,7 +241,7 @@ double TMeanFieldsForScSingleLayer::CalcMeanB (double E, const vector& i TMeanFieldsForScBilayer::TMeanFieldsForScBilayer() { // read startup file - string startup_path_name("TFitPofB_startup.xml"); + string startup_path_name("BMW_startup.xml"); TSAXParser *saxParser = new TSAXParser(); BMWStartupHandler *startupHandler = new BMWStartupHandler(); @@ -249,7 +249,7 @@ TMeanFieldsForScBilayer::TMeanFieldsForScBilayer() { int status (saxParser->ParseFile(startup_path_name.c_str())); // check for parse errors if (status) { // error - cerr << endl << "**ERROR** reading/parsing TFitPofB_startup.xml failed." \ + cerr << endl << "**ERROR** reading/parsing " << startup_path_name << " failed." \ << endl << "**ERROR** Please make sure that the file exists in the local directory and it is set up correctly!" \ << endl; assert(false); @@ -344,7 +344,7 @@ double TMeanFieldsForScBilayer::CalcMeanB (double E, const vector& inter TMeanFieldsForScTrilayer::TMeanFieldsForScTrilayer() { // read startup file - string startup_path_name("TFitPofB_startup.xml"); + string startup_path_name("BMW_startup.xml"); TSAXParser *saxParser = new TSAXParser(); BMWStartupHandler *startupHandler = new BMWStartupHandler(); @@ -352,7 +352,7 @@ TMeanFieldsForScTrilayer::TMeanFieldsForScTrilayer() { int status (saxParser->ParseFile(startup_path_name.c_str())); // check for parse errors if (status) { // error - cerr << endl << "**ERROR** reading/parsing TFitPofB_startup.xml failed." \ + cerr << endl << "**ERROR** reading/parsing " << startup_path_name << " failed." \ << endl << "**ERROR** Please make sure that the file exists in the local directory and it is set up correctly!" \ << endl; assert(false); @@ -449,7 +449,7 @@ double TMeanFieldsForScTrilayer::CalcMeanB (double E, const vector& inte TMeanFieldsForScTrilayerWithInsulator::TMeanFieldsForScTrilayerWithInsulator() { // read startup file - string startup_path_name("TFitPofB_startup.xml"); + string startup_path_name("BMW_startup.xml"); TSAXParser *saxParser = new TSAXParser(); BMWStartupHandler *startupHandler = new BMWStartupHandler(); @@ -457,7 +457,7 @@ TMeanFieldsForScTrilayerWithInsulator::TMeanFieldsForScTrilayerWithInsulator() { int status (saxParser->ParseFile(startup_path_name.c_str())); // check for parse errors if (status) { // error - cerr << endl << "**ERROR** reading/parsing TFitPofB_startup.xml failed." \ + cerr << endl << "**ERROR** reading/parsing " << startup_path_name << " failed." \ << endl << "**ERROR** Please make sure that the file exists in the local directory and it is set up correctly!" \ << endl; assert(false); diff --git a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h index d8357a9e..1808f112 100644 --- a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h +++ b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h @@ -5,7 +5,7 @@ Author: Bastian M. Wojek e-mail: bastian.wojek@psi.ch - 2009/11/27 + $Id$ ***************************************************************************/ diff --git a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEMLinkDef.h b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEMLinkDef.h index 28789c07..68665a5d 100644 --- a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEMLinkDef.h +++ b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEMLinkDef.h @@ -5,7 +5,7 @@ Author: Bastian M. Wojek e-mail: bastian.wojek@psi.ch - 2009/11/27 + $Id$ ***************************************************************************/