Commit 33ccb3b8 authored by John Douglas Veitch's avatar John Douglas Veitch

Revert "Merge branch 'fix_frame_globbing' into 'master'"

This reverts merge request !124
parent 8195b3aa
Pipeline #48729 passed with stages
in 73 minutes and 28 seconds
...@@ -210,7 +210,7 @@ static LALCache *GlobFramesPWD(char *ifo) ...@@ -210,7 +210,7 @@ static LALCache *GlobFramesPWD(char *ifo)
fprintf(stderr,"(%s,%s,%s)\n",frGlobCache->list[i].src,frGlobCache->list[i].dsc,frGlobCache->list[i].url); fprintf(stderr,"(%s,%s,%s)\n",frGlobCache->list[i].src,frGlobCache->list[i].dsc,frGlobCache->list[i].url);
frInCache = XLALCacheDuplicate(frGlobCache); frInCache = XLALCacheDuplicate(frGlobCache);
XLALCacheSieve(frInCache, 0, 0, ifoRegExPattern, NULL, NULL); XLALCacheSieve(frInCache, 0, 0, ifoRegExPattern, NULL, NULL);
if ( ! frInCache->length ) if ( ! frGlobCache->length )
{ {
fprintf( stderr, "error: no frame file files found after sieving\n"); fprintf( stderr, "error: no frame file files found after sieving\n");
exit( 1 ); exit( 1 );
...@@ -222,7 +222,7 @@ static LALCache *GlobFramesPWD(char *ifo) ...@@ -222,7 +222,7 @@ static LALCache *GlobFramesPWD(char *ifo)
fprintf(stderr,"(%s,%s,%s)\n",frInCache->list[i].src,frInCache->list[i].dsc,frInCache->list[i].url); fprintf(stderr,"(%s,%s,%s)\n",frInCache->list[i].src,frInCache->list[i].dsc,frInCache->list[i].url);
} }
return(frInCache); return(frGlobCache);
} }
static REAL8TimeSeries *readTseries(LALCache *cache, CHAR *channel, LIGOTimeGPS start, REAL8 length) static REAL8TimeSeries *readTseries(LALCache *cache, CHAR *channel, LIGOTimeGPS start, REAL8 length)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment