Changeset ac13512 in sasview


Ignore:
Timestamp:
Oct 8, 2009 1:48:32 PM (15 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:
a99a29ac
Parents:
0a140e8
Message:

working on invariant

Location:
DataLoader
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • DataLoader/invariant.py

    r0a140e8 rac13512  
    156156        k =  self.q_star /(2*(math.pi* math.fabs(float(contrast)))**2) 
    157157        # compute the volume 
    158         volume = 0.5 *(1 - math.sqrt(1 + 4*k)) 
    159         if 0< volume< 1: 
    160             return volume  
     158        volume1 = 0.5 *(1 - math.sqrt(1 + 4*k)) 
     159        volume2 = 0.5 *(1 + math.sqrt(1 + 4*k)) 
     160        print "volume1",volume1 
     161        print "volume2",volume2 
     162        print 
     163        if 0< volume1< 1: 
     164            return volume1 
     165        elif 0< volume2< 1:  
     166            return volume2  
    161167        return  
    162168     
  • DataLoader/setup.py

    ra3f8d58 rac13512  
    33""" 
    44import os, sys 
    5  
     5if len(sys.argv) == 1: 
     6    sys.argv.append('install') 
     7     
    68# Then build and install the modules 
    79from distutils.core import setup, Extension 
Note: See TracChangeset for help on using the changeset viewer.