Commit 0973392b authored by Kipp Cannon's avatar Kipp Cannon

tagSimInspiralTable: add process_id element

- refs #5395
Original: cf9feac47423efad4609a76c8782055e4012358e
parent 79299982
......@@ -1443,6 +1443,7 @@ SimInspiralTableFromLIGOLw (
{"amp_order", -1, 53},
{"taper", -1, 54},
{"bandpass", -1, 55},
{"process_id", -1, 56},
{NULL, 0, 0}
};
......@@ -1742,10 +1743,12 @@ SimInspiralTableFromLIGOLw (
thisSim->bandpass = i4colData;
}
else if ( tableDir[j].idx == 56 ) {
thisSim->qmParameter1 = r4colData;
}
else if ( tableDir[j].idx == 57 ) {
thisSim->qmParameter2 = r4colData;
if ( tableDir[j].pos > 0 )
{
thisSim->process_id = XLALLIGOLwParseIlwdChar(env, tableDir[j].pos, "process", "process_id");
if ( thisSim->process_id < 0 )
return -1;
}
}
else
{
......
......@@ -800,6 +800,7 @@ LALWriteLIGOLwXMLTable (
{
FIRST_TABLE_ROW
fprintf( xml->fp, SIM_INSPIRAL_ROW,
tablePtr.simInspiralTable->process_id,
tablePtr.simInspiralTable->waveform,
tablePtr.simInspiralTable->geocent_end_time.gpsSeconds,
tablePtr.simInspiralTable->geocent_end_time.gpsNanoSeconds,
......
......@@ -387,7 +387,7 @@ fputs( " <Column Name=\"sim_inspiralgroup:sim_inspiral:simulation_id\" Type
fputs( " <Stream Name=\"sim_inspiralgroup:sim_inspiral:table\" Type=\"Local\" Delimiter=\",\">\n", fp ) == EOF )
#define SIM_INSPIRAL_ROW \
" \"process:process_id:0\",\"%s\",%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%22.16e,\"%s\",%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%d,%d,\"%s\",%d,\"%s\",%d,\"sim_inspiral:simulation_id:%" LAL_INT8_FORMAT "\""
" \"process:process_id:%ld\",\"%s\",%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%22.16e,\"%s\",%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%e,%d,%d,\"%s\",%d,\"%s\",%d,\"sim_inspiral:simulation_id:%" LAL_INT8_FORMAT "\""
#if 0
{ /* so that editors will match succeeding brace */
......
......@@ -55,14 +55,6 @@
* \c sngl_inspiral table is read in, only those entries relevant for an
* InspiralTemplate are read in and stored.
*
* The routine \c SimInspiralTableFromLIGOLw reads in a \c sim_inspiral
* table from the LIGOLwXML file specified in \c fileName. It returns the
* number of rows read in and \c SimHead provides a pointer to the head of a
* linked list of \c SimInspiralTables containing the events. Additionally, a
* \c startTime and \c endTime are specified. Only simulated events
* occuring between these times are returned. If the \c endTime is set to
* zero, then all events are returned.
*
* The routine \c XLALSearchSummaryTableFromLIGOLw reads in a
* \c search_summary table from the LIGOLwXML file specified in
* \c fileName. It returns a pointer to the head of a linked list of
......
......@@ -515,6 +515,7 @@ typedef struct
tagSimInspiralTable
{
struct tagSimInspiralTable *next;
long process_id;
CHAR waveform[LIGOMETA_WAVEFORM_MAX];
LIGOTimeGPS geocent_end_time;
LIGOTimeGPS h_end_time;
......
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