Changeset 4

Timestamp:

06/30/09 10:49:35 (3 years ago)

Author:

jwise

Message:

Peak files with "datavar" for partiview can now be read.

Location:

trunk/TOOLS

Files:

• hdf5_read_routines.pro (modified) (1 diff)
• read_peaks.pro (modified) (1 diff)

trunk/TOOLS/hdf5_read_routines.pro

@@ -26 +26 @@
     endelse
     secondslash = strpos(lines[0], '/', 1)
-    firstgrid = strmid(lines[0], 0, secondslash+1)
-    lines = lines[where(strmatch(lines, firstgrid+'*'))]
+    ;firstgrid = strmid(lines[0], 0, secondslash+1)
+    lastgrid = strmid(lines[n_elements(lines)-1], 0, secondslash+1)
+    lines = lines[where(strmatch(lines, lastgrid+'*'))]
     lines = strmid(lines, secondslash+1)
     ec = strpos(lines, 'Dataset')-1

trunk/TOOLS/read_peaks.pro

@@ -14 +14 @@
 ; read file
   i = 0
-  nst = strarr(100)
+  maxlines = 100
+  nst = strarr(maxlines)
   while (not EOF(unit)) DO BEGIN
       line = ''
       readf,unit,line
 ; lines that contain a #  are comment lines !
-      if (strpos(line,'#') eq -1) then BEGIN
+      if ((strpos(line,'#') eq -1) and (strpos(line,'datavar') eq -1)) then BEGIN
           nst(i) = strtrim(strcompress(line),2)
           i = i + 1
+          if (i ge maxlines) then break
       ENDIF ELSE PRINT, 'line',i,' is a comment line'
   END