added user function for GbG LF

configure.ac

@@ -1239,6 +1239,7 @@ AC_CONFIG_FILES([Makefile \
 		 src/external/libSpinValve/classes/Makefile \
                  src/external/libPhotoMeissner/Makefile \
                  src/external/libPhotoMeissner/classes/Makefile \
+                 src/external/libGbGLF/Makefile \
                  src/external/libBNMR/Makefile \
                  src/musredit_qt5/Makefile \
                  src/musredit/Makefile \

src/classes/PTheory.cpp

@@ -301,6 +301,7 @@ PTheory::PTheory(PMsrHandler *msrInfo, UInt_t runNo, const Bool_t hasParent) : f
       cerr << endl << ">> PTheory::PTheory: **ERROR** user function object could not be invoked. See line no " << line->fLineNo;
       cerr << endl;
       fValid = false;
+      return;
     } else { // user function valid, hence expand the fUserParam vector to the proper size
       fUserParam.resize(fParamNo.size());
     }

src/external/Makefile.am

@@ -3,7 +3,8 @@ if BUILD_ASLIBS
   ASDIRS = Nonlocal \
            MagProximity \
 	   libSpinValve \
-	   libPhotoMeissner
+	   libPhotoMeissner \
+           libGbGLF
 endif
 
 if BUILD_CUBALIB

src/external/libGbGLF/Makefile.am

@@ -0,0 +1,56 @@
+## Process this file with automake to create Makefile.in
+
+h_sources = \
+  PGbGLF.h
+
+h_linkdef = \
+  PGbGLFLinkDef.h
+
+dict_h_sources = \
+  PGbGLFDict.h
+
+cpp_sources = \
+  PGbGLF.cpp
+
+dict_cpp_sources = \
+  PGbGLFDict.cpp
+
+include_HEADERS = $(h_sources)
+noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
+
+AM_CPPFLAGS = -I$(top_srcdir)/src/include $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) -I$(ROOTINCDIR)
+AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
+
+BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
+AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
+CLEANFILES = *Dict.cpp *Dict.h *~ core
+
+%Dict.cpp %Dict.h: %.h %LinkDef.h
+	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
+
+lib_LTLIBRARIES = libGbGLF.la
+
+libGbGLF_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
+libGbGLF_la_LIBADD = $(USERFCN_LIBS) $(GSL_LIBS)
+libGbGLF_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS)
+
+## For the moment do not build pkgconfig files for musrfit plug-ins...
+## pkgconfigdir = $(libdir)/pkgconfig
+## pkgconfig_DATA = LFRelaxation.pc
+
+## However, create some symbolic links to the shared library
+## in order to unify the function call on different operating systems
+
+if IS_DARWIN
+install-exec-hook:
+	$(LN_S) -f $(libdir)/libGbGLF.dylib $(libdir)/libGbGLF.so
+uninstall-hook:
+	rm -f $(libdir)/libGbGLF.so
+endif
+
+if IS_CYGWIN
+install-exec-hook:
+	$(LN_S) -f $(bindir)/cygGbGLF-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libGbGLF.so
+uninstall-hook:
+	rm -f $(libdir)/libGbGLF.so
+endif

src/external/libGbGLF/PGbGLF.cpp

