Changeset c9ecd1b in sasview


Ignore:
Timestamp:
Sep 8, 2017 11:22:46 AM (5 years ago)
Author:
krzywon
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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
cd57c7d4
Parents:
b682c6a
Message:

Comment NXcanSAS reader and remove unused variable from fitpanel.

Location:
src/sas
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py

    r7c24685 rc9ecd1b  
    126126 
    127127            if isinstance(value, h5py.Group): 
    128                 parent_class = class_name 
     128                # Set parent class before recursion 
    129129                self.parent_class = class_name 
    130130                parent_list.append(key) 
     
    137137                # Recursion step to access data within the group 
    138138                self.read_children(value, parent_list) 
    139                 self.parent_class = parent_class 
     139                # Reset parent class when returning from recursive method 
     140                self.parent_class = class_name 
    140141                self.add_intermediate() 
    141142                parent_list.remove(key) 
  • src/sas/sasgui/perspectives/fitting/fitpanel.py

    rd79feea rc9ecd1b  
    407407                    self.SetSelection(pos) 
    408408                    self.on_close_page(event=None) 
    409                     temp = self.GetSelection() 
    410409                    self.DeletePage(pos) 
    411410                    self.sim_page = None 
Note: See TracChangeset for help on using the changeset viewer.