Changeset 97eed48 in sasview


Ignore:
Timestamp:
Apr 4, 2014 6:55:26 AM (5 years ago)
Author:
Tobias Richter <tobias.richter@…>
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:
4651383
Parents:
64aa49e
Message:

refs #4 - reduce C/C++ warnings

Location:
src/sans
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sans/models/c_extension/c_models/schulz.cpp

    r230f479 r97eed48  
    2929} 
    3030 
    31 /** 
    32  * Function to evaluate 1D scattering function 
    3331/** 
    3432 * Function to evaluate 1D Schulz function. 
  • src/sans/pr/c_extensions/Cinvertor.c

    r5777106 r97eed48  
    509509        // Regularization factor 
    510510        double regterm = 0.0; 
    511         double tmp = 0.0; 
    512511        // Number of slices in regularization term estimate 
    513512        int nslice = 25; 
     
    529528        diff = self->params.y[i] - iq(pars, self->params.d_max, npars, self->params.x[i]); 
    530529        residual = diff*diff / (self->params.err[i]*self->params.err[i]); 
    531         tmp = residual; 
    532530 
    533531        // regularization term 
     
    539537                return NULL; 
    540538        }; 
    541  
    542539    } 
    543  
    544540        return residuals; 
    545541} 
     
    564560        // Regularization factor 
    565561        double regterm = 0.0; 
    566         double tmp = 0.0; 
    567562        // Number of slices in regularization term estimate 
    568563        int nslice = 25; 
     
    584579        diff = self->params.y[i] - pr(pars, self->params.d_max, npars, self->params.x[i]); 
    585580        residual = diff*diff / (self->params.err[i]*self->params.err[i]); 
    586         tmp = residual; 
    587581 
    588582        // regularization term 
     
    594588                return NULL; 
    595589        }; 
    596  
    597590    } 
    598  
    599591        return residuals; 
    600592} 
Note: See TracChangeset for help on using the changeset viewer.