@@ -0,0 +1,173 @@
+/***************************************************************************
+
+  PGbGLF.cpp
+
+  Author: Andreas Suter
+  e-mail: andreas.suter@psi.ch
+
+***************************************************************************/
+
+/***************************************************************************
+ *   Copyright (C) 2007-2016 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  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <cassert>
+#include <iostream>
+#include <cmath>
+using namespace std;
+
+#include "PMusr.h"
+#include "PGbGLF.h"
+
+#define TWO_PI 6.28318530717958647692528676656
+
+ClassImp(PGbGLF)
+
+//--------------------------------------------------------------------------
+// Constructor
+//--------------------------------------------------------------------------
+/**
+ *
+ */
+PGbGLF::PGbGLF()
+{
+  fWs = 0;
+  fWs = gsl_integration_workspace_alloc(65536);
+  if (fWs == 0) {
+    cerr << "debug> PGbGLF::PGbGLF(): **ERROR** couldn't allocate fWs ..." << endl;
+  }
+
+  fIntTab = 0;
+
+  fGslFunParam.wExt = 0.0;
+  fGslFunParam.s0   = 0.0;
+  fGslFunParam.s1   = 0.0;
+
+  fPrevParam[0] = 0.0;
+  fPrevParam[1] = 0.0;
+  fPrevParam[2] = 0.0;
+}
+
+//--------------------------------------------------------------------------
+// Destructor
+//--------------------------------------------------------------------------
+/**
+ *
+ */
+PGbGLF::~PGbGLF()
+{
+  if (fWs)
+    gsl_integration_workspace_free(fWs);
+  if (fIntTab)
+    gsl_integration_qawo_table_free(fIntTab);
+}
+
+//--------------------------------------------------------------------------
+// operator()
+//--------------------------------------------------------------------------
+/**
+ * <p>Method returning the function value at a given time for a given set of parameters.
+ *
+ * \param t time
+ * \param par
+ */
+Double_t PGbGLF::operator()(Double_t t, const std::vector<Double_t> &par) const
+{
+  // param: [0] Bext (G), [1] Delta0 (1/us), [2] DeltaGbG (1/us)
+  assert(par.size()==3);
+
+  if (t<0.0)
+    return 1.0;
+  if (t>fTmax)
+    t = fTmax;
+
+  Double_t dval = 0.0;
+  Double_t wExt = TWO_PI * GAMMA_BAR_MUON * par[0];
+  Double_t s0   = par[1];
+  Double_t s1   = par[2];
+
+  Double_t wExt2 = wExt*wExt;
+  Double_t s02   = s0*s0;
+  Double_t s12   = s1*s1;
+  Double_t t2    = t*t;
+
+  Double_t result = 0.0;
+  Double_t err = 0.0;
+
+  // if integration table is not already setup, do it
+  if (fIntTab == 0) {
+    fIntTab = gsl_integration_qawo_table_alloc(wExt, fTmax, GSL_INTEG_SINE, 16);
+    if (fIntTab == 0) {
+      cerr << ">> PGbGLF::operator(): **ERROR** couldn't invoke qawo table." << endl;
+      return 0.0;
+    }
+    fFun.function = &pz_GbG_2;
+    fGslFunParam.wExt = wExt;
+    fGslFunParam.s0 = s0;
+    fGslFunParam.s1 = s1;
+    fFun.params = &fGslFunParam;
+  }
+  // if parameter set has changed, adopted fFun parameters
+  if (fPrevParam[1] != par[1]) {
+    fPrevParam[0] = par[0];
+    fPrevParam[1] = par[1];
+    fPrevParam[2] = par[2];
+    fGslFunParam.wExt = wExt;
+    fGslFunParam.s0 = s0;
+    fGslFunParam.s1 = s1;
+    fFun.params = &fGslFunParam;
+  }
+
+  // P_z^LF (GbG, 1st part)
+  Double_t aa = 1.0+t2*s12;
+  dval = 1.0 - 2.0*(s02+s12)/wExt2 + 2.0*(s02+s12*aa)/(wExt2*pow(aa,2.5))*cos(wExt*t)*exp(-0.5*s02*t2/aa);
+
+  // P_z^LF (GbG, 2nd part)
+  gsl_integration_qawo_table_set_length(fIntTab, t);
+  gsl_integration_qawo(&fFun, 0.0, 1.0e-9, 1.0e-9, 1024, fWs, fIntTab, &result, &err);
+  dval += result;
+
+  return dval;
+}
+
+//--------------------------------------------------------------------------
+// pz_GbG_2 (private)
+//--------------------------------------------------------------------------
+/**
+ * <p>Integrand of the non-analytic part of the GbG-LF polarization
+ *
+ * \param x
+ * \param param
+ */
+
+double pz_GbG_2(double x, void *param)
+{
+  gslFunParam *p = (gslFunParam*) param;
+
+  double s02 = p->s0 * p->s0;
+  double s12 = p->s1 * p->s1;
+  double x2 = x*x;
+  double aa = 1.0+x2*s12;
+
+  return 2.0*(s02*s02+3.0*s12*s12*aa*aa+6.0*s02*s12*aa)/(pow(p->wExt, 3.0)*pow(aa, 4.5))*exp(-0.5*s02*x2/aa);
+}

src/external/libGbGLF/PGbGLF.h

@@ -0,0 +1,76 @@
+/***************************************************************************
+
+  PGbGLF.h
+
+  Author: Andreas Suter
+  e-mail: andreas.suter@psi.ch
+
+***************************************************************************/
+
+/***************************************************************************
+ *   Copyright (C) 2007-2016 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  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef _PGBGLF_H_
+#define _PGBGLF_H_
+
+#include <vector>
+using namespace std;
+
+#include <gsl/gsl_integration.h>
+
+#include "PUserFcnBase.h"
+
+typedef struct {
+  double wExt;
+  double s0;
+  double s1;
+} gslFunParam;
+
+
+double pz_GbG_2(double x, void *param);
+
+//--------------------------------------------------------------------------------------------
+/**
+ * <p>Interface class for the user function.
+ */
+class PGbGLF : public PUserFcnBase
+{
+  public:
+    PGbGLF();
+    virtual ~PGbGLF();
+
+    virtual Bool_t NeedGlobalPart() const { return false; }
+    virtual void SetGlobalPart(vector<void *> &globalPart, UInt_t idx) {}
+    virtual Bool_t GlobalPartIsValid() const { return true; }
+
+    virtual Double_t operator()(Double_t t, const std::vector<Double_t> &param) const;
+
+  private:
+    static const Double_t fTmax = 12.0;
+    mutable Double_t fPrevParam[3];
+    mutable gslFunParam fGslFunParam;
+    gsl_integration_workspace *fWs;
+    mutable gsl_function fFun;
+    mutable gsl_integration_qawo_table *fIntTab;
+
+  ClassDef(PGbGLF, 1)
+};
+
+#endif // _PGBGLF_H_

src/external/libGbGLF/PGbGLFLinkDef.h

@@ -0,0 +1,40 @@
+/***************************************************************************
+
+  PGbGLFLinkDef.h
+
+  Author: Andreas Suter
+
+***************************************************************************/
+
+/***************************************************************************
+ *   Copyright (C) 2016 by Andreas Suter                                   *
+ *                                                                         *
+ *                                                                         *
+ *   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  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+// root dictionary stuff --------------------------------------------------
+#ifdef __CINT__
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class PGbGLF+;
+
+#endif //__CINT__
+// root dictionary stuff --------------------------------------------------
+

src/tests/GbG_LF/CMakeLists.txt

@@ -7,5 +7,5 @@ set(DependOnLibs gslcblas)
 
 add_executable(GbG_LF GbG_LF.cpp)
 
-target_link_libraries(GbG_LF gslcblas gsl)
+target_link_libraries(GbG_LF gsl gslcblas)