Index: sansrealspace/src/realspace/test/cylinder_d=0.5_Iq2D.txt
===================================================================
--- sansrealspace/src/realspace/test/cylinder_d=0.5_Iq2D.txt	(revision a2c1196ad8c06b1343cc4c9c510c9764628d9da2)
+++ sansrealspace/src/realspace/test/cylinder_d=0.5_Iq2D.txt	(revision f980d4a81cb3e30b1036a193f676c8fcca7fdfb8)
@@ -1,27 +1,27 @@
-PARS: {'scale': 1.0, 'length': 100, 'radius': 20, 'background': 0.0, 'cyl_theta': 1.0, 'contrast': 1.0, 'cyl_phi': 1.0}
+PARS: {'scale': 1.0, 'length': 100, 'radius': 20, 'background': 0.0, 'cyl_theta': 1.5707963267948966, 'contrast': 1.0, 'cyl_phi': 1.5707963267948966}
 <q>  <ana>  <sim>  <err>
-0.001  1.25586e+013  1.25584e+013  5.26233e+008
-0.00929167  1.1909e+013  1.19068e+013  1.04923e+010
-0.0175833  1.0341e+013  1.03408e+013  3.11388e+010
-0.025875  8.16205e+012  8.15049e+012  5.18067e+010
-0.0341667  5.77306e+012  5.75279e+012  6.23249e+010
-0.0424583  3.56425e+012  3.55305e+012  5.89665e+010
-0.05075  1.82415e+012  1.84081e+012  4.53723e+010
-0.0590417  6.86403e+011  6.74985e+011  2.6955e+010
-0.0673333  1.26379e+011  1.248e+011  1.07889e+010
-0.075625  1.69416e+009  2.89547e+009  1.50778e+009
-0.0839167  1.17674e+011  1.07376e+011  8.66466e+009
-0.0922083  2.93262e+011  2.90816e+011  1.4123e+010
-0.1005  4.06932e+011  3.98585e+011  1.69585e+010
-0.108792  4.1248e+011  4.30879e+011  1.82588e+010
-0.117083  3.26735e+011  3.32331e+011  1.66224e+010
-0.125375  2.00372e+011  1.9155e+011  1.2709e+010
-0.133667  8.63351e+010  9.06573e+010  8.67162e+009
-0.141958  1.76833e+010  1.4993e+010  3.5005e+009
-0.15025  2.29778e+008  2.08421e+008  4.0582e+008
-0.158542  1.83678e+010  1.58227e+010  3.54108e+009
-0.166833  4.78555e+010  4.61547e+010  6.02634e+009
-0.175125  6.83196e+010  6.41105e+010  7.15624e+009
-0.183417  7.03999e+010  7.16712e+010  7.5763e+009
-0.191708  5.61199e+010  5.95249e+010  6.90467e+009
-0.2  3.43293e+010  4.68345e+010  6.07661e+009
+0.001  1.25586e+013  1.25584e+013  5.25262e+008
+0.00929167  1.1909e+013  1.19058e+013  1.05064e+010
+0.0175833  1.0341e+013  1.03345e+013  3.12179e+010
+0.025875  8.16205e+012  8.14926e+012  5.17962e+010
+0.0341667  5.77306e+012  5.81045e+012  6.21145e+010
+0.0424583  3.56425e+012  3.55223e+012  5.90114e+010
+0.05075  1.82415e+012  1.80424e+012  4.48859e+010
+0.0590417  6.86403e+011  6.93632e+011  2.71769e+010
+0.0673333  1.26379e+011  1.2136e+011  1.06077e+010
+0.075625  1.69416e+009  1.50569e+009  1.08773e+009
+0.0839167  1.17674e+011  1.24732e+011  9.32509e+009
+0.0922083  2.93262e+011  2.7841e+011  1.38067e+010
+0.1005  4.06932e+011  4.09882e+011  1.72092e+010
+0.108792  4.1248e+011  4.37694e+011  1.84369e+010
+0.117083  3.26735e+011  3.07555e+011  1.59575e+010
+0.125375  2.00372e+011  1.98719e+011  1.30112e+010
+0.133667  8.63351e+010  8.31996e+010  8.33716e+009
+0.141958  1.76833e+010  1.4757e+010  3.47028e+009
+0.15025  2.29778e+008  5.88028e+008  6.83052e+008
+0.158542  1.83678e+010  1.6151e+010  3.56511e+009
+0.166833  4.78555e+010  5.04122e+010  6.33775e+009
+0.175125  6.83196e+010  7.36705e+010  7.69267e+009
+0.183417  7.03999e+010  7.70008e+010  7.86228e+009
+0.191708  5.61199e+010  5.68128e+010  6.74312e+009
+0.2  3.43293e+010  3.12432e+010  4.97778e+009
Index: sansrealspace/src/realspace/test/early_test.py
===================================================================
--- sansrealspace/src/realspace/test/early_test.py	(revision a2c1196ad8c06b1343cc4c9c510c9764628d9da2)
+++ sansrealspace/src/realspace/test/early_test.py	(revision f980d4a81cb3e30b1036a193f676c8fcca7fdfb8)
@@ -209,10 +209,10 @@
     
     # Along Y
