Changes in / [1bd266b:5e0891b] in sasview
- Location:
- src/sas
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Perspectives/Inversion/DMaxExplorerWidget.py
re908916 rb0ba43e 42 42 self.parent = parent 43 43 44 self.setWindowTitle("D maxExplorer")44 self.setWindowTitle("Dââ Explorer") 45 45 46 46 self.pr_state = pr_state … … 116 116 bck = [] 117 117 chi2 = [] 118 plotable_xs = [] #Introducing this to make sure size of x and y for plotting is the same.8 118 119 119 try: 120 120 dmin = float(self.model.item(W.DMIN).text()) … … 128 128 129 129 original = self.pr_state.d_max 130 131 130 for x in xs: 132 131 self.pr_state.d_max = x … … 141 140 bck.append(self.pr_state.background) 142 141 chi2.append(self.pr_state.chi2) 143 plotable_xs.append(x)144 142 except Exception as ex: 145 143 # This inversion failed, skip this D_max value … … 190 188 y_unit = "a.u." 191 189 192 data = Data1D( plotable_xs, ys)190 data = Data1D(xs, ys) 193 191 if self.hasPlot: 194 192 self.plot.removePlot(None) -
src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py
r34cf92c rb0ba43e 43 43 estimateSignal = QtCore.pyqtSignal(tuple) 44 44 estimateNTSignal = QtCore.pyqtSignal(tuple) 45 estimateDynamicNTSignal = QtCore.pyqtSignal(tuple)46 estimateDynamicSignal = QtCore.pyqtSignal(tuple)47 45 calculateSignal = QtCore.pyqtSignal(tuple) 48 46 … … 196 194 self.model.itemChanged.connect(self.model_changed) 197 195 self.estimateNTSignal.connect(self._estimateNTUpdate) 198 self.estimateDynamicNTSignal.connect(self._estimateDynamicNTUpdate)199 self.estimateDynamicSignal.connect(self._estimateDynamicUpdate)200 196 self.estimateSignal.connect(self._estimateUpdate) 201 197 self.calculateSignal.connect(self._calculateUpdate) 202 203 self.maxDistanceInput.textEdited.connect(self.performEstimateDynamic)204 198 205 199 def setupMapper(self): … … 315 309 and not self.isCalculating) 316 310 self.removeButton.setEnabled(self.logic.data_is_loaded) 317 self.explorerButton.setEnabled(self.logic.data_is_loaded) 311 self.explorerButton.setEnabled(self.logic.data_is_loaded 312 and np.all(self.logic.data.dy != 0)) 318 313 self.stopButton.setVisible(self.isCalculating) 319 314 self.regConstantSuggestionButton.setEnabled( … … 506 501 self.dataPlot = self._dataList[data_ref].get(DICT_KEYS[2]) 507 502 self.performEstimate() 508 509 def updateDynamicGuiValues(self):510 pr = self._calculator511 alpha = self._calculator.suggested_alpha512 self.model.setItem(WIDGETS.W_MAX_DIST,513 QtGui.QStandardItem("{:.4g}".format(pr.get_dmax())))514 self.regConstantSuggestionButton.setText("{:-3.2g}".format(alpha))515 self.noOfTermsSuggestionButton.setText(516 "{:n}".format(self.nTermsSuggested))517 518 self.enableButtons()519 503 520 504 def updateGuiValues(self): … … 657 641 self.calcThread.ready(2.5) 658 642 659 #Perform estimate should be done on value enter this should solve delay problem660 self.performEstimate()661 662 643 def stopCalcThread(self): 663 644 """ Stops a thread if it exists and is running """ … … 686 667 error_func=self._threadError, 687 668 completefn=self._estimateNTCompleted, 688 updatefn=None)689 self.estimationThreadNT.queue()690 self.estimationThreadNT.ready(2.5)691 692 def performEstimateDynamicNT(self):693 """694 Perform parameter estimation695 """696 from .Thread import EstimateNT697 698 self.updateCalculator()699 700 # If a thread is already started, stop it701 self.stopEstimateNTThread()702 703 pr = self._calculator.clone()704 # Skip the slit settings for the estimation705 # It slows down the application and it doesn't change the estimates706 pr.slit_height = 0.0707 pr.slit_width = 0.0708 nfunc = self.getNFunc()709 710 self.estimationThreadNT = EstimateNT(pr, nfunc,711 error_func=self._threadError,712 completefn=self._estimateDynamicNTCompleted,713 669 updatefn=None) 714 670 self.estimationThreadNT.queue() … … 737 693 self.estimationThread.ready(2.5) 738 694 739 def performEstimateDynamic(self):740 """741 Perform parameter estimation742 """743 from .Thread import EstimatePr744 745 # If a thread is already started, stop it746 self.stopEstimationThread()747 748 self.estimationThread = EstimatePr(self._calculator.clone(),749 self.getNFunc(),750 error_func=self._threadError,751 completefn=self._estimateDynamicCompleted,752 updatefn=None)753 self.estimationThread.queue()754 self.estimationThread.ready(2.5)755 756 695 def stopEstimationThread(self): 757 696 """ Stop the estimation thread if it exists and is running """ … … 766 705 ''' Send a signal to the main thread for model update''' 767 706 self.estimateSignal.emit((alpha, message, elapsed)) 768 769 def _estimateDynamicCompleted(self, alpha, message, elapsed):770 ''' Send a signal to the main thread for model update'''771 self.estimateDynamicSignal.emit((alpha, message, elapsed))772 707 773 708 def _estimateUpdate(self, output_tuple): … … 786 721 self.performEstimateNT() 787 722 788 def _estimateDynamicUpdate(self, output_tuple):789 """790 Parameter estimation completed,791 display the results to the user792 793 :param alpha: estimated best alpha794 :param elapsed: computation time795 """796 alpha, message, elapsed = output_tuple797 self._calculator.alpha = alpha798 self._calculator.elapsed += self._calculator.elapsed799 if message:800 logger.info(message)801 self.performEstimateDynamicNT()802 803 723 def _estimateNTCompleted(self, nterms, alpha, message, elapsed): 804 724 ''' Send a signal to the main thread for model update''' 805 725 self.estimateNTSignal.emit((nterms, alpha, message, elapsed)) 806 807 def _estimateDynamicNTCompleted(self, nterms, alpha, message, elapsed):808 ''' Send a signal to the main thread for model update'''809 self.estimateDynamicNTSignal.emit((nterms, alpha, message, elapsed))810 726 811 727 def _estimateNTUpdate(self, output_tuple): … … 831 747 self.startThread() 832 748 833 def _estimateDynamicNTUpdate(self, output_tuple):834 """835 Parameter estimation completed,836 display the results to the user837 838 :param alpha: estimated best alpha839 :param nterms: estimated number of terms840 :param elapsed: computation time841 """842 nterms, alpha, message, elapsed = output_tuple843 self._calculator.elapsed += elapsed844 self._calculator.suggested_alpha = alpha845 self.nTermsSuggested = nterms846 # Save useful info847 self.updateDynamicGuiValues()848 if message:849 logger.info(message)850 if self.isBatch:851 self.acceptAlpha()852 self.acceptNoTerms()853 self.startThread()854 855 749 def _calculateCompleted(self, out, cov, pr, elapsed): 856 750 ''' Send a signal to the main thread for model update''' -
src/sas/sascalc/pr/invertor.py
r6701a0b rb8080e1 71 71 A[j][i] = (Fourier transformed base function for point j) 72 72 73 We the nchoose a number of r-points, n_r, to evaluate the second73 We them choose a number of r-points, n_r, to evaluate the second 74 74 derivative of P(r) at. This is used as our regularization term. 75 75 For a vector r of length n_r, the following n_r rows are set to :: … … 144 144 x, y, err, d_max, q_min, q_max and alpha 145 145 """ 146 if name == 'x':146 if name == 'x': 147 147 if 0.0 in value: 148 148 msg = "Invertor: one of your q-values is zero. " … … 227 227 return None 228 228 229 def add_errors(self, yvalues):230 """231 Adds errors to data set is they are not avaialble232 :return:233 """234 stats_errors = np.zeros(len(yvalues))235 for i in range(len(yvalues)):236 # Scale the error so that we can fit over several decades of Q237 scale = 0.05 * np.sqrt(yvalues[i])238 min_err = 0.01 * yvalues[i]239 stats_errors[i] = scale * np.sqrt(np.fabs(yvalues[i])) + min_err240 logger.warning("Simulated errors have been added to the data set\n")241 return stats_errors242 243 229 def clone(self): 244 230 """ … … 258 244 invertor.x = self.x 259 245 invertor.y = self.y 260 if np.size(self.err) == 0 or np.all(self.err) == 0: 261 invertor.err = self.add_errors(self.y) 262 else: 263 invertor.err = self.err 246 invertor.err = self.err 264 247 invertor.est_bck = self.est_bck 265 248 invertor.background = self.background … … 285 268 A[i][j] = (Fourier transformed base function for point j) 286 269 287 We the nchoose a number of r-points, n_r, to evaluate the second270 We them choose a number of r-points, n_r, to evaluate the second 288 271 derivative of P(r) at. This is used as our regularization term. 289 272 For a vector r of length n_r, the following n_r rows are set to ::
Note: See TracChangeset
for help on using the changeset viewer.