Add bugfixes to golem branch

Makefile

@@ -38,7 +38,7 @@ all: $(STAT_PRODUCT) $(DYN_PRODUCT)
 
 $(DYN_PRODUCT) : $(OBJS)
 	@echo Linking $(DYN_PRODUCT)
-	@$(CXX) $(LDFLAGS) $(DYN_OPT) -shared $(OBJS) -o $(DYN_PRODUCT)
+	@$(CXX) $(DYN_OPT) -shared $(OBJS) -o $(DYN_PRODUCT) $(LDFLAGS)
 $(STAT_PRODUCT) : $(OBJS)
 	@echo Linking $(STAT_PRODUCT)
 	@$(AR) -rcs $(STAT_PRODUCT) $(OBJS)
@@ -77,6 +77,7 @@ install :
 	cp $(LBFGSB_HEADERS) $(PREFIX)/include/$(NAME)/lbfgsb/
 	mkdir -p $(PREFIX)/include/$(NAME)/likelihood
 	cp $(LIKELIHOOD_HEADERS) $(PREFIX)/include/$(NAME)/likelihood/
+	cp $(BASEDIR)/phystools.pc $(PREFIX)/lib/pkgconfig/
 
 docs : doxygen
 

PhysTools/autodiff.h

@@ -793,8 +793,9 @@ namespace autodiff{
 		T te(e);
 		result.v=pow(b.v,te);
 		const unsigned int n=detail::dimensionExtractor<FD,FD_t::N,typename FD_t::BaseType>::nVars(result);
+		T scale = std::pow(b.v, te - T(1)) * e;
 		std::transform(result.g,result.g+n,result.g,
-					   std::bind2nd(std::multiplies<T>(),pow(b.v,te-T(1))*e));
+				[scale](T x) {return x*scale;});
 		return(result);
 	}
 
@@ -807,8 +808,9 @@ namespace autodiff{
 		T tb(b);
 		result.v=pow(tb,e.v);
 		const unsigned int n=detail::dimensionExtractor<FD,FD_t::N,typename FD_t::BaseType>::nVars(result);
+		T scale = result.v*std::log(tb);
 		std::transform(result.g,result.g+n,result.g,
-					   std::bind2nd(std::multiplies<T>(),result.v*log(tb)));
+				[scale](T x) {return x*scale;});
 		return(result);
 	}
 
@@ -1074,7 +1076,7 @@ namespace autodiff{
 			result.v=-result.v;
 			const unsigned int n=detail::dimensionExtractor<FD,nVars,T>::nVars(result);
 			std::transform(result.g,result.g+n,result.g,
-						   std::bind2nd(std::multiplies<T>(),T(-1)));
+					[](T x) {return -x;});
 		}
 		return(result);
 	}
@@ -1088,7 +1090,7 @@ namespace autodiff{
 			result.v=-result.v;
 			const unsigned int n=detail::dimensionExtractor<FD,nVars,T>::nVars(result);
 			std::transform(result.g,result.g+n,result.g,
-						   std::bind2nd(std::multiplies<T>(),T(-1)));
+					[](T x) {return -x;});
 		}
 		return(result);
 	}

PhysTools/bin_types.h

@@ -4,6 +4,7 @@
 #ifndef PHYSTOOLS_BIN_TYPES_H
 #define PHYSTOOLS_BIN_TYPES_H
 
+#include <boost/serialization/split_member.hpp>
 #include "PhysTools/hdf5_serialization.h"
 #include "PhysTools/histogram.h"
 

PhysTools/dynamic_histogram.h

@@ -569,7 +569,7 @@ class histogram<Dynamic,StoreType> : public histogramBase<Dynamic,StoreType,unsi
 		}
 
 		///Get the internal coordinates within the histogram (bin indices) to which this iterator refers
-		const internalCoordinate* (&getCoordinates() const){
+		const internalCoordinate* const (&getCoordinates() const){
 			return(coordinates);
 		}
 		///Get the internal coordinate in dimension dim within the histogram (bin index) to which this iterator refers
@@ -762,7 +762,7 @@ class histogram<Dynamic,StoreType> : public histogramBase<Dynamic,StoreType,unsi
 		}
 
 		///Get the internal coordinates within the histogram (bin indices) to which this iterator refers
-		const internalCoordinate* (&getCoordinates() const){
+		const internalCoordinate* const (&getCoordinates() const){
 			return(coordinates);
 		}
 		///Get the internal coordinate in dimension dim within the histogram (bin index) to which this iterator refers