PSIBIN-changes...

src/external/libLFRelaxation/Makefile.libLFRelaxation

@@ -7,16 +7,16 @@ ROOTCFLAGS    = $(shell $(ROOTSYS)/bin/root-config --cflags)
 #---------------------------------------------------
 
 OS            = LINUX
-CXX           = g++
-CXXFLAGS      = -g -Wall -Wno-trigraphs -fPIC
+CXX           = g++-4.4.0
+CXXFLAGS      = -O3 -Wall -Wno-trigraphs -fPIC
 MUSRFITINCLUDE = ../../include
 #MUSRFITINCLUDE = /home/l_wojek/rep/analysis/musrfit/src/include
 LOCALINCLUDE  = .
-ROOTINCLUDE   = $(ROOTSYS)/include/root
+ROOTINCLUDE   = $(ROOTSYS)/include
 INCLUDES      = -I$(LOCALINCLUDE) -I$(MUSRFITINCLUDE) -I$(ROOTINCLUDE)
-LD            = g++
-LDFLAGS       = -g
-SOFLAGS       = -O -shared
+LD            = g++-4.4.0
+LDFLAGS       = -O3
+SOFLAGS       = -shared
 
 # the output from the root-config script:
 CXXFLAGS      += $(ROOTCFLAGS)

src/external/libLFRelaxation/TIntegrator.h

@@ -90,4 +90,21 @@ inline double TIntSinGss::FuncAtX(double x) const
   return TMath::Sin(TMath::TwoPi()*fPar[0]*x) * TMath::Exp(-0.5*fPar[1]*fPar[1]*x*x);
 }
 
+// To be integrated: df/dE * E / sqrt(E^2+ Delta^2)
+
+class TGapIntegral : public TIntegrator {
+  public:
+    TGapIntegral() {}
+    ~TGapIntegral() {}
+    double FuncAtX(double) const; // parameter: E
+
+};
+
+inline double TGapIntegral::FuncAtX(double e) const
+{
+  double kt(0.08617384436*fPar[0]); // kB in meV/K
+  double expekt(TMath::Exp(e/kt));
+  return -expekt*e/(kt*(1.0+expekt)*TMath::Sqrt(e*e+fPar[1]*fPar[1]));
+}
+
 #endif //_TIntegrator_H_

src/external/libLFRelaxation/TLFRelaxation.h

@@ -18,11 +18,18 @@
 
 using namespace std;
 
-#include <gsl/gsl_math.h>
-#include <gsl/gsl_sf_exp.h>
-#include <gsl/gsl_sf_log.h>
-#include <gsl/gsl_sf_trig.h>
-#include <gsl/gsl_sf_bessel.h>
+//#include <gsl/gsl_math.h>
+//#include <gsl/gsl_sf_exp.h>
+//#include <gsl/gsl_sf_log.h>
+//#include <gsl/gsl_sf_trig.h>
+//#include <gsl/gsl_sf_bessel.h>
+
+#include "/usr/include/gsl/gsl_math.h"
+#include "/usr/include/gsl/gsl_sf_exp.h"
+#include "/usr/include/gsl/gsl_sf_log.h"
+#include "/usr/include/gsl/gsl_sf_trig.h"
+#include "/usr/include/gsl/gsl_sf_bessel.h"
+
 
 //#include "TMath.h"
 #include "PUserFcnBase.h"