Changeset 9e2bc6c in sasview for src/sans

Timestamp:

Apr 4, 2014 10:04:58 AM (11 years ago)

Author:

Jeff Krzywon <jeffery.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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

f309303

Parents:

92a8206

Message:

Fixing tickets #204 and #233.

Location:

src/sans/dataloader/readers

Files:

• cansas_constants.py (modified) (1 diff)
• cansas_reader.py (modified) (9 diffs)

src/sans/dataloader/readers/cansas_constants.py

@@ -193 +193 @@
                                      "timestamp" : {
                                                     "variable" : META_DATA,
-                                                    "storeas" : "content",
+                                                    "storeas" : "timestamp",
                                                     }
                                      },

src/sans/dataloader/readers/cansas_reader.py

@@ -17 +17 @@
 import os
 import sys
+import datetime
 from sans.dataloader.data_info import Data1D
 from sans.dataloader.data_info import Collimation
@@ -428 +429 @@
                                 cs_values.current_level, attr, data1d, \
                                 tagname, node_value, cs_values.ns_optional)
-                    
+                # If the value is a timestamp, convert to a datetime object
+                elif cs_values.ns_datatype == "timestamp":
+                    if node_value is None or node_value.isspace():
+                        pass
+                    else:
+                        try:
+                            node_value = \
+                                datetime.datetime.fromtimestamp(node_value)
+                        except ValueError:
+                            node_value = None
                 # If appending to a dictionary (meta_data | run_name)
                 # make sure the key is unique
@@ -516 +526 @@
         main_node = doc.createElement("SASroot")
         
-        doc = self.setProcessingInstructions(doc, datainfo.meta_data[PREPROCESS])
+        doc = self.setProcessingInstructions(doc, \
+                                        datainfo.meta_data.get(PREPROCESS, {}))
         main_node.setAttribute("version", self.cansas_version)
         main_node.setAttribute("xmlns", ns)
@@ -532 +543 @@
         
         write_node(doc, entry_node, "Title", datainfo.title)
+        if datainfo.run == None or datainfo.run == []:
+            RUN_NAME_DEFAULT = "None"
+            datainfo.run.append(RUN_NAME_DEFAULT)
+            datainfo.run_name[RUN_NAME_DEFAULT] = RUN_NAME_DEFAULT
         for item in datainfo.run:
             runname = {}
@@ -567 +582 @@
             spectrum = datainfo.trans_spectrum[i]
             node = doc.createElement("SAStransmission_spectrum")
+            node.setAttribute("name", spectrum.name)
+            if isinstance(spectrum.timestamp, datetime.datetime):
+                node.setAttribute("timestamp", spectrum.timestamp)
             entry_node.appendChild(node)
             for i in range(len(spectrum.wavelength)):
@@ -632 +650 @@
             source.setAttribute("name", str(datainfo.source.name))
         instr.appendChild(source)
+        if datainfo.source.radiation == None or datainfo.source.radiation == '':
+            datainfo.source.radiation = "neutron"
         write_node(doc, source, "radiation", datainfo.source.radiation)
         
@@ -663 +683 @@
         
         #   Collimation
+        if datainfo.collimation == [] or datainfo.collimation == None:
+            coll = Collimation()
+            datainfo.collimation.append(coll)
         for item in datainfo.collimation:
             coll = doc.createElement("SAScollimation")
@@ -696 +719 @@
 
         #   Detectors
+        if datainfo.detector == None or datainfo.detector == []:
+            det = Detector()
+            det.name = ""
+            datainfo.detector.append(det)
+                
         for item in datainfo.detector:
             det = doc.createElement("SASdetector")
@@ -808 +836 @@
         return minidomObject
     
-