Changeset bf23693 in sasview

Timestamp:

Jul 19, 2016 11:57:56 AM (8 years ago)

Author:

lewis

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:

11794f2

Parents:

55bc56bc (diff), e19d29b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into file-converter

Files:

• sasview/test/upcoming_formats/APS_DND-CAT.TXT (added)
• sasview/test/upcoming_formats/APS_X.TXT (added)
• sasview/test/upcoming_formats/APS_Y.TXT (added)
• sasview/test/upcoming_formats/Anton-Paar_PDH.txt (added)
• sasview/test/upcoming_formats/FIT2D_I.TXT (added)
• sasview/test/upcoming_formats/FIT2D_Q.TXT (added)
• sasview/test/upcoming_formats/ISIS_83404.TXT (added)
• sasview/test/upcoming_formats/ISIS_98929.TXT (added)
• sasview/test/upcoming_formats/Z83000.I1D (added)
• sasview/test/upcoming_formats/Z83000.QAX (added)
• sasview/test/upcoming_formats/Z83001.I1D (added)
• sasview/test/upcoming_formats/Z83001.QAX (added)
• sasview/test/upcoming_formats/Z83002.I1D (added)
• sasview/test/upcoming_formats/Z98000.I1D (added)
• sasview/test/upcoming_formats/Z98000.QAX (added)
• sasview/test/upcoming_formats/Z98001.I1D (added)
• sasview/test/upcoming_formats/Z98001.QAX (added)
• sasview/test/upcoming_formats/Z98002.I1D (added)
• sasview/sasview.py (modified) (5 diffs)
• src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (1 diff)
• src/sas/sasgui/perspectives/file_converter/__init__.py (added)
• src/sas/sasgui/perspectives/file_converter/bsl_loader.py (added)
• src/sas/sasgui/perspectives/file_converter/converter_panel.py (added)
• src/sas/sasgui/perspectives/file_converter/converter_widgets.py (added)
• src/sas/sasgui/perspectives/file_converter/file_converter.py (added)
• src/sas/sasgui/perspectives/file_converter/meta_panels.py (added)

sasview/sasview.py

@@ -81 +81 @@
 #Always use private .matplotlib setup to avoid conflicts with other
 #uses of matplotlib
-#Have to check if .sasview exists first 
+#Have to check if .sasview exists first
 sasdir = os.path.join(os.path.expanduser("~"),'.sasview')
 if not os.path.exists(sasdir):
@@ -119 +119 @@
         # Fitting perspective
         try:
-            import sas.sasgui.perspectives.fitting as module    
+            import sas.sasgui.perspectives.fitting as module
             fitting_plug = module.Plugin()
             self.gui.add_perspective(fitting_plug)
@@ -145 +145 @@
             logging.error(traceback.format_exc())
 
-        #Calculator perspective   
+        #Calculator perspective
         try:
             import sas.sasgui.perspectives.calculator as module
@@ -152 +152 @@
         except:
             logging.error("%s: could not find Calculator plug-in module"% \
+                                                        APP_NAME)
+            logging.error(traceback.format_exc())
+
+        # File converter tool
+        try:
+            import sas.sasgui.perspectives.file_converter as module
+            converter_plug = module.Plugin()
+            self.gui.add_perspective(converter_plug)
+        except:
+            logging.error("%s: could not find File Converter plug-in module"% \
                                                         APP_NAME)
             logging.error(traceback.format_exc())
@@ -191 +201 @@
 if __name__ == "__main__":
     run()
-

src/sas/sascalc/dataloader/readers/cansas_reader.py

@@ -942 +942 @@
             written = written | self.write_node(pix, "z", item.pixel_size.z,
                                                 {"unit": item.pixel_size_unit})
-            written = written | self.write_node(det, "slit_length",
-                                                item.slit_length,
-                                                {"unit": item.slit_length_unit})
             if written == True:
                 self.append(pix, det)
+            self.write_node(det, "slit_length", item.slit_length,
+                {"unit": item.slit_length_unit})
+
 
     def _write_process_notes(self, datainfo, entry_node):