Changeset b699768 in sasview for src/sas/sascalc/calculator

Timestamp:

Feb 19, 2016 10:07:22 AM (9 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d7bb526

Parents:

792e6be

Message:

Initial commit of the refactored SasCalc? module.

Location:

src/sas/sascalc/calculator

Files:

• __init__.py (moved) (moved from src/sas/data_util/__init__.py)
• instrument.py (moved) (moved from src/sas/calculator/instrument.py)
• kiessig_calculator.py (moved) (moved from src/sas/calculator/kiessig_calculator.py)
• resolution_calculator.py (moved) (moved from src/sas/calculator/resolution_calculator.py) (1 diff)
• sas_gen.py (moved) (moved from src/sas/calculator/sas_gen.py)
• slit_length_calculator.py (moved) (moved from src/sas/calculator/slit_length_calculator.py)

src/sas/sascalc/calculator/resolution_calculator.py

@@ -1086 +1086 @@
         # try to set it as a Data2D otherwise pass (not required for now)
         try:
-            from sas.dataloader.data_info import Data2D
+            from sas.sascalc.dataloader.data_info import Data2D
             output = Data2D()
             inten = numpy.zeros_like(qx_value)