Strip out old scaling code

1 files changed, 46 insertions, 0 deletions

diff --git a/src/merge.h b/src/merge.h
new file mode 100644
index 00000000..f653ec21
--- /dev/null
+++ b/src/merge.h
@@ -0,0 +1,46 @@
+/*
+ * merge.h
+ *
+ * Parallel weighted merging of intensities
+ *
+ * Copyright © 2012-2015 Deutsches Elektronen-Synchrotron DESY,
+ *                       a research centre of the Helmholtz Association.
+ *
+ * Authors:
+ *   2010-2015 Thomas White <taw@physics.org>
+ *
+ * This file is part of CrystFEL.
+ *
+ * CrystFEL 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * CrystFEL 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 CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef MERGE_H
+#define MERGE_H
+
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+
+#include "crystal.h"
+#include "reflist.h"
+#include "geometry.h"
+
+extern RefList *lsq_intensities(Crystal **crystals, int n, int n_threads,
+                                PartialityModel pmodel, int min_meas,
+                                double push_res);
+
+#endif	/* MERGE */