Changeset b2b36932 in sasview for src/sas

Timestamp:

Dec 7, 2016 4:06:16 PM (8 years ago)

Author:

krzywon

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b61bd57

Parents:

9300bfa

Message:

#824: 2D data without detector information can now use the slicers, and annular and sector averaging. The real question is why are we limiting this to single detector sets?

Location:

src/sas

Files:

• sascalc/dataloader/manipulations.py (modified) (2 diffs)
• sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) (1 diff)

src/sas/sascalc/dataloader/manipulations.py

@@ -143 +143 @@
         :return: Data1D object
         """
-        if len(data2D.detector) != 1:
+        if len(data2D.detector) > 1:
             msg = "_Slab._avg: invalid number of "
             msg += " detectors: %g" % len(data2D.detector)
@@ -299 +299 @@
             error on number of counts, number of entries summed
         """
-        if len(data2D.detector) != 1:
+        if len(data2D.detector) > 1:
             msg = "Circular averaging: invalid number "
             msg += "of detectors: %g" % len(data2D.detector)

src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py

@@ -316 +316 @@
 
         slicerpop.AppendSeparator()
-        if len(self.data2D.detector) == 1:
+        if len(self.data2D.detector) <= 1:
             item_list = self.parent.get_current_context_menu(self)
             if (not item_list == None) and (not len(item_list) == 0) and\