diff --git a/pub/doc/frida.1 b/pub/doc/frida.1
index 9b6dc8086445781e52093e6edc0b953540a67ddd..7ef3e1b9ad66b1591c75f38ca19b9acde9204759 100644
--- a/pub/doc/frida.1
+++ b/pub/doc/frida.1
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "frida 3"
-.TH frida 3 "2010-03-16" "perl v5.10.1" "Frida man page"
+.TH frida 3 "2010-04-07" "perl v5.10.1" "Frida man page"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -133,9 +133,7 @@
Frida \- Fast reliable interactive data analysis
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
-\&\fBfrida1, ida\fR
-.PP
-\&\fBfrida2, frida\fR
+\&\fBfrida\fR
.SH "NEWS"
.IX Header "NEWS"
The first \s-1JCNS\s0 School on Data Analysis for Quasielastic Neutron Scattering
@@ -143,21 +141,6 @@ with \s-1FRIDA\s0 will take place 28\-29 April 2010 at Garching. Register now: h
.SH "DESCRIPTION"
.IX Header "DESCRIPTION"
Frida is software for scientific data analysis, primarily written for inelastic neutron scattering. Its data model is quite generic (data files consist of x\-y-dy tables that are differentiated by z coordinates), so that it can be used for many different kinds of observational data.
-.PP
-Frida1, written in \s-1FORTRAN\s0, was developed in the 1990s. The original name \s-1IDA\s0 was changed to Frida just because there were too many other open-source projects all called \s-1IDA\s0.
-.PP
-Frida2 is a rewrite in \*(C+.
-It is the standard tool for data analysis
-at the backscattering spectrometer \s-1SPHERES\s0.
-The more specific routines for time-of-flight spectroscopy
-are currently being ported from Frida1 to Frida2,
-so that Frida1 can be phased out by mid\-2010.
-.PP
-Frida1 includes raw data reduction routines
-for numerous backscattering and time-of-flight spectrometers.
-These routines are not ported to Frida2,
-but to the separate raw-data reduction package \s-1SLAW:\s0
-http://iffwww.iff.kfa\-juelich.de/~wuttke/slaw/.
.SH "INSTALLATION"
.IX Header "INSTALLATION"
Installation guide: http://iffwww.iff.kfa\-juelich.de/~wuttke/doku/doku.php?id=frida:installation
@@ -173,15 +156,36 @@ Development snapshot: http://iffwww.iff.kfa\-juelich.de/~wuttke/frida2.git/
Main web site: http://www.messen\-und\-deuten.de/frida/
.PP
Documentation wiki: http://iffwww.iff.kfa\-juelich.de/~wuttke/doku/doku.php?id=frida:frida
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fBslaw\fR(1)
.SH "BUGS"
.IX Header "BUGS"
See http://iffwww.iff.kfa\-juelich.de/~wuttke/flyspray/index.php?project=2&do=index&switch=1.
.PP
Send bug reports to j.wuttke@fz\-juelich.de.
+.SH "HISTORY"
+.IX Header "HISTORY"
+Frida1, written in \s-1FORTRAN\s0, was developed in the 1990s. The original name \s-1IDA\s0 was changed to Frida just because there were too many other open-source projects all called \s-1IDA\s0.
+.PP
+Frida2 is a rewrite in \*(C+.
+It is the standard tool for data analysis
+at the backscattering spectrometer \s-1SPHERES\s0.
+The more specific routines for time-of-flight spectroscopy
+are currently being ported from Frida1 to Frida2,
+so that Frida1 can be phased out by mid\-2010.
+.PP
+Frida1 includes raw data reduction routines
+for numerous backscattering and time-of-flight spectrometers.
+These routines are not ported to Frida2,
+but to the separate raw-data reduction package \s-1SLAW:\s0
+http://iffwww.iff.kfa\-juelich.de/~wuttke/slaw/.
.SH "AUTHOR"
.IX Header "AUTHOR"
Joachim Wuttke <j.wuttke@fz\-juelich.de>
.SH "COPYING"
.IX Header "COPYING"
-Copyright (C) 2009 Joachim Wuttke. Free use of this software is
+Copyright (C) 2009\- Joachim Wuttke.
+.PP
+Free use of this software is
granted under the terms of the \s-1GNU\s0 General Public License (\s-1GPL\s0).
diff --git a/pub/doc/frida.html b/pub/doc/frida.html
index e237c35adc33f5bbd9ae78599bf6d441a9026440..8a1810df79244bd4f7634f7238b1238441659b9c 100644
--- a/pub/doc/frida.html
+++ b/pub/doc/frida.html
@@ -23,7 +23,9 @@
<li><a href="#description">DESCRIPTION</a></li>
<li><a href="#installation">INSTALLATION</a></li>
<li><a href="#documentation">DOCUMENTATION</a></li>
+ <li><a href="#see_also">SEE ALSO</a></li>
<li><a href="#bugs">BUGS</a></li>
+ <li><a href="#history">HISTORY</a></li>
<li><a href="#author">AUTHOR</a></li>
<li><a href="#copying">COPYING</a></li>
</ul>
@@ -43,8 +45,7 @@
</p>
<hr />
<h1><a name="synopsis">SYNOPSIS</a></h1>
-<p><strong>frida1, ida</strong></p>
-<p><strong>frida2, frida</strong></p>
+<p><strong>frida</strong></p>
<p>
</p>
<hr />
@@ -56,18 +57,6 @@ with FRIDA will take place 28-29 April 2010 at Garching. Register now: <a href="
<hr />
<h1><a name="description">DESCRIPTION</a></h1>
<p>Frida is software for scientific data analysis, primarily written for inelastic neutron scattering. Its data model is quite generic (data files consist of x-y-dy tables that are differentiated by z coordinates), so that it can be used for many different kinds of observational data.</p>
-<p>Frida1, written in FORTRAN, was developed in the 1990s. The original name IDA was changed to Frida just because there were too many other open-source projects all called IDA.</p>
-<p>Frida2 is a rewrite in C++.
-It is the standard tool for data analysis
-at the backscattering spectrometer SPHERES.
-The more specific routines for time-of-flight spectroscopy
-are currently being ported from Frida1 to Frida2,
-so that Frida1 can be phased out by mid-2010.</p>
-<p>Frida1 includes raw data reduction routines
-for numerous backscattering and time-of-flight spectrometers.
-These routines are not ported to Frida2,
-but to the separate raw-data reduction package SLAW:
-<a href="http://iffwww.iff.kfa-juelich.de/~wuttke/slaw/.">http://iffwww.iff.kfa-juelich.de/~wuttke/slaw/.</a></p>
<p>
</p>
<hr />
@@ -86,19 +75,41 @@ but to the separate raw-data reduction package SLAW:
<p>
</p>
<hr />
+<h1><a name="see_also">SEE ALSO</a></h1>
+<p><strong>slaw</strong>(1)</p>
+<p>
+</p>
+<hr />
<h1><a name="bugs">BUGS</a></h1>
<p>See <a href="http://iffwww.iff.kfa-juelich.de/~wuttke/flyspray/index.php?project=2&do=index&switch=1.">http://iffwww.iff.kfa-juelich.de/~wuttke/flyspray/index.php?project=2&do=index&switch=1.</a></p>
<p>Send bug reports to <a href="mailto:j.wuttke@fz-juelich.de.">j.wuttke@fz-juelich.de.</a></p>
<p>
</p>
<hr />
+<h1><a name="history">HISTORY</a></h1>
+<p>Frida1, written in FORTRAN, was developed in the 1990s. The original name IDA was changed to Frida just because there were too many other open-source projects all called IDA.</p>
+<p>Frida2 is a rewrite in C++.
+It is the standard tool for data analysis
+at the backscattering spectrometer SPHERES.
+The more specific routines for time-of-flight spectroscopy
+are currently being ported from Frida1 to Frida2,
+so that Frida1 can be phased out by mid-2010.</p>
+<p>Frida1 includes raw data reduction routines
+for numerous backscattering and time-of-flight spectrometers.
+These routines are not ported to Frida2,
+but to the separate raw-data reduction package SLAW:
+<a href="http://iffwww.iff.kfa-juelich.de/~wuttke/slaw/.">http://iffwww.iff.kfa-juelich.de/~wuttke/slaw/.</a></p>
+<p>
+</p>
+<hr />
<h1><a name="author">AUTHOR</a></h1>
<p>Joachim Wuttke <<a href="mailto:j.wuttke@fz-juelich.de">j.wuttke@fz-juelich.de</a>></p>
<p>
</p>
<hr />
<h1><a name="copying">COPYING</a></h1>
-<p>Copyright (C) 2009 Joachim Wuttke. Free use of this software is
+<p>Copyright (C) 2009- Joachim Wuttke.</p>
+<p>Free use of this software is
granted under the terms of the GNU General Public License (GPL).</p>
</body>
diff --git a/pub/doc/frida.pod b/pub/doc/frida.pod
index 67603d6565574e0d94363fca13676c33e8dce4bb..f205dc4413e8ab694e3c0e8011ca0194d44f2d15 100644
--- a/pub/doc/frida.pod
+++ b/pub/doc/frida.pod
@@ -6,39 +6,27 @@
=end html
+
=head1 NAME
Frida - Fast reliable interactive data analysis
+
=head1 SYNOPSIS
-B<frida1, ida>
+B<frida>
-B<frida2, frida>
=head1 NEWS
The first JCNS School on Data Analysis for Quasielastic Neutron Scattering
with FRIDA will take place 28-29 April 2010 at Garching. Register now: http://www.jcns.info/DataAnalysis2010/
+
=head1 DESCRIPTION
Frida is software for scientific data analysis, primarily written for inelastic neutron scattering. Its data model is quite generic (data files consist of x-y-dy tables that are differentiated by z coordinates), so that it can be used for many different kinds of observational data.
-Frida1, written in FORTRAN, was developed in the 1990s. The original name IDA was changed to Frida just because there were too many other open-source projects all called IDA.
-
-Frida2 is a rewrite in C++.
-It is the standard tool for data analysis
-at the backscattering spectrometer SPHERES.
-The more specific routines for time-of-flight spectroscopy
-are currently being ported from Frida1 to Frida2,
-so that Frida1 can be phased out by mid-2010.
-
-Frida1 includes raw data reduction routines
-for numerous backscattering and time-of-flight spectrometers.
-These routines are not ported to Frida2,
-but to the separate raw-data reduction package SLAW:
-http://iffwww.iff.kfa-juelich.de/~wuttke/slaw/.
=head1 INSTALLATION
@@ -51,6 +39,7 @@ The old download location at sourceforge.net is no longer maintained
Development snapshot: http://iffwww.iff.kfa-juelich.de/~wuttke/frida2.git/
+
=head1 DOCUMENTATION
Main web site: http://www.messen-und-deuten.de/frida/
@@ -58,17 +47,44 @@ Main web site: http://www.messen-und-deuten.de/frida/
Documentation wiki: http://iffwww.iff.kfa-juelich.de/~wuttke/doku/doku.php?id=frida:frida
+=head1 SEE ALSO
+
+B<slaw>(1)
+
+
=head1 BUGS
See http://iffwww.iff.kfa-juelich.de/~wuttke/flyspray/index.php?project=2&do=index&switch=1.
Send bug reports to j.wuttke@fz-juelich.de.
+
+=head1 HISTORY
+
+Frida1, written in FORTRAN, was developed in the 1990s. The original name IDA was changed to Frida just because there were too many other open-source projects all called IDA.
+
+Frida2 is a rewrite in C++.
+It is the standard tool for data analysis
+at the backscattering spectrometer SPHERES.
+The more specific routines for time-of-flight spectroscopy
+are currently being ported from Frida1 to Frida2,
+so that Frida1 can be phased out by mid-2010.
+
+Frida1 includes raw data reduction routines
+for numerous backscattering and time-of-flight spectrometers.
+These routines are not ported to Frida2,
+but to the separate raw-data reduction package SLAW:
+http://iffwww.iff.kfa-juelich.de/~wuttke/slaw/.
+
+
=head1 AUTHOR
Joachim Wuttke <j.wuttke@fz-juelich.de>
+
=head1 COPYING
-Copyright (C) 2009 Joachim Wuttke. Free use of this software is
+Copyright (C) 2009- Joachim Wuttke.
+
+Free use of this software is
granted under the terms of the GNU General Public License (GPL).
diff --git a/pub/src/Makefile.am b/pub/src/Makefile.am
index 8fce6feae7978bca448f492fabcbf0e48e9f01f8..01f7bfe3f53240c625763b80a589014af40c7251 100644
--- a/pub/src/Makefile.am
+++ b/pub/src/Makefile.am
@@ -1,5 +1,5 @@
-BUILT_SOURCES = xax_yacc.h # otherwise we cannot include it into flex
-AM_YFLAGS = -d -p xax # options passed to yacc
+BUILT_SOURCES = xax_yacc.h # otherwise we cannot include it into flex
+AM_YFLAGS = -d -p xax # options passed to yacc
AM_LFLAGS = -Pxax -olex.yy.c # options passed to lex
AM_CXXFLAGS = -Wunused \
-Waddress -Warray-bounds -Wc++0x-compat \
@@ -13,8 +13,8 @@ AM_CXXFLAGS = -Wunused \
-Wtype-limits
# -Wconversion -Wuninitialized -Wsign-compare
-bin_PROGRAMS = frida2
-frida2_SOURCES = \
+bin_PROGRAMS = frida
+frida_SOURCES = \
coord.cpp \
coord.h \
curve.cpp \
diff --git a/pub/src/Makefile.in b/pub/src/Makefile.in
index f8bafbd402fe04a97af8dd45173e160ba118fb89..df9d2dbb371d3369b5f73b97b357d1976e769c53 100644
--- a/pub/src/Makefile.in
+++ b/pub/src/Makefile.in
@@ -34,7 +34,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-bin_PROGRAMS = frida2$(EXEEXT)
+bin_PROGRAMS = frida$(EXEEXT)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in xax_lex.cpp \
xax_yacc.cpp xax_yacc.h
@@ -53,15 +53,15 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
-am_frida2_OBJECTS = coord.$(OBJEXT) curve.$(OBJEXT) dualplot.$(OBJEXT) \
+am_frida_OBJECTS = coord.$(OBJEXT) curve.$(OBJEXT) dualplot.$(OBJEXT) \
edif.$(OBJEXT) expr.$(OBJEXT) file_in.$(OBJEXT) \
file_out.$(OBJEXT) frida2.$(OBJEXT) func.$(OBJEXT) \
index.$(OBJEXT) list.$(OBJEXT) manip.$(OBJEXT) mystd.$(OBJEXT) \
olm.$(OBJEXT) opr.$(OBJEXT) plot.$(OBJEXT) rng.$(OBJEXT) \
rssm.$(OBJEXT) spec.$(OBJEXT) special2.$(OBJEXT) \
xax_lex.$(OBJEXT) xax_yacc.$(OBJEXT)
-frida2_OBJECTS = $(am_frida2_OBJECTS)
-frida2_LDADD = $(LDADD)
+frida_OBJECTS = $(am_frida_OBJECTS)
+frida_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
@@ -91,8 +91,8 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-SOURCES = $(frida2_SOURCES)
-DIST_SOURCES = $(frida2_SOURCES)
+SOURCES = $(frida_SOURCES)
+DIST_SOURCES = $(frida_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -233,10 +233,10 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-BUILT_SOURCES = xax_yacc.h # otherwise we cannot include it into flex
-AM_YFLAGS = -d -p xax # options passed to yacc
+BUILT_SOURCES = xax_yacc.h # otherwise we cannot include it into flex
+AM_YFLAGS = -d -p xax # options passed to yacc
AM_LFLAGS = -Pxax -olex.yy.c # options passed to lex
-frida2_SOURCES = \
+frida_SOURCES = \
coord.cpp \
coord.h \
curve.cpp \
@@ -364,9 +364,9 @@ xax_yacc.h: xax_yacc.cpp
rm -f xax_yacc.cpp; \
$(MAKE) $(AM_MAKEFLAGS) xax_yacc.cpp; \
else :; fi
-frida2$(EXEEXT): $(frida2_OBJECTS) $(frida2_DEPENDENCIES)
- @rm -f frida2$(EXEEXT)
- $(CXXLINK) $(frida2_OBJECTS) $(frida2_LDADD) $(LIBS)
+frida$(EXEEXT): $(frida_OBJECTS) $(frida_DEPENDENCIES)
+ @rm -f frida$(EXEEXT)
+ $(CXXLINK) $(frida_OBJECTS) $(frida_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
diff --git a/pub/src/frida b/pub/src/frida
new file mode 100755
index 0000000000000000000000000000000000000000..22a40c1bc8797bba4cf5c9be79a8f2d3e6a03ff1
Binary files /dev/null and b/pub/src/frida differ