Changeset 7032


Ignore:
Timestamp:
10/04/10 18:57:57 (9 years ago)
Author:
aivar
Message:

Deal with sigma and instrument response.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/maven/projects/curve-fitter/src/main/java/loci/curvefitter/JaolhoCurveFitter.java

    r6925 r7032  
    7272 
    7373        for (ICurveFitData data: dataArray) { 
    74             double yData[] = data.getYData(); 
     74            double yData[] = data.getYCount(); 
    7575            for (int i = 0; i < length; ++i) { 
    7676                lmaData[1][i] = yData[start + i]; 
     
    9191                success = false; 
    9292                System.out.println("exception " + e); 
    93                 log("exception " + e); 
    9493            } 
    9594 
     
    101100                System.out.println("iterations: " + lma.iterationCount); 
    102101                System.out.println("chi2: " + lma.chi2 + ", param0: " + lma.parameters[0] + ", param1: " + lma.parameters[1] + ", param2: " + lma.parameters[2]); 
    103                 log("iterations: " + lma.iterationCount); 
    104                 log("chi2: " + lma.chi2 + ", param0: " + lma.parameters[0] + ", param1: " + lma.parameters[1] + ", param2: " + lma.parameters[2]); 
    105102            } 
    106103 
     
    113110        } 
    114111        System.out.println("goodPixels " + goodPixels + " badPixels " + badPixels); 
    115         log("goodPixels " + goodPixels + " badPixels " + badPixels); 
    116112        //TODO error return deserves more thought 
    117113        return 0; 
Note: See TracChangeset for help on using the changeset viewer.