Changeset 45d90b9 in sasview for src/sas/sascalc

Timestamp:

Mar 15, 2016 11:29:06 AM (8 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:

e0bbb7c

Parents:

0b63c6e

Message:

Fixed path in cansas_reader

File:

• src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (2 diffs)

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

@@ -149 +149 @@
         # Generic values for the cansas file based on the version
         cansas_defaults = CANSAS_NS.get(self.cansas_version, "1.0")
-        schema_path = "{0}/sas/dataloader/readers/schema/{1}".format\
+        schema_path = "{0}/sas/sascalc/dataloader/readers/schema/{1}".format\
                 (base, cansas_defaults.get("schema")).replace("\\", "/")
 
@@ -1005 +1005 @@
         mod = mod_name.split("sas/")
         mod_name = mod[1]
-        if mod_name != "dataloader/readers/cansas_reader":
+        if mod_name != "sascalc/dataloader/readers/cansas_reader":
             string = self.to_string(doc, pretty_print=False)
             doc = parseString(string)