Changeset d8e81f7 in sasmodels for sasmodels/model_test.py
- Timestamp:
- Mar 28, 2019 9:49:06 AM (5 years ago)
- Branches:
- master, ticket-1257-vesicle-product, ticket_1156, ticket_822_more_unit_tests
- Children:
- 6140894
- Parents:
- b39bf3b (diff), 2ed7de0 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/model_test.py
rb39bf3b rd8e81f7 247 247 platform=self.platform) 248 248 # run the tests 249 <<<<<<< HEAD 249 250 #self.info = ps_model.info 250 251 #print("SELF.INFO PARAMS!!!",[p.id for p in self.info.parameters.call_parameters]) 251 252 #print("PS MODEL PARAMETERS:",[p.id for p in ps_model.info.parameters.call_parameters]) 253 ======= 254 >>>>>>> 2ed7de04217c5103c5fd8d7c14e29e04923269d5 252 255 results.append(self.run_one(ps_model, ps_test)) 253 256 … … 394 397 invalid = [] 395 398 for par in sorted(pars.keys()): 396 # special handling of R_eff mode, which is not a usual parameter 399 # Ignore the R_eff mode parameter when checking for valid parameters. 400 # It is an allowed parameter for a model even though it does not exist 401 # in the parameter table. The call_Fq() function pops it from the 402 # parameter list and sends it directly to kernel.Fq(). 397 403 if par == product.RADIUS_MODE_ID: 398 continue399 if par == product.RADIUS_TYPE_ID:400 continue401 if par == product.STRUCTURE_MODE_ID:402 404 continue 403 405 parts = par.split('_pd')
Note: See TracChangeset
for help on using the changeset viewer.