Changeset 845 for sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

Timestamp:

Mar 8, 2012 7:41:49 AM (11 years ago)

Author:

ajj

Message:

Fix to the canSAS XML reader to put in sane values if Qmean and Shadowfactor are missing.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf (modified) (3 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

@@ -124 +124 @@
                                                                 Duplicate/O Qmean,$w4
                                                                 reswave[][1] = Qmean[p]         //qBar
+                                                        else
+                                                                reswave[][1] = Qsas[p] // If there is no Qmean specified, use Q values
                                                         endif
                                                         if(exists(xmlDataSetFolder+"Shadowfactor"))
@@ -129 +131 @@
                                                                 Duplicate/O Shadowfactor, $w5
                                                                 reswave[][2] = Shadowfactor[p]          //fShad
+                                                        else
+                                                                reswave[][2] = 1 // default shadowfactor to 1 if it doesn't exist
                                                         endif
                                                 elseif(exists(xmlDataSetFolder+"dQl"))
@@ -256 +260 @@
                                                         Wave Qmean = $(xmlDataFolder+"Qmean")
                                                         reswave[][1] = Qmean[p]         //qBar
+                                                else
+                                                        reswave[][1] = Qsas[p] // If there is no Qmean specified, use Q values
                                                 endif
                                                 if(exists(xmlDataFolder+"Shadowfactor"))
                                                         Wave Shadowfactor = $(xmlDataFolder+"Shadowfactor")
                                                         reswave[][2] = Shadowfactor[p]          //fShad
+                                                else
+                                                                reswave[][2] = 1 // default shadowfactor to 1 if it doesn't exist
                                                 endif
                                         elseif(exists(xmlDataFolder+"dQl"))