Index: nsguiframe/docs/sphinx/Makefile
===================================================================
--- sansguiframe/docs/sphinx/Makefile	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,130 +1,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = _build
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	-rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/guiframe.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/guiframe.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/guiframe"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/guiframe"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf: latex
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	make -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
Index: nsguiframe/docs/sphinx/_extensions/only_directives.py
===================================================================
--- sansguiframe/docs/sphinx/_extensions/only_directives.py	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,63 +1,0 @@
-#
-# A pair of directives for inserting content that will only appear in
-# either html or latex.
-#
-
-from docutils.nodes import Body, Element
-from docutils.parsers.rst import directives
-
-class only_base(Body, Element):
-    def dont_traverse(self, *args, **kwargs):
-        return []
-
-class html_only(only_base):
-    pass
-
-class latex_only(only_base):
-    pass
-
-def run(content, node_class, state, content_offset):
-    text = '\n'.join(content)
-    node = node_class(text)
-    state.nested_parse(content, content_offset, node)
-    return [node]
-
-def html_only_directive(name, arguments, options, content, lineno,
-                        content_offset, block_text, state, state_machine):
-    return run(content, html_only, state, content_offset)
-
-def latex_only_directive(name, arguments, options, content, lineno,
-                         content_offset, block_text, state, state_machine):
-    return run(content, latex_only, state, content_offset)
-
-def builder_inited(app):
-    if app.builder.name == 'html':
-        latex_only.traverse = only_base.dont_traverse
-    else:
-        html_only.traverse = only_base.dont_traverse
-
-def setup(app):
-    app.add_directive('htmlonly', html_only_directive, True, (0, 0, 0))
-    app.add_directive('latexonly', latex_only_directive, True, (0, 0, 0))
-    app.add_node(html_only)
-    app.add_node(latex_only)
-
-    # This will *really* never see the light of day As it turns out,
-    # this results in "broken" image nodes since they never get
-    # processed, so best not to do this.
-    # app.connect('builder-inited', builder_inited)
-
-    # Add visit/depart methods to HTML-Translator:
-    def visit_perform(self, node):
-        pass
-    def depart_perform(self, node):
-        pass
-    def visit_ignore(self, node):
-        node.children = []
-    def depart_ignore(self, node):
-        node.children = []
-
-    app.add_node(html_only, html=(visit_perform, depart_perform))
-    app.add_node(html_only, latex=(visit_ignore, depart_ignore))
-    app.add_node(latex_only, latex=(visit_perform, depart_perform))
-    app.add_node(latex_only, html=(visit_ignore, depart_ignore))
Index: nsguiframe/docs/sphinx/api/aboutbox.rst
===================================================================
--- sansguiframe/docs/sphinx/api/aboutbox.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-aboutbox
-******************************************************************************
-
-:mod:`sans.guiframe.aboutbox`
-==============================================================================
-
-.. automodule:: sans.guiframe.aboutbox
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/config.rst
===================================================================
--- sansguiframe/docs/sphinx/api/config.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-config
-******************************************************************************
-
-:mod:`sans.guiframe.config`
-==============================================================================
-
-.. automodule:: sans.guiframe.config
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/dataFitting.rst
===================================================================
--- sansguiframe/docs/sphinx/api/dataFitting.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-dataFitting
-******************************************************************************
-
-:mod:`sans.guiframe.dataFitting`
-==============================================================================
-
-.. automodule:: sans.guiframe.dataFitting
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/data_loader.rst
===================================================================
--- sansguiframe/docs/sphinx/api/data_loader.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-data_loader
-******************************************************************************
-
-:mod:`sans.guiframe.data_loader`
-==============================================================================
-
-.. automodule:: sans.guiframe.data_loader
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/dummyapp.rst
===================================================================
--- sansguiframe/docs/sphinx/api/dummyapp.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-dummyapp
-******************************************************************************
-
-:mod:`sans.guiframe.dummyapp`
-==============================================================================
-
-.. automodule:: sans.guiframe.dummyapp
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/gui_manager.rst
===================================================================
--- sansguiframe/docs/sphinx/api/gui_manager.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-gui_manager
-******************************************************************************
-
-:mod:`sans.guiframe.gui_manager`
-==============================================================================
-
-.. automodule:: sans.guiframe.gui_manager
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/index.rst
===================================================================
--- sansguiframe/docs/sphinx/api/index.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,25 +1,0 @@
-.. Autogenerated by genmods.py
-
-.. _api-index:
-
-##############################################################################
-   Reference
-##############################################################################
-
-.. only:: html
-
-   :Release: |version|
-   :Date: |today|
-
-.. toctree::
-
-   aboutbox.rst
-   config.rst
-   data_loader.rst
-   dataFitting.rst
-   dummyapp.rst
-   gui_manager.rst
-   load_thread.rst
-   statusbar.rst
-   utils.rst
-   version.rst
Index: nsguiframe/docs/sphinx/api/load_thread.rst
===================================================================
--- sansguiframe/docs/sphinx/api/load_thread.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-load_thread
-******************************************************************************
-
-:mod:`sans.guiframe.load_thread`
-==============================================================================
-
-.. automodule:: sans.guiframe.load_thread
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/AnnulusSlicer.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/AnnulusSlicer.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-AnnulusSlicer
-******************************************************************************
-
-:mod:`sans.guiframe.local_perspectives.plotting.AnnulusSlicer`
-==============================================================================
-
-.. automodule:: sans.guiframe.local_perspectives.plotting.AnnulusSlicer
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/Arc.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/Arc.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-Arc
-******************************************************************************
-
-:mod:`sans.guiframe.local_perspectives.plotting.Arc`
-==============================================================================
-
-.. automodule:: sans.guiframe.local_perspectives.plotting.Arc
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/AzimutSlicer.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/AzimutSlicer.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-AzimutSlicer
-******************************************************************************
-
-:mod:`sans.guiframe.local_perspectives.plotting.AzimutSlicer`
-==============================================================================
-
-.. automodule:: sans.guiframe.local_perspectives.plotting.AzimutSlicer
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/BaseInteractor.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/BaseInteractor.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-BaseInteractor
-******************************************************************************
-
-:mod:`sans.guiframe.local_perspectives.plotting.BaseInteractor`
-==============================================================================
-
-.. automodule:: sans.guiframe.local_perspectives.plotting.BaseInteractor
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/Edge.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/Edge.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-Edge
-******************************************************************************
-
-:mod:`sans.guiframe.local_perspectives.plotting.Edge`
-==============================================================================
-
-.. automodule:: sans.guiframe.local_perspectives.plotting.Edge
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/Plotter1D.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/Plotter1D.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-Plotter1D
-******************************************************************************
-
-:mod:`sans.guiframe.local_perspectives.plotting.Plotter1D`
-==============================================================================
-
-.. automodule:: sans.guiframe.local_perspectives.plotting.Plotter1D
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/Plotter2D.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/Plotter2D.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-Plotter2D
-******************************************************************************
-
-:mod:`sans.guiframe.local_perspectives.plotting.Plotter2D`
-==============================================================================
-
-.. automodule:: sans.guiframe.local_perspectives.plotting.Plotter2D
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/SectorSlicer.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/SectorSlicer.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-SectorSlicer
-******************************************************************************
-
-:mod:`sans.guiframe.local_perspectives.plotting.SectorSlicer`
-==============================================================================
-
-.. automodule:: sans.guiframe.local_perspectives.plotting.SectorSlicer
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/SlicerParameters.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/SlicerParameters.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-SlicerParameters
-******************************************************************************
-
-:mod:`sans.guiframe.local_perspectives.plotting.SlicerParameters`
-==============================================================================
-
-.. automodule:: sans.guiframe.local_perspectives.plotting.SlicerParameters
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/binder.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/binder.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-binder
-******************************************************************************
-
-:mod:`sans.guiframe.local_perspectives.plotting.binder`
-==============================================================================
-
-.. automodule:: sans.guiframe.local_perspectives.plotting.binder
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/boxMask.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/boxMask.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-boxMask
-******************************************************************************
-
-:mod:`sans.guiframe.local_perspectives.plotting.boxMask`
-==============================================================================
-
-.. automodule:: sans.guiframe.local_perspectives.plotting.boxMask
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/boxSlicer.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/boxSlicer.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-boxSlicer
-******************************************************************************
-
-:mod:`sans.guiframe.local_perspectives.plotting.boxSlicer`
-==============================================================================
-
-.. automodule:: sans.guiframe.local_perspectives.plotting.boxSlicer
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/boxSum.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/boxSum.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-boxSum
-******************************************************************************
-
-:mod:`sans.guiframe.local_perspectives.plotting.boxSum`
-==============================================================================
-
-.. automodule:: sans.guiframe.local_perspectives.plotting.boxSum
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/detector_dialog.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/detector_dialog.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-detector_dialog
-******************************************************************************
-
-:mod:`sans.guiframe.local_perspectives.plotting.detector_dialog`
-==============================================================================
-
-.. automodule:: sans.guiframe.local_perspectives.plotting.detector_dialog
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/index.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/index.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,33 +1,0 @@
-.. Autogenerated by genmods.py
-
-.. _api-index:
-
-##############################################################################
-   Local Perspective: Plotting
-##############################################################################
-
-.. only:: html
-
-   :Release: |version|
-   :Date: |today|
-
-.. toctree::
-
-   AnnulusSlicer.rst
-   Arc.rst
-   AzimutSlicer.rst
-   BaseInteractor.rst
-   binder.rst
-   boxMask.rst
-   boxSlicer.rst
-   boxSum.rst
-   detector_dialog.rst
-   Edge.rst
-   masking.rst
-   Plotter1D.rst
-   Plotter2D.rst
-   plotting.rst
-   sectorMask.rst
-   SectorSlicer.rst
-   slicerpanel.rst
-   SlicerParameters.rst
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/masking.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/masking.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-masking
-******************************************************************************
-
-:mod:`sans.guiframe.local_perspectives.plotting.masking`
-==============================================================================
-
-.. automodule:: sans.guiframe.local_perspectives.plotting.masking
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/plotting.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/plotting.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-plotting
-******************************************************************************
-
-:mod:`sans.guiframe.local_perspectives.plotting.plotting`
-==============================================================================
-
-.. automodule:: sans.guiframe.local_perspectives.plotting.plotting
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/sectorMask.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/sectorMask.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-sectorMask
-******************************************************************************
-
-:mod:`sans.guiframe.local_perspectives.plotting.sectorMask`
-==============================================================================
-
-.. automodule:: sans.guiframe.local_perspectives.plotting.sectorMask
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/local_perspectives/plotting/slicerpanel.rst
===================================================================
--- sansguiframe/docs/sphinx/api/local_perspectives/plotting/slicerpanel.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-slicerpanel
-******************************************************************************
-
-:mod:`sans.guiframe.local_perspectives.plotting.slicerpanel`
-==============================================================================
-
-.. automodule:: sans.guiframe.local_perspectives.plotting.slicerpanel
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/statusbar.rst
===================================================================
--- sansguiframe/docs/sphinx/api/statusbar.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-statusbar
-******************************************************************************
-
-:mod:`sans.guiframe.statusbar`
-==============================================================================
-
-.. automodule:: sans.guiframe.statusbar
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/utils.rst
===================================================================
--- sansguiframe/docs/sphinx/api/utils.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-utils
-******************************************************************************
-
-:mod:`sans.guiframe.utils`
-==============================================================================
-
-.. automodule:: sans.guiframe.utils
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/api/version.rst
===================================================================
--- sansguiframe/docs/sphinx/api/version.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. Autogenerated by genmods.py
-
-******************************************************************************
-version
-******************************************************************************
-
-:mod:`sans.guiframe.version`
-==============================================================================
-
-.. automodule:: sans.guiframe.version
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
Index: nsguiframe/docs/sphinx/conf.py
===================================================================
--- sansguiframe/docs/sphinx/conf.py	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,220 +1,0 @@
-# -*- coding: utf-8 -*-
-#
-# guiframe documentation build configuration file, created by
-# sphinx-quickstart on Thu Jun 03 11:04:06 2010.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.append(os.path.abspath(os.path.dirname('../../guiframe')))
-path = '../../guiframe/local_perspectives/plotting'
-sys.path.append(os.path.abspath(os.path.dirname(path)))
-sys.path.append(os.path.abspath('_extensions'))
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest',
-              'sphinx.ext.coverage', 'sphinx.ext.pngmath',
-              'only_directives',             
-             ]
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'guiframe'
-copyright = u'2010, sans group'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '0.1'
-# The full version, including alpha/beta/rc tags.
-release = '0.1.0'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  Major themes that come with
-# Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'default'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = ''
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'guiframedoc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
-
-# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'guiframe.tex', u'guiframe Documentation',
-   u'sans group', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'guiframe', u'guiframe Documentation',
-     [u'sans group'], 1)
-]
Index: nsguiframe/docs/sphinx/genmods.py
===================================================================
--- sansguiframe/docs/sphinx/genmods.py	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,96 +1,0 @@
-from __future__ import with_statement
-import os.path
-
-MODULE_TEMPLATE=""".. Autogenerated by genmods.py
-
-******************************************************************************
-%(name)s
-******************************************************************************
-
-:mod:`%(package)s.%(module)s`
-==============================================================================
-
-.. automodule:: %(package)s.%(module)s
-   :members:
-   :undoc-members:
-   :inherited-members:
-   :show-inheritance:
-
-"""
-
-INDEX_TEMPLATE=""".. Autogenerated by genmods.py
-
-.. _api-index:
-
-##############################################################################
-   %(package_name)s
-##############################################################################
-
-.. only:: html
-
-   :Release: |version|
-   :Date: |today|
-
-.. toctree::
-
-   %(rsts)s
-"""
-
-
-def genfiles(package, package_name, modules, dir='api'):
-
-    if not os.path.exists(dir):
-        os.makedirs(dir)
-
-    for module,name in modules:
-        with open(os.path.join(dir,module+'.rst'), 'w') as f:
-            f.write(MODULE_TEMPLATE%locals())
-
-    rsts = "\n   ".join(module+'.rst' for module,name in modules)
-    with open(os.path.join(dir,'index.rst'),'w') as f:
-        f.write(INDEX_TEMPLATE%locals())
-
-
-modules=[
-         ('aboutbox', 'aboutbox'),
-    ('config', 'config'),
-    ('data_loader', 'data_loader'),
-    ('dataFitting', 'dataFitting'),
-    ('dummyapp', 'dummyapp'),
-    ('gui_manager', 'gui_manager'),
-    ('load_thread', 'load_thread'),
-    ('statusbar', 'statusbar'),
-    ('utils', 'utils'),
-    ('version', 'version'),
-]
-package = 'sans.guiframe'
-package_name='Reference'
-
-if __name__ == "__main__":
-    genfiles(package, package_name, modules, dir='api')
-    
-    modules=[
-             ('AnnulusSlicer', 'AnnulusSlicer'),
-             ('Arc', 'Arc'),
-             ('AzimutSlicer', 'AzimutSlicer'),
-             ('BaseInteractor', 'BaseInteractor'),
-             ('binder', 'binder'),
-             ('boxMask', 'boxMask'),
-             ('boxSlicer', 'boxSlicer'),
-             ('boxSum', 'boxSum'),
-             ('detector_dialog', 'detector_dialog'),
-             ('Edge', 'Edge'),
-             ('masking', 'masking'),
-             ('Plotter1D', 'Plotter1D'),
-             ('Plotter2D', 'Plotter2D'),
-             ('plotting', 'plotting'), 
-             ('sectorMask', 'sectorMask'),
-             ('SectorSlicer', 'SectorSlicer'),
-             ('slicerpanel', 'slicerpanel'),
-             ('SlicerParameters', 'SlicerParameters'),
-             ]
-    package = 'sans.guiframe.local_perspectives.plotting'
-    package_name = 'Local Perspective: Plotting'
-    genfiles(package, package_name, modules, dir='api/local_perspectives/plotting')
-    print "Sphinx: generate .rst files complete..."
-    
Index: nsguiframe/docs/sphinx/index.rst
===================================================================
--- sansguiframe/docs/sphinx/index.rst	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,23 +1,0 @@
-.. guiframe documentation master file, created by
-   sphinx-quickstart on Thu Jun 03 11:04:06 2010.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Welcome to guiframe's documentation!
-====================================
-
-Contents:
-
-.. toctree::
-   :maxdepth: 2
-
-   api/index.rst
-   api/local_perspectives/plotting/index.rst
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
-
Index: nsguiframe/docs/sphinx/make.bat
===================================================================
--- sansguiframe/docs/sphinx/make.bat	(revision f1e2efb846f639744b83b851535865204941b4a1)
+++ 	(revision )
@@ -1,155 +1,0 @@
-@ECHO OFF
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set BUILDDIR=_build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
-if NOT "%PAPER%" == "" (
-	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
-)
-
-if "%1" == "" goto help
-
-if "%1" == "help" (
-	:help
-	echo.Please use `make ^<target^>` where ^<target^> is one of
-	echo.  html       to make standalone HTML files
-	echo.  dirhtml    to make HTML files named index.html in directories
-	echo.  singlehtml to make a single large HTML file
-	echo.  pickle     to make pickle files
-	echo.  json       to make JSON files
-	echo.  htmlhelp   to make HTML files and a HTML help project
-	echo.  qthelp     to make HTML files and a qthelp project
-	echo.  devhelp    to make HTML files and a Devhelp project
-	echo.  epub       to make an epub
-	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
-	echo.  text       to make text files
-	echo.  man        to make manual pages
-	echo.  changes    to make an overview over all changed/added/deprecated items
-	echo.  linkcheck  to check all external links for integrity
-	echo.  doctest    to run all doctests embedded in the documentation if enabled
-	goto end
-)
-
-if "%1" == "clean" (
-	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
-	del /q /s %BUILDDIR%\*
-	goto end
-)
-
-if "%1" == "html" (
-	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
-	goto end
-)
-
-if "%1" == "dirhtml" (
-	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
-	goto end
-)
-
-if "%1" == "singlehtml" (
-	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
-	goto end
-)
-
-if "%1" == "pickle" (
-	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
-	echo.
-	echo.Build finished; now you can process the pickle files.
-	goto end
-)
-
-if "%1" == "json" (
-	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
-	echo.
-	echo.Build finished; now you can process the JSON files.
-	goto end
-)
-
-if "%1" == "htmlhelp" (
-	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
-	echo.
-	echo.Build finished; now you can run HTML Help Workshop with the ^
-.hhp project file in %BUILDDIR%/htmlhelp.
-	goto end
-)
-
-if "%1" == "qthelp" (
-	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
-	echo.
-	echo.Build finished; now you can run "qcollectiongenerator" with the ^
-.qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\guiframe.qhcp
-	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\guiframe.ghc
-	goto end
-)
-
-if "%1" == "devhelp" (
-	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
-	echo.
-	echo.Build finished.
-	goto end
-)
-
-if "%1" == "epub" (
-	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
-	echo.
-	echo.Build finished. The epub file is in %BUILDDIR%/epub.
-	goto end
-)
-
-if "%1" == "latex" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	echo.
-	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "text" (
-	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
-	echo.
-	echo.Build finished. The text files are in %BUILDDIR%/text.
-	goto end
-)
-
-if "%1" == "man" (
-	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
-	echo.
-	echo.Build finished. The manual pages are in %BUILDDIR%/man.
-	goto end
-)
-
-if "%1" == "changes" (
-	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
-	echo.
-	echo.The overview file is in %BUILDDIR%/changes.
-	goto end
-)
-
-if "%1" == "linkcheck" (
-	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
-	echo.
-	echo.Link check complete; look for any errors in the above output ^
-or in %BUILDDIR%/linkcheck/output.txt.
-	goto end
-)
-
-if "%1" == "doctest" (
-	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
-	echo.
-	echo.Testing of doctests in the sources finished, look at the ^
-results in %BUILDDIR%/doctest/output.txt.
-	goto end
-)
-
-:end
Index: nsguiframe/media/Graph_help.html
===================================================================
--- sansguiframe/media/Graph_help.html	(revision 65db06f048946026c55c1831eff59e8999503c13)
+++ 	(revision )
@@ -1,94 +1,0 @@
-<html>
-<body>
-
-<h4>Graph Context Menu</h4>
-<ul>
-<li><a href="#intro">Introduction</a></li>
-<li><a href="#reset">Reset graph</a></li>
-<li><a href="#save">Save plot image</a></li>
-<li><a href="#savedata">Save data</a></li>
-<li><a href="#drag">Drag plot</a></li>
-<li><a href="#select">Select data</a></li>
-<li><a href="#zoom">Zoom in/out</a></li>
-<li><a href="#remove">Remove data</a></li>
-<li><a href="#scale">Change scale</a></li>
-<li><a href="#linearfit">Linear fit</a></li>
-</ul>
-
-<h5><a name="intro">Introduction</a></h5>
-<p> 
-	Locating the pointer and right-clicking on a data/theory plot will bring a context menu.
-	On the menu, select a menu item. 
-</p>
-
-<h5><a name="reset">Reset graph</a></h5>
-<p>
-	To reset the graph's axis range, right click on the plot and the context menu pops-up.
-	Select <b>Reset Graph</b> and the plot will take its initial range. 
-	Also the 'home' icon in tool bar will do the same.
-</p>
-
-<h5><a name="save"> Save plot image</a></h5>
-<p>
-	Right click on plot. Context menu will pop-up select save image [file name].A dialog
-	window opens and write a the name of the file to save and click on <b>Save Image.</b>
-</p>
-
-<h5><a name="savedata"> Save data</a></h5>
-<p>
-	From the context menu, select 'Save points as a file' for 1D, or 'Save as a file(DAT)'
-	for 2D. Note that two formats, txt and xml, are available in 1D saving.
-</p>
-
-
-<h5><a name="drag"> Drag plot</a></h5>
-<p>
-Select the <b>crossed arrows</b>  button on the plot panel <b>toolbar </b> to drag the plot.
-To disable dragging mode, unselect the same button on the toolbar.
-</p>
-
-<h5><a name="remove">Remove data from plot</a></h5>
-<p>
-	Highlight the plot and the context menu appears.Select <b>remove [file name]</b>.
-	The plot selected will disappear.
-</p>
-
-<h5><a name="zoom">Zoom in/out</a></h5>
-<p>
- Select the <b>rectangle</b>  button on the plot panel <b>toolbar </b> to zoom in
- a region of the plot.
-</p>
-<p>
-To disable zoom mode, unselect the same button on the toolbar. 
-After zoom in a region, select <b>left arrow</b> or <b>right arrow</b>button on the toolbar
-to set the graph the the previous size.
-If a mouse wheel button is available, <b>zoom in/out</b> by scrolling the mouse wheel
- ( see 'Key combination' help for details).
-</p>
-<h5><a name="scale">Change scale</a></h5>
-<p>
-	If the loaded data is a 1-D data.Changing scale or Data Representation will work as
-	followed:<b>right click</b> on the plot window.
-	A context menu pops-up  and select <b>Change Scale</b>. A dialog window titled<b>
-	select the scale of the graph</b> will pop-up then change the <b>x</b>, the <b>y</b>
-	and the <b>view </b> values as wish.
-	If the loaded data  is an image.<b>Right click</b> on the image to pop-up the context
-	menu. Select <Toggle linear/Log scale> to switch from linear to log scale. The scale 
-	selected is printed on the statusbar.
-	
-</p>
-
-<h5><a name="linearfit">Linear fit</a></h5>
-<p>
-	Linear fit is to perform a line model fitting keeping the scale of the plot. 
-	Highlight data to fit. 
-	From the context menu
-	select <b> Linear Fit</b>.A dialog window appears.
-	Change model initial parameters, data limits
-	and hit <b> fit</b> button. 
-	New parameters values are displayed and the line with the new 
-	parameters is added to the plot.
-</p>
-
-</body>
-</html>
Index: nsguiframe/media/averaging_help.html
===================================================================
--- sansguiframe/media/averaging_help.html	(revision 65db06f048946026c55c1831eff59e8999503c13)
+++ 	(revision )
@@ -1,107 +1,0 @@
-<html>
-<body>
-
-<h4>2D Data Averaging</h4>
-<ul>
-<li><a href="#Description">Description</a></li>
-<li><a href="#How to use">How to Average? </a></li>
-<p> Available averagings: </p>
-<li><a href="#Circular Average">Perform Circular Average</a></li>
-<li><a href="#Masked Average">Masked Circular Average</a></li>
-<li><a href="#Sector"> Sector [Q view]</a></li>
-<li><a href="#Annulus"> Annulus [Phi view]</a></li>
-<li><a href="#Box sum"> Box sum</a></li>
-<li><a href="#Box averaging in Qx"> Box averaging in Qx</a></li>
-<li><a href="#Box averaging in Qy"> Box averaging in Qy</a></li>
-
-</ul>
-<h5><a name="Description">Description</a></h5>
-<p>
- This feature allows you to perform different types of averages on your data,
- and allows you to see what regions of the detector will contribute to 
- the average. 
- The region to be averaged will be drown and can be modified by dragging the lines around. 
-</p>
-
-
-<h5><a name="How to use">How to Average?</a></h5>
-<p>
-Right click on 2D data for the context menu to appear. Select one type of averages
-among <b>"sector [Q view]", "Annulus [Phi view]", "Box sum", "Box averaging in Qx ",
-"box averaging on Qy","Perform circular Average".</b>
-</p> 
-<p>
-A slicer will appear except for <b> "Perform circular Average"</b>
-that you can drag by clicking on a slicer 's marker. 
- When the marker is highlighted in red , it means that the slicer can change size.You can
- also move some of the slicer by simply drag its side when highlighted in red.
- the slicer size will be reset to its previous size if the user try to select a region greater 
- than the size of the data.
- 
-</p>
- <p>The user can also select a region to average when a slicer has been selected already by <b>right 
- clicking </b> on the context menu and selecting <b>Edit Slicer Parameters</b>. The dialog window 
- will appears and the user can enter values to selected a region or selected numbers of points to 
- plot <b>nbins</b>.
-</p>
- 
-<p>
- For <b>Box sum</b> , when the user selects this option, a new panel is created containing 
- the result of average of the sum of every pixels contains on  that data.The user can also enter 
- values to select a region.
-</p>
-
-<h5><a name="Circular Average">Perform Circular Average</a></h5>
-<p>
-It will perform and average in constant q-rings around the (x,y)
- pixel location of the beam center. 
-</p>
-
-
-<h5><a name="Masked Average">Masked Circular Average</a></h5>
-<p>
-This operation is same as 'Perform Circular Average' except that the masked region is excluded if masked.
-</p>
-
-<h5><a name="Sector">Sector [Q view]</a></h5>
-<p>
-It averages in constant q-arcs. The width of the sector
- is specified in degrees (+/- delta phi) each direction from the central angle (phi).
-</p>
-
-<h5><a name="Annulus"> Annulus [Phi view]</a></h5>
-<p>
-It performs an average between two q-values centered in (0,0),
- and averaged over a width of a specified number of pixels.
- The data is returned as a function of angle (phi) in degrees. 
- Moving one circle of this slicer
- to radius of zero corresponding to a circular averaging on radius qmax , 
- the outer circle.
-  The angle zero starts from the positive x-axis direction.
-</p>
-
-<h5><a name="Box sum"> Box sum</a></h5>
-<p>
-Perform the sum of counts in a 2D region of interest.When editing the slicer ,the user can 
-enter the length and the width the rectangle slicer and the coordinates of the center of this
-rectangle. 
-</p>
-<h5><a name="Box averaging in Qx"> Box averaging in Qx</a></h5>
-<p>
-Computes average I(Qx) for a region of interest. When editing the slicer ,the user can 
-control the length and the width the rectangle slicer. 
-The averaged output is calculated from the constant bins with rectangular shape.
-The resultant q values are nominal values, i.e., the central values of each bins on the x-axis.
-
-</p>
-<h5><a name="Box averaging in Qy"> Box averaging in Qy</a></h5>
-<p>
- Computes average I(Qy) for a region of interest.When editing the slicer ,the user can 
-control the length and the width the rectangle slicer. 
-The averaged output is calculated from the constant bins with rectangular shape.
-The resultant q values are nominal values, i.e., the central values of each bins on the y-axis.
-</p>
-
-</body>
-</html>
-
Index: nsguiframe/media/change_scale_help.html
===================================================================
--- sansguiframe/media/change_scale_help.html	(revision 65db06f048946026c55c1831eff59e8999503c13)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<html>
-<body>
-<h4>Change scale</h4>
-<p>
-	If the loaded data is a 1-D data.Changing scale or Data Representation will work as
-	followed:<b>right click</b> on the plot window.
-	A context menu pops-up  and select <b>Change Scale</b>. A dialog window titled<b>
-	select the scale of the graph</b> will pop-up then change the <b>x</b>, the <b>y</b>
-	and the <b>view </b> values as wish.
-	If the loaded data  is an image.<b>Right click</b> on the image to pop-up the context
-	menu. Select <Toggle linear/Log scale> to switch from linear to log scale. The scale 
-	selected is printed on the statusbar.
-	
-</p>
-</body>
-</html>
Index: nsguiframe/media/data_explorer_help.html
===================================================================
--- sansguiframe/media/data_explorer_help.html	(revision 65db06f048946026c55c1831eff59e8999503c13)
+++ 	(revision )
@@ -1,96 +1,0 @@
-<html>
-<body>
-
-<h4>Data Explorer Options</h4>
-<ul>
-<li><a href="#intro">Introduction</a></li>
-<li><a href="#load">Load data</a></li>
-<li><a href="#active">Activate data</a></li>
-<li><a href="#remove">Remove data</a></li>
-<li><a href="#send">Send data to applications</a></li>
-<li><a href="#append">Append plot to graph</a></li>
-<li><a href="#new">Create new plot</a></li>
-<li><a href="#freeze">Freeze theory</a></li>
-<li><a href="#delete">Delete plot panel</a></li>
-</ul>
-
-<h5><a name="intro"><font color="blue">Introduction</font></a></h5>
-<p> 
-<b>Data Explorer</b> is a panel that allows the user more interactions with
-data. Some functionalities provided by the Data Explorer are also available
-through the context menu of plot panels or other menus of the applications.Under 
-menu <b>View</b> of the menubar, Data explorer can be toggle from Show to Hide 
-when clicking on menu <b>Data Explorer OFF</b>. This latter  can be labeled as 
-<b>Data Explorer ON</b> if the Data Explorer is not visible.
-</p>
-<p><b><font size=2>IMPORTANT!</font></b> When Data explorer is not visible all data loaded will
-be send directly to the current active application. When data Explorer is shown
-data go fist to the Data Explorer for the user to handle them.
-</p>
-
-<h5><a name="load"><font color="blue">Load data</font></a></h5>
-<p>
-To Load data, click on the button <b>Load Data</b>, then select one or more 
-files to load into the application. Close the file dialog that first appears. In
-the list control label <b>Data</b> will be displayed data label with the name
-of each selected file.
- Expending this data by clicking on <b>+</b> sign on each label
-will display available information about this loaded data.
-</p>
-
-<h5><a name="active"><font color="blue">Activate data</font></a></h5>
-<p>
-To interact with data, check a data label and click on a button. Checking Data 
-make them active  for the next operation. Unchecking Data labels will
-deactivate them.
-</p>
-<p>
-There is a combo box labeled <b> Selection Options</b> that allows to activate 
-or select multiple data simultaneously. 
-</p>
-
-<h5><a name="remove"><font color="blue">Remove data</font></a></h5>
-<p>
-Remove data button  remove all reference of this data into the application.
-</p>
-<p>
-<font size=2><b>WARNING!</b></font> Remove data will stop any jobs 
-currently using the selected data.
-</p>
-
-<h5><a name="send"><font color="blue">Send data to applications</font></a></h5>
-<p>
-Click on the button <b>Send To</b> to send Data to the current active application.
-Then from the application control panel interact more with that Data.
-</p>
-<h5><a name="append"><font color="blue">Append plot to graph</font></a></h5>
-<p>
-Click on the button <b>Append To</b> to append selected Data to a plot panel on
-focus. Next to this button is a combo box containing available panels names. 
-Selecting a name from this combo box will set  the corresponding lot panel on 
-focus. If not plot panel is available, the combo box and button will be disable.
-2D Data cannot be appended to any plot panels . This operation can only be 
-performed on 1D data and plot panels currently containing 1D data.
-</p>
-
-<h5><a name="new"><font color="blue">Create new plot</font></a></h5>
-<p>
-Click on <b>New Plot</b> button to create a new plot panel where selected data 
-will be plotted.
-</p>
-
-<h5><a name="freeze"><font color="blue">Freeze theory</font></a></h5>
-<p>
-<b>Freeze Theory</b> button generate Data from selected theory. This operation 
-can only be performed when theory labels are selected. 
-</p>
-<h5><a name="delete"><font color="blue">Delete plot panel</font></a></h5>
-<p>
-Click on <b>Delete Plot</b> to remove all reference of the plot panel on focus.
-User can click on a plot panel or select a name of the plot panel in the corresponding
-combo box to set a plot panel on focus.
-</p>
-
-
-</body>
-</html>
Index: nsguiframe/media/key_help.html
===================================================================
--- sansguiframe/media/key_help.html	(revision 65db06f048946026c55c1831eff59e8999503c13)
+++ 	(revision )
@@ -1,40 +1,0 @@
-<html>
-<body>
-
-<h4>Key Combination</h4>
-<ul>
-<li><a href="#Float">Floating Panel</a></li>
-<li><a href="#GraphMenu">Graph Context Menu</a></li>
-<li><a href="#Zoom">Zoom In & Out</a></li>
-</ul>
-
-<h5><a name="Float">Floating Panel</a></h5>
-<p>
-<h6>For a graph panel to float on the top of the SV window:</h6></p>
-<p> Press the <b>Ctrl(Cmd on MAC) key</b> on dragging and placing a panel.
-Or if you want to make all plot panels float, select 'Float' from Graph/Preperences
-in the menu bar. Otherwise choose 'Dock'.</p>
-
-<p>
-<h5><a name="GraphMenu">Graph Context Menu</a></h5>
-<p>
-<h6>To get the graph context menu to print, copy, save data, (2D)average, etc.:</h6></p>
-<p> <b>Locate the mouse point on the plot to highlight and 
-<b>(Mouse) Right Click</b> to bring up the full menu.</p>
-
-<p>
-<h5><a name="Zoom">Zoom In and Out</a></h5>
-<p>
-<h6>To Zoom in or out the full plot:</h6></p>
-<p> <b>Locate the mouse point inside the graph which will be the center of the zooming,
-then <b>rotate MouseWheel</b>.</p>
-<p>
-<h6>To Zoom in or out the plot in x or y direction:</h6></p>
-<p> <b>Locate (and click) the mouse point near x (or y) axis just outside of the graph 
-and then <b>rotate MouseWheel</b>.</p>
-<p> Note that this works only on the 1D plots.</p>
-
-
-</body>
-</html>
-
Index: nsguiframe/test/cansas1d.xml
===================================================================
--- sansguiframe/test/cansas1d.xml	(revision 09b73a3821013d4d64c4e69555954fb456c939db)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="example.xsl" ?>
-<SASroot version="1.0"
-    xmlns="cansas1d/1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd"
-    >
-	<SASentry>
-		<Title>Test title</Title>
-		<Run name='run name'>1234</Run>
-		<SASdata>
-			<Idata>
-				<Q unit="1/A">0.02</Q>
-				<I unit="1/cm">1000</I>
-				<Idev unit="1/cm">3</Idev>
-				<Qdev unit="1/A">0.01</Qdev>
-				<Qmean unit="1/A"><!-- Qmean is optional --></Qmean>
-				<Shadowfactor><!-- Shadowfactor is optional --></Shadowfactor>
-			</Idata>
-			<Idata>
-				<Q unit="1/A">0.03</Q>
-				<I unit="1/cm">1001</I>
-				<Idev unit="1/cm">4</Idev>
-				<Qdev unit="1/A">0.02</Qdev>
-				<Qmean unit="1/A"><!-- Qmean is optional --></Qmean>
-				<Shadowfactor><!-- Shadowfactor is optional --></Shadowfactor>
-			</Idata>
-		</SASdata>
-		<SASsample name='my sample'>
-			<ID>SI600-new-long</ID>
-			<thickness unit="mm">1.03</thickness>
-			<transmission>0.327</transmission>
-			<temperature unit="C">0.0000</temperature>
-			<position>
-				<x unit="mm">10.00</x>
-				<y unit="mm">0.00</y>
-			</position>
-			<orientation>
-				<roll unit="degree">22.5<!-- was: sample_orientation --></roll>
-				<pitch unit="degree">0.020<!-- was: sample_offset_angle --></pitch>
-			</orientation>
-			<details>
-				<!-- was: sample_prep -->
-				http://chemtools.chem.soton.ac.uk/projects/blog/blogs.php/bit_id/2720
-			</details>
-			<details>
-				Some text here
-			</details>
-			
-		</SASsample>
-		<SASinstrument name="TEST instrument">
-			<name>canSAS instrument</name>
-			<SASsource name="source name">
-				<radiation>neutron</radiation>
-				<beam_size name='bm'>
-					<x unit="mm">12.00</x>
-					<y unit="mm">13.00</y>
-				</beam_size>
-				<beam_shape>disc</beam_shape>
-				<wavelength unit="A">6.00</wavelength>
-				<wavelength_min unit="nm">0.22</wavelength_min>
-				<wavelength_max unit="nm">1.00</wavelength_max>
-				<wavelength_spread unit="percent">
-					14.3
-				</wavelength_spread>
-			</SASsource>
-			<SAScollimation name="test coll name">
-				<length unit='mm'> 123.0</length>
-				<aperture name="source" type="radius">
-					<size>
-						<x unit="mm">50</x>
-					</size>
-					<distance unit="m">11.000<!-- was: distance_coll --></distance>
-				</aperture>
-				<aperture name="sample" type="radius">
-					<size name='size name'>
-						<x unit="mm">1</x>
-					</size>
-				</aperture>
-			</SAScollimation>
-			<SASdetector>
-				<name>fictional hybrid</name>
-				<SDD unit="m">
-					<!-- sample-to-detector distance -->
-					4.150
-				</SDD>
-				<orientation>
-					<roll unit="degree">1.00</roll>
-					<pitch unit="degree">0.00</pitch>
-					<yaw unit="degree">0.00</yaw>
-				</orientation>
-				<offset>
-					<x unit="mm">1</x>
-					<y unit="mm">2</y>
-				</offset>
-				<beam_center>
-					<x unit="mm">322.64</x>
-					<y unit="mm">327.68</y>
-				</beam_center>
-				<pixel_size>
-					<x unit="mm">5.00</x>
-					<y unit="mm">5.00</y>
-				</pixel_size>
-			</SASdetector>
-		</SASinstrument>
-		<SASprocess>
-			<name>spol</name>
-			<date>04-Sep-2007 18:35:02</date>
-			<term name="radialstep" unit="mm">10.000</term>
-			<term name="sector_width" unit="degree">180.0</term>
-			<term name="sector_orient" unit="degree">0.0</term>
-			<term name="MASK_file">USER:MASK.COM</term>
-			<SASprocessnote>
-				AvA1 0.0000E+00 AsA2 1.0000E+00 XvA3 1.0526E+03 XsA4
-				5.2200E-02 XfA5 0.0000E+00
-			</SASprocessnote>
-			<SASprocessnote>
-				S... 13597 0 2.26E+02 2A 5mM 0%D2O Sbak 13594 0 1.13E+02
-				H2O Buffer
-			</SASprocessnote>
-			<SASprocessnote>V... 13552 3 1.00E+00 H2O5m</SASprocessnote>
-		</SASprocess>
-		<SASprocess>
-			<name>NCNR-IGOR</name>
-			<date>03-SEP-2006 11:42:47</date>
-			<description />
-			<term name="average_type">Circular</term>
-			<term name="SAM_file">SEP06064.SA3_AJJ_L205</term>
-			<term name="BKD_file">SEP06064.SA3_AJJ_L205</term>
-			<term name="EMP_file">SEP06064.SA3_AJJ_L205</term>
-			<term name="DIV_file">SEP06064.SA3_AJJ_L205</term>
-			<term name="MASK_file">SEP06064.SA3_AJJ_L205</term>
-			<term name="ABS:TSTAND">1</term>
-			<term name="ABS:DSTAND" unit="mm">1</term>
-			<term name="ABS:IZERO">230.09</term>
-			<term name="ABS:XSECT" unit="mm">1</term>
-			<SASprocessnote/>
-		</SASprocess>
-		<SASnote />
-	</SASentry>
-</SASroot>
Index: nsguiframe/test/utest_manipulations.py
===================================================================
--- sansguiframe/test/utest_manipulations.py	(revision 09b73a3821013d4d64c4e69555954fb456c939db)
+++ 	(revision )
@@ -1,262 +1,0 @@
-"""
-    Unit tests for data manipulations
-"""
-#TODO: what happens if you add a Data1D to a Data2D?
-
-import unittest
-import numpy, math
-from DataLoader.loader import  Loader
-from sans.guiframe.dataFitting import Theory1D, Data1D, Data2D
- 
-import os.path
-
-class data_info_tests(unittest.TestCase):
-    
-    def setUp(self):
-        self.data = Loader().load("cansas1d.xml")
-        
-    def test_clone1D(self):
-        """
-            Test basic cloning
-        """
-        clone = self.data.clone_without_data()
-        
-        for i in range(len(self.data.detector)):
-            self.assertEqual(self.data.detector[i].distance, clone.detector[i].distance)
-            
-class theory1d_tests(unittest.TestCase):
-    
-    def setUp(self):
-        self.data = Loader().load("cansas1d.xml")
-        
-    def test_clone_theory1D(self):
-        """
-            Test basic cloning
-        """
-        theory = Theory1D(x=[], y=[], dy=None)
-        theory.clone_without_data(clone=self.data)
-        theory.copy_from_datainfo(data1d=self.data)
-        for i in range(len(self.data.detector)):
-            self.assertEqual(self.data.detector[i].distance, theory.detector[i].distance)
-            
-        for i in range(len(self.data.x)):
-            self.assertEqual(self.data.x[i], theory.x[i])
-            self.assertEqual(self.data.y[i], theory.y[i])
-            self.assertEqual(self.data.dy[i], theory.dy[i])
-
-class manip_tests(unittest.TestCase):
-    
-    def setUp(self):
-        # Create two data sets to play with
-        x_0 = numpy.ones(5)
-        for i in range(5):
-            x_0[i] = x_0[i]*(i+1.0)
-            
-        y_0 = 2.0*numpy.ones(5)
-        dy_0 = 0.5*numpy.ones(5)
-        self.data = Data1D(x_0, y_0, dy=dy_0)
-        
-        x = self.data.x
-        y = numpy.ones(5)
-        dy = numpy.ones(5)
-        self.data2 = Data1D(x, y, dy=dy)
-        
-        
-    def test_load(self):
-        """
-            Test whether the test file was loaded properly
-        """
-        # There should be 5 entries in the file
-        self.assertEqual(len(self.data.x), 5)
-        
-        for i in range(5):
-            # The x values should be from 1 to 5
-            self.assertEqual(self.data.x[i], float(i+1))
-        
-            # All y-error values should be 0.5
-            self.assertEqual(self.data.dy[i], 0.5)    
-            
-            # All y values should be 2.0
-            self.assertEqual(self.data.y[i], 2.0)    
-        
-    def test_add(self):
-        result = self.data2+self.data
-        for i in range(5):
-            self.assertEqual(result.y[i], 3.0)
-            self.assertEqual(result.dy[i], math.sqrt(0.5**2+1.0))
-        
-    def test_sub(self):
-        result = self.data2-self.data
-        for i in range(5):
-            self.assertEqual(result.y[i], -1.0)
-            self.assertEqual(result.dy[i], math.sqrt(0.5**2+1.0))
-        
-    def test_mul(self):
-        result = self.data2*self.data
-        for i in range(5):
-            self.assertEqual(result.y[i], 2.0)
-            self.assertEqual(result.dy[i], math.sqrt((0.5*1.0)**2+(1.0*2.0)**2))
-        
-    def test_div(self):
-        result = self.data2/self.data
-        for i in range(5):
-            self.assertEqual(result.y[i], 0.5)
-            self.assertEqual(result.dy[i], math.sqrt((1.0/2.0)**2+(0.5*1.0/4.0)**2))
-        
-    def test_radd(self):
-        result = self.data+3.0
-        for i in range(5):
-            self.assertEqual(result.y[i], 5.0)
-            self.assertEqual(result.dy[i], 0.5)
-            
-        result = 3.0+self.data
-        for i in range(5):
-            self.assertEqual(result.y[i], 5.0)
-            self.assertEqual(result.dy[i], 0.5)
-            
-    def test_rsub(self):
-        result = self.data-3.0
-        for i in range(5):
-            self.assertEqual(result.y[i], -1.0)
-            self.assertEqual(result.dy[i], 0.5)
-            
-        result = 3.0-self.data
-        for i in range(5):
-            self.assertEqual(result.y[i], 1.0)
-            self.assertEqual(result.dy[i], 0.5)
-            
-    def test_rmul(self):
-        result = self.data*3.0
-        for i in range(5):
-            self.assertEqual(result.y[i], 6.0)
-            self.assertEqual(result.dy[i], 1.5)
-            
-        result = 3.0*self.data
-        for i in range(5):
-            self.assertEqual(result.y[i], 6.0)
-            self.assertEqual(result.dy[i], 1.5)
-            
-    def test_rdiv(self):
-        result = self.data/4.0
-        for i in range(5):
-            self.assertEqual(result.y[i], 0.5)
-            self.assertEqual(result.dy[i], 0.125)
-            
-        result = 6.0/self.data
-        for i in range(5):
-            self.assertEqual(result.y[i], 3.0)
-            self.assertEqual(result.dy[i], 6.0*0.5/4.0)
-            
-class manip_2D(unittest.TestCase):
-    
-    def setUp(self):
-        # Create two data sets to play with
-        x_0 = 2.0*numpy.ones([5,4])
-        dx_0 = 0.5*numpy.ones([5,4])
-        self.data = Data2D(x_0, dx_0)
-        
-        y = numpy.ones([5,4])
-        dy = numpy.ones([5,4])
-        self.data2 = Data2D(y, dy)
-        
-        
-    def test_load(self):
-        """
-            Test whether the test file was loaded properly
-        """
-        # There should be 5 entries in the file
-        self.assertEqual(numpy.size(self.data.data, 0), 5)
-        self.assertEqual(numpy.size(self.data.data, 1), 4)
-        
-        for i in range(5):
-            for j in range(4):
-                # All y-error values should be 0.5
-                self.assertEqual(self.data.err_data[i][j], 0.5)    
-                
-                # All y values should be 2.0
-                self.assertEqual(self.data.data[i][j], 2.0)    
-        
-    def test_add(self):
-        result = self.data2+self.data
-        for i in range(5):
-            for j in range(4):
-                self.assertEqual(result.data[i][j], 3.0)
-                self.assertEqual(result.err_data[i][j], math.sqrt(0.5**2+1.0))
-        
-    def test_sub(self):
-        result = self.data2-self.data
-        for i in range(5):
-            for j in range(4):
-                self.assertEqual(result.data[i][j], -1.0)
-                self.assertEqual(result.err_data[i][j], math.sqrt(0.5**2+1.0))
-        
-    def test_mul(self):
-        result = self.data2*self.data
-        for i in range(5):
-            for j in range(4):
-                self.assertEqual(result.data[i][j], 2.0)
-                self.assertEqual(result.err_data[i][j], math.sqrt((0.5*1.0)**2+(1.0*2.0)**2))
-        
-    def test_div(self):
-        result = self.data2/self.data
-        for i in range(5):
-            for j in range(4):
-                self.assertEqual(result.data[i][j], 0.5)
-                self.assertEqual(result.err_data[i][j], math.sqrt((1.0/2.0)**2+(0.5*1.0/4.0)**2))
-        
-    def test_radd(self):
-        result = self.data+3.0
-        for i in range(5):
-            for j in range(4):
-                self.assertEqual(result.data[i][j], 5.0)
-                self.assertEqual(result.err_data[i][j], 0.5)
-            
-        result = 3.0+self.data
-        for i in range(5):
-            for j in range(4):
-                self.assertEqual(result.data[i][j], 5.0)
-                self.assertEqual(result.err_data[i][j], 0.5)
-            
-    def test_rsub(self):
-        result = self.data-3.0
-        for i in range(5):
-            for j in range(4):
-                self.assertEqual(result.data[i][j], -1.0)
-                self.assertEqual(result.err_data[i][j], 0.5)
-            
-        result = 3.0-self.data
-        for i in range(5):
-            for j in range(4):
-                self.assertEqual(result.data[i][j], 1.0)
-                self.assertEqual(result.err_data[i][j], 0.5)
-            
-    def test_rmul(self):
-        result = self.data*3.0
-        for i in range(5):
-            for j in range(4):
-                self.assertEqual(result.data[i][j], 6.0)
-                self.assertEqual(result.err_data[i][j], 1.5)
-            
-        result = 3.0*self.data
-        for i in range(5):
-            for j in range(4):
-                self.assertEqual(result.data[i][j], 6.0)
-                self.assertEqual(result.err_data[i][j], 1.5)
-            
-    def test_rdiv(self):
-        result = self.data/4.0
-        for i in range(5):
-            for j in range(4):
-                self.assertEqual(result.data[i][j], 0.5)
-                self.assertEqual(result.err_data[i][j], 0.125)
-            
-        result = 6.0/self.data
-        for i in range(5):
-            for j in range(4):
-                self.assertEqual(result.data[i][j], 3.0)
-                self.assertEqual(result.err_data[i][j], 6.0*0.5/4.0)
-            
-
-if __name__ == '__main__':
-    unittest.main()
-   
