Changeset 82c11d3 in sasview for sansmodels/src/c_models/lamellarPS_HG.cpp

Timestamp:

Jan 5, 2012 6:24:51 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

20d91bd

Parents:

98fdccd

Message:

refactored bunch of models

File:

• sansmodels/src/c_models/lamellarPS_HG.cpp (modified) (2 diffs)

sansmodels/src/c_models/lamellarPS_HG.cpp

@@ -18 +18 @@
  *   sansmodels/src/libigor
  *
- *      TODO: refactor so that we pull in the old sansmodels.c_extensions
  *      TODO: add 2D function
  */
 
 #include <math.h>
-#include "models.hh"
 #include "parameters.hh"
 #include <stdio.h>
 using namespace std;
+#include "lamellarPS_HG.h"
 
 extern "C" {
         #include "libCylinder.h"
-        #include "lamellarPS_HG.h"
 }
 
@@ -137 +135 @@
         return 0.0;
 }
-
-/*
-double LamellarPSHGModel :: operator()(double qx, double qy) {
-        LamellarPSHGParameters dp;
-        // Fill parameter array
-        dp.scale      = scale();
-        dp.spacing   = spacing();
-        dp.deltaT  = deltaT();
-        dp.deltaH = deltaH();
-        dp.sld_tail   = sld_tail();
-        dp.sld_head = sld_head();
-        dp.sld_solvent   = sld_solvent();
-        dp.n_plates = n_plates();
-        dp.caille = caille();
-        dp.background    = background();
-
-        // Get the dispersion points for the deltaT
-        vector<WeightPoint> weights_deltaT;
-        deltaT.get_weights(weights_deltaT);
-
-        // Get the dispersion points for the deltaH
-        vector<WeightPoint> weights_deltaH;
-        deltaH.get_weights(weights_deltaH);
-
-        // Perform the computation, with all weight points
-        double sum = 0.0;
-        double norm = 0.0;
-
-        // Loop over deltaT weight points
-        for(int i=0; i< (int)weights_deltaT.size(); i++) {
-                dp.deltaT = weights_deltaT[i].value;
-
-                // Loop over deltaH weight points
-                for(int j=0; j< (int)weights_deltaH.size(); j++) {
-                        dp.deltaH = weights_deltaH[j].value;
-
-                        sum += weights_deltaT[i].weight *weights_deltaH[j].weight *lamellarPS_HG_analytical_2DXY(&dp, qx, qy);
-                        norm += weights_deltaT[i].weight * weights_deltaH[j].weight;
-                }
-        }
-        return sum/norm + background();
-}
-*/
-
-