Changeset 553

Timestamp:

05/17/12 15:49:25 (12 years ago)

Author:

lelod

Message:

correc_amsu marche

File:

• trunk/src/correc_amsu.pro (modified) (9 diffs)

trunk/src/correc_amsu.pro

@@ -6 +6 @@
 ; ============
 ;
-; .. function: correc_amsu(numch, yyyyb, mmb, ddb, yyyye, mme, dde, lonmin, lonmax, latmin, latmax)
+;  correc_amsu,numch, yyyyb, mmb, ddb, yyyye, mme, dde, lonmin, lonmax, latmin, latmax
 ; DESCRIPTION
 ; ===========
@@ -35 +35 @@
 ;    latmax=20.
 
-;    result = cresamsu(numch, yyyyb, mmb, ddb $
+;    cresamsu,numch, yyyyb, mmb, ddb $
 ;            , yyyye, mme, dde $
-;            , lonmin, lonmax, latmin, latmax)
+;            , lonmin, lonmax, latmin, latmax
 ; 
 ;
@@ -57 +57 @@
 ;
 
-function correc_amsu $
-   , numch $
-   , yyyyb $
-   , mmb $
-   , ddb $
-   , yyyye $
-   , mme $
-   , dde $
-   , lonmin $
-   , lonmax $
-   , latmin $
-   , latmax
+pro correc_amsu, numch, yyyyb, mmb, ddb, yyyye, mme, dde, lonmin, lonmax, latmin, latmax
 
 compile_opt idl2, strictarrsubs
@@ -76 +65 @@
 routine = (SCOPE_TRACEBACK(/STRUCTURE))[s-1].Routine
 ;
-key_performance=0
-if key_performance EQ 1 THEN BEGIN
-    time1 = SYSTIME(1)
-ENDIF
 ;
-;
-; Return to caller if errors
-ON_ERROR, 2
-result = -1
-;
-usage = 'result = correc_amsu(numch, yyyyb, mmb, ddb, yyyye, mme, dde, lonmin, lonmax, latmin, latmax)'
 ;
 nparam = N_PARAMS()
@@ -93 +72 @@
           + '!C' $
           + 'Usage : ' + usage])
-    return, result
+    stop
 ENDIF
 ;
@@ -111 +90 @@
 mmyb=mmb
 mmye=mme
-indic=0
+
 for yyyy=yyyyb,yyyye do begin
    if (yyyye ne yyyyb) then begin
@@ -146 +125 @@
             ; decodage du nb de points (nn)
          nn=n_elements(tb1)
+         deborb=min(desc)
+         nborb=max(desc)
+         for norb=deborb,nborb do begin
+            jnd=where(desc eq norb,orbit)
+            if orbit ne 0 then begin            
+               tb=tb1[jnd]
+               fovo=fov[jnd]
+               masko=mask[jnd]
+               if norb eq deborb then begin
+                  nfov=max(fov[jnd])
+                  print,'nb points fauchee', nfov
+                  fovv=indgen(nfov)+1
+                  sumtb=fltarr(nfov)
+                  vartb=fltarr(nfov)
+                  kont=intarr(nfov)*0L
+               endif
 
-         if indic eq 0 then begin
-            nfov=max(fov)
-            fovv=indgen(nfov)+1
-            sumtb=fltarr(nfov)
-            vartb=fltarr(nfov)
-            kont=intarr(nfov)*0L
-         endif
-         nfovday=max(fov)
-         if nfovday gt nfov then goto, nextday
-         for ifov=0,nfov-1 do begin 
-            ind=where(fov eq ifov+1 and mask eq 1 ,nifov) 
-            if (nifov ne 0) then begin 
-               sumtb[ifov]=sumtb[ifov]+tb1[ind] 
-               vartb[ifov]=vartb[ifov]+tb1[ind]*tb1[ind] 
-               kont[ifov]=kont[ifov]+1L
-            endif 
-         endfor 
-
+               nfovorb=max(fovo)
+               if nfovorb eq nfov then begin
+                  for ifov=0,nfov-1 do begin 
+                     ind=where(fovo eq ifov+1 and masko eq 1 ,nifov) 
+                     if (nifov ne 0) then begin 
+                        sumtb[ifov]=sumtb[ifov]+total(tb[ind])
+                        vartb[ifov]=vartb[ifov]+total(tb[ind]*tb[ind]) 
+                        kont[ifov]=kont[ifov]+nifov
+                     endif 
+                  endfor 
+               endif else begin
+                  print,'fauchee plus large que normale ',nfovorb,'pour orbite no ',norb
+               endelse
+            endif
+         endfor
 nofile:
          print, 'www : no data to read for this day'
          goto, nextday
 nextday:
-         indic=indic+1
       endfor
    endfor
@@ -176 +167 @@
 
 moytb=sumtb/kont
-sigtb=sqrt((vartb-moytb*moytb)/kont)
+sigtb=sqrt((vartb-kont*moytb*moytb)/kont)
+print,'moytb',moytb
 window,0
 plot,fovv,moytb,psym=7,xstyle=1,ystyle=1,yrange=[min(moytb)-max(sigtb),max(moytb)+max(sigtb)]
@@ -185 +177 @@
 
 realend:
-        
-result = 0
-return, result  
 end