Changeset 7d64b0e in sasview

Timestamp:

Mar 12, 2015 10:32:08 AM (10 years ago)

Author:

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:

bb074b3

Parents:

d26dea0 (diff), ac1670a2 (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' of ​https://github.com/SasView/sasview.git

Files:

• src/sas/models/c_extension/c_models/lamellarPS.cpp (modified) (2 diffs)
• src/sas/models/c_extension/libigor/libCylinder.c (modified) (2 diffs)
• test/sasmodels/test/utest_other_models.py (modified) (2 diffs)
• sasview/default_categories.json (modified) (1 diff)
• sasview/local_config.py (modified) (1 diff)
• src/sas/dataloader/readers/cansas_reader.py (modified) (11 diffs)
• src/sas/guiframe/config.py (modified) (1 diff)
• src/sas/guiframe/local_perspectives/data_loader/data_loader.py (modified) (2 diffs)

src/sas/models/c_extension/c_models/lamellarPS.cpp

@@ -68 +68 @@
   ii=0;
   Sq = 0.0;
-  for(ii=1;ii<(NNint-1);ii+=1) {
+  for(ii=1;ii<=(NNint-1);ii+=1) {
 
     fii = (double)ii;   //do I really need to do this?
@@ -144 +144 @@
   for(int i=0; i< (int)weights_spacing.size(); i++) {
     dp[1] = weights_spacing[i].value;
-    for(int j=0; j< (int)weights_spacing.size(); j++) {
-      dp[2] = weights_delta[i].value;
+    //for(int j=0; j< (int)weights_spacing.size(); j++) {    BUGS fixed March 2015
+    for(int j=0; j< (int)weights_delta.size(); j++) {
+      //dp[2] = weights_delta[i].value;        BUG
+      dp[2] = weights_delta[j].value;
 
       sum += weights_spacing[i].weight * weights_delta[j].weight * LamellarPS_kernel(dp, q);

src/sas/models/c_extension/libigor/libCylinder.c

@@ -1379 +1379 @@
         ii=0;
         Sq = 0.0;
-        for(ii=1;ii<(NNint-1);ii+=1) {
+        for(ii=1;ii<=(NNint-1);ii+=1) {
         
                 fii = (double)ii;               //do I really need to do this?
@@ -1451 +1451 @@
         ii=0;
         Sq = 0.0;
-        for(ii=1;ii<(NNint-1);ii+=1) {
+        for(ii=1;ii<=(NNint-1);ii+=1) {
         
                 fii = (double)ii;               //do I really need to do this?

test/sasmodels/test/utest_other_models.py

@@ -899 +899 @@
     def test1D(self):
         """ Test 1D model for a LamellarPS Model"""
-        self.assertAlmostEquals(self.comp.run(0.001), 27899.30836, 1)
+        self.assertAlmostEquals(self.comp.run(0.001), 28895.13397, 1)
         
     def test1D_2(self):
         """ Test 2D model for a LamellarPS Model"""
-        self.assertAlmostEquals(self.comp.run([0.001, 1.3]),27899.30836, 1) 
+        self.assertAlmostEquals(self.comp.run([0.001, 1.3]),28895.13397, 1) 
     
     def testEval_1D(self):
@@ -948 +948 @@
     def test1D(self):
         """ Test 1D model for a LamellarPSHG Model"""
-        self.assertAlmostEquals(self.comp.run(0.001),6831387.29466, 3)
+        self.assertAlmostEquals(self.comp.run(0.001),6838238.571488, 3)
         
     def test1D_2(self):
         """ Test 2D model for a LamellarPSHG Model"""
-        self.assertAlmostEquals(self.comp.run([0.001, 1.3]),6831387.29466,3)
+        self.assertAlmostEquals(self.comp.run([0.001, 1.3]),6838238.571488,3)
         
     def testEval_1D(self):

sasview/default_categories.json

@@ -1 @@
-{"Shapes": [["PearlNecklaceModel", true], ["HollowCylinderModel", true], ["CoreMultiShellModel", true], ["LamellarFFHGModel", true], ["FCCrystalModel", true], ["CoreShellEllipsoidXTModel", true], ["FuzzySphereModel", true], ["CSParallelepipedModel", true], ["BCCrystalModel", true], ["EllipticalCylinderModel", true], ["RectangularHollowPrismInfThinWallsModel", true], ["LamellarPCrystalModel", true], ["OnionExpShellModel", true], ["VesicleModel", true], ["MultiShellModel", true], ["RaspBerryModel", true], ["CoreShellEllipsoidModel", true], ["CappedCylinderModel", true], ["CylinderModel", true], ["SphericalSLDModel", true], ["StackedDisksModel", true], ["LamellarPSHGModel", true], ["CoreShellBicelleModel", true], ["RectangularHollowPrismModel", true], ["LamellarPSModel", true], ["EllipsoidModel", true], ["SphereModel", true], ["ParallelepipedModel", true], ["TriaxialEllipsoidModel", true], ["LamellarModel", true], ["RectangularPrismModel", true], ["PringlesModel", true], ["CoreShellCylinderModel", true], ["BinaryHSModel", true], ["FlexibleCylinderModel", true], ["SCCrystalModel", true], ["FlexCylEllipXModel", true], ["LinearPearlsModel", true], ["CoreShellModel", true]], "Structure Factor": [["SquareWellStructure", true], ["HayterMSAStructure", true], ["HardsphereStructure", true], ["StickyHSStructure", true]], "Shape-Independent": [["TwoPowerLawModel", true], ["GelFitModel", true], ["DABModel", true], ["PowerLawAbsModel", true], ["PorodModel", true], ["MassFractalModel", true], ["TeubnerStreyModel", true], ["DebyeModel", true], ["MassSurfaceFractal", true], ["Core2ndMomentModel", true], ["TwoLorentzianModel", true], ["UnifiedPowerRgModel", true], ["PolymerExclVolume", true], ["BEPolyelectrolyte", true], ["GuinierModel", true], ["GuinierPorodModel", true], ["CorrLengthModel", true], ["StarPolymer", true], ["FractalModel", true], ["RPA10Model", true], ["PeakLorentzModel", true], ["BroadPeakModel", true], ["PeakGaussModel", true], ["FractalCoreShellModel", true], ["Poly_GaussCoil", true], ["SurfaceFractalModel", true], ["GaussLorentzGelModel", true], ["LorentzModel", true]], "Uncategorized": [["ReflectivityModel", true], ["ReflectivityIIModel", true], ["LineModel", true], ["MicelleSphCoreModel", true]]}
+{"Shapes": [["PearlNecklaceModel", true], ["HollowCylinderModel", true], ["CoreMultiShellModel", true], ["FCCrystalModel", true], ["CoreShellEllipsoidXTModel", true], ["FuzzySphereModel", true], ["CSParallelepipedModel", true], ["EllipticalCylinderModel", true], ["BCCrystalModel", true], ["LamellarFFHGModel", true], ["RectangularHollowPrismInfThinWallsModel", true], ["LamellarPCrystalModel", true], ["OnionExpShellModel", true], ["VesicleModel", true], ["MultiShellModel", true], ["RaspBerryModel", true], ["CoreShellEllipsoidModel", true], ["CappedCylinderModel", true], ["CylinderModel", true], ["SphericalSLDModel", true], ["StackedDisksModel", true], ["LamellarPSHGModel", true], ["CoreShellBicelleModel", true], ["RectangularHollowPrismModel", true], ["LamellarPSModel", true], ["EllipsoidModel", true], ["SphereModel", true], ["ParallelepipedModel", true], ["TriaxialEllipsoidModel", true], ["LamellarModel", true], ["PringlesModel", true], ["RectangularPrismModel", true], ["CoreShellCylinderModel", true], ["BinaryHSModel", true], ["FlexibleCylinderModel", true], ["SCCrystalModel", true], ["FlexCylEllipXModel", true], ["LinearPearlsModel", true], ["CoreShellModel", true]], "Structure Factor": [["SquareWellStructure", true], ["HayterMSAStructure", true], ["HardsphereStructure", true], ["StickyHSStructure", true]], "Shape-Independent": [["TwoPowerLawModel", true], ["GelFitModel", true], ["DABModel", true], ["PowerLawAbsModel", true], ["PorodModel", true], ["MassFractalModel", true], ["RPA10Model", true], ["TeubnerStreyModel", true], ["DebyeModel", true], ["MassSurfaceFractal", true], ["Core2ndMomentModel", true], ["TwoLorentzianModel", true], ["UnifiedPowerRgModel", true], ["PolymerExclVolume", true], ["BEPolyelectrolyte", true], ["GuinierModel", true], ["GuinierPorodModel", true], ["CorrLengthModel", true], ["StarPolymer", true], ["FractalModel", true], ["PeakLorentzModel", true], ["BroadPeakModel", true], ["PeakGaussModel", true], ["FractalCoreShellModel", true], ["Poly_GaussCoil", true], ["SurfaceFractalModel", true], ["GaussLorentzGelModel", true], ["LorentzModel", true]], "Uncategorized": [["ReflectivityModel", true], ["ReflectivityIIModel", true], ["LineModel", true], ["MicelleSphCoreModel", true]]}

sasview/local_config.py

@@ -34 +34 @@
 '''If you found this software useful to your work please remember to acknowledge 
 its use in your publications as suggested below and reference the SasView website: 
-http://www.sasview.org/index.html. Please also consider letting us know by sending us the 
+http://www.sasview.org/. Please also consider letting us know by sending us the 
 reference to your work. This will help us to ensure the long term support and 
 development of the software.
 '''
 _acknowledgement_publications = \
-'''This work originally developed as part of the DANSE project funded by the NSF
-under grant DMR-0520547, and currently maintained by NIST, UMD, ORNL, ISIS, ESS 
+'''This work benefited from software developed by the DANSE project under NSF 
+award DMR-0520547 and currently maintained by NIST, UMD, ORNL, ISIS, ESS 
 and ILL.
 '''

src/sas/dataloader/readers/cansas_reader.py

@@ -105 +105 @@
     base_ns = "{cansas1d/1.0}"
 
-    logging = []
-    errors = []
+    logging = None
+    errors = None
 
     type_name = "canSAS"
@@ -120 +120 @@
     def __init__(self):
         ## List of errors
-        self.errors = []
+        self.errors = set()
+        self.logging = []
         self.encoding = None
 
@@ -252 +253 @@
         for error in self.errors:
             data1d.errors.append(error)
-        del self.errors[:]
+        self.errors.clear()
         numpy.trim_zeros(data1d.x)
         numpy.trim_zeros(data1d.y)
@@ -301 +302 @@
         attr = node.attrib
         value_unit = ''
+        err_msg = None
         if 'unit' in attr and new_current_level.get('unit') is not None:
             try:
@@ -322 +324 @@
                         value_unit = local_unit
                         err_msg = "Unit converter is not available.\n"
-                        self.errors.append(err_msg)
                 else:
                     value_unit = local_unit
@@ -333 +334 @@
                             ".format(data1d.{0})"
                 exec intermediate.format(unitname, "{0}", "{1}")
-                self.errors.append(err_msg)
                 value_unit = local_unit
             except:
@@ -340 +340 @@
                 err_msg += "\"{0}\" unit [{1}]"
                 err_msg = err_msg.format(tagname, local_unit)
-                self.errors.append(err_msg)
                 value_unit = local_unit
         elif 'unit' in attr:
             value_unit = attr['unit']
+        if err_msg:
+            self.errors.add(err_msg)
         node_value = "float({0})".format(node_value)
         return node_value, value_unit
@@ -355 +356 @@
         """
         if data1d == None:
-            self.errors = []
+            self.errors = set()
             x_vals = numpy.empty(0)
             y_vals = numpy.empty(0)
@@ -697 +698 @@
             node.append(point)
             self.write_node(point, "Q", datainfo.x[i],
-                            {'unit': datainfo.x_unit})
+                            {'unit': datainfo._xunit})
             if len(datainfo.y) >= i:
                 self.write_node(point, "I", datainfo.y[i],
-                                {'unit': datainfo.y_unit})
+                                {'unit': datainfo._yunit})
             if datainfo.dy != None and len(datainfo.dy) > i:
                 self.write_node(point, "Idev", datainfo.dy[i],
-                                {'unit': datainfo.y_unit})
+                                {'unit': datainfo._yunit})
             if datainfo.dx != None and len(datainfo.dx) > i:
                 self.write_node(point, "Qdev", datainfo.dx[i],
-                                {'unit': datainfo.x_unit})
+                                {'unit': datainfo._xunit})
             if datainfo.dxw != None and len(datainfo.dxw) > i:
                 self.write_node(point, "dQw", datainfo.dxw[i],
-                                {'unit': datainfo.x_unit})
+                                {'unit': datainfo._xunit})
             if datainfo.dxl != None and len(datainfo.dxl) > i:
                 self.write_node(point, "dQl", datainfo.dxl[i],
-                                {'unit': datainfo.x_unit})
+                                {'unit': datainfo._xunit})
 
     def _write_trans_spectrum(self, datainfo, entry_node):
@@ -1169 +1170 @@
                             err_mess += " %s unit [%s]; expecting [%s]\n  %s" \
                                 % (variable, units, local_unit, exc_value)
-                            self.errors.append(err_mess)
+                            self.errors.add(err_mess)
                             if optional:
                                 logging.info(err_mess)
@@ -1178 +1179 @@
                         % (variable, units)
                         err_mess += " expecting [%s]" % local_unit
-                        self.errors.append(err_mess)
+                        self.errors.add(err_mess)
                         if optional:
                             logging.info(err_mess)

src/sas/guiframe/config.py

@@ -31 +31 @@
 '''If you found this software useful to your work please remember to acknowledge 
 its use in your publications as suggested below and reference the SasView website: 
-http://www.sasview.org/index.html. Please also consider letting us know by sending us the 
+http://www.sasview.org/. Please also consider letting us know by sending us the 
 reference to your work. This will help us to ensure the long term support and 
 development of the software.
 '''
 _acknowledgement_publications = \
-'''This work originally developed as part of the DANSE project funded by the NSF
-under grant DMR-0520547, and currently maintained by NIST, UMD, ORNL, ISIS, ESS 
+'''This work benefited from software developed by the DANSE project under NSF 
+award DMR-0520547 and currently maintained by NIST, UMD, ORNL, ISIS, ESS 
 and ILL.
 '''

src/sas/guiframe/local_perspectives/data_loader/data_loader.py

@@ -204 +204 @@
             except:
                 any_error = True
-        if any_error or error_message != "":
-            if error_message == "":
-                error = "Error: " + str(sys.exc_value) + "\n"
-                error += "while loading Data: \n%s\n" % str(p_file)
-                error_message = "The data file you selected could not be loaded.\n"
-                error_message += "Make sure the content of your file"
-                error_message += " is properly formatted.\n\n"
-                error_message += "When contacting the SasView team, mention the"
-                error_message += " following:\n%s" % str(error)
-            elif data_error:
-                base_message = "Errors occurred while loading {0}\n".format(p_file)
-                base_message += "The data file loaded but with errors.\n"
-                error_message = base_message + error_message
-            else:
-                error_message += "%s\n" % str(p_file)
-            info = "error"
+            if any_error or error_message != "":
+                if error_message == "":
+                    error = "Error: " + str(sys.exc_info()[1]) + "\n"
+                    error += "while loading Data: \n%s\n" % str(basename)
+                    error_message += "The data file you selected could not be loaded.\n"
+                    error_message += "Make sure the content of your file"
+                    error_message += " is properly formatted.\n\n"
+                    error_message += "When contacting the SasView team, mention the"
+                    error_message += " following:\n%s" % str(error)
+                elif data_error:
+                    base_message = "Errors occurred while loading "
+                    base_message += "{0}\n".format(basename)
+                    base_message += "The data file loaded but with errors.\n"
+                    error_message = base_message + error_message
+                else:
+                    error_message += "%s\n" % str(p_file)
+                info = "error"
+        
+        if any_error or error_message:
             self.load_update(output=output, message=error_message, info=info)
-
         else:
             message = "Loading Data Complete! "
         message += log_msg
         self.load_complete(output=output, error_message=error_message,
-                           message=message, path=path, info=info)
+                           message=message, path=path, info='warning')
 
     def load_update(self, output=None, message="", info="warning"):
@@ -233 +235 @@
         """
         if message != "":
-            wx.PostEvent(self.parent, StatusEvent(status=message, info='info',
+            wx.PostEvent(self.parent, StatusEvent(status=message, info=info,
                                                   type="progress"))
     def load_complete(self, output, message="", error_message="", path=None,