GenerateSimulation.c   GenerateSimulation.c 
skipping to change at line 81 skipping to change at line 81
REAL8 s1x; /**< (x,y,z) components of spin of m1 body */ REAL8 s1x; /**< (x,y,z) components of spin of m1 body */
REAL8 s1y; /**< z-axis along line of sight, L in x-z pla ne */ REAL8 s1y; /**< z-axis along line of sight, L in x-z pla ne */
REAL8 s1z; /**< dimensionless spin, Kerr bound: |s1| <= 1 */ REAL8 s1z; /**< dimensionless spin, Kerr bound: |s1| <= 1 */
REAL8 s2x; /**< (x,y,z) component ofs spin of m2 body */ REAL8 s2x; /**< (x,y,z) component ofs spin of m2 body */
REAL8 s2y; /**< z-axis along line of sight, L in x-z pla ne */ REAL8 s2y; /**< z-axis along line of sight, L in x-z pla ne */
REAL8 s2z; /**< dimensionless spin, Kerr bound: |s2| <= 1 */ REAL8 s2z; /**< dimensionless spin, Kerr bound: |s2| <= 1 */
REAL8 lambda1; /**< (tidal deformability of mass 1) / (total mass)^5 (dimensionless) */ REAL8 lambda1; /**< (tidal deformability of mass 1) / (total mass)^5 (dimensionless) */
REAL8 lambda2; /**< (tidal deformability of mass 2) / (total mass)^5 (dimensionless) */ REAL8 lambda2; /**< (tidal deformability of mass 2) / (total mass)^5 (dimensionless) */
LALSimInspiralInteraction interactionFlags; /**< flag to control spin and tidal effects */ LALSimInspiralInteraction interactionFlags; /**< flag to control spin and tidal effects */
int axisChoice; /**< flag to choose reference frame for spin c oordinates */ int axisChoice; /**< flag to choose reference frame for spin c oordinates */
int inspiralOnly; /**< flag to choose if generating only the the inspiral 1 or also merger and ring-down*/
char outname[256]; /**< file to which output should be written * / char outname[256]; /**< file to which output should be written * /
int verbose; int verbose;
} GSParams; } GSParams;
const char * usage = const char * usage =
"Generate a simulation using the lalsimulation library\n" "Generate a simulation using the lalsimulation library\n"
"\n" "\n"
"Various options are required depending on the approximant\n" "Various options are required depending on the approximant\n"
"--approximant APPROX Supported approximants:\n" "--approximant APPROX Supported approximants:\n"
" IMRPhenomA\n" " IMRPhenomA\n"
skipping to change at line 130 skipping to change at line 131
"--spin2y S2Y z-axis=line of sight, L in x-z plane at referen ce\n" "--spin2y S2Y z-axis=line of sight, L in x-z plane at referen ce\n"
"--spin2z S2Z Kerr limit: s2x^2 + s2y^2 + s2z^2 <= 1\n" "--spin2z S2Z Kerr limit: s2x^2 + s2y^2 + s2z^2 <= 1\n"
"--tidal-flag Flag 'NOTIDAL', 'TIDAL5PN', 'TIDAL6PN'\n" "--tidal-flag Flag 'NOTIDAL', 'TIDAL5PN', 'TIDAL6PN'\n"
"--tidal-lambda1 L1 (tidal deformability of mass 1) / (total mass)^ 5 (~4-80 for NS)\n" "--tidal-lambda1 L1 (tidal deformability of mass 1) / (total mass)^ 5 (~4-80 for NS)\n"
"--tidal-lambda2 L2 (tidal deformability of mass 2) / (total mass)^ 5 (~4-80 for NS)\n" "--tidal-lambda2 L2 (tidal deformability of mass 2) / (total mass)^ 5 (~4-80 for NS)\n"
"--f-min FMIN Frequency at which to start waveform in Hz\n" "--f-min FMIN Frequency at which to start waveform in Hz\n"
"--f-max FMAX Frequency at which to stop waveform in Hz\n" "--f-max FMAX Frequency at which to stop waveform in Hz\n"
" (default: generate as much as possible)\n" " (default: generate as much as possible)\n"
"--distance D Distance in Mpc\n" "--distance D Distance in Mpc\n"
"--axis Ref. frame for PhenSpin (0: L, 1: J, 2: N defau lt)\n" "--axis Ref. frame for PhenSpin (0: L, 1: J, 2: N defau lt)\n"
"--inspiralOnly generate only inspiral, for PhenSpin\n"
"--outname FNAME File to which output should be written (overwri tes)\n" "--outname FNAME File to which output should be written (overwri tes)\n"
"--verbose Provide this flag to add verbose output\n" "--verbose Provide this flag to add verbose output\n"
; ;
/* Parse command line, sanity check arguments, and return a newly /* Parse command line, sanity check arguments, and return a newly
* allocated GSParams object */ * allocated GSParams object */
static GSParams *parse_args(ssize_t argc, char **argv) { static GSParams *parse_args(ssize_t argc, char **argv) {
ssize_t i; ssize_t i;
char msg[256]; char msg[256];
GSParams *params; GSParams *params;
skipping to change at line 263 skipping to change at line 265
} else if (strcmp(argv[i], "--f-min") == 0) { } else if (strcmp(argv[i], "--f-min") == 0) {
params->f_min = atof(argv[++i]); params->f_min = atof(argv[++i]);
} else if (strcmp(argv[i], "--f-max") == 0) { } else if (strcmp(argv[i], "--f-max") == 0) {
params->f_max = atof(argv[++i]); params->f_max = atof(argv[++i]);
} else if (strcmp(argv[i], "--distance") == 0) { } else if (strcmp(argv[i], "--distance") == 0) {
params->distance = atof(argv[++i]) * 1e6 * LAL_PC_SI; params->distance = atof(argv[++i]) * 1e6 * LAL_PC_SI;
} else if (strcmp(argv[i], "--inclination") == 0) { } else if (strcmp(argv[i], "--inclination") == 0) {
params->inclination = atof(argv[++i]); params->inclination = atof(argv[++i]);
} else if (strcmp(argv[i], "--axis") == 0) { } else if (strcmp(argv[i], "--axis") == 0) {
params->axisChoice = atof(argv[++i]); params->axisChoice = atof(argv[++i]);
} else if (strcmp(argv[i], "--inspiralOnly") == 0) {
params->inspiralOnly = 1;
} else if (strcmp(argv[i], "--outname") == 0) { } else if (strcmp(argv[i], "--outname") == 0) {
strncpy(params->outname, argv[++i], 256); strncpy(params->outname, argv[++i], 256);
} else if (strcmp(argv[i], "--verbose") == 0) { } else if (strcmp(argv[i], "--verbose") == 0) {
params->verbose = 1; params->verbose = 1;
} else { } else {
snprintf(msg, 256, "Error: invalid option: %s\n", argv[i]); snprintf(msg, 256, "Error: invalid option: %s\n", argv[i]);
XLALPrintError(msg); XLALPrintError(msg);
goto fail; goto fail;
} }
} }
skipping to change at line 512 skipping to change at line 516
E1z = - sin(params->inclination); E1z = - sin(params->inclination);
XLALSimInspiralSpinTaylorT4(&hplus, &hcross, XLALSimInspiralSpinTaylorT4(&hplus, &hcross,
params->phiRef, 0., params->deltaT, params->m1, params->phiRef, 0., params->deltaT, params->m1,
params->m2, params->fRef, params->distance, params->m2, params->fRef, params->distance,
params->s1x, params->s1y, params->s1z, params->s2x, params->s1x, params->s1y, params->s1z, params->s2x,
params->s2y, params->s2z, LNhatx, LNhaty, LNhatz, params->s2y, params->s2z, LNhatx, LNhaty, LNhatz,
E1x, E1y, E1z, params->lambda1, params->lambda2, E1x, E1y, E1z, params->lambda1, params->lambda2,
params->interactionFlags, params->phaseO, params->a mpO); params->interactionFlags, params->phaseO, params->a mpO);
break; break;
case GSApproximant_PhenSpinTaylorRD: case GSApproximant_PhenSpinTaylorRD:
XLALSimIMRPSpinInspiralRDGenerator(&hplus, &hcross, params->ph iRef, params->deltaT, params->m1, params->m2, params->fRef, params->distanc e, params->inclination, params->s1x, params->s1y, params->s1z, params->s2x, params->s2y, params->s2z, params->phaseO, params->axisChoice); XLALSimIMRPSpinInspiralRDGenerator(&hplus, &hcross, params->ph iRef, params->deltaT, params->m1, params->m2, params->fRef, params->distanc e, params->inclination, params->s1x, params->s1y, params->s1z, params->s2x, params->s2y, params->s2z, params->phaseO, params->axisChoice, params->insp iralOnly);
break; break;
case GSApproximant_SEOBNRv1: case GSApproximant_SEOBNRv1:
XLALSimIMRSpinAlignedEOBWaveform( &hplus, &hcross, XLALSimIMRSpinAlignedEOBWaveform( &hplus, &hcross,
params->phiRef, params->deltaT, params->m1, params->phiRef, params->deltaT, params->m1,
params->m2, params->fRef, params->distance, params->m2, params->fRef, params->distance,
params->inclination, params->s1z, params->s2z); params->inclination, params->s1z, params->s2z);
break; break;
default: default:
XLALPrintError("Error: some lazy programmer forgot to a dd their TD waveform generation function\n"); XLALPrintError("Error: some lazy programmer forgot to a dd their TD waveform generation function\n");
} }
 End of changes. 4 change blocks. 
1 lines changed or deleted 5 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/