Ignore:
Timestamp:
Feb 24, 2017 9:39:00 AM (3 years ago)
Author:
GitHub <noreply@…>
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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
c221349
Parents:
2ffe241 (diff), cb05bfd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Paul Kienzle <pkienzle@…> (02/24/17 09:39:00)
git-committer:
GitHub <noreply@…> (02/24/17 09:39:00)
Message:

Merge branch 'master' into sesans41

File:
1 edited

Legend:

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

    rb5db35d r7caf3e5  
    136136                output.x, output.x_unit = self._unit_conversion(x, lam_unit, default_z_unit) 
    137137                output.y = y 
    138                 output.y_unit = '\AA^{-2} cm^{-1}'  # output y_unit added 
     138                output.y_unit = r'\AA^{-2} cm^{-1}'  # output y_unit added 
    139139                output.dx, output.dx_unit = self._unit_conversion(dx, lam_unit, default_z_unit) 
    140140                output.dy = dy 
    141141                output.lam, output.lam_unit = self._unit_conversion(lam, lam_unit, default_z_unit) 
    142142                output.dlam, output.dlam_unit = self._unit_conversion(dlam, lam_unit, default_z_unit) 
     143                 
     144                output.xaxis(r"\rm{z}", output.x_unit) 
     145                output.yaxis(r"\rm{ln(P)/(t \lambda^2)}", output.y_unit)  # Adjust label to ln P/(lam^2 t), remove lam column refs 
    143146 
    144                 output.xaxis("\\rm{z}", output.x_unit) 
    145                 output.yaxis("\\rm{ln(P)/(t \lambda^2)}", output.y_unit)  # Adjust label to ln P/(lam^2 t), remove lam column refs 
    146147                # Store loading process information 
    147148                output.meta_data['loader'] = self.type_name 
     
    151152                zaccept_unit_split = paramnames[7].split("[") 
    152153                zaccept_unit = zaccept_unit_split[1].replace("]","") 
    153                 if zaccept_unit.strip() == '\AA^-1' or zaccept_unit.strip() == '\A^-1': 
     154                if zaccept_unit.strip() == r'\AA^-1' or zaccept_unit.strip() == r'\A^-1': 
    154155                    zaccept_unit = "1/A" 
    155156                output.sample.zacceptance=(float(paramvals[7]),zaccept_unit) 
Note: See TracChangeset for help on using the changeset viewer.