Commit 7ad43aa5bf20bc01bc400103c98a2a659c30ab46
1 parent
56829eab
Exists in
master
replaced use of strnumber by valid_num to fix a bug under gdl on some plateforms ... git status
Showing
1 changed file
with
6 additions
and
1 deletions
Show diff stats
src/idl_misc/Astron_for_Dustemwrap/pro/misc/readcol.pro
... | ... | @@ -292,6 +292,7 @@ pro readcol,name,v1,V2,v3,v4,v5,v6,v7,v8,v9,v10,v11,v12,v13,v14,v15, $ |
292 | 292 | ngood-- |
293 | 293 | if ~keyword_set(SILENT) then $ |
294 | 294 | message,'Skipping Line ' + strtrim(skipline+j+1,2),/INF |
295 | + ;stop | |
295 | 296 | goto, BADLINE |
296 | 297 | endif |
297 | 298 | |
... | ... | @@ -300,6 +301,7 @@ pro readcol,name,v1,V2,v3,v4,v5,v6,v7,v8,v9,v10,v11,v12,v13,v14,v15, $ |
300 | 301 | ngood-- |
301 | 302 | if keyword_set(DEBUG) then $ |
302 | 303 | message,'Skipping Comment Line ' + strtrim(skipline+j+1,2),/INF |
304 | + stop | |
303 | 305 | goto, BADLINE |
304 | 306 | endif |
305 | 307 | |
... | ... | @@ -309,6 +311,7 @@ pro readcol,name,v1,V2,v3,v4,v5,v6,v7,v8,v9,v10,v11,v12,v13,v14,v15, $ |
309 | 311 | if N_elements(var) LT nfmt then begin |
310 | 312 | if ~keyword_set(SILENT) then $ |
311 | 313 | message,'Skipping Line ' + strtrim(skipline+j+1,2),/INF |
314 | + ;stop | |
312 | 315 | ngood-- |
313 | 316 | goto, BADLINE ;Enough columns? |
314 | 317 | endif |
... | ... | @@ -325,10 +328,12 @@ pro readcol,name,v1,V2,v3,v4,v5,v6,v7,v8,v9,v10,v11,v12,v13,v14,v15, $ |
325 | 328 | for i = 0L,ncol-1 do begin |
326 | 329 | |
327 | 330 | if check_numeric[i] then begin ;Check for valid numeric data |
328 | - tst = strnumber(var[i],val,hex=hex[i],NAN=nan) ;Valid number? | |
331 | + ;tst = strnumber(var[i],val,hex=hex[i],NAN=nan) ;Valid number? | |
332 | + tst = valid_num(var[i]) ;Modified by JPB to avoid nasty bug on some plateforms with GDL | |
329 | 333 | if ~tst then begin ;If not, skip this line |
330 | 334 | if ~keyword_set(SILENT) then $ |
331 | 335 | message,'Skipping Line ' + strtrim(skipline+j+1,2),/INF |
336 | + ;stop | |
332 | 337 | ngood-- |
333 | 338 | goto, BADLINE |
334 | 339 | endif | ... | ... |