Changeset 466 for trunk

Timestamp:

12/14/11 23:18:10 (12 years ago)

Author:

lelod

Message:

suite tests

Location:

trunk/src

Files:

• extract_amsua.pro (modified) (6 diffs)
• interpolswath.pro (modified) (1 diff)

trunk/src/extract_amsua.pro

@@ -270 +270 @@
 loadct,39
 numwindow=1
-while ilist le nlist do begin
+;while ilist le nlist do begin
+ while (not eof(lun_a)) do begin
    ilist=ilist+1
    onefile = ''
@@ -350 +351 @@
       endfor
    endfor
-window,numwindow
-plot,amalon,amalat,xrange=[lon_min,lon_max],yrange=[lat_min,lat_max],xstyle=1,ystyle=1,psym=2,color=0
-jnd=where(ch_nadir gt tbmin and ch_nadir lt tbmax)
-tb=ch_nadir[jnd]
-lolo=amalon[jnd]
-lala=amalat[jnd]
-colscale=intarr(n_elements(tb))
-for j=0,n_elements(tb)-1 do begin
-   colscale[j]=(tb[j]-min(tb))*255/(max(tb)-min(tb))
-endfor
-print,min(colscale),max(colscale)
-plots,lolo,lala,psym=5,symsize=2,color=colscale
-numwindow=numwindow+1
+;moych=fltarr(nbpix)
+;for ifo=0,nbpix-1 do moych[ifo]= mean(ch_nadir[ifo,*])
+;print,'correction',moych
+;print,'cor_s',cor_s
+;print,'cor_l',cor_l
+;plot,amafov,moych,psym=1,color=0
+;oplot,amafov,cor_l+200,psym=2,color=200
+
+;window,numwindow
+;plot,amalon,amalat,xrange=[lon_min,lon_max],yrange=[lat_min,lat_max],xstyle=1,ystyle=1,/nodata
+;jnd=where(ch_nadir gt tbmin and ch_nadir lt tbmax and amalon ge lon_min and amalon le lon_max $
+;         and amalat ge lat_min and amalat le lat_max)
+;tb=ch_nadir[jnd]
+;lolo=amalon[jnd]
+;lala=amalat[jnd]
+;colscale=intarr(n_elements(tb))
+;for j=0,n_elements(tb)-1 do begin
+;   colscale[j]=(tb[j]-min(tb))*255/(max(tb)-min(tb))
+;endfor
+;plots,lolo,lala,psym=5,symsize=2,color=colscale
+;numwindow=numwindow+1
 
 ; appel a interpolswath pour ajuster les pixels amsua sur une grille
@@ -380 +389 @@
          fovgrid=indgen(nbgrid)+1
       endif
-     ; ind=where(tbgrid gt tbmin and tbgrid lt tbmax,nbon)
+      ;ind=where(tbgrid gt tbmin and tbgrid lt tbmax,nbon)
      ; if (nbon ne 0) then begin
-     ;    longit=longrid(ind)
-     ;    latit=latgrid(ind)
-     ;    oplot,longit,latit,psym=4,color=0
+         longit=longrid
+         latit=latgrid
+      ;   oplot,longit,latit,psym=3,color=0
      ; endif else begin
      ;    print,'pas de point valable dans la fauchee'
@@ -413 +422 @@
 
    endfor
+
 
    nn=n_elements(chint)
@@ -473 +483 @@
 loadct,39
 window,0
-plot,lonint,latint,xrange=[lon_min,lon_max],yrange=[lat_min,lat_max],xstyle=1,ystyle=1,psym=3,color=0
+plot,lonint,latint,xrange=[lon_min,lon_max],yrange=[lat_min,lat_max],xstyle=1,ystyle=1,/nodata
 ind=where(maskint eq 1)
 oplot,lonint[ind],latint[ind],psym=1
@@ -482 +492 @@
 colscale=intarr(n_elements(tb))
 for j=0,n_elements(tb)-1 do begin
-   colscale[j]=tb[j]*255/(max(tb)-min(tb))
+   colscale[j]=(tb[j]-min(tb))*255/(max(tb)-min(tb))
 endfor
 print,min(colscale),max(colscale)
-   plots,lolo,lala,psym=5,symsize=2,color=colscale
+   plots,lolo,lala,psym=5,symsize=1,color=colscale
 end

trunk/src/interpolswath.pro

@@ -93 +93 @@
 tbint=fltarr(nbgrid)
 mask=intarr(nbgrid)
-for i=0,na-1 do begin
-   ind=where(abs(grid-fova[i]) le pixatot[i]/2,nii)
+for i=0,nbgrid-1 do begin
+   ind=where(abs(grid[i]-fova) eq min(abs(grid[i]-fova)),nii)
+      if nii eq 1 then begin
+         tbint[i]=tb[ind]
+         mask[i]=masklu[ind]
+      endif else begin
+         print,'pas de minimum?',nii
+      endelse
+   endfor
+
+;for i=0,na-1 do begin
+ ;  ind=where(abs(grid-fova[i]) le pixatot[i]/2,nii)
   ; print,i,nii
-   if nii ne 0 then begin
-      tbint[ind]=tb[i]
-      mask[ind]=masklu[i]
-   endif
-   if nii eq 0 then begin
-   endif
-
-      
-endfor
+  ; if nii ne 0 then begin
+   ;   tbint[ind]=tb[i]
+  ;    mask[ind]=masklu[i]
+  ; endif
+  ; if nii eq 0 then begin
+  ;     
+;endfor
 latgrid=interpol(latlu,fova,grid)
 longrid=interpol(lonlu,fova,grid)