tidied up reading of densities

Annie Hughes
1 parent b3211d62
Showing 1 changed file with 7 additions and 13 deletions Show diff stats
src/idl/dustem_read_qabs_lv.pro
@@ -54,7 +54,6 @@ IF keyword_set(help) THEN BEGIN
 ENDIF
  
  
-  
 st=''
 Nmax=10000L
 sts=strarr(Nmax)
@@ -71,18 +70,15 @@ ENDWHILE
 Nsizes=fix(str)
  
 ;Get sizes
-readf,unit,st
-sizes=float(str_sep(strcompress(strtrim(st,2)),' '))
+readf,unit,str
+sizes=float(str_sep(strcompress(strtrim(str,2)),' '))
 Ncol=Nsizes
  
-IF keyword_set(read_densities) THEN BEGIN
-  readf,unit,st
-  ;stop
-  IF st EQ '#### Qabs ####' THEN BEGIN
-    message,'Problem with size dependent densities in Qabs.DAT',/continue
-    ;stop
- ENDIF
-  densities=float(str_sep(strcompress(strtrim(st,2)),' '))
+; test read the next line to see if it contains densities 
+readf,unit,str
+first_char=strmid(str,0,1)
+IF first_char ne '#' THEN BEGIN
+  densities=float(str_sep(strcompress(strtrim(str,2)),' '))
 ENDIF ELSE BEGIN
   densities=fltarr(Nsizes)+la_undef()
 ENDELSE
@@ -130,7 +126,6 @@ close,unit
 free_lun,unit
  
 qsca_str=sts[0:nlines-1]
-;stop
  
 Nlines=n_elements(qsca_str); -- ORIGINAL
 ;Nlines=n_elements(qabs_str)
@@ -139,7 +134,6 @@ qabs_values=fltarr(Nlines,Ncol)
 qsca_values=fltarr(Nlines,Ncol)
  
 FOR i=0L,Nlines-2 DO BEGIN
-   ;print,i
    qabs_values[i,*]=str_sep(strcompress(strtrim(qabs_str[i],2)),' ')
    qsca_values[i,*]=str_sep(strcompress(strtrim(qsca_str[i],2)),' ')
 ENDFOR