Changeset 138

Timestamp:

06/04/09 18:10:52 (15 years ago)

Author:

ericg

Message:

Corrections to fields masked with NaN in ybinx.pro

File:

• trunk/procs/ybinx.pro (modified) (5 diffs)

trunk/procs/ybinx.pro

@@ -28 +28 @@
                IF var3_ybinx NE "" THEN sw3 = 1 ELSE sw3 = 0
 
-               ; mask fields with NaN fo regression computation
+               ; mask fields with valmask for regression computation
 
                IF sw3 THEN BEGIN 
@@ -36 +36 @@
                ENDIF 
 
+               ; ensure masks are the same
+
+               idxmskpn = where(finite(fld, /nan))
+               idxmskpn2 = where(finite(fld2, /nan))
+               IF idxmskpn(0) NE -1 THEN fld(idxmskpn) = valmask
+               IF idxmskpn2(0) NE -1 THEN fld2(idxmskpn2) = valmask
+
+               idxmskpn = where(fld GT valmask/10.)
+               idxmskpn2 = where(fld2 GT valmask/10.)
+               IF idxmskpn(0) NE -1 THEN fld2(idxmskpn) = valmask
+               IF idxmskpn2(0) NE -1 THEN fld(idxmskpn2) = valmask
+
                ; print min/max of field for debug
                idxmskp = where(fld LE valmask/10.)
@@ -53 +65 @@
                ; select months if required
 
-               ntxt = "All months"
+               CASE cmd.timave OF 
+                  '1d': ntxt = "All days"
+                  ELSE :ntxt = "All months"
+               ENDCASE 
 
                IF stddev_mth NE '00' THEN BEGIN 
@@ -77 +92 @@
 
                ; for now just 2d fields
-
-               IF nzt NE 1 THEN BEGIN 
-                  print, '***** 2D field only for now in ybinx ****'
-                  stop
-               ENDIF 
+;               IF nzt NE 1 THEN BEGIN 
+;                  print, '***** 2D field only for now in ybinx ****'
+;                  stop
+;               ENDIF 
 
                ; find indexes of var2 in each bin
@@ -138 +152 @@
                WHILE ib LE nbins DO BEGIN 
                   
+                  IF debug_w THEN print, 'bin = ', ib
                   binsz = binpop(ib)
                   IF binsz GT 1 THEN BEGIN 
                      fldy(ib, 0:binsz-1) = fld(idxb(ib, 0:binsz-1))
+                     IF debug_w THEN print, 'fld(idxb(ib, 0:binsz-1)) =',fld(idxb(ib, 0:binsz-1)) 
                      fldys(ib, 0:binsz-1) = flds(idxb(ib, 0:binsz-1))
                      surfb(ib, 0:binsz-1) = surf(idxb(ib, 0:binsz-1))