Commit a91571ff authored by Miroslav Shaltev's avatar Miroslav Shaltev
Browse files

build against lalsuite 1c6dcbb6ed81b7a4de48ef0edbcd6a65a51f300d

parent 1787e73d
......@@ -2000,7 +2000,6 @@ INT4 FCGridSearch::read_CL(int argc, char *argv[]) {
strcpy(uvar_ephemS, SUNEPHEMERIS);
/* register user input variables */
LAL_CALL( LALRegisterBOOLUserVar( &status, "help", 'h', UVAR_HELP, "Print this message", &uvar_help), &status);
LAL_CALL( LALRegisterBOOLUserVar( &status, "version", 'V', UVAR_SPECIAL, "Output version information", &uvar_version), &status);
LAL_CALL( LALRegisterINTUserVar( &status, "SNRthType", 0, UVAR_OPTIONAL, "Type of SNRth computation: 0 - constant, 1 - numerical, 2 - Gaussian, 3 - WSG Eq. 38 PRD85 084010, 4 - KW Eq. 3.31 PRD85 042003", &uvar_SNRthType), &status);
LAL_CALL( LALRegisterREALUserVar( &status, "ConstSNRth", 0, UVAR_OPTIONAL, "SNRth value used with SNRthType = 0", &uvar_ConstSNRth), &status);
......@@ -2067,8 +2066,12 @@ INT4 FCGridSearch::read_CL(int argc, char *argv[]) {
LAL_CALL( LALRegisterREALUserVar( &status, "debug_sqsnrth_Ntemp",0, UVAR_DEVELOPER, "Use this Ntemp to compute sqsnrth", &uvar_debug_sqsnrth_Ntemp), &status);
/* read all command line variables */
LAL_CALL( LALUserVarReadAllInput(&status, argc, argv), &status);
/* read cmdline & cfgfile */
BOOLEAN should_exit = 0;
XLAL_CHECK( XLALUserVarReadAllInput( &should_exit, argc, argv ) == XLAL_SUCCESS, XLAL_EFUNC );
if ( should_exit ) {
exit (1);
}
/* set log level */
// LogSetLevel((LogLevel_t)uvar_loglevel);
......
......@@ -931,7 +931,6 @@ INT4 FCSearch::read_CL(int argc, char *argv[]) {
lal_errhandler = LAL_ERR_EXIT;
/* register user input variables */
LAL_CALL( LALRegisterBOOLUserVar( &status, "help", 'h', UVAR_HELP, "Print this message", &uvar_help), &status);
LAL_CALL( LALRegisterINTUserVar( &status, "logLevel", 0, UVAR_OPTIONAL, "Set logLevel", &uvar_loglevel), &status);
LAL_CALL( LALRegisterBOOLUserVar( &status, "log", 0, UVAR_OPTIONAL, "Write log file", &uvar_log), &status);
LAL_CALL( LALRegisterSTRINGUserVar( &status, "DataFiles", 0, UVAR_REQUIRED, "1st SFT file pattern", &uvar_DataFiles), &status);
......@@ -1029,9 +1028,12 @@ INT4 FCSearch::read_CL(int argc, char *argv[]) {
LAL_CALL ( LALRegisterBOOLUserVar( &status, "ComputeDTS", 0, UVAR_OPTIONAL, "Compute the distance to the signal in FStatSearchType=2 mode, using the Fisher matrix", &uvar_ComputeDTS), &status);
LAL_CALL( LALRegisterSTRINGUserVar( &status, "FstatMethod", 0, UVAR_OPTIONAL, XLALFstatMethodHelpString(), &uvar_FstatMethod ), &status);
/* read all command line variables */
LAL_CALL( LALUserVarReadAllInput(&status, argc, argv), &status);
/* read cmdline & cfgfile */
BOOLEAN should_exit = 0;
XLAL_CHECK( XLALUserVarReadAllInput( &should_exit, argc, argv ) == XLAL_SUCCESS, XLAL_EFUNC );
if ( should_exit ) {
exit (1);
}
/* set log level */
// LogSetLevel((LogLevel_t)uvar_loglevel);
......
......@@ -1367,7 +1367,6 @@ INT4 FCSearch::XLALInitUserVars ( int argc, char *argv[] )
}
/* register user input variables */
XLALRegisterUvarMember( help, BOOLEAN, 'h', HELP, "Print this message");
XLALRegisterUvarMember( Signal, STRINGVector, 0, OPTIONAL, "Signal parameters [alpha,delta,freq,f1dot,f2dot,f3dot,cosi,psi,phi0,h0,asini,argp,ecc,tpssb,period]");
XLALRegisterUvarMember( Alpha, STRINGVector, 0, OPTIONAL, "Direction Alpha [startpoint,min,max,startstep,scale,fixed,desc]");
XLALRegisterUvarMember( Delta, STRINGVector, 0, OPTIONAL, "Direction Delta [startpoint,min,max,startstep,scale,fixed,desc]");
......@@ -1468,9 +1467,12 @@ INT4 FCSearch::XLALInitUserVars ( int argc, char *argv[] )
XLALRegisterUvarMember( BNSLEL,BOOLEAN, 0, DEVELOPER, "Use low-eccentricity approximation to compute BNS metric [only TRUE is supported for now!]");
XLALRegisterUvarMember( metricType, INT4, 0, OPTIONAL, "Type of metric to compute: 0=phase-metric, 1=average F-metric");
if ( XLALUserVarReadAllInput ( argc, argv ) != XLAL_SUCCESS )
XLAL_ERROR ( XLAL_EFUNC );
/* read cmdline & cfgfile */
BOOLEAN should_exit = 0;
XLAL_CHECK( XLALUserVarReadAllInput( &should_exit, argc, argv ) == XLAL_SUCCESS, XLAL_EFUNC );
if ( should_exit ) {
exit (1);
}
if (uvar->help) // if user had requested help, then we're already done here
exit(0);
......
......@@ -485,7 +485,6 @@ XLALInitUserVars ( UserVariables_t *uvar, int argc, char *argv[] )
XLAL_CHECK ( (uvar->outLabel = XLALStringDuplicate ( MISC_DEFAULT )) != NULL, XLAL_EFUNC );
// ---------- register all our user-variable ----------
XLALRegisterUvarMember ( help, BOOLEAN, 'h', HELP , "Print this help/usage message");
/* output options */
XLALRegisterUvarMember ( outSingleSFT, BOOLEAN, 's', OPTIONAL, "Write a single concatenated SFT file instead of individual files" );
XLALRegisterUvarMember ( outSFTdir, STRING, 'n', OPTIONAL, "Output SFTs: Output directory for SFTs");
......@@ -531,13 +530,13 @@ XLALInitUserVars ( UserVariables_t *uvar, int argc, char *argv[] )
XLALRegisterUvarMember ( randSeed, INT4, 0, DEVELOPER, "Specify random-number seed for reproducible noise (use system time otherwise).");
/* read cmdline & cfgfile */
ret = XLALUserVarReadAllInput ( argc, argv );
XLAL_CHECK ( ret == XLAL_SUCCESS, XLAL_EFUNC, "Failed to parse user-input\n");
if ( uvar->help ) { /* if help was requested, we're done */
exit (0);
BOOLEAN should_exit = 0;
XLAL_CHECK( XLALUserVarReadAllInput( &should_exit, argc, argv ) == XLAL_SUCCESS, XLAL_EFUNC );
if ( should_exit ) {
exit (1);
}
return XLAL_SUCCESS;
} /* XLALInitUserVars() */
......
......@@ -2006,7 +2006,6 @@ INT4 SSDOptimize::read_CL(int argc, char *argv[]) {
lal_errhandler = LAL_ERR_EXIT;
/* register user input variables */
LAL_CALL( LALRegisterBOOLUserVar( &status, "help", 'h', UVAR_HELP, "Print this message", &uvar_help), &status);
LAL_CALL( LALRegisterINTUserVar( &status, "logLevel", 0, UVAR_OPTIONAL, "Set logLevel", &uvar_loglevel), &status);
LAL_CALL( LALRegisterBOOLUserVar( &status, "log", 0, UVAR_OPTIONAL, "Write log file", &uvar_log), &status);
LAL_CALL( LALRegisterSTRINGUserVar( &status, "DataFiles", 0, UVAR_OPTIONAL, "SFT file pattern", &uvar_DataFiles), &status);
......@@ -2121,9 +2120,12 @@ INT4 SSDOptimize::read_CL(int argc, char *argv[]) {
LAL_CALL( LALRegisterBOOLUserVar( &status, "CompareApproximation",0, UVAR_DEVELOPER, "Compare the different types for SNRth computation", &uvar_CompareApproximation), &status);
LAL_CALL ( LALRegisterBOOLUserVar( &status, "version", 'v', UVAR_SPECIAL, "Output version information", &uvar_version), &status);
/* read all command line variables */
LAL_CALL( LALUserVarReadAllInput(&status, argc, argv), &status);
/* read cmdline & cfgfile */
BOOLEAN should_exit = 0;
XLAL_CHECK( XLALUserVarReadAllInput( &should_exit, argc, argv ) == XLAL_SUCCESS, XLAL_EFUNC );
if ( should_exit ) {
exit (1);
}
/* set log level */
//LogSetLevel((LogLevel_t)uvar_loglevel);
......
......@@ -1805,7 +1805,6 @@ INT4 SSDOptimize::read_CL(int argc, char *argv[]) {
lal_errhandler = LAL_ERR_EXIT;
/* register user input variables */
LAL_CALL( LALRegisterBOOLUserVar( &status, "help", 'h', UVAR_HELP, "Print this message", &uvar_help), &status);
LAL_CALL( LALRegisterINTUserVar( &status, "logLevel", 0, UVAR_OPTIONAL, "Set logLevel", &uvar_loglevel), &status);
LAL_CALL( LALRegisterBOOLUserVar( &status, "log", 0, UVAR_OPTIONAL, "Write log file", &uvar_log), &status);
LAL_CALL( LALRegisterSTRINGUserVar( &status, "DataFiles", 0, UVAR_OPTIONAL, "SFT file pattern", &uvar_DataFiles), &status);
......@@ -1900,9 +1899,12 @@ INT4 SSDOptimize::read_CL(int argc, char *argv[]) {
LAL_CALL( LALRegisterBOOLUserVar( &status, "EnablePartialSFTs", 0, UVAR_DEVELOPER, "Enable partial SFTs in segments", &uvar_EnablePartialSFTs), &status);
LAL_CALL ( LALRegisterBOOLUserVar( &status, "version", 'v', UVAR_SPECIAL, "Output version information", &uvar_version), &status);
/* read all command line variables */
LAL_CALL( LALUserVarReadAllInput(&status, argc, argv), &status);
/* read cmdline & cfgfile */
BOOLEAN should_exit = 0;
XLAL_CHECK( XLALUserVarReadAllInput( &should_exit, argc, argv ) == XLAL_SUCCESS, XLAL_EFUNC );
if ( should_exit ) {
exit (1);
}
/* set log level */
//LogSetLevel((LogLevel_t)uvar_loglevel);
......
Supports Markdown
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