-    #ana.setParam('cyl_theta', 1.57)
-    #ana.setParam('cyl_phi', 1.57)
+    ana.setParam('cyl_theta', 1.57)
+    ana.setParam('cyl_phi', 1.57)
     
     # Along Z
-    ana.setParam('cyl_theta', 0)
-    ana.setParam('cyl_phi', 0)
+    #ana.setParam('cyl_theta', 0)
+    #ana.setParam('cyl_phi', 0)
     
     model = VolumeCanvas.VolumeCanvas()    
@@ -226,14 +226,19 @@
     
     # Along Y
-    #model.setParam('%s.orientation' % handle, [0,0,0])
+    model.setParam('%s.orientation' % handle, [0,0,0])
     
     # Along Z
-    model.setParam('%s.orientation' % handle, [1.57,0,0])
-    
-    
-    ana = ana.runXY([0.1, 0.01])
-    sim = model.getIq2D(0.1, 0.01)
+    #model.setParam('%s.orientation' % handle, [1.57,0,0])
+    
+    
     print model.npts
-    print ana, sim, sim/ana, ana/sim
+    for i in range(40):
+        qmax = 0.5
+        anaX = ana.runXY([qmax*i/40.0, 0.0])
+        simX = model.getIq2D(qmax*i/40.0, 0.0)
+        
+        anaY = ana.runXY([0, qmax*i/40.0])
+        simY = model.getIq2D(0, qmax*i/40.0)
+        print anaX, simX, simX/anaX, '|', anaY, simY, simY/anaY
     
 def test_7():
@@ -284,7 +289,6 @@
         print ana_val, sim_val, sim_val/ana_val, err, (sim_val-ana_val)/err
     
-
     
     
 if __name__ == "__main__":
-    test_7()
+    test_6()
Index: sansrealspace/src/realspace/test/sim_validation.py
===================================================================
--- sansrealspace/src/realspace/test/sim_validation.py	(revision a2c1196ad8c06b1343cc4c9c510c9764628d9da2)
+++ sansrealspace/src/realspace/test/sim_validation.py	(revision f980d4a81cb3e30b1036a193f676c8fcca7fdfb8)
@@ -109,4 +109,6 @@
         self.ana.setParam('radius', radius)
         self.ana.setParam('length', length)
+        self.ana.setParam('cyl_theta', math.pi/2.0)
+        self.ana.setParam('cyl_phi', math.pi/2.0)
         self.create()
        
@@ -141,4 +143,7 @@
         self.ana.setParam('radius_b', radius_b)
         #self.ana.setParam('radius', radius_a)
+        
+        # Default orientation is there=1.57, phi=0
+        # Radius_a is along the x direction
 
         self.create()
@@ -311,7 +316,7 @@
     
     # 2D: Density=5, 71.2 secs for 50 points
-    vali = CoreShellValidator(radius = 15, thickness=5, density = 5.0)
+    #vali = CoreShellValidator(radius = 15, thickness=5, density = 5.0)
     #validate_model(vali, q_min=0.001, q_max=1, n_q=50)
-    validate_model_2D(vali, q_min=0.001, q_max=1, phi=1.0, n_q=50)
+    #validate_model_2D(vali, q_min=0.001, q_max=1, phi=1.0, n_q=50)
 
     # 2D: Density=2, 11.1 secs for 25 points
@@ -325,6 +330,6 @@
     #vali = CylinderValidator(radius = 20, length=100, density = 0.1)
     #validate_model(vali, q_min=0.001, q_max=0.5, n_q=25)
-    #vali = CylinderValidator(radius = 20, length=100, density = 0.5)
-    #validate_model_2D(vali, q_min=0.001, q_max=0.2, phi=1.0, n_q=25)
+    vali = CylinderValidator(radius = 20, length=100, density = 0.5)
+    validate_model_2D(vali, q_min=0.001, q_max=0.2, phi=1.0, n_q=25)
     
     # 2D: Density=0.5, 2.26 secs for 25 points
Index: sansrealspace/src/realspace/test/utest_oriented.py
===================================================================
--- sansrealspace/src/realspace/test/utest_oriented.py	(revision a2c1196ad8c06b1343cc4c9c510c9764628d9da2)
+++ sansrealspace/src/realspace/test/utest_oriented.py	(revision f980d4a81cb3e30b1036a193f676c8fcca7fdfb8)
@@ -187,5 +187,6 @@
         self.ana.setParam('radius_a', radius_a)
         self.ana.setParam('radius_b', radius_b)
-
+        # Default orientation is there=1.57, phi=0
+        # Radius_a is along the x direction
        
         canvas = VolumeCanvas.VolumeCanvas()
