Ignore:
Timestamp:
Apr 10, 2017 1:00:32 PM (7 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, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
6e6dd4c
Parents:
6267876
git-author:
Jeff Krzywon <krzywon@…> (04/10/17 13:00:32)
git-committer:
krzywon <krzywon@…> (04/10/17 13:00:32)
Message:

Resolve merge conflicts and 2 small fixes to slicer panel. #467

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/dataloader/manipulations.py

    r7432acb r3e5648b  
    430430            z_max = max(data2D.q_data) 
    431431            z_min = min(data2D.q_data) 
    432             x_max = data2D.dqx_data[data2D.q_data[z_max]] 
    433             x_min = data2D.dqx_data[data2D.q_data[z_min]] 
    434             y_max = data2D.dqy_data[data2D.q_data[z_max]] 
    435             y_min = data2D.dqy_data[data2D.q_data[z_min]] 
     432            x_max = data2D.dqx_data[numpy.where(data2D.q_data == z_max)] 
     433            x_min = data2D.dqx_data[numpy.where(data2D.q_data == z_min)] 
     434            y_max = data2D.dqy_data[numpy.where(data2D.q_data == z_max)] 
     435            y_min = data2D.dqy_data[numpy.where(data2D.q_data == z_min)] 
    436436            # Find qdx at q = 0 
    437437            dq_overlap_x = (x_min * z_max - x_max * z_min) / (z_max - z_min) 
     
    785785            z_max = max(data2D.q_data) 
    786786            z_min = min(data2D.q_data) 
    787             x_max = data2D.dqx_data[data2D.q_data[z_max]] 
    788             x_min = data2D.dqx_data[data2D.q_data[z_min]] 
    789             y_max = data2D.dqy_data[data2D.q_data[z_max]] 
    790             y_min = data2D.dqy_data[data2D.q_data[z_min]] 
     787            x_max = data2D.dqx_data[numpy.where(data2D.q_data == z_max)] 
     788            x_min = data2D.dqx_data[numpy.where(data2D.q_data == z_min)] 
     789            y_max = data2D.dqy_data[numpy.where(data2D.q_data == z_max)] 
     790            y_min = data2D.dqy_data[numpy.where(data2D.q_data == z_min)] 
    791791            # Find qdx at q = 0 
    792792            dq_overlap_x = (x_min * z_max - x_max * z_min) / (z_max - z_min) 
Note: See TracChangeset for help on using the changeset viewer.