Changeset 141

Timestamp:

06/10/09 11:22:41 (15 years ago)

Author:

ericg

Message:

Bug correction for overlay of f/bin(next)

Location:

trunk/procs

Files:

• def_work.pro (modified) (3 diffs)
• plt_map.pro (modified) (2 diffs)

trunk/procs/def_work.pro

@@ -147 +147 @@
                cmdi.proj = strmid(cmdi.proj, 0, strpos(cmdi.proj, '['))
             ENDIF ELSE leg_format = default_txt_format 
+
             ; decode proj for number of overlays in window (min=1)
             overl = strpos(cmdi.proj, 'o')
@@ -155 +156 @@
             ENDELSE
 
+            nadd = nover
+
             ; make loop on number of overlays
             iover = 1
+            inext = 0
             WHILE iover LE nover DO BEGIN
 
-               idx = iline + nb_lines + iover - 1
+               idx = iline + nb_lines + iover + inext - 1
                cmdo = decode_cmd(cmdline, idx)
                idx_main=idx
-;                print, ' plot,window,overlay   = ', iplot, iwin, iover
-;                print, '     max win, max over = ', nwin, nover
-;                print, ' index = ', idx
-
-               CASE cmdo.exp OF
-                  'CT': BEGIN
-                     data_domain = 'global'
-                     print, 'WARNING set data_domain = global in def_work'
-                  END 
-                  'GloSea40':BEGIN
-                     data_domain = 'glosea'
-                     print, 'WARNING set data_domain = glosea in def_work'
-                  END 
-                  ELSE:
-               ENDCASE 
+
+               IF debug_w THEN BEGIN 
+                  print, ' In def_work:'
+                  print, ' plot,window,overlay, inext   = ', iplot, iwin, iover, inext
+                  print, '     max win, max over = ', nwin, nover
+                  print, ' index = ', idx
+               ENDIF 
+
                ; make overlay
 
@@ -183 +180 @@
                ; end of loop on overlays
                iover = iover+1
+               ; special case y=f(next) on 2 lines
+
+               IF strpos(cmdi.var, '(next)') GT -1 THEN BEGIN 
+                  inext = inext + 1
+                  nadd =  nadd + 1
+               ENDIF ELSE BEGIN 
+                  inext = 0
+               ENDELSE 
+
             ENDWHILE
-            nb_lines =  nb_lines + nover
-
-         ; special case y=f(next) on 2 lines
-
-            IF strpos(cmdi.var, '(next)') GT -1 THEN nb_lines =  nb_lines + 1
+            nb_lines =  nb_lines + nadd
+
             
          ; end of loop on windows

trunk/procs/plt_map.pro

@@ -788 +788 @@
        ELSE: BEGIN ; $$$$$$$$$$$$$$$$$$$$$$$$$$   make plot   $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ 
 
-         CASE plttyp OF 
+          IF debug_w THEN BEGIN
+             print, '   Plot type (plttyp) = ', plttyp
+             stop
+          ENDIF 
+         Case plttyp OF 
             'plt': BEGIN 
          ;
@@ -1012 +1016 @@
                IF common_time EQ 1 THEN BEGIN
                   IF iover EQ 1 THEN time_prev = time ELSE time = time_prev
-               ENDIF 
+               ENDIF
                
                IF st_rms EQ 1 THEN BEGIN ; time series of rms deviation on a sigma surface