Index: sansmodels/src/sans/models/test/EllipticalCylinderModel_avg.txt
===================================================================
--- sansmodels/src/sans/models/test/EllipticalCylinderModel_avg.txt	(revision 8e36cddc31aee946bb051c6a6d4eade849ca2ed4)
+++ sansmodels/src/sans/models/test/EllipticalCylinderModel_avg.txt	(revision 8e36cddc31aee946bb051c6a6d4eade849ca2ed4)
@@ -0,0 +1,40 @@
+<q_average> <2d_average> <1d_average>
+      0.01    450.443    450.538
+      0.02    228.492    228.583
+      0.03    146.821    146.905
+      0.04    99.4147    99.4891
+      0.05    68.9323    68.9963
+      0.06    48.1927    48.2457
+      0.07    33.0745    33.1168
+      0.08    22.2556    22.2879
+      0.09    14.5954     14.619
+       0.1    9.17509    9.19152
+      0.11    5.56564    5.57647
+      0.12    3.24036    3.24712
+      0.13    1.79904    1.80306
+      0.14    1.00773    1.01007
+      0.15   0.594332   0.595781
+      0.16   0.402332   0.403396
+      0.17   0.342629   0.343579
+      0.18    0.31809   0.318926
+      0.19   0.307435   0.307546
+       0.2    0.29984   0.297366
+      0.21   0.278055   0.270346
+      0.22   0.256689   0.243026
+      0.23    0.23293   0.215236
+      0.24   0.204926   0.184429
+      0.25   0.184026   0.161486
+      0.26   0.162934   0.139665
+      0.27   0.141375   0.118023
+      0.28   0.123117   0.100842
+      0.29   0.102219  0.0818505
+       0.3  0.0817566  0.0641323
+      0.31  0.0647355  0.0501547
+      0.32  0.0484443   0.036785
+      0.33  0.0376914  0.0282178
+      0.34  0.0322234  0.0239272
+      0.35  0.0297307  0.0214156
+      0.36  0.0319883  0.0227386
+      0.37  0.0356066  0.0248264
+      0.38  0.0384513   0.026131
+      0.39  0.0412045   0.027696
Index: sansmodels/src/sans/models/test/ParallelepipedModel_avg.txt
===================================================================
--- sansmodels/src/sans/models/test/ParallelepipedModel_avg.txt	(revision 8e36cddc31aee946bb051c6a6d4eade849ca2ed4)
+++ sansmodels/src/sans/models/test/ParallelepipedModel_avg.txt	(revision 8e36cddc31aee946bb051c6a6d4eade849ca2ed4)
@@ -0,0 +1,40 @@
+<q_average> <2d_average> <1d_average>
+      0.01    1725.91    1726.27
+      0.02    844.857     845.19
+      0.03    512.535    512.824
+      0.04    320.226    320.463
+      0.05    200.934    201.119
+      0.06    126.006    126.142
+      0.07    77.5009    77.5985
+      0.08    47.8653    47.9338
+      0.09     30.465    30.5136
+       0.1    19.9904     20.026
+      0.11    13.8118    13.8388
+      0.12     9.7314     9.7521
+      0.13    6.59526    6.61053
+      0.14    4.24325    4.25362
+      0.15    2.42938    2.43556
+      0.16    1.17861    1.18168
+      0.17   0.547176    0.54844
+      0.18    0.30821   0.308673
+      0.19   0.339807    0.33912
+       0.2   0.495962     0.4905
+      0.21    0.60034   0.582884
+      0.22   0.648638   0.614215
+      0.23   0.630062   0.582034
+      0.24   0.554903   0.499162
+      0.25   0.501067   0.439671
+      0.26   0.468122   0.400928
+      0.27   0.449514   0.374445
+      0.28   0.445149   0.363161
+      0.29   0.411549   0.328163
+       0.3   0.345371   0.269387
+      0.31   0.261773   0.201769
+      0.32   0.165108   0.125196
+      0.33  0.0886511  0.0669448
+      0.34  0.0466287  0.0361501
+      0.35  0.0314074  0.0235842
+      0.36  0.0433855  0.0316342
+      0.37  0.0625163  0.0442813
+      0.38   0.073453   0.050116
+      0.39  0.0790395  0.0535744
Index: sansmodels/src/sans/models/test/TriaxialEllipsoidModel_avg.txt
===================================================================
--- sansmodels/src/sans/models/test/TriaxialEllipsoidModel_avg.txt	(revision 8e36cddc31aee946bb051c6a6d4eade849ca2ed4)
+++ sansmodels/src/sans/models/test/TriaxialEllipsoidModel_avg.txt	(revision 8e36cddc31aee946bb051c6a6d4eade849ca2ed4)
@@ -0,0 +1,40 @@
+<q_average> <2d_average> <1d_average>
+      0.01    6164.57    6166.44
+      0.02    2194.43    2195.78
+      0.03    874.092    874.921
+      0.04    373.102    373.577
+      0.05    180.232    180.513
+      0.06    92.2845    92.4552
+      0.07    45.6843    45.7821
+      0.08    22.4145     22.466
+      0.09    11.5733    11.5978
+       0.1    6.36235    6.34288
+      0.11    4.16701    4.01228
+      0.12    3.30499    3.12787
+      0.13    2.65935    2.62135
+      0.14    2.10192     2.1788
+      0.15    1.67028    1.77924
+      0.16    1.31569    1.37152
+      0.17    1.00186    0.99509
+      0.18   0.763725   0.718548
+      0.19   0.579733   0.531899
+       0.2    0.43648   0.412982
+      0.21   0.349758    0.35239
+      0.22   0.295571   0.319034
+      0.23   0.262257    0.28683
+      0.24   0.243974   0.253296
+      0.25    0.22178   0.216689
+      0.26   0.187983   0.176596
+      0.27   0.151557   0.141555
+      0.28   0.119923   0.115955
+      0.29  0.0961798  0.0978735
+       0.3  0.0831647  0.0869363
+      0.31   0.076784  0.0810271
+      0.32  0.0731715   0.075475
+      0.33  0.0690195  0.0688126
+      0.34  0.0626216  0.0614295
+      0.35  0.0544358  0.0530275
+      0.36  0.0462065  0.0448143
+      0.37  0.0395145  0.0384918
+      0.38   0.034362  0.0339966
+      0.39  0.0306087   0.031047
Index: sansmodels/src/sans/models/test/validate_2D_3axes_shape_model.py
===================================================================
--- sansmodels/src/sans/models/test/validate_2D_3axes_shape_model.py	(revision 27953d102b93d16d5dff1ce0c3abfc7ce159adaa)
+++ sansmodels/src/sans/models/test/validate_2D_3axes_shape_model.py	(revision 8e36cddc31aee946bb051c6a6d4eade849ca2ed4)
@@ -25,5 +25,5 @@
         Averaging the 3-axes 2D scattering intensity give a slightly
         different output than the 1D function  
