Merged muonspin/musrfit into master

src/external/Nonlocal/Makefile.am

@@ -62,3 +62,13 @@ install-exec-hook:
 uninstall-hook:
 	rm -f $(libdir)/libPNL_PippardFitter.so
 endif
+
+xmldir = $(HOME)/.musrfit/external
+xml_DATA = nonlocal_startup.xml
+
+install-xml_DATA: $(xml_DATA)
+	$(INSTALL_DATA) '$(xml_DATA)' '$xmldir'
+
+uninstall-xml_DATA: $(xml_DATA)
+	$(RM) '$(xml_DATA)' '$xmldir'
+

src/external/Nonlocal/PNL_StartupHandler.cpp

@@ -5,8 +5,6 @@
   Author: Andreas Suter
   e-mail: andreas.suter@psi.ch
 
-  $Id$
-
 ***************************************************************************/
 
 /***************************************************************************
@@ -56,7 +54,8 @@ PNL_StartupHandler::PNL_StartupHandler()
   fTrimSpDataPath = TString("");
 
   // get default path (for the moment only linux like)
-  char startup_path_name[128];
+  char startup_path_name[512];
+  char *home_str=0;
 
   // check if the startup file is found in the current directory
   strcpy(startup_path_name, "./nonlocal_startup.xml");
@@ -65,7 +64,8 @@ PNL_StartupHandler::PNL_StartupHandler()
     fStartupFilePath = TString(startup_path_name);
   } else { // startup file is not found in the current directory
     cout << endl << "PNL_StartupHandler(): **WARNING** Couldn't find nonlocal_startup.xml in the current directory, will try default one." << endl;
-    strncpy(startup_path_name, "/home/nemu/analysis/musrfit/src/external/Nonlocal/nonlocal_startup.xml", sizeof(startup_path_name));
+    home_str = getenv("HOME");
+    snprintf(startup_path_name, sizeof(startup_path_name), "%s/.musrfit/nonlocal_startup.xml", home_str);
     if (StartupFileExists(startup_path_name)) {
       fStartupFileFound = true;
       fStartupFilePath = TString(startup_path_name);

src/external/libPhotoMeissner/classes/Makefile.am

@@ -28,7 +28,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
 
 BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
 AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
-CLEANFILES = ../include/*Dict.cpp ../include/*Dict.h *~ core
+CLEANFILES = ../classes/*Dict* ../include/*Dict.* *~ core
 
 %Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h
 	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
@@ -59,3 +59,14 @@ install-exec-hook:
 uninstall-hook:
 	rm -f $(libdir)/libPPhotoMeissner.so
 endif
+
+# define default xml install
+xmldir = $(HOME)/.musrfit/external
+xml_DATA = ../test/photoMeissner_startup.xml
+
+instal-xml_DATA: $(xml_DATA)
+	$(INSTALL_DATA) '$(xml_DATA)' '$(xmldir)' 
+
+uninstal-xml_DATA: $(xml_DATA)
+	$(RM) '$(xml_DATA)' '$(xmldir)' 
+

src/external/libPhotoMeissner/classes/PStartupHandler_PM.cpp

@@ -231,7 +231,8 @@ PStartupHandler_PM::PStartupHandler_PM()
   fStartupFilePath = "";
 
   // get default path (for the moment only linux like)
-  char startup_path_name[128];
+  char startup_path_name[512];
+  char *home_path=0;
 
   // check if the startup file is found in the current directory
   strcpy(startup_path_name, "./photoMeissner_startup.xml");
@@ -240,7 +241,8 @@ PStartupHandler_PM::PStartupHandler_PM()
     fStartupFilePath = TString(startup_path_name);
   } else { // startup file is not found in the current directory
     cout << endl << ">> PStartupHandler_PM(): **WARNING** Couldn't find photoMeissner_startup.xml in the current directory, will try default one." << endl;
-    strncpy(startup_path_name, "/home/nemu/analysis/musrfit/src/external/libPhotoMeissner/test/photoMeissner_startup.xml", sizeof(startup_path_name));
+    home_path = getenv("HOME");
+    snprintf(startup_path_name, sizeof(startup_path_name), "%s/.musrfit/external/photoMeissner_startup.xml", home_path);
     if (StartupFileExists(startup_path_name)) {
       fStartupFileFound = true;
       fStartupFilePath = TString(startup_path_name);

src/external/libSpinValve/classes/Makefile.am

@@ -28,7 +28,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
 
 BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
 AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
-CLEANFILES = ../include/*Dict.cpp ../include/*Dict.h *~ core
+CLEANFILES = ../classes/*Dict.* ../include/*Dict.* *~ core
 
 %Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h
 	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
@@ -59,3 +59,14 @@ install-exec-hook:
 uninstall-hook:
 	rm -f $(libdir)/libPSpinValve.so
 endif
+
+# define default xml install
+xmldir = $(HOME)/.musrfit/external
+xml_DATA = ../test/spinValve_startup.xml
+
+instal-xml_DATA: $(xml_DATA)
+	$(INSTALL_DATA) '$(xml_DATA)' '$(xmldir)' 
+
+uninstal-xml_DATA: $(xml_DATA)
+	$(RM) '$(xml_DATA)' '$(xmldir)' 
+

src/external/libSpinValve/classes/PStartupHandler_SV.cpp

@@ -52,6 +52,7 @@ PStartupHandler_SV::PStartupHandler_SV()
 
   // get default path (for the moment only linux like)
   char startup_path_name[128];
+  char *home_path=0;
 
   // check if the startup file is found in the current directory
   strcpy(startup_path_name, "./spinValve_startup.xml");
@@ -59,8 +60,9 @@ PStartupHandler_SV::PStartupHandler_SV()
     fStartupFileFound = true;
     fStartupFilePath = TString(startup_path_name);
   } else { // startup file is not found in the current directory
-    cout << endl << ">> PStartupHandler_SV(): **WARNING** Couldn't find skewedLorentzian_startup.xml in the current directory, will try default one." << endl;
+    cout << endl << ">> PStartupHandler_SV(): **WARNING** Couldn't find spinValve_startup.xml in the current directory, will try default one." << endl;
-    strncpy(startup_path_name, "/home/nemu/analysis/musrfit/src/external/libSpinValve/test/spinValve_startup.xml", sizeof(startup_path_name));
+    home_path = getenv("HOME");
+    snprintf(startup_path_name, sizeof(startup_path_name), "%s/.musrfit/external/spinValve_startup.xml", home_path);
     if (StartupFileExists(startup_path_name)) {
       fStartupFileFound = true;
       fStartupFilePath = TString(startup_path_name);