Changeset 6756712 in sasview for sansmodels/src/sans
- Timestamp:
- Apr 22, 2009 4:12:49 PM (16 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:
- 280a14b
- Parents:
- c3e4a7fa
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sansmodels/src/sans/models/MultiplicationModel.py
rc3e4a7fa r6756712 152 152 self.model1.setParam( name, value) 153 153 154 155 if self.modelD !=None: 156 if name == self.para1 or name == self.para2: 154 if name==self.para1 or name == self.para2 and self.modelD !=None: 157 155 self.modelD.params[name]= value 158 elif name in self.model2.getParamList() and name != 'radius': 156 self.model2.setParam('radius', self.modelD.run()) 157 else: 158 if name in self.model2.getParamList(): 159 159 self.model2.setParam( name, value) 160 elif name in self.model2.getParamList()and name != 'radius': 161 self.model2.setParam( name, value) 162 163 160 161 162 164 163 self._setParamHelper( name, value) 165 164 … … 210 209 #MultiplicationModel(self.model1, self.model2 ) 211 210 212 if self.modelD!=None:213 value = self.modelD.run(x)214 self.model2.setParam( "radius", value)211 #if self.modelD!=None: 212 # value = self.modelD.run(x) 213 # self.model2.setParam( "radius", value) 215 214 216 215 #print "self.model2.setParam( radius, value)",value
Note: See TracChangeset
for help on using the changeset viewer.