Maintenance will be performed on git.ligo.org, chat.ligo.org, containers.ligo.org, and docs.ligo.org starting 2 March 2020 at approximately 8am MST. It is expected to take around 10 minutes and will include a short period of downtime towards the end of the maintenance window. Please direct any comments, concerns, or questions to computing-help@igwn.org.

Commit a80d0ed9 authored by John Douglas Veitch's avatar John Douglas Veitch

Rebase from recent master

parent 264bf3bc
......@@ -21,7 +21,6 @@
#include <lal/LALInferencePrior.h>
#include <lal/LALInferenceLikelihood.h>
#include <lal/LALInferenceProposal.h>
#include <lal/LALInferenceReadData.h>
#include <lal/LALInferenceHDF5.h>
#include <lal/LALInferencePriorVolumes.h>
......@@ -1210,13 +1209,6 @@ void LALInferenceNestedSamplingAlgorithm(LALInferenceRunState *runState)
XLALH5FileAddScalarAttribute(groupPtr, "cpu_time", &execution_time, LAL_D_TYPE_CODE);
}
LALInferenceVariables *injParams = NULL;
if ( (injParams=LALInferencePrintInjectionSample(runState)) )
{
LALInferenceH5VariablesArrayToDataset(groupPtr, &injParams, 1, "injection_params");
LALInferenceClearVariables(injParams);
XLALFree(injParams);
}
XLALH5FileClose(h5file);
}
......
......@@ -2190,7 +2190,7 @@ void LALInferenceInjectionToVariables(SimInspiralTable *theEventTable, LALInfere
}
LALInferenceVariables *LALInferencePrintInjectionSample(LALInferenceRunState *runState) {
void LALInferencePrintInjectionSample(LALInferenceRunState *runState) {
int errnum=0;
char *fname=NULL;
char defaultname[]="injection_params.dat";
......@@ -2209,7 +2209,7 @@ LALInferenceVariables *LALInferencePrintInjectionSample(LALInferenceRunState *ru
ProcessParamsTable *ppt = LALInferenceGetProcParamVal(runState->commandLine,"--inj");
if (!ppt)
return(NULL);
return;
SimInspiralTableFromLIGOLw(&injTable, ppt->value, 0, 0);
......@@ -2240,7 +2240,7 @@ LALInferenceVariables *LALInferencePrintInjectionSample(LALInferenceRunState *ru
if (!(approx && order)){
fprintf(stdout,"Unable to print injection sample: No approximant/PN order set\n");
return(NULL);
return;
}
REAL8 fref = 100.;
......@@ -2294,8 +2294,9 @@ LALInferenceVariables *LALInferencePrintInjectionSample(LALInferenceRunState *ru
LALInferencePrintSample(outfile, injparams);
fclose(outfile);
//LALInferenceClearVariables(injparams);
return(injparams);
LALInferenceClearVariables(injparams);
XLALFree(injparams);
return;
}
int enforce_m1_larger_m2(SimInspiralTable* injEvent){
......
......@@ -66,7 +66,7 @@ void LALInferenceInjectionToVariables(SimInspiralTable *theEventTable, LALInfere
* \brief Function to output a sample with logL values etc for the injection, if one is made.
* Requires --inj, --outfile and optionally --event (if not 0).
*/
LALInferenceVariables *LALInferencePrintInjectionSample(LALInferenceRunState *runState);
void LALInferencePrintInjectionSample(LALInferenceRunState *runState);
void LALInferenceInjectFromMDC(ProcessParamsTable *commandLine, LALInferenceIFOData *IFOdata);
/*@}*/
......
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