Changeset 0ba3b08 in sasview for sansmodels/src/c_models/DiamCyl.cpp

Timestamp:

Jan 5, 2012 10:16:29 AM (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:

011e0e4

Parents:

bbbed8c

Message:

refactored bunch of models

File:

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

sansmodels/src/c_models/DiamCyl.cpp

@@ -18 +18 @@
  *   sansmodels/src/libigor
  *
- *      TODO: refactor so that we pull in the old sansmodels.c_extensions
  */
 
 #include <math.h>
-#include "models.hh"
 #include "parameters.hh"
 #include <stdio.h>
 using namespace std;
+#include "DiamCyl.h"
 
 extern "C" {
         #include "libStructureFactor.h"
-        #include "DiamCyl.h"
 }
 
@@ -112 +110 @@
   return 0.0;
 }
-// Testing code
-
-/**
-int main(void)
-{
-        DiamCylFunc c = DiamCylFunc();
-
-        printf("I(Qx=%g,Qy=%g) = %g\n", 0.001, 0.001, c(0.001, 0.001));
-        printf("I(Q=%g) = %g\n", 0.001, c(0.001));
-        c.radius.dispersion = new GaussianDispersion();
-        c.radius.dispersion->npts = 100;
-        c.radius.dispersion->width = 20;
-
-        //c.length.dispersion = GaussianDispersion();
-        //c.length.dispersion.npts = 20;
-        //c.length.dispersion.width = 65;
-
-        //printf("I(Q=%g) = %g\n", 0.001, c(0.001));
-        //printf("I(Q=%g) = %g\n", 0.001, c(0.001));
-        //printf("I(Qx=%g, Qy=%g) = %g\n", 0.001, 0.001, c(0.001, 0.001));
-        //printf("I(Q=%g,  Phi=%g) = %g\n", 0.00447, .7854, c.evaluate_rphi(sqrt(0.00002), .7854));
-
-
-
-        double i_avg = c(0.01, 0.01);
-        double i_1d = c(sqrt(0.0002));
-
-        printf("\nI(Qx=%g, Qy=%g) = %g\n", 0.01, 0.01, i_avg);
-        printf("I(Q=%g)         = %g\n", sqrt(0.0002), i_1d);
-        printf("ratio %g %g\n", i_avg/i_1d, i_1d/i_avg);
-
-
-        return 0;
-}
- **/