From a38991dbe8797b59725ae5a912212b73c26d1a30 Mon Sep 17 00:00:00 2001 From: Kipp Cannon Date: Wed, 29 Jun 2022 15:28:50 +0900 Subject: [PATCH 1/4] StringSearch.c: remove use of MetadataTable - replace with native table objects --- lalapps/src/string/StringSearch.c | 49 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/lalapps/src/string/StringSearch.c b/lalapps/src/string/StringSearch.c index b1fab25c92..36b16d4aaf 100644 --- a/lalapps/src/string/StringSearch.c +++ b/lalapps/src/string/StringSearch.c @@ -204,8 +204,8 @@ int main(int argc,char *argv[]) int NTemplates_fix; /* number of template given by the template bank file */ REAL8 fcutoff_fix[MAXTEMPLATES]; /* high frequency cutoffs given by the template bank file */ SnglBurst *events=NULL; - MetadataTable process; - MetadataTable procparams; + ProcessTable *process; + ProcessParamsTable *procparams = NULL; REAL8TimeSeries *ht; /* strain data */ REAL8FFTPlan *fplan; /* fft plan */ REAL8FFTPlan *rplan; /* fft plan */ @@ -213,15 +213,14 @@ int main(int argc,char *argv[]) /* create the process and process params tables */ - procparams.processParamsTable = NULL; - process.processTable = XLALCreateProcessTableRow(); - XLALGPSTimeNow(&(process.processTable->start_time)); - if(XLALPopulateProcessTable(process.processTable, PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId, lalAppsVCSIdentInfo.vcsStatus, lalAppsVCSIdentInfo.vcsDate, 0)) + process = XLALCreateProcessTableRow(); + XLALGPSTimeNow(&(process->start_time)); + if(XLALPopulateProcessTable(process, PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId, lalAppsVCSIdentInfo.vcsStatus, lalAppsVCSIdentInfo.vcsDate, 0)) exit(1); /****** ReadCommandLine ******/ XLALPrintInfo("ReadCommandLine()\n"); - if (ReadCommandLine(argc,argv,&CommandLineArgs, process.processTable, &procparams.processParamsTable)) return 1; + if (ReadCommandLine(argc,argv,&CommandLineArgs, process, &procparams)) return 1; XLALPrintInfo("\t%c%c detector\n",CommandLineArgs.ChannelName[0],CommandLineArgs.ChannelName[1]); /* set the trigger cluster window global variable */ cluster_window = CommandLineArgs.cluster; @@ -302,17 +301,17 @@ int main(int argc,char *argv[]) /****** XLALSnglBurstAssignIDs ******/ XLALPrintInfo("XLALSnglBurstAssignIDs()\n"); if(!XLALSortSnglBurst(&events, XLALCompareSnglBurstByPeakTimeAndSNR)) return 12; - XLALSnglBurstAssignIDs(events, process.processTable->process_id, 0); + XLALSnglBurstAssignIDs(events, process->process_id, 0); /****** OutputEvents ******/ XLALPrintInfo("OutputEvents()\n"); - if (OutputEvents(&CommandLineArgs, process.processTable, procparams.processParamsTable, events)) return 13; + if (OutputEvents(&CommandLineArgs, process, procparams, events)) return 13; /****** FreeMem ******/ XLALPrintInfo("FreeMem()\n"); - XLALDestroyProcessParamsTable(procparams.processParamsTable); + XLALDestroyProcessParamsTable(procparams); XLALDestroySnglBurstTable(events); - XLALDestroyProcessTable(process.processTable); + XLALDestroyProcessTable(process); if (FreeMem(strtemplate, NTemplates)) return 14; XLALPrintInfo("StringJob is done\n"); @@ -459,7 +458,7 @@ static ProcessParamsTable **add_process_param(ProcessParamsTable **proc_param, int OutputEvents(const struct CommandLineArgsTag *CLA, ProcessTable *proctable, ProcessParamsTable *procparamtable, SnglBurst *events){ LIGOLwXMLStream *xml; - MetadataTable searchsumm; + SearchSummaryTable *searchsumm; char ifo[3]; strncpy( ifo, CLA->ChannelName, 2 ); @@ -484,26 +483,26 @@ int OutputEvents(const struct CommandLineArgsTag *CLA, ProcessTable *proctable, if(XLALWriteLIGOLwXMLProcessParamsTable(xml, procparamtable)) return -1; /* create the search summary table */ - searchsumm.searchSummaryTable = XLALCreateSearchSummaryTableRow(proctable); + searchsumm = XLALCreateSearchSummaryTableRow(proctable); /* the number of nodes for a standalone job is always 1 */ - searchsumm.searchSummaryTable->nnodes = 1; + searchsumm->nnodes = 1; /* store the input and output start and end times */ - searchsumm.searchSummaryTable->in_start_time = CLA->GPSStart; - searchsumm.searchSummaryTable->in_end_time = CLA->GPSEnd; + searchsumm->in_start_time = CLA->GPSStart; + searchsumm->in_end_time = CLA->GPSEnd; if (XLALGPSToINT8NS(&CLA->trigstarttime) > 0) - searchsumm.searchSummaryTable->out_start_time = CLA->trigstarttime; + searchsumm->out_start_time = CLA->trigstarttime; else { - searchsumm.searchSummaryTable->out_start_time = CLA->GPSStart; - XLALGPSAdd(&searchsumm.searchSummaryTable->out_start_time, CLA->ShortSegDuration/4+CLA->pad); + searchsumm->out_start_time = CLA->GPSStart; + XLALGPSAdd(&searchsumm->out_start_time, CLA->ShortSegDuration/4+CLA->pad); } - searchsumm.searchSummaryTable->out_end_time = CLA->GPSEnd; - XLALGPSAdd(&searchsumm.searchSummaryTable->out_end_time, -CLA->ShortSegDuration/4-CLA->pad); - snprintf(searchsumm.searchSummaryTable->ifos, LIGOMETA_IFOS_MAX, "%s", ifo); - searchsumm.searchSummaryTable->nevents = XLALSnglBurstTableLength(events); + searchsumm->out_end_time = CLA->GPSEnd; + XLALGPSAdd(&searchsumm->out_end_time, -CLA->ShortSegDuration/4-CLA->pad); + snprintf(searchsumm->ifos, LIGOMETA_IFOS_MAX, "%s", ifo); + searchsumm->nevents = XLALSnglBurstTableLength(events); /* write search_summary table */ - if(XLALWriteLIGOLwXMLSearchSummaryTable(xml, searchsumm.searchSummaryTable)) return -1; - XLALDestroySearchSummaryTable(searchsumm.searchSummaryTable); + if(XLALWriteLIGOLwXMLSearchSummaryTable(xml, searchsumm)) return -1; + XLALDestroySearchSummaryTable(searchsumm); /* burst table */ if(XLALWriteLIGOLwXMLSnglBurstTable(xml, events)) return -1; -- GitLab From 77c27e19741714ac11563f851e83e5dcccb0660e Mon Sep 17 00:00:00 2001 From: Kipp Cannon Date: Thu, 30 Jun 2022 14:47:22 +0900 Subject: [PATCH 2/4] lalmetaio: clean up headers - whitespace, edit comments. --- lalmetaio/lib/LIGOLwXMLRead.h | 4 +--- lalmetaio/lib/LIGOMetadataTables.h | 7 +++---- lalmetaio/lib/LIGOMetadataUtils.h | 1 - 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lalmetaio/lib/LIGOLwXMLRead.h b/lalmetaio/lib/LIGOLwXMLRead.h index bc105d99f0..389e6f8226 100644 --- a/lalmetaio/lib/LIGOLwXMLRead.h +++ b/lalmetaio/lib/LIGOLwXMLRead.h @@ -91,12 +91,10 @@ XLALTimeSlideTableFromLIGOLw ( const char *filename ); -/* these functions need to be lalified, but they are in support... */ - SearchSummaryTable * XLALSearchSummaryTableFromLIGOLw ( const char *fileName - ); +); #ifdef __cplusplus } diff --git a/lalmetaio/lib/LIGOMetadataTables.h b/lalmetaio/lib/LIGOMetadataTables.h index 0c22a4a817..4f0cabc885 100644 --- a/lalmetaio/lib/LIGOMetadataTables.h +++ b/lalmetaio/lib/LIGOMetadataTables.h @@ -160,9 +160,6 @@ tagProcessParamsTable ProcessParamsTable; - -/* shared object is lalapps, lalwrapper_cvs_tag is lalapps cvs tag */ -/* lal_cvs tag is populated automatically */ typedef struct tagSearchSummaryTable { @@ -202,6 +199,7 @@ tagSnglBurst } SnglBurst; + typedef struct tagSnglInspiralTable { @@ -329,7 +327,6 @@ tagSnglRingdownTable SnglRingdownTable; - typedef struct tagMultiInspiralTable { @@ -715,6 +712,7 @@ tagSegmentTable } SegmentTable; + typedef struct tagTimeSlideSegmentMapTable { @@ -724,6 +722,7 @@ tagTimeSlideSegmentMapTable } TimeSlideSegmentMapTable; + #if 0 { /* so that editors will match succeeding brace */ #elif defined(__cplusplus) diff --git a/lalmetaio/lib/LIGOMetadataUtils.h b/lalmetaio/lib/LIGOMetadataUtils.h index d68b88de01..28d9effc79 100644 --- a/lalmetaio/lib/LIGOMetadataUtils.h +++ b/lalmetaio/lib/LIGOMetadataUtils.h @@ -152,7 +152,6 @@ XLALReturnDetector( InterferometerNumber IFONumber ); - int XLALCompareSearchSummaryByOutTime ( const void *a, -- GitLab From 109516b3f03bb50acff1c5ceecfdd36a7186e0bb Mon Sep 17 00:00:00 2001 From: Kipp Cannon Date: Fri, 1 Jul 2022 13:45:21 +0900 Subject: [PATCH 3/4] lalinference: remove unused #include's related to XML I/O --- lalinference/bin/LALInferenceBurst.c | 2 -- lalinference/bin/LALInferenceInjectedLike.c | 1 - lalinference/bin/LALInferenceNest.c | 1 - lalinference/bin/mpi/LALInferenceMCMC.c | 1 - lalinference/lib/LALInferenceMultibanding.c | 1 - lalinference/lib/LALInferenceReadBurstData.c | 1 - lalinference/lib/LALInferenceRemoveLines.c | 2 -- lalinference/test/LALInferenceTestInjectionLikelihood.c | 1 - 8 files changed, 10 deletions(-) diff --git a/lalinference/bin/LALInferenceBurst.c b/lalinference/bin/LALInferenceBurst.c index bc9930c504..5e307c154d 100644 --- a/lalinference/bin/LALInferenceBurst.c +++ b/lalinference/bin/LALInferenceBurst.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -41,7 +40,6 @@ #include #include #include -#include #include #include diff --git a/lalinference/bin/LALInferenceInjectedLike.c b/lalinference/bin/LALInferenceInjectedLike.c index 12bdae399a..2032898e35 100644 --- a/lalinference/bin/LALInferenceInjectedLike.c +++ b/lalinference/bin/LALInferenceInjectedLike.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/lalinference/bin/LALInferenceNest.c b/lalinference/bin/LALInferenceNest.c index 372b8c795c..8072930b6f 100644 --- a/lalinference/bin/LALInferenceNest.c +++ b/lalinference/bin/LALInferenceNest.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/lalinference/bin/mpi/LALInferenceMCMC.c b/lalinference/bin/mpi/LALInferenceMCMC.c index 9681d46bb0..8877dc017f 100644 --- a/lalinference/bin/mpi/LALInferenceMCMC.c +++ b/lalinference/bin/mpi/LALInferenceMCMC.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include "LALInferenceMCMCSampler.h" #include diff --git a/lalinference/lib/LALInferenceMultibanding.c b/lalinference/lib/LALInferenceMultibanding.c index 60f0a6550d..bddc4ffe80 100644 --- a/lalinference/lib/LALInferenceMultibanding.c +++ b/lalinference/lib/LALInferenceMultibanding.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/lalinference/lib/LALInferenceReadBurstData.c b/lalinference/lib/LALInferenceReadBurstData.c index a7a5d7eed7..9b791ea2b1 100644 --- a/lalinference/lib/LALInferenceReadBurstData.c +++ b/lalinference/lib/LALInferenceReadBurstData.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include diff --git a/lalinference/lib/LALInferenceRemoveLines.c b/lalinference/lib/LALInferenceRemoveLines.c index 47b9383b99..37b8b4cb4a 100644 --- a/lalinference/lib/LALInferenceRemoveLines.c +++ b/lalinference/lib/LALInferenceRemoveLines.c @@ -43,8 +43,6 @@ #include #include #include -//#include -//#include #include #include diff --git a/lalinference/test/LALInferenceTestInjectionLikelihood.c b/lalinference/test/LALInferenceTestInjectionLikelihood.c index cb8cba2efb..d76c0b3ae0 100644 --- a/lalinference/test/LALInferenceTestInjectionLikelihood.c +++ b/lalinference/test/LALInferenceTestInjectionLikelihood.c @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include -- GitLab From 860d766cea95620e54a1b022cd0c923179391192 Mon Sep 17 00:00:00 2001 From: Kipp Cannon Date: Fri, 1 Jul 2022 14:26:33 +0900 Subject: [PATCH 4/4] lalapps: fix some missing #include's --- lalapps/src/inspiral/calcexpsnr.c | 1 + lalapps/src/inspiral/coinj.c | 1 + lalapps/src/inspiral/splitbank.c | 1 + lalapps/src/ring/injsgnl.c | 1 + 4 files changed, 4 insertions(+) diff --git a/lalapps/src/inspiral/calcexpsnr.c b/lalapps/src/inspiral/calcexpsnr.c index ca1a0a401c..7b2d472aa9 100644 --- a/lalapps/src/inspiral/calcexpsnr.c +++ b/lalapps/src/inspiral/calcexpsnr.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include diff --git a/lalapps/src/inspiral/coinj.c b/lalapps/src/inspiral/coinj.c index 09284a3ae1..5b661cbde8 100644 --- a/lalapps/src/inspiral/coinj.c +++ b/lalapps/src/inspiral/coinj.c @@ -24,6 +24,7 @@ #include #include +#include #include #include #include diff --git a/lalapps/src/inspiral/splitbank.c b/lalapps/src/inspiral/splitbank.c index 23e2b6f799..e66bd205ec 100644 --- a/lalapps/src/inspiral/splitbank.c +++ b/lalapps/src/inspiral/splitbank.c @@ -126,6 +126,7 @@ */ #include +#include #include #include #include diff --git a/lalapps/src/ring/injsgnl.c b/lalapps/src/ring/injsgnl.c index 613a84a4fb..c53f04e8b6 100644 --- a/lalapps/src/ring/injsgnl.c +++ b/lalapps/src/ring/injsgnl.c @@ -19,6 +19,7 @@ #include "config.h" +#include #include #include -- GitLab