Commit 60ebc086 authored by Kipp Cannon's avatar Kipp Cannon

change event_id in SnglInspiralTable structure to long

- refs #5390
- Deletes all code that won't compile as a result of this change with a few exceptions
Functions Deleted:
LALCreateTwoIFOCoincListEllipsoid()
XLALSnglInspiralCoincTestEllipsoid()
LALCreateTwoIFOCoincList()
LALCreateNIFOCoincList()
LALRemoveRepeatedCoincs()
LALFreeCoincInspiral()
XLALFreeCoincInspiral()
LALAddSnglInspiralToCoinc()
XLALAddSnglInspiralToCoinc()
LALSnglInspiralCoincTest()
XLALSnglInspiralCoincTest()
LALExtractSnglInspiralFromCoinc()
XLALExtractSnglInspiralFromCoinc()
XLALCreateCoincSlideTable()
XLALSetupCoincSlideTable()
XLALRecreateCoincFromSngls()
XLALGenerateCoherentBank()
XLALInspiralPsi0Psi3CutBCVC()
XLALInspiralIotaCutBCVC()
LALInspiralDistanceCutCleaning()
XLALInspiralDistanceCutBCVC()
XLALInspiralDistanceCut()
LALCoincCutSnglInspiral()
XLALClusterCoincInspiralTable()
XLALCoincInspiralIfos()
XLALCoincInspiralIfosCut()
XLALCoincInspiralIfosDiscard()
XLALCoincInspiralIdNumber()
XLALCoincInspiralSlideCut()
XLALInspiralSNRCutBCV2()
XLALStatCutCoincInspiral()
XLALRateStatCutCoincInspiral()
XLALCompleteCoincInspiral()
XLALPlayTestCoincInspiral()
XLALMeanMassCut()
LALFindChirpClusterEvents()
LALFindChirpPTFFilterSegment()
XLALSnglSimInspiralTest()
XLALCoincSimInspiralTest()
LALCompareSnglInspiralByID()
XLALCoincSegCutSnglInspiral()
XLALClusterInEventID()
Programs Deleted:
lalapps_coherentbank
lalapps_coire
lalapps_corse
lalapps_inspiral
lalapps_populate_chisq
lalapps_sire
lalapps_sned
lalapps_thinca
Original: f4c2bae0118a5afc3f0b4888dee0bfc284162f5a
parent 5a0a480b
......@@ -86,13 +86,10 @@ src/inspiral/lalapps_check_hipe_times
src/inspiral/lalapps_cohPTF_hipe
src/inspiral/lalapps_coh_PTF_post_processing
src/inspiral/lalapps_coherent_inspiral
src/inspiral/lalapps_coherentbank
src/inspiral/lalapps_cohire
src/inspiral/lalapps_coinext
src/inspiral/lalapps_coinj
src/inspiral/lalapps_coire
src/inspiral/lalapps_compare_ini
src/inspiral/lalapps_corse
src/inspiral/lalapps_flag_triggers
src/inspiral/lalapps_followup0_page
src/inspiral/lalapps_followup0_pipe
......@@ -107,7 +104,6 @@ src/inspiral/lalapps_inca
src/inspiral/lalapps_injcut
src/inspiral/lalapps_inspfrinj
src/inspiral/lalapps_inspinj
src/inspiral/lalapps_inspiral
src/inspiral/lalapps_inspiral_hipe
src/inspiral/lalapps_inspiral_online_pipe
src/inspiral/lalapps_inspiral_online_pipe_inject
......@@ -120,16 +116,12 @@ src/inspiral/lalapps_minj
src/inspiral/lalapps_multi_hipe
src/inspiral/lalapps_ninja
src/inspiral/lalapps_plot_hipe
src/inspiral/lalapps_populate_chisq
src/inspiral/lalapps_randombank
src/inspiral/lalapps_siminspiral_to_frame
src/inspiral/lalapps_sire
src/inspiral/lalapps_siva
src/inspiral/lalapps_skymap
src/inspiral/lalapps_sned
src/inspiral/lalapps_spininj
src/inspiral/lalapps_splitbank
src/inspiral/lalapps_thinca
src/inspiral/lalapps_tmpltbank
src/inspiral/lalapps_trigbank
src/inspiral/lalapps_trigger_hipe
......
......@@ -3741,8 +3741,6 @@ void BankEfficiencyAscii2Xml(void)
{
UINT4 countline = 0, nfast_max=0;
UINT8 id = 0;
ResultIn trigger;
/* Initialising below variables to 0.0 to stop compilation warnings.
Are they actually used!? Someone has commented out the lines where
......@@ -3831,6 +3829,7 @@ void BankEfficiencyAscii2Xml(void)
/* id = inputData->event_id->id;*/
fprintf(output, SNGL_INSPIRAL_ROW,
inputData->process_id,
inputData->ifo,
inputData->search,
inputData->channel,
......@@ -3893,7 +3892,7 @@ void BankEfficiencyAscii2Xml(void)
inputData->spin2x,
inputData->spin2y,
inputData->spin2z,
id);
inputData->event_id);
inputData = inputData->next;
fprintf(output, "\n");
......
......@@ -7,15 +7,9 @@ include $(top_srcdir)/gnuscripts/lalsuite_help2man.am
SUBDIRS = posterior
INSPIRALSRC = inspiral.c inspiralutils.c inspiral.h
TMPLTBANKSRC = tmpltbank.c inspiralutils.c inspiral.h
COHERESRC = coherent_inspiral.c
COHIRESRC = cohire.c
COHEREBANK = coherentbank.c
INCASRC = inca.c
THINCASRC = thinca.c
SIRESRC = sire.c
COIRESRC = coire.c
SIVASRC = siva.c
INSPINJSRC = inspinj.c inspiralutils.c inspiral.h
INJCUTSRC = injcut.c
......@@ -24,7 +18,6 @@ BBHINJSRC = bbhinj.c
BLINDINJSRC = blindinj.c
SPLITBANKSRC = splitbank.c
TRIGBANKSRC = trigbank.c
CHISQSRC = populate_chisq.c
TRIGSCANSRC = trigscan.c
INSPFRINJSRC = inspfrinj.c
GWF2XMLSRC = gwf2xml.c
......@@ -35,19 +28,14 @@ NINJASRC = ninja.c
FRNINJASRC = fr_ninja.c
MDCNINJASRC = mdc_ninja.c inspiralutils.c inspiral.h
CALCEXPSNRSRC = calcexpsnr.c
SNEDSRC = sned.c
CORSESRC = corse.c
SKYMAPSRC = skymap.c
COINJSRC = coinj.c
STOCHBANKSRC = stochasticbank.c
if LALMETAIO
LALMETAIO_PROGS = \
lalapps_inspiral \
lalapps_tmpltbank \
lalapps_inca \
lalapps_sire \
lalapps_coire \
lalapps_siva \
lalapps_inspinj \
lalapps_injcut \
......@@ -57,32 +45,22 @@ LALMETAIO_PROGS = \
lalapps_blindinj \
lalapps_inspfrinj \
lalapps_gwf2xml \
lalapps_thinca \
lalapps_trigbank \
lalapps_populate_chisq \
lalapps_trigscan \
lalapps_spininj \
lalapps_cohire \
lalapps_coherentbank \
lalapps_coinext \
lalapps_randombank \
lalapps_ninja \
lalapps_fr_ninja \
lalapps_mdc_ninja \
lalapps_calcexpsnr \
lalapps_sned \
lalapps_corse \
lalapps_skymap \
lalapps_coinj \
lalapps_cbc_stochasticbank
lalapps_inspiral_SOURCES = $(INSPIRALSRC)
lalapps_cohire_SOURCES = $(COHIRESRC)
lalapps_coherentbank_SOURCES = $(COHEREBANK)
lalapps_tmpltbank_SOURCES = $(TMPLTBANKSRC)
lalapps_inca_SOURCES = $(INCASRC)
lalapps_thinca_SOURCES = $(THINCASRC)
lalapps_sire_SOURCES = $(SIRESRC)
lalapps_coire_SOURCES = $(COIRESRC)
lalapps_siva_SOURCES = $(SIVASRC)
lalapps_inspinj_SOURCES = $(INSPINJSRC)
lalapps_injcut_SOURCES = $(INJCUTSRC)
......@@ -91,7 +69,6 @@ lalapps_bbhinj_SOURCES = $(BBHINJSRC)
lalapps_blindinj_SOURCES = $(BLINDINJSRC)
lalapps_splitbank_SOURCES = $(SPLITBANKSRC)
lalapps_trigbank_SOURCES = $(TRIGBANKSRC)
lalapps_populate_chisq_SOURCES = $(CHISQSRC)
lalapps_trigscan_SOURCES = $(TRIGSCANSRC)
lalapps_spininj_SOURCES = $(SPININJSRC)
lalapps_inspfrinj_SOURCES = $(INSPFRINJSRC)
......@@ -102,23 +79,13 @@ lalapps_ninja_SOURCES = $(NINJASRC)
lalapps_fr_ninja_SOURCES = $(FRNINJASRC)
lalapps_mdc_ninja_SOURCES = $(MDCNINJASRC)
lalapps_calcexpsnr_SOURCES = $(CALCEXPSNRSRC)
lalapps_sned_SOURCES = $(SNEDSRC)
lalapps_corse_SOURCES = $(CORSESRC)
lalapps_skymap_SOURCES = $(SKYMAPSRC)
lalapps_coinj_SOURCES = $(COINJSRC)
lalapps_cbc_stochasticbank_SOURCES = $(STOCHBANKSRC)
endif
if LALMETAIO
if LALPULSAR
LALPULSAR_PROGS = lalapps_coherent_inspiral
lalapps_coherent_inspiral_SOURCES = $(COHERESRC)
endif
endif
bin_PROGRAMS = \
$(LALMETAIO_PROGS) \
$(LALPULSAR_PROGS)
$(LALMETAIO_PROGS)
if HAVE_PYTHON
pybin_scripts = \
......@@ -256,14 +223,10 @@ MOSTLYCLEANFILES += \
*TMPLTBANK*.xml
EXTRA_DIST += \
$(COHERESRC) \
$(COIRESRC) \
$(DATA) \
$(INCASRC) \
$(INSPINJSRC) \
$(INSPIRALSRC) \
$(MINJSRC) \
$(SIRESRC) \
$(SIVASRC) \
$(SPLITBANKSRC) \
$(TMPLTBANKSRC) \
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -332,21 +332,13 @@ int main( int argc, char **argv )
{
PTFSpinTmplt = PTFSpinTmpltHead;
PTFSpinTmpltHead = PTFSpinTmplt->next;
if ( PTFSpinTmplt->event_id )
{
LALFree( PTFSpinTmplt->event_id );
}
LALFree( PTFSpinTmplt );
XLALFreeSnglInspiral( &PTFSpinTmplt );
}
while ( PTFNoSpinTmpltHead )
{
PTFNoSpinTmplt = PTFNoSpinTmpltHead;
PTFNoSpinTmpltHead = PTFNoSpinTmplt->next;
if ( PTFNoSpinTmplt->event_id )
{
LALFree( PTFNoSpinTmplt->event_id );
}
LALFree( PTFNoSpinTmplt );
XLALFreeSnglInspiral( &PTFNoSpinTmplt );
}
LALCheckMemoryLeaks();
......
......@@ -2931,11 +2931,7 @@ UINT8 coh_PTF_add_sngl_triggers(
if (coh_PTF_trig_time_check(params,currEvent->end,\
currEvent->end))
{
if (currEvent->event_id)
{
LALFree(currEvent->event_id);
}
LALFree(currEvent);
XLALFreeSnglInspiral(&currEvent);
continue;
}
/* And add the trigger to the lists. IF it passes clustering! */
......@@ -2958,11 +2954,7 @@ UINT8 coh_PTF_add_sngl_triggers(
}
else
{
if (currEvent->event_id)
{
LALFree(currEvent->event_id);
}
LALFree(currEvent);
XLALFreeSnglInspiral(&currEvent);
}
}
}
......@@ -2993,10 +2985,7 @@ SnglInspiralTable* coh_PTF_create_sngl_event(
SnglInspiralTable *thisEvent;
thisEvent = (SnglInspiralTable *)
LALCalloc(1, sizeof(SnglInspiralTable));
thisEvent->event_id = (EventIDColumn *)
LALCalloc(1, sizeof(EventIDColumn));
thisEvent->event_id->id=*eventId;
(*eventId)++;
thisEvent->event_id = (*eventId)++;
/* Set end times */
trigTime = cohSNR->epoch;
XLALGPSAdd(&trigTime,currPos*cohSNR->deltaT);
......@@ -3101,7 +3090,7 @@ UINT4 coh_PTF_accept_sngl_trig_check(
if (fabs(XLALGPSDiff(&time1,&time2)) < params->clusterWindow)
{
if (thisEvent.snr < currEvent->snr\
&& (thisEvent.event_id->id != currEvent->event_id->id))
&& (thisEvent.event_id != currEvent->event_id))
{
if ( XLALGPSDiff(&time1,&time2) < 0 )
loudTrigBefore = 1;
......@@ -3184,12 +3173,8 @@ void coh_PTF_cluster_sngl_triggers(
}
else
{
if (currEvent->event_id)
{
LALFree(currEvent->event_id);
}
currEvent2 = currEvent->next;
LALFree(currEvent);
XLALFreeSnglInspiral(&currEvent);
currEvent = currEvent2;
}
triggerNum+=1;
......@@ -3274,11 +3259,7 @@ void coh_PTF_cleanup(
SnglInspiralTable *thisSnglEvent;
thisSnglEvent = snglEvents;
snglEvents = snglEvents->next;
if ( thisSnglEvent->event_id )
{
LALFree( thisSnglEvent->event_id );
}
LALFree( thisSnglEvent );
XLALFreeSnglInspiral( &thisSnglEvent );
}
while ( PTFbankhead )
......@@ -3514,9 +3495,7 @@ SnglInspiralTable *conv_insp_tmpl_to_sngl_table(
{
SnglInspiralTable *cnvTemplate;
cnvTemplate = (SnglInspiralTable *) LALCalloc(1,sizeof(SnglInspiralTable));
cnvTemplate->event_id = (EventIDColumn *)
LALCalloc(1, sizeof(EventIDColumn) );
cnvTemplate->event_id->id=eventNumber;
cnvTemplate->event_id = eventNumber;
cnvTemplate->mass1 = template->mass1;
cnvTemplate->mass2 = template->mass2;
cnvTemplate->chi = template->chi;
......
......@@ -73,7 +73,6 @@ LALFindChirpCreateCoherentInput(
{
COMPLEX8TimeSeries *cohInputData = NULL;
LIGOTimeGPS end_time;
UINT8 UNUSED eventID = 0;
INT4 numPoints = 0;
REAL4 cohSegLength = 0.0;
INT4 inputEpochSeconds = 0;
......@@ -122,7 +121,6 @@ LALFindChirpCreateCoherentInput(
/* Get necessary info from input structures */
end_time = templt->end;
eventID = templt->event_id->id;
numPoints = input->data->length;
cohSegLength = coherentSegmentLength;
inputEpochSeconds = input->epoch.gpsSeconds;
......
This diff is collapsed.
......@@ -80,15 +80,6 @@ typedef struct tagTriggerErrorList
TriggerErrorList;
/* Functions for performing coincident analysis */
void
LALCreateTwoIFOCoincListEllipsoid(
LALStatus *status,
CoincInspiralTable **coincOutput,
SnglInspiralTable *snglInput,
InspiralAccuracyList *accuracyParams
);
/* Functions for checking for coincidence between inspiral events */
INT2 XLALCompareInspiralsEllipsoid(
TriggerErrorList *aPtr,
......@@ -97,13 +88,6 @@ INT2 XLALCompareInspiralsEllipsoid(
InspiralAccuracyList *params
);
void
XLALSnglInspiralCoincTestEllipsoid(
CoincInspiralTable *coincInspiral,
SnglInspiralTable *snglInspiral,
InspiralAccuracyList *accuracyParams
);
/* Functions for generating the error matrix and position vectors for triggers */
gsl_matrix * XLALGetErrorMatrixFromSnglInspiral(
SnglInspiralTable *event,
......
This diff is collapsed.
......@@ -652,19 +652,6 @@ LALFindChirpStoreEvent (
CHAR *searchName
);
void
LALFindChirpClusterEvents (
LALStatus *status,
SnglInspiralTable **eventList,
FindChirpFilterInput *input,
FindChirpFilterParams *params,
FindChirpBankVetoData *bankVetoData,
UINT4 subBankIndex,
int writeCData,
InspiralTemplate *bankCurrent
);
void
LALFindChirpFilterOutputVeto(
LALStatus *status,
......
This diff is collapsed.
......@@ -116,14 +116,6 @@ XLALPTFWaveformDerivatives(
REAL8 dydt[14],
void *params );
void
LALFindChirpPTFFilterSegment (
LALStatus *status,
SnglInspiralTable **eventList,
FindChirpFilterInput *input,
FindChirpFilterParams *params
);
/*@}*/ /* end:FindChirpPTF.h */
#if 0
......
This diff is collapsed.
......@@ -653,7 +653,6 @@ LALSnglInspiralTableFromLIGOLw (
/* parse the contents of the row into the InspiralTemplate structure */
for ( j = 0; tableDir[j].name; ++j )
{
enum METAIO_Type column_type = env->ligo_lw.table.col[tableDir[j].pos].data_type;
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;
......@@ -843,21 +842,9 @@ LALSnglInspiralTableFromLIGOLw (
{
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
{
i8colData = XLALLIGOLwParseIlwdChar(env, tableDir[j].pos, "sngl_inspiral", "event_id");
if ( i8colData < 0 )
return -1;
}
if ( i8colData )
{
thisEvent->event_id = LALCalloc( 1, sizeof(*thisEvent->event_id) );
thisEvent->event_id->id = i8colData;
thisEvent->event_id->snglInspiralTable = thisEvent;
}
thisEvent->event_id = XLALLIGOLwParseIlwdChar(env, tableDir[j].pos, "sngl_inspiral", "process_id");
if ( thisEvent->event_id < 0 )
return -1;
}
}
else if ( tableDir[j].idx == 45 )
......
This diff is collapsed.
......@@ -77,7 +77,6 @@ liblalinspiral_la_SOURCES = \
FindChirpBankVeto.c \
FindChirpChisq.c \
FindChirpChisqInit.c \
FindChirpClusterEvents.c \
FindChirpData.c \
FindChirpFilter.c \
FindChirpFilterInit.c \
......@@ -85,7 +84,6 @@ liblalinspiral_la_SOURCES = \
FindChirpIMRSimulation.c \
FindChirpLinkedList.c \
FindChirpMemory.c \
FindChirpPTFFilter.c \
FindChirpPTFTemplate.c \
FindChirpPTFWaveform.c \
FindChirpPhenomWaveform.c \
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -135,7 +135,7 @@ fputs( " <Column Name=\"sngl_inspiralgroup:sngl_inspiral:event_id\" Type=\"
fputs( " <Stream Name=\"sngl_inspiralgroup:sngl_inspiral:table\" Type=\"Local\" Delimiter=\",\">\n", fp ) == EOF )
#define SNGL_INSPIRAL_ROW \
" \"process:process_id:0\",\"%s\",\"%s\",\"%s\",%d,%d,%22.16e,%d,%d,%22.16e,%22.16e,%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,%e,%d,%e,%d,%22.16e,%e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,\"sngl_inspiral:event_id:%" LAL_INT8_FORMAT "\""
" \"process:process_id:%ld\",\"%s\",\"%s\",\"%s\",%d,%d,%22.16e,%d,%d,%22.16e,%22.16e,%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,%e,%d,%e,%d,%22.16e,%e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,%.8e,\"sngl_inspiral:event_id:%ld\""
#define PRINT_LIGOLW_XML_SNGL_INSPIRAL_BNS(fp) ( \
fputs( " <Table Name=\"sngl_inspiralgroup:sngl_inspiral:table\">\n", fp ) == EOF || \
......
......@@ -169,7 +169,6 @@ tagEventIDColumn
UINT8 id;
CHAR textId[LIGOMETA_UNIQUE_MAX];
UCHAR dbUniqueId[LIGOMETA_DBUNIQUE_MAX];
struct tagSnglInspiralTable *snglInspiralTable;
struct tagSnglRingdownTable *snglRingdownTable;
struct tagSummValueTable *summValueTable;
struct tagMultiInspiralTable *multiInspiralTable;
......@@ -327,7 +326,7 @@ tagSnglInspiralTable
REAL4 spin2x;
REAL4 spin2y;
REAL4 spin2z;
EventIDColumn *event_id;
long event_id;
}
SnglInspiralTable;
......
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