Commit 6113f72a authored by Adam Mercer's avatar Adam Mercer

Merge branch 'ilwdchar_to_int' into 'master'

convert ID columns from ilwd:char to int_8s

See merge request lscsoft/lalsuite!644
parents 5ab512bc 74c08ba0
Pipeline #163129 passed with stages
in 119 minutes and 30 seconds
......@@ -91,6 +91,7 @@ outputs:
- gsl
- hdf5 # [linux]
- {{ pin_subpackage('lal', exact=True) }}
- python-ligo-lw
- ligo-segments
- lscsoft-glue >=@MIN_GLUE_VERSION@
- mkl # [fft_impl == "mkl"]
......
......@@ -19,6 +19,7 @@ Build-Depends: bc,
python-dateutil,
python-freezegun,
python-glue (>= @MIN_GLUE_VERSION@),
python-ligo-lw,
python-ligo-segments,
python-mock,
python-numpy (>= @MIN_NUMPY_VERSION@),
......@@ -30,6 +31,7 @@ Build-Depends: bc,
python3-dateutil,
python3-freezegun,
python3-glue (>= @MIN_GLUE_VERSION@),
python3-ligo-lw,
python3-ligo-segments,
python3-numpy (>= @MIN_NUMPY_VERSION@),
python3-pytest,
......@@ -83,12 +85,14 @@ Architecture: any
Depends: ${misc:Depends},
${python:Depends},
${shlibs:Depends},
python-ligo-lw,
python-ligo-segments,
python-glue (>= @MIN_GLUE_VERSION@),
python-scipy,
python-six,
python-dateutil,
lal (= ${binary:Version})
Recommends: python-ligo-lw
Description: Python bindings for LAL
The LSC Algorithm Library for gravitational wave analysis.
This package contains Python bindings for the LAL library.
......@@ -110,12 +114,14 @@ Architecture: any
Depends: ${misc:Depends},
${python3:Depends},
${shlibs:Depends},
python3-ligo-lw,
python3-ligo-segments,
python3-glue (>= @MIN_GLUE_VERSION@),
python3-scipy,
python3-six,
python3-dateutil,
lal (= ${binary:Version})
Recommends: python3-ligo-lw
Description: Python 3 bindings for LAL
The LSC Algorithm Library for gravitational wave analysis.
This package contains Python 3 bindings for the LAL library.
......
......@@ -43,6 +43,7 @@ BuildRequires: python-devel
BuildRequires: python2-dateutil
BuildRequires: python2-freezegun
BuildRequires: python2-glue >= @MIN_GLUE_VERSION@
BuildRequires: python2-ligo-lw
BuildRequires: python2-ligo-segments
BuildRequires: python2-mock
BuildRequires: python2-numpy >= @MIN_NUMPY_VERSION@
......@@ -60,6 +61,7 @@ BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-dateutil
BuildRequires: python%{python3_pkgversion}-freezegun
BuildRequires: python%{python3_pkgversion}-glue >= @MIN_GLUE_VERSION@
BuildRequires: python%{python3_pkgversion}-ligo-lw
BuildRequires: python%{python3_pkgversion}-ligo-segments
BuildRequires: python%{python3_pkgversion}-numpy >= @MIN_NUMPY_VERSION@
BuildRequires: python%{python3_pkgversion}-pytest
......@@ -104,10 +106,17 @@ Requires: %{name} = %{version}
Requires: python
Requires: python2-dateutil
Requires: python2-glue >= @MIN_GLUE_VERSION@
Requires: python2-ligo-lw
Requires: python2-ligo-segments
Requires: python2-numpy >= @MIN_NUMPY_VERSION@
Requires: python2-scipy
Requires: python2-six
# temporariliy commented out. if it was said to be a requirement it would
# create a dependency loop, but it's an optional runtime dependency.
# unfortunately the "Recommends" key-word is not yet available in the
# package management system of LDG clusters. uncomment when the feature
# becomes available.
#Recommends: python-ligo-lw
Provides: %{name}-python = %{version}-%{release}
Obsoletes: %{name}-python < %{version}-%{release}
%{?python_provide:%python_provide python2-%{name}}
......@@ -123,10 +132,17 @@ Requires: %{name} = %{version}
Requires: python%{python3_pkgversion}
Requires: python%{python3_pkgversion}-dateutil
Requires: python%{python3_pkgversion}-glue >= @MIN_GLUE_VERSION@
Requires: python%{python3_pkgversion}-ligo-lw
Requires: python%{python3_pkgversion}-ligo-segments
Requires: python%{python3_pkgversion}-numpy >= @MIN_NUMPY_VERSION@
Requires: python%{python3_pkgversion}-scipy
Requires: python%{python3_pkgversion}-six
# temporariliy commented out. if it was said to be a requirement it would
# create a dependency loop, but it's an optional runtime dependency.
# unfortunately the "Recommends" key-word is not yet available in the
# package management system of LDG clusters. uncomment when the feature
# becomes available.
#Recommends: python%{python3_pkgversion}-ligo-lw
%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
%description -n python%{python3_pkgversion}-%{name}
The LSC Algorithm Library for gravitational wave data analysis.
......
......@@ -64,10 +64,10 @@ from scipy.signal import signaltools
from ligo import segments
from glue.ligolw import ligolw
from glue.ligolw import array as ligolw_array
from glue.ligolw import param as ligolw_param
from glue.ligolw import types as ligolw_types
from ligo.lw import ligolw
from ligo.lw import array as ligolw_array
from ligo.lw import param as ligolw_param
from ligo.lw import types as ligolw_types
import lal
from . import iterutils
from . import git_version
......@@ -1081,7 +1081,7 @@ class NDBins(tuple):
>>> y = NDBins((LogarithmicBins(1, 25, 3), LogarithmicBins(1, 25, 3)))
>>> x == y
False
>>> from glue.ligolw.ligolw import LIGO_LW
>>> from ligo.lw.ligolw import LIGO_LW
>>> import sys
>>> elem = x.to_xml(LIGO_LW())
>>> elem.write(sys.stdout) # doctest: +NORMALIZE_WHITESPACE
......
......@@ -29,9 +29,9 @@ the DMT to store time- and frequency-series data in XML files,
"""
from glue.ligolw import ligolw
from glue.ligolw import array as ligolw_array
from glue.ligolw import param as ligolw_param
from ligo.lw import ligolw
from ligo.lw import array as ligolw_array
from ligo.lw import param as ligolw_param
import lal
import six
import numpy as np
......
......@@ -79,7 +79,7 @@ SnglBurst *XLALSnglBurstTableFromLIGOLw(
/* find columns */
XLALClearErrno();
column_pos.process_id = XLALLIGOLwFindColumn(&env, "process_id", METAIO_TYPE_ILWD_CHAR, 1);
column_pos.process_id = XLALLIGOLwFindColumn(&env, "process_id", METAIO_TYPE_INT_8S, 1);
column_pos.ifo = XLALLIGOLwFindColumn(&env, "ifo", METAIO_TYPE_LSTRING, 1);
column_pos.search = XLALLIGOLwFindColumn(&env, "search", METAIO_TYPE_LSTRING, 1);
column_pos.channel = XLALLIGOLwFindColumn(&env, "channel", METAIO_TYPE_LSTRING, 1);
......@@ -95,7 +95,7 @@ SnglBurst *XLALSnglBurstTableFromLIGOLw(
column_pos.confidence = XLALLIGOLwFindColumn(&env, "confidence", METAIO_TYPE_REAL_4, 1);
column_pos.chisq = XLALLIGOLwFindColumn(&env, "chisq", METAIO_TYPE_REAL_8, 1);
column_pos.chisq_dof = XLALLIGOLwFindColumn(&env, "chisq_dof", METAIO_TYPE_REAL_8, 1);
column_pos.event_id = XLALLIGOLwFindColumn(&env, "event_id", METAIO_TYPE_ILWD_CHAR, 1);
column_pos.event_id = XLALLIGOLwFindColumn(&env, "event_id", METAIO_TYPE_INT_8S, 1);
/* check for failure (== a required column is missing) */
......@@ -125,11 +125,7 @@ SnglBurst *XLALSnglBurstTableFromLIGOLw(
/* populate the columns */
if((row->process_id = XLALLIGOLwParseIlwdChar(&env, column_pos.process_id, "process", "process_id")) < 0) {
XLALDestroySnglBurstTable(head);
MetaioAbort(&env);
XLAL_ERROR_NULL(XLAL_EFUNC);
}
row->process_id = env.ligo_lw.table.elt[column_pos.process_id].data.int_8s;
if(strlen(env.ligo_lw.table.elt[column_pos.ifo].data.lstring.data) >= sizeof(row->ifo) ||
strlen(env.ligo_lw.table.elt[column_pos.search].data.lstring.data) >= sizeof(row->search) ||
strlen(env.ligo_lw.table.elt[column_pos.channel].data.lstring.data) >= sizeof(row->channel)) {
......@@ -151,11 +147,7 @@ SnglBurst *XLALSnglBurstTableFromLIGOLw(
row->confidence = env.ligo_lw.table.elt[column_pos.confidence].data.real_4;
row->chisq = env.ligo_lw.table.elt[column_pos.chisq].data.real_8;
row->chisq_dof = env.ligo_lw.table.elt[column_pos.chisq_dof].data.real_8;
if((row->event_id = XLALLIGOLwParseIlwdChar(&env, column_pos.event_id, "sngl_burst", "event_id")) < 0) {
XLALDestroySnglBurstTable(head);
MetaioAbort(&env);
XLAL_ERROR_NULL(XLAL_EFUNC);
}
row->event_id = env.ligo_lw.table.elt[column_pos.event_id].data.int_8s;
}
if(miostatus < 0) {
XLALDestroySnglBurstTable(head);
......@@ -233,7 +225,7 @@ SimBurst *XLALSimBurstTableFromLIGOLw(
/* find columns */
XLALClearErrno();
column_pos.process_id = XLALLIGOLwFindColumn(&env, "process_id", METAIO_TYPE_ILWD_CHAR, 1);
column_pos.process_id = XLALLIGOLwFindColumn(&env, "process_id", METAIO_TYPE_INT_8S, 1);
column_pos.waveform = XLALLIGOLwFindColumn(&env, "waveform", METAIO_TYPE_LSTRING, 1);
column_pos.ra = XLALLIGOLwFindColumn(&env, "ra", METAIO_TYPE_REAL_8, 0);
column_pos.dec = XLALLIGOLwFindColumn(&env, "dec", METAIO_TYPE_REAL_8, 0);
......@@ -251,8 +243,8 @@ SimBurst *XLALSimBurstTableFromLIGOLw(
column_pos.hrss = XLALLIGOLwFindColumn(&env, "hrss", METAIO_TYPE_REAL_8, 0);
column_pos.egw_over_rsquared = XLALLIGOLwFindColumn(&env, "egw_over_rsquared", METAIO_TYPE_REAL_8, 0);
column_pos.waveform_number = XLALLIGOLwFindColumn(&env, "waveform_number", METAIO_TYPE_INT_8U, 0);
column_pos.time_slide_id = XLALLIGOLwFindColumn(&env, "time_slide_id", METAIO_TYPE_ILWD_CHAR, 1);
column_pos.simulation_id = XLALLIGOLwFindColumn(&env, "simulation_id", METAIO_TYPE_ILWD_CHAR, 1);
column_pos.time_slide_id = XLALLIGOLwFindColumn(&env, "time_slide_id", METAIO_TYPE_INT_8S, 1);
column_pos.simulation_id = XLALLIGOLwFindColumn(&env, "simulation_id", METAIO_TYPE_INT_8S, 1);
/* check for failure (== a required column is missing) */
......@@ -277,12 +269,7 @@ SimBurst *XLALSimBurstTableFromLIGOLw(
/* populate the columns */
if((row->process_id = XLALLIGOLwParseIlwdChar(&env, column_pos.process_id, "process", "process_id")) < 0) {
XLALDestroySimBurst(row);
XLALDestroySimBurstTable(head);
MetaioAbort(&env);
XLAL_ERROR_NULL(XLAL_EFUNC);
}
row->process_id = env.ligo_lw.table.elt[column_pos.process_id].data.int_8s;
if(strlen(env.ligo_lw.table.elt[column_pos.waveform].data.lstring.data) >= sizeof(row->waveform)) {
XLALDestroySimBurst(row);
XLALDestroySimBurstTable(head);
......@@ -300,18 +287,8 @@ SimBurst *XLALSimBurstTableFromLIGOLw(
XLALGPSSet(&row->time_geocent_gps, env.ligo_lw.table.elt[column_pos.time_geocent_gps].data.int_4s, env.ligo_lw.table.elt[column_pos.time_geocent_gps_ns].data.int_4s);
if(column_pos.time_geocent_gmst >= 0)
row->time_geocent_gmst = env.ligo_lw.table.elt[column_pos.time_geocent_gmst].data.real_8;
if((row->time_slide_id = XLALLIGOLwParseIlwdChar(&env, column_pos.time_slide_id, "time_slide", "time_slide_id")) < 0) {
XLALDestroySimBurst(row);
XLALDestroySimBurstTable(head);
MetaioAbort(&env);
XLAL_ERROR_NULL(XLAL_EFUNC);
}
if((row->simulation_id = XLALLIGOLwParseIlwdChar(&env, column_pos.simulation_id, "sim_burst", "simulation_id")) < 0) {
XLALDestroySimBurst(row);
XLALDestroySimBurstTable(head);
MetaioAbort(&env);
XLAL_ERROR_NULL(XLAL_EFUNC);
}
row->time_slide_id = env.ligo_lw.table.elt[column_pos.time_slide_id].data.int_8s;
row->simulation_id = env.ligo_lw.table.elt[column_pos.simulation_id].data.int_8s;
if(!strcmp(row->waveform, "StringCusp")) {
if(column_pos.duration < 0 || column_pos.frequency < 0 || column_pos.amplitude < 0) {
......
......@@ -101,6 +101,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
python-lalmetaio (>= @MIN_LALMETAIO_VERSION@~),
python-lalsimulation (>= @MIN_LALSIMULATION_VERSION@~),
python-lalburst (>= @MIN_LALBURST_VERSION@~),
python-ligo-lw,
python-ligo-segments,
python-glue
Description: Python bindings for LALInspiral
......@@ -129,6 +130,7 @@ Depends: ${misc:Depends},
python3-lalmetaio (>= @MIN_LALMETAIO_VERSION@~),
python3-lalsimulation (>= @MIN_LALSIMULATION_VERSION@~),
python3-lalburst (>= @MIN_LALBURST_VERSION@~),
python3-ligo-lw,
python3-ligo-segments,
lalinspiral (= ${binary:Version}),
python3-glue
......
......@@ -175,12 +175,7 @@ LALSnglInspiralTableFromLIGOLw (
{
fprintf( stderr, "unable to find column %s\n", tableDir[i].name );
if ( ! strcmp(tableDir[i].name, "event_id") )
{
fprintf( stderr,
"The event_id column is not populated, continuing anyway\n");
}
else if ( strstr(tableDir[i].name, "Gamma") )
if ( strstr(tableDir[i].name, "Gamma") )
{
fprintf( stderr,
"The %s column is not populated, continuing anyway\n", tableDir[i].name);
......@@ -234,6 +229,7 @@ LALSnglInspiralTableFromLIGOLw (
REAL4 r4colData = env->ligo_lw.table.elt[tableDir[j].pos].data.real_4;
REAL8 r8colData = env->ligo_lw.table.elt[tableDir[j].pos].data.real_8;
INT4 i4colData = env->ligo_lw.table.elt[tableDir[j].pos].data.int_4s;
INT8 i8colData = env->ligo_lw.table.elt[tableDir[j].pos].data.int_8s;
if ( tableDir[j].pos < 0 ) continue;
......@@ -418,12 +414,7 @@ LALSnglInspiralTableFromLIGOLw (
}
else if ( tableDir[j].idx == 44 )
{
if ( tableDir[j].pos > 0 )
{
thisEvent->event_id = XLALLIGOLwParseIlwdChar(env, tableDir[j].pos, "sngl_inspiral", "event_id");
if ( thisEvent->event_id < 0 )
return -1;
}
thisEvent->event_id = i8colData;
}
else if ( tableDir[j].idx == 45 )
{
......@@ -499,12 +490,7 @@ LALSnglInspiralTableFromLIGOLw (
}
else if ( tableDir[j].idx == 63 )
{
if ( tableDir[j].pos > 0 )
{
thisEvent->process_id = XLALLIGOLwParseIlwdChar(env, tableDir[j].pos, "process", "process_id");
if ( thisEvent->process_id < 0 )
return -1;
}
thisEvent->process_id = i8colData;
}
else
{
......@@ -666,12 +652,7 @@ InspiralTmpltBankFromLIGOLw (
{
fprintf( stderr, "unable to find column %s\n", tableDir[i].name );
if ( ! strcmp(tableDir[i].name, "event_id") )
{
fprintf( stderr,
"The event_id column is not populated, continuing anyway\n");
}
else if ( strstr(tableDir[i].name, "Gamma") )
if ( strstr(tableDir[i].name, "Gamma") )
{
fprintf( stderr,
"The %s column is not populated, continuing anyway\n", tableDir[i].name);
......@@ -793,19 +774,16 @@ InspiralTmpltBankFromLIGOLw (
}
else if ( tableDir[j].idx == 16 )
{
if ( tableDir[j].pos > 0 )
INT8 i8colData;
if ( column_type == METAIO_TYPE_INT_8S )
i8colData = env->ligo_lw.table.elt[tableDir[j].pos].data.int_8s;
else
{
INT8 i8colData;
if ( column_type == METAIO_TYPE_INT_8S )
i8colData = env->ligo_lw.table.elt[tableDir[j].pos].data.int_8s;
else
{
i8colData = XLALLIGOLwParseIlwdChar(env, tableDir[j].pos, "sngl_inspiral", "event_id");
if ( i8colData < 0 )
return -1;
}
thisTmplt->event_id = i8colData;
i8colData = XLALLIGOLwParseIlwdChar(env, tableDir[j].pos, "sngl_inspiral", "event_id");
if ( i8colData < 0 )
return -1;
}
thisTmplt->event_id = i8colData;
}
else if ( tableDir[j].idx == 17 )
{
......@@ -1075,6 +1053,7 @@ SimInspiralTableFromLIGOLw (
REAL4 r4colData = env->ligo_lw.table.elt[tableDir[j].pos].data.real_4;
REAL8 r8colData = env->ligo_lw.table.elt[tableDir[j].pos].data.real_8;
INT4 i4colData = env->ligo_lw.table.elt[tableDir[j].pos].data.int_4s;
INT8 i8colData = env->ligo_lw.table.elt[tableDir[j].pos].data.int_8s;
if ( tableDir[j].idx == 0 )
{
snprintf(thisSim->waveform, LIGOMETA_WAVEFORM_MAX * sizeof(CHAR),
......@@ -1303,21 +1282,13 @@ SimInspiralTableFromLIGOLw (
{
thisSim->bandpass = i4colData;
}
else if ( tableDir[j].idx == 56 ) {
if ( tableDir[j].pos > 0 )
{
thisSim->process_id = XLALLIGOLwParseIlwdChar(env, tableDir[j].pos, "process", "process_id");
if ( thisSim->process_id < 0 )
return -1;
}
else if ( tableDir[j].idx == 56 )
{
thisSim->process_id = i8colData;
}
else if ( tableDir[j].idx == 57 ) {
if ( tableDir[j].pos > 0 )
{
thisSim->simulation_id = XLALLIGOLwParseIlwdChar(env, tableDir[j].pos, "sim_inspiral", "simulation_id");
if ( thisSim->simulation_id < 0 )
return -1;
}
else if ( tableDir[j].idx == 57 )
{
thisSim->simulation_id = i8colData;
}
else
{
......
......@@ -217,205 +217,6 @@ MetaTableDirectory* XLALCreateMetaTableDir(
}
SnglRingdownTable* XLALSnglRingdownTableFromLIGOLw (
CHAR *fileName
)
{
int i, j;
int mioStatus = 0;
INT4 i4colData;
INT8 UNUSED i8colData;
REAL4 r4colData;
REAL8 r8colData;
SnglRingdownTable *eventHead = NULL;
SnglRingdownTable *thisEvent = NULL;
struct MetaioParseEnvironment parseEnv;
const MetaioParseEnv env = &parseEnv;
MetaTableDirectory *tableDir = NULL;
/* open the sngl_ringdown XML file */
mioStatus = MetaioOpenTable( env, fileName, "sngl_ringdown" );
if ( mioStatus )
{
XLALPrintError( "XLAL Error - unable to open sngl_ringdown table: "
"metaio error code %d\n", mioStatus );
XLAL_ERROR_NULL( XLAL_EDATA );
/* return 0;*/
}
/* create table directory to find columns in file */
tableDir = XLALCreateMetaTableDir(env, sngl_ringdown_table);
if ( ! tableDir )
{
XLALPrintError( "XLAL Error - "
"unable to create sngl_ringdown table directory\n" );
XLAL_ERROR_NULL( XLAL_EIO );
}
/* loop over the rows in the file */
i = 0;
while ( (mioStatus = MetaioGetRow(env)) == 1 )
{
/* count the rows in the file */
i++;
/* allocate memory for the ringdown structure we are about to read in */
if ( ! eventHead )
{
thisEvent = eventHead = (SnglRingdownTable *)
LALCalloc( 1, sizeof(SnglRingdownTable) );
}
else
{
thisEvent = thisEvent->next = (SnglRingdownTable *)
LALCalloc( 1, sizeof(SnglRingdownTable) );
}
if ( ! thisEvent )
{
XLALPrintError( "XLAL Error - could not allocate sngl_ringdown table\n" );
XLAL_CLOBBER_EVENTS;
MetaioClose( env );
XLAL_ERROR_NULL( XLAL_ENOMEM );
}
/* parse the contents of the row into the SnglRingdownTable structure */
for ( j = 0; tableDir[j].name; ++j )
{
if ( tableDir[j].pos < 0 )
{
XLALPrintError( "XLAL Error - bad table directory for element %d\n", j );
XLAL_CLOBBER_EVENTS;
XLAL_ERROR_NULL( XLAL_EIO );
}
/* dereference the data stored in the table */
r4colData = env->ligo_lw.table.elt[tableDir[j].pos].data.real_4;
r8colData = env->ligo_lw.table.elt[tableDir[j].pos].data.real_8;
i4colData = env->ligo_lw.table.elt[tableDir[j].pos].data.int_4s;
i8colData = env->ligo_lw.table.elt[tableDir[j].pos].data.int_8s;
if ( tableDir[j].idx == 0 )
{
snprintf( thisEvent->ifo, LIGOMETA_IFO_MAX * sizeof(CHAR),
"%s", env->ligo_lw.table.elt[tableDir[j].pos].data.lstring.data );
}
else if ( tableDir[j].idx == 1 )
{
snprintf( thisEvent->channel, LIGOMETA_CHANNEL_MAX * sizeof(CHAR),
"%s", env->ligo_lw.table.elt[tableDir[j].pos].data.lstring.data );
}
else if ( tableDir[j].idx == 2 )
{
thisEvent->start_time.gpsSeconds = i4colData;
}
else if ( tableDir[j].idx == 3 )
{
thisEvent->start_time.gpsNanoSeconds = i4colData;
}
else if ( tableDir[j].idx == 4 )
{
thisEvent->start_time_gmst = r8colData;
}
else if ( tableDir[j].idx == 5 )
{
thisEvent->frequency = r4colData;
}
else if ( tableDir[j].idx == 6 )
{
thisEvent->quality = r4colData;
}
else if ( tableDir[j].idx == 7 )
{
thisEvent->phase = r4colData;
}
else if ( tableDir[j].idx == 8 )
{
thisEvent->mass = r4colData;
}
else if ( tableDir[j].idx == 9 )
{
thisEvent->spin = r4colData;
}
else if ( tableDir[j].idx == 10 )
{
thisEvent->epsilon = r4colData;
}
else if ( tableDir[j].idx == 11 )
{
thisEvent->num_clust_trigs = i4colData;
}
else if ( tableDir[j].idx == 12 )
{
thisEvent->ds2_H1H2 = r4colData;
}
else if ( tableDir[j].idx == 13 )
{
thisEvent->ds2_H1L1 = r4colData;
}
else if ( tableDir[j].idx == 14 )
{
thisEvent->ds2_H1V1 = r4colData;
}
else if ( tableDir[j].idx == 15 )
{
thisEvent->ds2_H2L1 = r4colData;
}
else if ( tableDir[j].idx == 16 )
{
thisEvent->ds2_H2V1 = r4colData;
}
else if ( tableDir[j].idx == 17 )
{
thisEvent->ds2_L1V1 = r4colData;
}
else if ( tableDir[j].idx == 18 )
{
thisEvent->amplitude = r4colData;
}
else if ( tableDir[j].idx == 19 )
{
thisEvent->snr = r4colData;
}
else if ( tableDir[j].idx == 20 )
{
thisEvent->eff_dist = r4colData;
}
else if ( tableDir[j].idx == 21 )
{
thisEvent->sigma_sq = r8colData;
}
else if ( tableDir[j].idx == 22 )
{
sscanf( env->ligo_lw.table.elt[tableDir[j].pos].data.lstring.data, "sngl_ringdown:event_id:%ld", &(thisEvent->event_id) );
}
else
{
XLALPrintError( "XLAL Error - "
"table directory index %d out of bounds\n", j );
XLAL_CLOBBER_EVENTS;
XLAL_ERROR_NULL( XLAL_EIO );
}
}
}
if ( mioStatus == -1 )
{
XLALPrintError( "XLAL Error - error parsing after row %d\n", i );
XLAL_CLOBBER_EVENTS;
MetaioClose( env );
XLAL_ERROR_NULL( XLAL_EIO );
}
/* Normal exit */
LALFree( tableDir );
MetaioClose( env );
return eventHead;
}
SimRingdownTable* XLALSimRingdownTableFromLIGOLw (
CHAR *fileName,
INT4 startTime,
......
......@@ -30,10 +30,6 @@ extern "C" {
* function prototypes
*/
SnglRingdownTable* XLALSnglRingdownTableFromLIGOLw (
CHAR *fileName
);
SimRingdownTable* XLALSimRingdownTableFromLIGOLw (
CHAR *fileName,
INT4 startTime,
......
This diff is collapsed.
This diff is collapsed.
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