Reweighting branch merge

.gitignore

@@ -16,6 +16,7 @@ config.status
 hmc_tm
 invert
 offline_measurement
+measure
 lib/
 benchmark
 

Makefile.in

@@ -67,7 +67,7 @@ NOOPTMOD = test/check_xchange test/check_geometry
 
 PROGRAMS = hmc_tm benchmark invert gen_sources  \
 	check_locallity test_lemon hopping_test LapH_ev \
-	offline_measurement
+	offline_measurement measure
 
 ALLOBJ = ${MODULES} ${PROGRAMS} ${SMODULES}
 SUBDIRS = ${USESUBDIRS}
@@ -76,7 +76,7 @@ SUBDIRS = ${USESUBDIRS}
 .SUFFIXES:
 
 # need to build modules before subdirs!
-all: Makefile dep $(SUBDIRS) hmc_tm invert benchmark offline_measurement
+all: Makefile dep $(SUBDIRS) hmc_tm invert benchmark offline_measurement measure
 
 $(SUBDIRS):
 	$(MAKE) --directory=$@

doc/main.tex

@@ -61,15 +61,15 @@ \section{Implementation}
 \myinput{components}
 \myinput{test}
 
-%\myinput{eo_pre}
-%\myinput{martins-trick}
-%\myinput{deflation}
-%\myinput{c-code}
-%\myinput{integrationschemes}
-
-%\myinput{parallel}
-%\myinput{operator}
-%\myinput{online}
+\myinput{eo_pre}
+\myinput{martins-trick}
+\myinput{deflation}
+\myinput{c-code}
+\myinput{integrationschemes}
+
+\myinput{parallel}
+\myinput{operator}
+\myinput{online}
 
 \section{File Formats and IO}
 \myinput{prop_format.tex}

invert.c

@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
   int j, i, ix = 0, isample = 0, op_id = 0;
   char datafilename[206];
   char parameterfilename[206];
-  char conf_filename[50];
+  char conf_filename[300];
   char * input_filename = NULL;
   char * filename = NULL;
   double plaquette_energy;

meas/Makefile.in

@@ -34,6 +34,7 @@ LIBRARIES = libmeas
 libmeas_TARGETS = measurements \
 	oriented_plaquettes \
 	correlators \
+	reweightingmeas \
 	pion_norm \
 	polyakov_loop \
 	energy_density gradient_flow

meas/measurements.c

@@ -2,6 +2,7 @@
  *  
  * Copyright (C) 2008 Carsten Urbach
  *               2009 Florian Burger
+ *               2016 Georg Bergner
  *
  * This file is part of tmLQCD.
  *
@@ -35,8 +36,10 @@
 #include "polyakov_loop.h"
 #include "oriented_plaquettes.h"
 #include "gradient_flow.h"
+#include "reweightingmeas.h"
 #include "measurements.h"
 
+
 measurement measurement_list[max_no_measurements];
 int no_measurements = 0;
 
@@ -49,6 +52,8 @@ int add_measurement(const enum MEAS_TYPE meas_type) {
   measurement_list[no_measurements].measurefunc = &dummy_meas;
   measurement_list[no_measurements].type = meas_type;
   measurement_list[no_measurements].initialised = 1;
+  measurement_list[no_measurements].parameter=(void *)NULL;
+	measurement_list[no_measurements].destructor = &default_destructor;
   no_measurements++;
   return(no_measurements);
 }
@@ -80,6 +85,12 @@ int init_measurements(){
       measurement_list[i].measurefunc = &gradient_flow_measurement;
     }
 
+    if(measurement_list[i].type == REWEIGHTING) {
+      measurement_list[i].measurefunc = &reweighting_measurement;
+      initialize_reweighting_parameter(&measurement_list[i].parameter);
+			measurement_list[i].destructor = &free_reweighting_parameter;
+    }
+
     measurement_list[i].id = i;
  }
 return(0);
@@ -88,7 +99,14 @@ return(0);
 
 
 void free_measurements(){
-
+	int i;
+	for(i = 0; i < no_measurements; i++) {
+		if (measurement_list[i].parameter) {
+			measurement_list[i].destructor(measurement_list[i].parameter);
+			free(measurement_list[i].parameter);
+			measurement_list[i].parameter = NULL;
+		}
+	}
  return;
 }
 
@@ -102,5 +120,10 @@ void dummy_meas(const int traj, const int id, const int ieo) {
 }
 
 
+void default_destructor(void* ptr) {
+
+}
+
+
 
 

meas/measurements.h

@@ -4,6 +4,8 @@
  *
  * Adapted from monomial.h by Florian Burger 2009/12/16
  *
+ * More flexible handling of measurements parameters by Georg Bergner 2016
+ *
  * This file is part of tmLQCD.
  *
  * tmLQCD is free software: you can redistribute it and/or modify
@@ -18,6 +20,9 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with tmLQCD.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *
  ***********************************************************************/
 #ifndef _MEASUREMENTS_H
 #define _MEASUREMENTS_H
@@ -30,35 +35,48 @@ enum MEAS_TYPE {
   PIONNORM, 
   POLYAKOV, 
   ORIENTED_PLAQUETTES,
-  GRADIENT_FLOW 
+  GRADIENT_FLOW,
+  REWEIGHTING
   };
 
+
+
+
 typedef struct {
   enum MEAS_TYPE type;
   int initialised;
   int id;
 
-  /* frequency of the measurement */
-  int freq;
-  /* for maximal iterations in inversions for correlators */
-  int max_iter;
   /* for polyakov loop */
   int direction;
+
+  /* for maximal iterations in inversions for correlators */
+  int max_iter;
+
 
   // random seed
   unsigned int seed;
 
-  /* how it's usually called */
-  char name[100];
 
   /* maximum number of slice, the source can be put
     if the correlator is measured in T(Z)-direction this will be set to 
     T(LZ) by init_measurements
   */
   int max_source_slice;
+
+
+  void* parameter;
+
+  /* frequency of the measurement */
+  int freq;
+
+
+  /* how it's usually called */
+  char name[100];
 
   /* functions for the measurement */
   void (*measurefunc) (const int traj, const int id, const int ieo);
+	void (*destructor)(void* param);
 } measurement;
 
 
@@ -74,5 +92,6 @@ int init_measurements();
 void free_measurements();
 
 void dummy_meas(const int traj, const int id, const int ieo);
+void default_destructor(void* ptr);
 
 #endif