Changeset 73cd800 in sasview for src/sas/sascalc/calculator/c_extensions/libfunc.c

Timestamp:

Mar 30, 2019 5:41:43 PM (6 years ago)

Author:

GitHub <noreply@…>

Parents:

1cf0fc0 (diff), 1342f6a (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:

dehoni <honecker@…> (03/30/19 17:41:43)

git-committer:

GitHub <noreply@…> (03/30/19 17:41:43)

Message:

Merge 1342f6af95377b8acc4a1082f09169a8a0813fcb into 1cf0fc0426654aa29d891b968376b013686c685f

File:

• src/sas/sascalc/calculator/c_extensions/libfunc.c (modified) (2 diffs)

src/sas/sascalc/calculator/c_extensions/libfunc.c

@@ -87 +87 @@
 }
 
+//The code calculating magnetic sld below seems to be not used.
+//Keeping it in order to check if it is not breaking anything.
 // calculate magnetic sld and return total sld
 // bn : contrast (not just sld of the layer)
@@ -95 +97 @@
 // spintheta: angle (anti-clock-wise) between neutron spin(up) and x axis
 // Note: all angles are in degrees.
-void cal_msld(polar_sld *p_sld, int isangle, double qx, double qy, double bn,
-                                double m01, double mtheta1, double mphi1,
-                                double spinfraci, double spinfracf, double spintheta)
-{
-        //locals
-        double q_x = qx;
-        double q_y = qy;
-        double sld = bn;
-        int is_angle = isangle;
-        double pi = 4.0*atan(1.0);
-        double s_theta = spintheta * pi/180.0;
-        double m_max = m01;
-        double m_phi = mphi1;
-        double m_theta = mtheta1;
-        double in_spin = spinfraci;
-        double out_spin = spinfracf;
-
-        double m_perp = 0.0;
-        double m_perp_z = 0.0;
-        double m_perp_y = 0.0;
-        double m_perp_x = 0.0;
-        double m_sigma_x = 0.0;
-        double m_sigma_z = 0.0;
-        double m_sigma_y = 0.0;
-        //double b_m = 0.0;
-        double q_angle = 0.0;
-        double mx = 0.0;
-        double my = 0.0;
-        double mz = 0.0;
-        double uu = sld;
-        double dd = sld;
-        double re_ud = 0.0;
-        double im_ud = 0.0;
-        double re_du = 0.0;
-        double im_du = 0.0;
-
-        //No mag means no further calculation
-        if (isangle>0) {
-                if (m_max < 1.0e-32){
-                        uu = sqrt(sqrt(in_spin * out_spin)) * uu;
-                        dd = sqrt(sqrt((1.0 - in_spin) * (1.0 - out_spin))) * dd;
-                }
-        }
-        else if (fabs(m_max)< 1.0e-32 && fabs(m_phi)< 1.0e-32 && fabs(m_theta)< 1.0e-32){
-                        uu = sqrt(sqrt(in_spin * out_spin)) * uu;
-                        dd = sqrt(sqrt((1.0 - in_spin) * (1.0 - out_spin))) * dd;
-        } else {
-
-                //These are needed because of the precision of inputs
-                if (in_spin < 0.0) in_spin = 0.0;
-                if (in_spin > 1.0) in_spin = 1.0;
-                if (out_spin < 0.0) out_spin = 0.0;
-                if (out_spin > 1.0) out_spin = 1.0;
-
-                if (q_x == 0.0) q_angle = pi / 2.0;
-                else q_angle = atan(q_y/q_x);
-                if (q_y < 0.0 && q_x < 0.0) q_angle -= pi;
-                else if (q_y > 0.0 && q_x < 0.0) q_angle += pi;
-
-                q_angle = pi/2.0 - q_angle;
-                if (q_angle > pi) q_angle -= 2.0 * pi;
-                else if (q_angle < -pi) q_angle += 2.0 * pi;
-
-                if (fabs(q_x) < 1.0e-16 && fabs(q_y) < 1.0e-16){
-                        m_perp = 0.0;
-                        }
-                else {
-                        m_perp = m_max;
-                        }
-                if (is_angle > 0){
-                        m_phi *= pi/180.0;
-                        m_theta *= pi/180.0;
-                        mx = m_perp * cos(m_theta) * cos(m_phi);
-                        my = m_perp * sin(m_theta);
-                        mz = -(m_perp * cos(m_theta) * sin(m_phi));
-                }
-                else{
-                        mx = m_perp;
-                        my = m_phi;
-                        mz = m_theta;
-                }
-                //ToDo: simplify these steps
-                // m_perp1 -m_perp2
-                m_perp_x = (mx) *  cos(q_angle);
-                m_perp_x -= (my) * sin(q_angle);
-                m_perp_y = m_perp_x;
-                m_perp_x *= cos(-q_angle);
-                m_perp_y *= sin(-q_angle);
-                m_perp_z = mz;
-
-                m_sigma_x = (m_perp_x * cos(-s_theta) - m_perp_y * sin(-s_theta));
-                m_sigma_y = (m_perp_x * sin(-s_theta) + m_perp_y * cos(-s_theta));
-                m_sigma_z = (m_perp_z);
-
-                //Find b
-                uu -= m_sigma_x;
-                dd += m_sigma_x;
-                re_ud = m_sigma_y;
-                re_du = m_sigma_y;
-                im_ud = m_sigma_z;
-                im_du = -m_sigma_z;
-
-                uu = sqrt(sqrt(in_spin * out_spin)) * uu;
-                dd = sqrt(sqrt((1.0 - in_spin) * (1.0 - out_spin))) * dd;
-
-                re_ud = sqrt(sqrt(in_spin * (1.0 - out_spin))) * re_ud;
-                im_ud = sqrt(sqrt(in_spin * (1.0 - out_spin))) * im_ud;
-                re_du = sqrt(sqrt((1.0 - in_spin) * out_spin)) * re_du;
-                im_du = sqrt(sqrt((1.0 - in_spin) * out_spin)) * im_du;
-        }
-        p_sld->uu = uu;
-        p_sld->dd = dd;
-        p_sld->re_ud = re_ud;
-        p_sld->im_ud = im_ud;
-        p_sld->re_du = re_du;
-        p_sld->im_du = im_du;
-}
+// void cal_msld(polar_sld *p_sld, int isangle, double qx, double qy, double bn,
+//                              double m01, double mtheta1, double mphi1,
+//                              double spinfraci, double spinfracf, double spintheta)
+// {
+//      //locals
+//      double q_x = qx;
+//      double q_y = qy;
+//      double sld = bn;
+//      int is_angle = isangle;
+//      double pi = 4.0*atan(1.0);
+//      double s_theta = spintheta * pi/180.0;
+//      double m_max = m01;
+//      double m_phi = mphi1;
+//      double m_theta = mtheta1;
+//      double in_spin = spinfraci;
+//      double out_spin = spinfracf;
+//
+//      double m_perp = 0.0;
+//      double m_perp_z = 0.0;
+//      double m_perp_y = 0.0;
+//      double m_perp_x = 0.0;
+//      double m_sigma_x = 0.0;
+//      double m_sigma_z = 0.0;
+//      double m_sigma_y = 0.0;
+//      //double b_m = 0.0;
+//      double q_angle = 0.0;
+//      double mx = 0.0;
+//      double my = 0.0;
+//      double mz = 0.0;
+//      double uu = sld;
+//      double dd = sld;
+//      double re_ud = 0.0;
+//      double im_ud = 0.0;
+//      double re_du = 0.0;
+//      double im_du = 0.0;
+//  const double norm=outspin;
+
+
+// The norm is needed to make sure that the scattering cross sections are
+//correctly weighted, such that the sum of spin-resolved measurements adds up to
+// the unpolarised or half-polarised scattering cross section. No intensity weighting
+// needed on the incoming polariser side (assuming that a user), has normalised
+// to the incoming flux with polariser in for SANSPOl and unpolarised beam, respectively.
+
+//if (out_spin < 0.5){norm=1-out_spin;}
+//else{norm=out_spin;}
+
+//      //No mag means no further calculation
+//      if (isangle>0) {
+//              if (m_max < 1.0e-32){
+//                      uu = sqrt(in_spin * out_spin/ norm) * uu ;
+//                      dd = sqrt((1.0 - in_spin) * (1.0 - out_spin)/ norm) * dd ;
+//              }
+//      }
+//      else if (fabs(m_max)< 1.0e-32 && fabs(m_phi)< 1.0e-32 && fabs(m_theta)< 1.0e-32){
+//                      uu = sqrt(in_spin * out_spin/ norm) * uu;
+//                      dd = sqrt((1.0 - in_spin) * (1.0 - out_spin)/ norm) * dd;
+//      } else {
+//
+//              //These are needed because of the precision of inputs
+//              if (in_spin < 0.0) in_spin = 0.0;
+//              if (in_spin > 1.0) in_spin = 1.0;
+//              if (out_spin < 0.0) out_spin = 0.0;
+//              if (out_spin > 1.0) out_spin = 1.0;
+//
+//              if (q_x == 0.0) q_angle = pi / 2.0;
+//              else q_angle = atan(q_y/q_x);
+//              if (q_y < 0.0 && q_x < 0.0) q_angle -= pi;
+//              else if (q_y > 0.0 && q_x < 0.0) q_angle += pi;
+//
+//              q_angle = pi/2.0 - q_angle;
+//              if (q_angle > pi) q_angle -= 2.0 * pi;
+//              else if (q_angle < -pi) q_angle += 2.0 * pi;
+//
+//              if (fabs(q_x) < 1.0e-16 && fabs(q_y) < 1.0e-16){
+//                      m_perp = 0.0;
+//                      }
+//              else {
+//                      m_perp = m_max;
+//                      }
+//              if (is_angle > 0){
+//                      m_phi *= pi/180.0;
+//                      m_theta *= pi/180.0;
+//                      mx = m_perp * cos(m_theta) * cos(m_phi);
+//                      my = m_perp * sin(m_theta);
+//                      mz = -(m_perp * cos(m_theta) * sin(m_phi));
+//              }
+//              else{
+//                      mx = m_perp;
+//                      my = m_phi;
+//                      mz = m_theta;
+//              }
+//              //ToDo: simplify these steps
+//              // m_perp1 -m_perp2
+//              m_perp_x = (mx) *  cos(q_angle);
+//              m_perp_x -= (my) * sin(q_angle);
+//              m_perp_y = m_perp_x;
+//              m_perp_x *= cos(-q_angle);
+//              m_perp_y *= sin(-q_angle);
+//              m_perp_z = mz;
+//
+//              m_sigma_x = (m_perp_x * cos(-s_theta) - m_perp_y * sin(-s_theta));
+//              m_sigma_y = (m_perp_x * sin(-s_theta) + m_perp_y * cos(-s_theta));
+//              m_sigma_z = (m_perp_z);
+//
+//              //Find b
+//              uu += m_sigma_x;
+//              dd -= m_sigma_x;
+//              re_ud = m_sigma_y;
+//              re_du = m_sigma_y;
+//              im_ud = m_sigma_z;
+//              im_du = -m_sigma_z;
+//
+//              uu = sqrt((in_spin) * (out_spin)/ norm) * uu;
+//              dd = sqrt((1.0 - in_spin) * (1.0 - out_spin)/ norm) * dd;
+//
+//              re_ud = sqrt(in_spin * (1.0 - out_spin)/ norm) * re_ud;
+//              im_ud = sqrt(in_spin * (1.0 - out_spin)/ norm) * im_ud;
+//              re_du = sqrt((1.0 - in_spin) * out_spin/ norm) * re_du;
+//              im_du = sqrt((1.0 - in_spin) * out_spin/ norm) * im_du;
+//      }
+//      p_sld->uu = uu;
+//      p_sld->dd = dd;
+//      p_sld->re_ud = re_ud;
+//      p_sld->im_ud = im_ud;
+//      p_sld->re_du = re_du;
+//      p_sld->im_du = im_du;
+// }