Changeset 888e62c in sasview

Timestamp:

Feb 5, 2009 2:02:45 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

8d93ec4

Parents:

d468daa

Message:

sansview print remove

Location:

sansview/perspectives/fitting

Files:

• fitpage1D.py (modified) (2 diffs)
• fitpanel.py (modified) (3 diffs)
• fitproblem.py (modified) (1 diff)
• fitting.py (modified) (5 diffs)
• modelpage.py (modified) (1 diff)
• simfitpage.py (modified) (4 diffs)

sansview/perspectives/fitting/fitpage1D.py

@@ -195 +195 @@
             self.qmin_x= self.data.xmin
             self.qmax_x= self.data.xmax           
-            #print "data2D range",self.qmax_x
-        
-            self.num_points= 100
+            print "data2D range",self.qmax_x
+        
+        self.num_points= 100
          
         
@@ -306 +306 @@
                             if self.data.y_bins[j]>= self.qmin_x and self.data.y_bins[j]<= self.qmax_x:
                                 res.append( (self.data.data[j][i]- self.model.runXY(\
-                                 [self.data.y_bins[j],self.data.x_bins[i]]))\
+                                 [self.data.x_bins[i],self.data.y_bins[j]]))\
                                     /self.data.err_data[j][i] )
                 sum=0

sansview/perspectives/fitting/fitpanel.py

@@ -62 +62 @@
     def onClosePage(self, event):
         self.ToggleWindowStyle(wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB)
-        print "went here",self.get_current_page(), self.GetPage(0)
+        #print "went here",self.get_current_page(), self.GetPage(0)
         #event.Skip()
         if self.GetPageCount() <= 2:
-            print "wente here"
+            #print "wente here"
             
             # Prevent last tab from being closed
@@ -133 +133 @@
         """
         from modelpage import ModelPage
-        print "fitpanel model", model
+        #print "fitpanel model", model
         panel = ModelPage(self,model,page_title, -1)
         panel.set_manager(self.manager)
@@ -184 +184 @@
              selected on that page. remove its reference into page_finder (fitting module)
         """
-        print "model page", page_number, page
+        #print "model page", page_number, page
         if page!=None and page_number!=None:
             

sansview/perspectives/fitting/fitproblem.py

@@ -26 +26 @@
     def set_smearer(self, smearer):
         self.smearer= smearer
-        print "smeaerer in fitproblem",self.smearer
+        #print "smeaerer in fitproblem",self.smearer
     def get_smearer(self):
         return self.smearer

sansview/perspectives/fitting/fitting.py

@@ -135 +135 @@
         self.index_model = 0
         self.parent.Bind(EVT_SLICER_PANEL, self._on_slicer_event)
+       
         
         #create the fitting panel
@@ -141 +142 @@
         self.mypanels.append(self.fit_panel)
         return self.mypanels
+    
+    
     def _on_model2D_show(self, event ):
         print "model2D get the id ", event.id
+        
+        
     def _on_slicer_event(self, event):
         print "fitting:slicer event ", event.panel
-        new_panel = event.panel
-        # Set group ID if available
-        event_id = self.parent.popup_panel(new_panel)
-        self.menu1.Append(event_id, new_panel.window_caption, 
-                         "Show %s plot panel" % new_panel.window_caption)
-        # Set UID to allow us to reference the panel later
-        new_panel.uid = event_id
-        new_panel
-        self.mypanels.append(new_panel) 
+        if event.panel!=None:
+            new_panel = event.panel
+            # Set group ID if available
+            event_id = self.parent.popup_panel(new_panel)
+            self.menu1.Append(event_id, new_panel.window_caption, 
+                             "Show %s plot panel" % new_panel.window_caption)
+            # Set UID to allow us to reference the panel later
+            new_panel.uid = event_id
+            new_panel
+            self.mypanels.append(new_panel) 
         return        
     def _on_show_panel(self, event):
@@ -375 +381 @@
                     #Do the single fit
                     self.fitter.set_model(Model(model), self.id, pars) 
-                    print "args...:",metadata,self.id,smearer,qmin,qmax,ymin,ymax
+                    #print "args...:",metadata,self.id,smearer,qmin,qmax,ymin,ymax
                   
                     self.fitter.set_data(data=metadata,Uid=self.id,
@@ -468 +474 @@
                           
                     self.fitter.set_model(new_model, self.id, pars) 
-                    
                     self.fitter.set_data(metadata,self.id,qmin,qmax,ymin,ymax)
                     self.fitter.select_problem_for_fit(Uid=self.id,value=value.get_scheduled())
@@ -642 +647 @@
                 xmin=data.xmin
                 xmax=data.xmax
-                print " q range =",    
+                #print " q range =",    
                 theory.data = numpy.zeros((len(data.y_bins),len(data.x_bins)))
-                for j in range(len(data.y_bins)):
-                    if data.y_bins[j]>= ymin and data.y_bins[j]<= ymax:
-                        for i in range(len(data.x_bins)):
+                for i in range(len(data.y_bins)):
+                    if data.y_bins[i]>= ymin and data.y_bins[i]<= ymax:
+                        for j in range(len(data.x_bins)):
                             if data.x_bins[i]>= qmin and data.x_bins[i]<= qmax:
                                 theory.data[j][i]=model.runXY([data.y_bins[j],data.x_bins[i]])

sansview/perspectives/fitting/modelpage.py

@@ -269 +269 @@
             else:
                 if self.data !=None and self.model !=None: # allow to recognize data panel from model panel
+                #if self.data !=None and self.model !=None:
                     self.cb1.SetValue(False)
                     self.select_all_param_helper()
                 
-                    self.populate_disp_box()
-                    self.set_panel_dispers(self.disp_list)
+                self.populate_disp_box()
+                self.set_panel_dispers(self.disp_list)
                 
         else:

sansview/perspectives/fitting/simfitpage.py

@@ -146 +146 @@
              @param delpage: the page removed
         """
-        print "self.model_list",self.model_list
+        #print "self.model_list",self.model_list
        
         self.model_list=[]
@@ -214 +214 @@
                 model=list[0]
                 param_list=model.getParamList()
-                print "simfitpage: on set_model self.params ",self.params
+                #print "simfitpage: on set_model self.params ",self.params
                 if self.params !=[]:
                     for element in self.params:
@@ -220 +220 @@
                             for item in param_list:
                                 if item==str(element[1]):
-                                    print "simfitpage: on set_model page 1",param_list
-                                    print "simfitpage: model name",element[0], model.name
-                                    print "simfitpage: param name ,param value",element[1],element[2]
+                                    #print "simfitpage: on set_model page 1",param_list
+                                    #print "simfitpage: model name",element[0], model.name
+                                    #print "simfitpage: param name ,param value",element[1],element[2]
                                     self.manager.set_page_finder(model.name,element[1],\
                                                                  str(element[2]))
@@ -271 +271 @@
                 param_name=param_names[1]
                 ##### just added
-                print "simfitpage: param name",model_name,param_name
+                #print "simfitpage: param name",model_name,param_name
             
                 param=[str(model_name),param_name,str(param_value)]