Refs #32 and #36. Changed the MTEX's posfix to jul.

neutrons · Dec 4, 2018 · 82d1174 · 82d1174
1 parent f9eed8e
commit 82d1174
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/pyrs/core/polefigurecalculator.py b/pyrs/core/polefigurecalculator.py
@@ -270,6 +270,7 @@ def export_pole_figure(self, detector_id_list,  file_name, file_type, file_heade
         exported the calculated pole figure
         :param detector_id_list: list of detector IDs to write the pole figure file
         :param file_name:
+        :param file_type: ASCII or MTEX (.jul)
         :param file_header: for MTEX format
         :return:
         """
@@ -291,7 +292,7 @@ def export_pole_figure(self, detector_id_list,  file_name, file_type, file_heade
             # export pole figure arrays as ascii column file
             export_arrays_to_ascii(self._pole_figure_dict, detector_id_list, file_name)
         elif file_type.lower() == 'mtex':
-            # export to mtex format
+            # export to MTEX format
             export_to_mtex(self._pole_figure_dict, detector_id_list, file_name, header=file_header)
 
         return
@@ -550,6 +551,14 @@ def export_to_mtex(pole_figure_array_dict, detector_id_list, file_name, header):
     # initialize output string
     mtex = ''
 
+    # MTEX HEAD
+    """
+    MTEX file format
+L 1 |NRSF2
+L 2 |alpha beta intensity
+    """
+    # TODO - 20181204 - Implement head #36 - ASAP(3)
+
     # header
     mtex += '{0}\n'.format(header)
 

diff --git a/pyrs/core/reductionengine.py b/pyrs/core/reductionengine.py
@@ -60,7 +60,7 @@ def _convert_to_2theta(self, event_ws_name, raw_nexus_file_name):
 
         LoadInstrument(Workspace=event_ws_name, InstrumentName='HB2B', RewriteSpectraMap=True)
 
-        # TODO - 20181114 - From here!
+        # TODO - 20181204 - Refer to "WANDPowderReduction" - ASAP(0)
 
         return vec_2theta, vec_y, vec_e
 

diff --git a/pyrs/interface/textureanalysiswindow.py b/pyrs/interface/textureanalysiswindow.py
@@ -498,7 +498,9 @@ def do_save_pole_figure(self):
         if platform.system() == 'Darwin':
             file_filter = ''
         else:
-            file_filter = 'MTEX (*.mtex);;ASCII (*.dat);;All Files (*.*)'
+            file_filter = 'MTEX (*.jul);;ASCII (*.dat);;All Files (*.*)'
+
+        # TODO - 20181204 - Replace getSaveFileName by a self-extended method to be fine with both Qt4 and Qt5 ASAP(1)
         file_info = QFileDialog.getSaveFileName(self, directory=self._core.working_dir,
                                                 caption='Save Pole Figure To ASCII File',
                                                 filter=file_filter)
@@ -515,18 +517,10 @@ def do_save_pole_figure(self):
         if len(file_name) == 0:
             return
 
-        # reconstruct name if required
-        # TODO - 20180711 - use filter to determine the file type and default posfix
-        # file_type_list = list()
-        # if file_filter == 'MTEX (*.mtex)':
-        #     file_type_list.append(('mtex', 'mtex'))
-        # elif file_filter == 'ASCII (*.dat)':
-        #     file_type_list.append('ascii')
-        #
-
+        # export 2 file types
         dir_name = os.path.dirname(file_name)
         base_name = os.path.basename(file_name).split('.')[0]
-        for file_type, posfix in [('ascii', 'dat'), ('mtex', 'mtex')]:
+        for file_type, posfix in [('ascii', 'dat'), ('mtex', 'jul')]:
             file_name_i = os.path.join(dir_name, '{0}.{1}'.format(base_name, posfix))
             self._core.save_pole_figure(self._data_key, detectors=None, file_name=file_name_i,
                                         file_type=file_type)