-        at hight Q (Q>~0.1). This is due(?) to the way the IGOR library 
+        at hight Q (Q>~0.2). This is due(?) to the way the IGOR library 
         averages, taking only 76 points in alpha, the angle between
         the axis of the ellipsoid and the q vector.
@@ -81,8 +81,8 @@
             psi_label = 'axis_psi'
             
-        output_f = open("%s_avg1.txt" % model.__class__.__name__,'w')
+        output_f = open("%s_avg.txt" % model.__class__.__name__,'w')
         output_f.write("<q_average> <2d_average> <1d_average>\n")
             
-        for i_q in range(1, 30):
+        for i_q in range(1, 40):
             q = 0.01*i_q
             sum = 0.0
@@ -114,5 +114,6 @@
 if __name__ == '__main__':
     validator = Validate2D()
-
+    
+    #te was not passed.
     te_passed =validator(TriaxialEllipsoidModel, points=76)
     pp_passed = validator(ParallelepipedModel, points=76)
@@ -122,6 +123,6 @@
     print "Model             Passed"
     print "TriaxialEllipsoid         %s" % te_passed
+    print "ParallelepipedModel    %s" % pp_passed
     print "EllipticalCylinder        %s" % ell_passed
-    print "ParallelepipedModel    %s" % pp_passed
  
         
