Changeset 318b5bbb in sasview for sansmodels/src/c_models/sc.cpp

Timestamp:

Dec 18, 2012 10:55:24 AM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

6550b64

Parents:

0203ade

Message:

Added polarization and magnetic stuffs

File:

• sansmodels/src/c_models/sc.cpp (modified) (3 diffs)

sansmodels/src/c_models/sc.cpp

@@ -55 +55 @@
   double a3_x, a3_y, a3_z, a2_x, a2_y, a1_x, a1_y;
   double q_z;
-  double alpha, cos_val_a3, cos_val_a2, cos_val_a1;
+  double cos_val_a3, cos_val_a2, cos_val_a1;
   double a1_dot_q, a2_dot_q,a3_dot_q;
   double answer;
@@ -80 +80 @@
   /// Angles here are respect to detector coordinate instead of against q coordinate(PRB 36, 3, 1754)
   // a3 axis orientation
-  a3_x = sin(theta) * cos(phi);//negative sign here???
-  a3_y = sin(theta) * sin(phi);
-  a3_z = cos(theta);
-
+  a3_x = cos(theta) * cos(phi);
+  a3_y = sin(theta);
+  //a3_z = -cos(theta) * sin(phi);
   // q vector
   q_z = 0.0;
 
   // Compute the angle btw vector q and the a3 axis
-  cos_val_a3 = a3_x*q_x + a3_y*q_y + a3_z*q_z;
-  alpha = acos(cos_val_a3);
-  //alpha = acos(cos_val_a3);
-  a3_dot_q = aa*q*cos_val_a3;
+  cos_val_a3 = a3_x*q_x + a3_y*q_y;// + a3_z*q_z;
+
   // a1 axis orientation
-  a1_x = sin(psi);
-  a1_y = cos(psi);
+  a1_x = -cos(phi)*sin(psi) * sin(theta)+sin(phi)*cos(psi);
+  a1_y = sin(psi)*cos(theta);
 
   cos_val_a1 = a1_x*q_x + a1_y*q_y;
-  a1_dot_q = aa*q*cos_val_a1*sin(alpha);
 
   // a2 axis orientation
-  a2_x = sqrt(1.0-sin(theta)*cos(phi))*cos(psi);
-  a2_y = sqrt(1.0-sin(theta)*cos(phi))*sin(psi);
+  a2_x = -sin(theta)*cos(psi)*cos(phi)-sin(psi)*sin(phi);
+  a2_y = cos(theta)*cos(psi);
   // a2 axis
-  cos_val_a2 =  sin(acos(cos_val_a1));//a2_x*q_x + a2_y*q_y;
-  a2_dot_q = aa*q*cos_val_a2*sin(alpha);
+  cos_val_a2 =  a2_x*q_x + a2_y*q_y;
 
   // The following test should always pass
   if (fabs(cos_val_a3)>1.0) {
-    printf("parallel_ana_2D: Unexpected error: cos(alpha)>1\n");
-    return 0;
-  }
+    //printf("parallel_ana_2D: Unexpected error: cos(alpha)>1\n");
+    cos_val_a3 = 1.0;
+  }
+   if (fabs(cos_val_a1)>1.0) {
+    //printf("parallel_ana_2D: Unexpected error: cos(alpha)>1\n");
+    cos_val_a1 = 1.0;
+  }
+   if (fabs(cos_val_a2)>1.0) {
+    //printf("parallel_ana_2D: Unexpected error: cos(alpha)>1\n");
+    cos_val_a3 = 1.0;
+  }
+  a3_dot_q = aa*q*cos_val_a3;
+  a1_dot_q = aa*q*cos_val_a1;//*sin(alpha);
+  a2_dot_q = aa*q*cos_val_a2;
+  
   // Call Zq=Z1*Z2*Z3
   Zq = (1.0-exp(-qDa_2))/(1.0-2.0*exp(-0.5*qDa_2)*cos(a1_dot_q)+exp(-qDa_2));
-  Zq = Zq * (1.0-exp(-qDa_2))/(1.0-2.0*exp(-0.5*qDa_2)*cos(a2_dot_q)+exp(-qDa_2));
-  Zq = Zq * (1.0-exp(-qDa_2))/(1.0-2.0*exp(-0.5*qDa_2)*cos(a3_dot_q)+exp(-qDa_2));
+  Zq *= (1.0-exp(-qDa_2))/(1.0-2.0*exp(-0.5*qDa_2)*cos(a2_dot_q)+exp(-qDa_2));
+  Zq *= (1.0-exp(-qDa_2))/(1.0-2.0*exp(-0.5*qDa_2)*cos(a3_dot_q)+exp(-qDa_2));
 
   // Use SphereForm directly from libigor
@@ -278 +285 @@
           }
           if (weights_theta.size()>1) {
-            _ptvalue *= fabs(sin(weights_theta[j].value*pi/180.0));
+            _ptvalue *= fabs(cos(weights_theta[j].value*pi/180.0));
           }
           sum += _ptvalue;