Changeset 6140894 in sasmodels for sasmodels/model_test.py

Timestamp:

Mar 28, 2019 11:19:16 AM (5 years ago)

Author:

richardh

Branches:

master, ticket-1257-vesicle-product, ticket_1156, ticket_822_more_unit_tests

Children:

3709366

Parents:

d8e81f7

Message:

removed nerge text from model_test, more notes in sphere.py

File:

• sasmodels/model_test.py (modified) (1 diff)

sasmodels/model_test.py

@@ -247 +247 @@
                                            platform=self.platform)
                     # run the tests
-<<<<<<< HEAD
                     #self.info = ps_model.info
                     #print("SELF.INFO PARAMS!!!",[p.id for p in self.info.parameters.call_parameters])
                     #print("PS MODEL PARAMETERS:",[p.id for p in ps_model.info.parameters.call_parameters])
-=======
->>>>>>> 2ed7de04217c5103c5fd8d7c14e29e04923269d5
                     results.append(self.run_one(ps_model, ps_test))