From 27466fe2d6213c1f0b02cb1e7f7302ad24a4e0fb Mon Sep 17 00:00:00 2001 From: Markus Rosenstihl Date: Mon, 23 Mar 2026 14:59:00 +0100 Subject: [PATCH] cleanup build scripts --- MANIFEST.in | 4 +- debian/control | 2 +- debian/files | 2 + debian/rules | 5 +- pyproject.toml | 56 +- setup.cfg | 26 - setup.py | 120 -- src/__main__.py | 68 ++ src/gui/damaris3.glade | 2209 ++++++++++++++++++++++++++++++++++++ src/tools/goniometer.py | 2 +- tests/exp_test.py | 8 +- tests/res_test.py | 20 +- tests/test_ADC_Result.py | 2 +- tests/test_Accumulation.py | 4 +- 14 files changed, 2362 insertions(+), 166 deletions(-) create mode 100644 debian/files delete mode 100644 setup.cfg delete mode 100644 setup.py create mode 100644 src/__main__.py create mode 100644 src/gui/damaris3.glade diff --git a/MANIFEST.in b/MANIFEST.in index 0871dc7..921a5a2 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,5 @@ -include src/gui/DAMARIS.png -include src/gui/DAMARIS.ico +include src/gui/DAMARIS3.png +include src/gui/DAMARIS3.ico include src/gui/damaris.glade include src/gui/damaris.gladep include doc/index.html diff --git a/debian/control b/debian/control index 94c6f06..899de7c 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: python3-damaris Section: science Priority: optional Maintainer: Markus Rosenstihl -Build-Depends: python3, debhelper, python3-dev, dh-sequence-python3, dpkg-dev +Build-Depends: python3, debhelper, python3-dev, dh-sequence-python3, dpkg-dev, pybuild-plugin-pyproject Standards-Version: 3.7.3 X-Python3-Version: >= 3.5 Rules-Requires-Root: no diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..c56a152 --- /dev/null +++ b/debian/files @@ -0,0 +1,2 @@ +python3-damaris_0.19_all.deb science optional +python3-damaris_0.19_amd64.buildinfo science optional diff --git a/debian/rules b/debian/rules index 9bdaaed..fa57c81 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,10 @@ PACKAGE_NAME=python3-damaris PYBUILD_NAME=python3-damaris MODULE_NAME=damaris3 PYBASE=$(CURDIR)/debian/${PACKAGE_NAME} -DH_ALWAYS_EXCLUDE=CVS:.git:venv +DH_ALWAYS_EXCLUDE=CVS:.git:venv:.venv:*.h5 %: dh $@ --buildsystem=pybuild + +override_dh_auto_test: + PYBUILD_TEST_ARGS="-v $(CURDIR)/tests" dh_auto_test diff --git a/pyproject.toml b/pyproject.toml index 8893b81..81c8075 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,23 +1,63 @@ [build-system] -requires = ["setuptools"] +requires = [ + "setuptools>=61.0", # provides the "setuptools.build_meta" backend + "wheel" # needed for the wheel building step +] build-backend = "setuptools.build_meta" [project] requires-python = ">= 3.9" name = "python3-damaris" -dynamic = ["version", - "dependencies", - "classifiers", - "keywords", - "license", - "readme", +version = "0.19" +description = "Python version 3 frontend for DAMARIS (DArmstadt MAgnetic Resonance Instrument Software)" +license = "GPL-2.0" +keywords = ["NMR", "data-processing"] +readme = {file = "README", content-type = "text/plain"} +dependencies = [ + "scipy >= 0.14.0", + "numpy >= 1.8.2, < 2.0", + "tables >= 3.1.1", + "matplotlib >= 1.4.1, <= 3.6", + "pyxdg", + "PyGObject >= 3.14.0, <= 3.51.0" ] authors = [ {name = "Achim Gädke"}, {name = "Christopher Schmitt"}, {name = "Christian Tacke"}, - {name = "Markus Rosenstihl", email = "markus.rosenstihl@pkm.tu-darmstadt.de"}, + {name = "Joachim Beerwerth"}, + {name = "Markus Rosenstihl", email = "markus.rosenstihl@pkm.tu-darmstadt.de"} ] maintainers = [ {name = "Markus Rosenstihl", email = "markus.rosenstihl@pkm.tu-darmstadt.de"} ] + +[project.scripts] +DAMARIS3 = "damaris.__main__:main" + + +[tool.setuptools] +packages = [ + "damaris", + "damaris.data", + "damaris.experiments", + "damaris.gui", + "damaris.tools" +] + +[tool.setuptools.package-dir] +"damaris" = "src" +"damaris.data" = "src/data" +"damaris.experiments" = "src/experiments" +"damaris.gui" = "src/gui" +"damaris.tools" = "src/tools" + +[tool.setuptools.package-data] +"damaris.gui" = ["DAMARIS3.png", "DAMARIS3.ico", "damaris.xml", "python.xml"] + +[tool.setuptools.data-files] +"share/python3-damaris/images" = ["src/gui/DAMARIS3.png", "src/gui/DAMARIS3.ico"] +"share/python3-damaris/doc" = ["doc/index.html"] +"share/python3-damaris/doc/reference-html" = ["doc/reference-html/*"] +"share/python3-damaris/doc/tutorial-html" = ["doc/tutorial-html/*"] + diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index e69ebeb..0000000 --- a/setup.cfg +++ /dev/null @@ -1,26 +0,0 @@ -[metadata] -name = python3-damaris -version = 0.18.0 -author = Achim Gädke, Christian, Tacke, Joachim Berwerth, Christopher Schmitt, Markus Rosenstihl -author_email = markus.rosenstihl@þkm.tu-darmstadt.de -url = https://gitea.pkm.physik.tu-darmstadt.de/IPKM/python3-damaris -description = DArmstadt MAgnetic Resonance Instrumentation Software -long_description = file: README.md -long_description_content_type = text/markdown -keywords = science, instrumentation -license = BSD 3-Clause License -classifiers = - License :: OSI Approved :: BSD License - Programming Language :: Python :: 3 - -[options] -packages = find: -zip_safe = True -include_package_data = True -install_requires = - scipy >= 0.14.0 - numpy (>= 1.8.2 , < 2.0) - tables >= 3.1.1 - matplotlib (>= 1.4.1, <= 3.6) - pyxdg - PyGObject (>= 3.14.0, <= 3.51.0) # girepository2.0-dev not available on bookworm diff --git a/setup.py b/setup.py deleted file mode 100644 index 5bf5b59..0000000 --- a/setup.py +++ /dev/null @@ -1,120 +0,0 @@ -#!/usr/bin/env python - -import shutil -import os -import os.path -import sys -from distutils.core import setup -from distutils.command.build_scripts import build_scripts as _build_scripts -from distutils import log -from distutils.util import convert_path -from distutils.dep_util import newer - -#if sys.version_info < (2, 5, 3): -# log.error("**** ERROR: Install manually: python setup.py install ****") -# raise ValueError - -class build_damaris_scripts(_build_scripts): - - #user_options=_build_scripts.user_options[:] - #user_options.append(('install-dir=', 'd', "directory to install scripts to")) - - def initialize_options (self): - _build_scripts.initialize_options(self) - self.damaris_dir = None - - def finalize_options (self): - _build_scripts.finalize_options(self) - self.set_undefined_options('install', - ('install_lib', 'damaris_dir')) - - def run (self): - "change PYTHON_PATH for DAMARIS executable" - _build_scripts.run(self) - script="scripts/DAMARIS3" - script = convert_path(script) - outfile = os.path.join(self.build_dir, os.path.basename(script)) - self.damaris_dir=os.path.normpath(self.damaris_dir) - if self.damaris_dir in sys.path: - log.debug("not changing %s (this path is on standard path)", script) - # nothing to do for us - return - - # now change PATH in DAMARIS script - # copy backup - log.info("adapting DAMARIS script to use local installation") - shutil.copyfile(outfile, outfile+".bak") - # the file should keep all its attributes (executable...) - inf=open(outfile+".bak","r") - outf=open(outfile,"w") - l=inf.readline() - while not l.startswith("import sys") and l!="": - outf.write(l) - l=inf.readline() - - if l!="": - outf.write(l) - l=inf.readline() - while l.endswith("# inserted by setup.py\n"): - l=inf.readline() - outf.write("sys.path.insert(0,\"%s\") # inserted by setup.py\n"%self.damaris_dir) - outf.write(l) - outf.writelines(inf.readlines()) - inf.close() - outf.close() - os.remove(outfile+".bak") - -# create doc data file information -distribution_doc_prefix=os.path.join("share","python3-damaris","doc") -distribution_data_files = [[ "share", []], - [os.path.join("share", "python3-damaris", "images"), - ["src/gui/DAMARIS3.png", "src/gui/DAMARIS3.ico"]], - [os.path.join("share", "python3-damaris"), []], - [distribution_doc_prefix, ['doc/index.html']]] - -if os.path.isdir(os.path.join("doc","reference-html")): - # no subdirs, work can be done in simple way - distribution_data_files.append([os.path.join(distribution_doc_prefix, 'reference-html'), - [os.path.join('doc', 'reference-html', f) - for f in os.listdir(os.path.join('doc', 'reference-html'))]]) - -if os.path.isdir(os.path.join("doc","tutorial-html")): - # here, modern style file and attachment directories should be handled - for d in os.walk(os.path.join("doc","tutorial-html")): - distribution_data_files.append([os.path.join(os.path.dirname(distribution_doc_prefix),d[0]), - [os.path.join(d[0], f) for f in d[2]]]) - -LONG_DESCRIPTION=""" -DArmstadt MAgnetic Resonance Instrument Software -""" - -GPL_LICENCE = "feed licence here" - -setup ( - name = 'python3-damaris', - version = "0.18.2", - description = 'python frontend for DAMARIS (DArmstadt MAgnetic Resonance Instrument Software)', - long_description = LONG_DESCRIPTION, - author = 'Achim Gaedke', - author_email = 'Achim.Gaedke@physik.tu-darmstadt.de', - maintainer = 'Achim Gaedke', - maintainer_email = 'markus.rosenstihl@pkm.tu-darmstadt.de', - url = 'http://www.fkp.physik.tu-darmstadt.de/damaris/', - license = GPL_LICENCE, - platforms = ['Any',], - keywords = ['NMR', 'data-processing'], - packages = [ 'damaris', - 'damaris.data', - 'damaris.experiments', - 'damaris.gui', - 'damaris.tools' ], - package_dir = { 'damaris': 'src', - 'damaris.data': 'src/data', - 'damaris.experiments': 'src/experiments', - 'damaris.gui': 'src/gui', - 'damaris.tools': 'src/tools' }, - package_data = { 'damaris.gui': ['DAMARIS3.png', 'DAMARIS3.ico', 'damaris.xml', 'python.xml']}, - scripts = ['scripts/DAMARIS3'], - cmdclass={"build_scripts": build_damaris_scripts}, - data_files = distribution_data_files - ) diff --git a/src/__main__.py b/src/__main__.py new file mode 100644 index 0000000..08944da --- /dev/null +++ b/src/__main__.py @@ -0,0 +1,68 @@ +#!/usr/bin/env python3 +""" +DAMARISi3 command-line interface. +""" + +import sys +import os +import argparse +import sqlite3 + +# for numpy-1.1 and later: check the environment for LANG and LC_NUMERIC +# see: http://projects.scipy.org/scipy/numpy/ticket/902 +if os.environ.get("LANG", "").startswith("de") or os.environ.get("LC_NUMERIC", "").startswith("de"): + os.environ["LC_NUMERIC"] = "C" + + +def main(): + """Main entry point for DAMARIS.""" + parser = argparse.ArgumentParser(description='DArmstadt MAgnetic Resonance Instrumentation Software') + + parser.add_argument("--run", action="store_true", help="run DAMARIS immediately with given scripts") + parser.add_argument("--clean", action="store_true", help="cleanup DAMARIS run files") + parser.add_argument("--debug", action="store_true", help="run DAMARIS with DEBUG flag set") + parser.add_argument("--mpl", help="run DAMARIS with matplotlib backend", + choices=["GTK3Agg", "GTK3Cairo"], default="GTK3Agg") + parser.add_argument("exp_script", help="experiment script", nargs="?", metavar="EXP.py") + parser.add_argument("res_script", help="result script", nargs="?", metavar="RES.py") + + args = parser.parse_args() + + import matplotlib + if args.mpl: + matplotlib.use(args.mpl) + + import damaris.gui.DamarisGUI + + lockfile = os.path.expanduser('~/.damaris.lockdb') + if args.clean: + if os.path.exists(lockfile): + print("Removing lockfile: %s" % lockfile) + os.remove(lockfile) + else: + print("Lockfile does not exists: %s" % lockfile) + lockdb = sqlite3.connect(lockfile) + + c = lockdb.cursor() + c.execute("CREATE TABLE IF NOT EXISTS damaris (uuid text, status text)") + lockdb.commit() + + if args.debug: + damaris.gui.DamarisGUI.debug = True + print("debug flag set") + try: + import resource + resource.setrlimit(resource.RLIMIT_CORE, (-1, -1)) + except ImportError: + pass + + print(args) + d = damaris.gui.DamarisGUI.DamarisGUI(args.exp_script, args.res_script, start_immediately=args.run) + d.run() + + sys.stdout = sys.__stdout__ + sys.stderr = sys.__stderr__ + + +if __name__ == "__main__": + main() diff --git a/src/gui/damaris3.glade b/src/gui/damaris3.glade new file mode 100644 index 0000000..3582136 --- /dev/null +++ b/src/gui/damaris3.glade @@ -0,0 +1,2209 @@ + + + + + 1 + 1 + 1 + 1 + 10 + 0 + + + 1 + 1 + 1 + 1 + 10 + 0 + + + 1 + 1 + 1 + 1 + 10 + 0 + + + 1 + 1 + 1 + 1 + 10 + 0 + + + 0 + 0 + 9 + 1 + 1 + 0 + + + + + + + + lin + + + log + + + log10 + + + + + + + + + + lin + + + log + + + log10 + + + ppm + + + + + + + + + + None + + + + + DAMARIS python frontend version %(damarisversion)s, 2012 +%(moduleversions)s + +DArmstadt Magnetic Resonance Instrument Software, 2004-2012 +Homepage https://element.fkp.physik.tu-darmstadt.de/damaris_cms/ + +Python frontend written by Christopher Schmitt, Achim Gädke, Markus Rosenstihl and Christian Tacke +Backends written by Achim Gädke, Markus Rosenstihl, Christian Tacke, tested by Holger Stork +The drivers included in the backend may use proprietary interfaces. +The source code distribution may include commercial third party's code, +which is specially marked and not covered by this license. + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program 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 2 of the License, or + (at your option) any later version. + + This program 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 this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. + + + + + + + + Python DAMARIS + This program's documentation + python_damaris_doc_menu + + + + + + DAMARIS Homepage + DArmstadt MAgnetic Resonance Instrument Homepage + damaris_homepage_doc_menu + + + + + + Python + Python scripting Language + python_doc_menu + + + + + + numpy/scipy + Array and Numeric Processing Support + numpy_scipy_doc_menu + + + + + + pytables + Hierachical Data Format Support + pytables_doc_menu + + + + + + DAMARIS Backends + (developer's stuff) + backend_doc_menu + + + + + + DAMARIS Repository + (developers' stuff) + repository_doc_menu + + + + + + + + + + + + + + + + + + + + + True + DAMARIS + GTK_WIN_POS_CENTER + 790 + + + + + True + 3 + + + True + + + True + Creates an empty script + New + True + gtk-new + + + + True + + + + + True + Opens a script + Open + True + gtk-open + + + + True + + + + + True + Saves a script + Save + True + gtk-save + + + + True + + + + + True + Saves a script in a new file + Save AS + True + gtk-save-as + + + + True + + + + + True + Saves all scripts + Save All + True + gtk-copy + + + + True + + + + + True + Checks script's syntax + Check Syntax + True + gtk-apply + + + + True + + + + + True + + + + + True + Undo + gtk-undo + + + + True + + + + + True + Redo + gtk-redo + + + + True + + + + + True + Search + gtk-find + + + + True + + + + + True + + + + + True + gtk-print + + + + True + + + + + True + + + + + True + Executes the scripts + True + Execute + True + gtk-execute + + + + True + + + + + True + + + True + False + True + False + + + + True + + + True + gtk-media-pause + 3 + + + + + True + Pause + + + False + False + 1 + + + + + + + + + + + True + False + Stops running experiment + True + Stop + True + gtk-stop + + + + True + + + + + True + + + + + True + This progam's documentation + Help + True + gtk-info + documentation_menu + + + + + + + + + + + True + True + + + + True + 2 + 5 + + + True + 0 + Column: + + + 3 + 4 + 1 + 2 + + + + + + + True + 0 + Line: + + + 1 + 2 + 1 + 2 + + + + + + + True + 0 + + + 1 + 2 + + + + + + True + True + GTK_SHADOW_IN + + + True + True + + + + + 5 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + adjustment1 + 1 + True + + + + 2 + 3 + 1 + 2 + + + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + adjustment2 + 1 + True + True + + + + 4 + 5 + 1 + 2 + + + + + + + + + True + Experiment Script + + + False + + + + + True + 2 + 5 + + + True + 0 + Column: + + + 3 + 4 + 1 + 2 + + + + + + + True + 0 + Line: + + + 1 + 2 + 1 + 2 + + + + + + + True + True + GTK_SHADOW_IN + + + True + True + + + + + + 5 + + + + + True + 0 + + + 1 + 2 + + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + adjustment3 + 1 + True + + + + 2 + 3 + 1 + 2 + + + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + adjustment4 + 1 + True + + + + 4 + 5 + 1 + 2 + + + + + + + + + True + Result Script + + + 1 + False + + + + + True + 3 + 6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + 1 + 0 + + + True + 2 + 4 + 12 + 4 + + + True + 2 + 4 + + + True + + + True + Source + + + False + False + + + + + True + True + + + False + False + 1 + + + + + + + + + + True + False + + model1 + + + + 0 + + + + + 1 + 2 + 1 + 2 + + + + + + + True + 0 + y-Scaling + + + 2 + 3 + 1 + 2 + + + 3 + + + + + True + False + + model2 + + + + 0 + + + + + 1 + 2 + + + + + + + True + 0 + x-Scaling + + + 2 + 3 + + + 3 + + + + + True + 0 + in ... + + + 1 + 2 + + + + + + True + 0 + + + 1 + 2 + + + + + + + True + True + Rescale graph if new ymax is larger than the old one or shrinked more than 20% + Auto-Scaling + True + True + + + + 3 + 4 + 1 + 2 + + + + + + + True + True + Plot error-bars if result to plot uses statistic + Show Statistics + True + True + + + + 3 + 4 + + + + + + + + + + + True + Settings: + True + + + + + 6 + 2 + 3 + fill + 2 + 2 + + + + + True + True + Save display data as text to file + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-floppy + + + False + False + + + + + True + 10 + Save as text + True + + + False + 1 + + + + + + + + + 5 + 6 + 1 + 2 + + GTK_FILL + + + + + True + True + Copy display data as text to clipboard + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-copy + + + False + False + + + + + True + 10 + Copy to Cipboard + True + + + False + 1 + + + + + + + + + 4 + 5 + 1 + 2 + + GTK_FILL + + + + + + + True + Display + + + 2 + False + + + + + True + 2 + + + True + 3 + + + True + 0 + + + 2 + 3 + + 4 + + + + + True + 0 + Lines in Buffer: 0 + GTK_JUSTIFY_RIGHT + + + + + 3 + 4 + + + + + True + 0 + File: Unnamed + + + 1 + 2 + + + 16 + 4 + + + + + 1 + 2 + + + + + + True + True + GTK_SHADOW_IN + + + True + True + False + GTK_WRAP_WORD + False + False + + + + + + + + + True + Log + True + + + 3 + False + + + + + True + + + True + + + True + + + True + Backend's Settings + + + False + False + + + + + True + True + start backend + True + True + True + + + False + False + 1 + + + + + True + + + True + executable + + + False + False + + + + + True + True + backend + + + 1 + + + + + True + True + browse + True + + + + False + False + 2 + + + + + 2 + + + + + True + + + True + spool directory + + + False + False + + + + + True + True + spool + + + 1 + + + + + 3 + + + + + True + True + delete job data after execution + True + True + True + + + False + False + 4 + + + + + True + + + True + log file name + + + False + False + + + + + True + True + logdata + + + 1 + + + + + 5 + + + + + True + + + True + maximum number of log files to keep + + + False + False + + + + + True + True + False + 4 + 3 + 10 + + + False + 1 + + + + + 6 + + + + + + + True + + + False + False + 1 + + + + + True + + + True + Scripts' Settings + + + False + False + + + + + True + True + start experiment script + True + True + True + + + False + False + 1 + + + + + True + True + start result script + True + True + True + + + False + False + 2 + + + + + True + True + delete result data after processing + True + True + True + + + False + False + 3 + + + + + 2 + + + + + False + False + + + + + True + + + False + False + 1 + + + + + True + + + True + HDF5 Data Pool's Settings + + + False + False + + + + + True + + + True + data pool file name + + + False + False + + + + + True + True + DAMARIS_data_pool.h5 + + + 1 + + + + + 1 + + + + + True + + + True + data pool write interval + + + False + False + + + + + True + True + 10 + 10 + 60 + + + False + 1 + + + + + True + min, compression + + + False + False + 2 + + + + + True + model3 + + + + 0 + + + + + False + False + 3 + + + + + True + , ratio + + + False + False + 4 + + + + + True + True + adjustment5 + 1 + True + + + False + False + 5 + + + + + + + + 2 + + + + + False + 2 + + + + + True + + + False + 3 + + + + + True + + + False + False + 4 + + + + + True + + + True + Frontend's Settings + + + False + False + + + + + True + + + True + Script Windows Font + + + False + False + + + + + True + True + + + + False + False + 1 + + + + + False + False + 1 + + + + + True + + + True + True + Printer Setup + True + + + + False + False + + + + + + + + 2 + + + + + True + ToDo + + + False + False + 3 + + + + + False + 5 + + + + + True + + + False + False + 6 + + + + + True + + + True + info, authors and disclaimer + + + False + False + + + + + True + True + GTK_POLICY_NEVER + GTK_SHADOW_IN + + + True + False + GTK_WRAP_WORD_CHAR + False + textbuffer1 + + + + + 1 + + + + + 7 + + + + + True + + + True + True + True + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-floppy + + + False + False + + + + + True + save configuration + True + + + False + False + 1 + + + + + + + + + False + False + + + + + True + True + True + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-refresh + + + False + False + + + + + True + reload configuration + True + + + False + False + 1 + + + + + + + + + False + False + 1 + + + + + False + False + 8 + + + + + + + True + Configuration + + + 4 + False + + + + + 1 + 2 + + + + + True + 8 + + + True + + + 6 + 7 + + 5 + + + + + True + + + + 3 + + + + + True + + + 4 + 5 + + 5 + + + + + True + + + 2 + 3 + + 5 + + + + + True + Backend: Idle. + + + 3 + 4 + + + + + + + 20 + True + Experiment Script: Idle. + + + 1 + 2 + + + + + + + True + Result Script: Idle. + + + 5 + 6 + + + + + + + True + 0 + + + + 7 + 8 + + + + + + 2 + 3 + GTK_FILL + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + diff --git a/src/tools/goniometer.py b/src/tools/goniometer.py index 89d09f5..4216f0d 100644 --- a/src/tools/goniometer.py +++ b/src/tools/goniometer.py @@ -56,7 +56,7 @@ class goniometer: def _recv(self): retstr = self.serial.readline().strip().replace("\x00","") - search_result = re.search("<(\d+)>", retstr) + search_result = re.search(r"<(\d+)>", retstr) if search_result != None: angle = float(search_result.group(1))/36.0 self.current_angle = angle diff --git a/tests/exp_test.py b/tests/exp_test.py index 43e00b2..360c829 100644 --- a/tests/exp_test.py +++ b/tests/exp_test.py @@ -1,11 +1,15 @@ -def test(): +import time + +def test(i): e=Experiment() e.ttl_pulse(length=1e-6, value=1) e.wait(1e-3) e.ttl_pulse(length=1e-6,value=1) e.record(samples=1024,frequency=1e6,sensitivity=1) + e.set_description("variable",i) + e.set_description("const", "test") return e def experiment(): for i in range(10): - yield test() \ No newline at end of file + yield test(i) \ No newline at end of file diff --git a/tests/res_test.py b/tests/res_test.py index c302a8f..7d5555c 100644 --- a/tests/res_test.py +++ b/tests/res_test.py @@ -1,8 +1,24 @@ +import tables + +r = MeasurementResult("test") + def result(): + try: + h5 = tables.open_file("test.h5", "w") + except: + print("h5 already opened") accu = Accumulation(error=False) for num,ts in enumerate(results): data["accu"] = accu - data["ts %i"%num] = ts+0 + data["data/ts %i"%num] = ts+0 + ts.write_to_hdf(h5, "/", f"adc_{num}", f"adc_{num}") data["fft"] = (ts+0).fft() + r[num] = ts.y[0][0] + data["test"] = r accu+=ts - print("ts") + accu.write_to_hdf(h5, "/", "name", "title") + print(accu) + try: + h5.close() + except: + print("h5 already closed") \ No newline at end of file diff --git a/tests/test_ADC_Result.py b/tests/test_ADC_Result.py index d817792..d6b54e3 100644 --- a/tests/test_ADC_Result.py +++ b/tests/test_ADC_Result.py @@ -4,7 +4,7 @@ import unittest from datetime import datetime import numpy as np -from src.data.ADC_Result import ADC_Result +from damaris.data.ADC_Result import ADC_Result class TestADCResult(unittest.TestCase): diff --git a/tests/test_Accumulation.py b/tests/test_Accumulation.py index 5668fc0..7234e69 100644 --- a/tests/test_Accumulation.py +++ b/tests/test_Accumulation.py @@ -5,8 +5,8 @@ from datetime import datetime import numpy as np -from src.data.ADC_Result import ADC_Result -from src.data.Accumulation import Accumulation +from damaris.data.ADC_Result import ADC_Result +from damaris.data.Accumulation import Accumulation class TestAccumulation(unittest.TestCase):