Changeset 7921


Ignore:
Timestamp:
03/16/12 20:00:38 (7 years ago)
Author:
aivar
Message:

SLIM Plugin: Working on Trac #674 Ensure TRI2 and SLIMPlugin results agree.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/projects/curve-fitter/src/main/java/loci/curvefitter/SLIMCurveFitter.java

    r7902 r7921  
    263263                     
    264264                    // get IRF curve, if any 
    265                     double[] instrumentResponse = getInstrumentResponse(data.getPixels()); 
     265                    double[] instrumentResponse = m_instrumentResponse; //TODO ARG was scaling: getInstrumentResponse(data.getPixels()); 
    266266                    int nInstrumentResponse = 0; 
    267267                    if (null != instrumentResponse) { 
     
    297297                            ); 
    298298                    // set outgoing parameters, unless they are fixed 
    299                     data.getParams()[0] = chiSquare.getValue() / chiSquareAdjust; 
     299                    data.getParams()[0] = chiSquare.getValue(); //TODO ARG TRI2 / chiSquareAdjust; take non-reduced chisquare target and return non-reduced chisquare; this s/b fixed elsewhere 
    300300                    if (free[0]) { 
    301301                        data.getParams()[1] = z.getValue(); 
     
    359359                            0.0099999998 //data.getChiSquareDelta() 
    360360                            ); 
    361                     data.getParams()[0] /= chiSquareAdjust; 
     361                    //data.getParams()[0]; //TODO ARG TRI2 don't make it reduced chisq /= chiSquareAdjust; 
    362362                    System.out.println("chiSqaure array is " + chiSquare.getValue() + " data version is " + data.getParams()[0]); 
    363363                    System.out.println("chisq " + data.getParams()[0] + " z " + data.getParams()[1] + " a " + data.getParams()[2] + " t " + data.getParams()[3]); 
Note: See TracChangeset for help on using the changeset viewer.