Changeset 4ce74b44 in sasview for fittingview/src
- Timestamp:
- Jun 4, 2012 4:29:09 PM (12 years ago)
- 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:
- da7cacb
- Parents:
- 045be84d
- Location:
- fittingview/src/sans/perspectives/fitting/plugin_models
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
fittingview/src/sans/perspectives/fitting/plugin_models/sum_Ap1_1_Ap2.py
r316e231 r4ce74b44 97 97 if not new_item in self.orientation_params: 98 98 self.orientation_params.append(new_item) 99 # get multiplicity if model provide it, else 1. 100 try: 101 multiplicity1 = p_model1.multiplicity 102 try: 103 multiplicity2 = p_model2.multiplicity 104 except: 105 multiplicity2 = 1 106 except: 107 multiplicity1 = 1 108 multiplicity2 = 1 99 # set multiplicity 1: muti_func Not supported. 100 multiplicity1 = 1 101 multiplicity2 = 1 109 102 ## functional multiplicity of the model 110 103 self.multiplicity1 = multiplicity1 -
fittingview/src/sans/perspectives/fitting/plugin_models/sum_p1_p2.py
r316e231 r4ce74b44 105 105 if not new_item in self.orientation_params: 106 106 self.orientation_params.append(new_item) 107 # get multiplicity if model provide it, else 1. 108 try: 109 multiplicity1 = p_model1.multiplicity 110 try: 111 multiplicity2 = p_model2.multiplicity 112 except: 113 multiplicity2 = 1 114 except: 115 multiplicity1 = 1 116 multiplicity2 = 1 107 # set multiplicity 1: muti_func Not supported. 108 multiplicity1 = 1 109 multiplicity2 = 1 117 110 ## functional multiplicity of the model 118 111 self.multiplicity1 = multiplicity1
Note: See TracChangeset
for help on using the changeset viewer.