| @@ -2692,7 +2692,7 class DPTemperaturesEstimation(Operation): | |||
|
|
2692 | 2692 | |
|
|
2693 | 2693 | if True: #len(y)!=0: |
|
|
2694 | 2694 | with suppress_stdout_stderr(): |
|
|
2695 | fitacf_guess.guess(y,x,zero,depth,t1,t2,len(y)) | |
|
|
2695 | fitacf_guess.guess(y,x,zero,depth,t1,t2,len(y)) | |
|
|
2696 | 2696 | t2=t1/t2 |
|
|
2697 | 2697 | |
|
|
2698 | 2698 | if (t1<5000.0 and t1> 600.0): |
| @@ -2717,13 +2717,18 class DPTemperaturesEstimation(Operation): | |||
|
|
2717 | 2717 | |
|
|
2718 | 2718 | eb=numpy.resize(eb,10) |
|
|
2719 | 2719 | dataOut.ifit=numpy.resize(dataOut.ifit,10) |
|
|
2720 | dataOut.covinv,e,dataOut.params,eb,dataOut.m=fitacf_fit_short.fit(wl,x,y,dataOut.cov,dataOut.covinv,e,dataOut.params,bm,angle,den,dataOut.range1[i],dataOut.year,dataOut.ifit,dataOut.m,l1) # | |
|
|
2720 | with suppress_stdout_stderr(): | |
|
|
2721 | dataOut.covinv,e,dataOut.params,eb,dataOut.m=fitacf_fit_short.fit(wl,x,y,dataOut.cov,dataOut.covinv,e,dataOut.params,bm,angle,den,dataOut.range1[i],dataOut.year,dataOut.ifit,dataOut.m,l1) # | |
|
|
2721 | 2722 | if dataOut.params[2]>dataOut.params[1]*1.05: |
|
|
2722 | 2723 | dataOut.ifit[2]=0 |
|
|
2723 | 2724 | dataOut.params[1]=dataOut.params[2]=t1 |
|
|
2724 | 2725 | dataOut.covinv,e,dataOut.params,eb,dataOut.m=fitacf_fit_short.fit(wl,x,y,dataOut.cov,dataOut.covinv,e,dataOut.params,bm,angle,den,dataOut.range1[i],dataOut.year,dataOut.ifit,dataOut.m,l1) # |
|
|
2725 | 2726 | if (dataOut.ifit[2]==0): |
|
|
2726 | 2727 | dataOut.params[2]=dataOut.params[1] |
|
|
2728 | with suppress_stdout_stderr(): | |
|
|
2729 | dataOut.covinv,e,dataOut.params,eb,dataOut.m=fitacf_fit_short.fit(wl,x,y,dataOut.cov,dataOut.covinv,e,dataOut.params,bm,angle,den,dataOut.range1[i],dataOut.year,dataOut.ifit,dataOut.m,l1) # | |
|
|
2730 | if (dataOut.ifit[2]==0): | |
|
|
2731 | dataOut.params[2]=dataOut.params[1] | |
|
|
2727 | 2732 | if (dataOut.ifit[3]==0 and iflag==0): |
|
|
2728 | 2733 | dataOut.params[3]=0.0 |
|
|
2729 | 2734 | if (dataOut.ifit[4]==0): |
General Comments 0
You need to be logged in to leave comments.
Login now