Changeset 2e2452b in sasview for sansmodels/src


Ignore:
Timestamp:
Dec 9, 2011 5:15:40 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:
2371363
Parents:
0e8b249
Message:

Re #4 Fix a bunch of model warnings

Location:
sansmodels/src/sans/models
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • sansmodels/src/sans/models/c_extensions/CGaussian.c

    r59b9b675 r2e2452b  
    267267 
    268268 
    269 static PyMethodDef module_methods[] = { 
    270     {NULL}  
    271 }; 
     269//static PyMethodDef module_methods[] = { 
     270//    {NULL} 
     271//}; 
    272272 
    273273/** 
  • sansmodels/src/sans/models/c_extensions/CLogNormal.c

    r59b9b675 r2e2452b  
    267267 
    268268 
    269 static PyMethodDef module_methods[] = { 
    270     {NULL}  
    271 }; 
     269//static PyMethodDef module_methods[] = { 
     270//    {NULL} 
     271//}; 
    272272 
    273273/** 
  • sansmodels/src/sans/models/c_extensions/CLorentzian.c

    r59b9b675 r2e2452b  
    267267 
    268268 
    269 static PyMethodDef module_methods[] = { 
    270     {NULL}  
    271 }; 
     269//static PyMethodDef module_methods[] = { 
     270//    {NULL} 
     271//}; 
    272272 
    273273/** 
  • sansmodels/src/sans/models/c_extensions/CSchulz.c

    r59b9b675 r2e2452b  
    267267 
    268268 
    269 static PyMethodDef module_methods[] = { 
    270     {NULL}  
    271 }; 
     269//static PyMethodDef module_methods[] = { 
     270//    {NULL} 
     271//}; 
    272272 
    273273/** 
  • sansmodels/src/sans/models/c_models/DiamCyl.cpp

    r5dc2818 r2e2452b  
    6666 
    6767        // Loop over radius weight points 
    68         for(int i=0; i<weights_rad.size(); i++) { 
     68        for(size_t i=0; i<weights_rad.size(); i++) { 
    6969                dp[0] = weights_rad[i].value; 
    7070                // Loop over length weight points 
    71                 for(int j=0; j<weights_len.size(); j++) { 
     71                for(size_t j=0; j<weights_len.size(); j++) { 
    7272                        dp[1] = weights_len[j].value; 
    7373 
  • sansmodels/src/sans/models/c_smearer/smearer.cpp

    r09e89b7 r2e2452b  
    169169                // Find Weights 
    170170                // Find q where the resolution smearing calculation of I(q) occurs 
    171                 double q, q_min, q_max, q_0; 
     171                double q, q_min, q_max, q_0=0.0; 
    172172                get_bin_range(i, &q, &q_min, &q_max); 
    173173                // Block q becomes <=0 
     
    175175                        continue; 
    176176                } 
    177                 bool last_qpoint = true; 
    178177                // Find q[0] value to normalize the weight later, 
    179178                //  otherwise, we will have a precision problem. 
     
    182181                } 
    183182                // Loop over all qj-values 
    184                 bool first_w = true; 
    185183                for(int j=0; j<nbins; j++) { 
    186184                        double q_j, q_high, q_low; 
     
    263261                                                // Later, it will be normalized again. 
    264262 
    265                                                 double q_shift_min = q - width; 
    266  
    267                                                 double u = (q_j * q_j - (q_shift) * (q_shift)); 
    268263                                                // The fabs below are not necessary but in case: the weight should never be imaginary. 
    269264                                                // At the edge of each sub_width. weight += u(at q_high bin) - u(0), where u(0) = 0, 
     
    292287 
    293288        // Loop over all q-values 
    294         double step = (qmax-qmin)/((double)nbins-1.0); 
    295289        double q, q_min, q_max; 
    296290        double q_j, q_jmax, q_jmin; 
Note: See TracChangeset for help on using the changeset viewer.