LAL: headers diff between 6.4.1 and 6.5.0 versions

	ConfigFile.h	ConfigFile.h

	skipping to change at line 20	skipping to change at line 20
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with with program; see the file COPYING. If not, write to the	* along with with program; see the file COPYING. If not, write to the
	* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,	* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
	* MA 02111-1307 USA	* MA 02111-1307 USA
	*/	*/


		/** \defgroup ConfigFile Config-File reading module
		* \ingroup support
		* \author Reinhard Prix
		* \date $Date$
		* \brief Module for general parsing of simple ASCII-based config-files.
		*
		*/

	/** \file	/** \file

	* \ingroup UserInput	* \ingroup ConfigFile
	* \author Reinhard Prix	* \author Reinhard Prix
	* \date $Date$	* \date $Date$
	* \brief Header file defining the API for ConfigFile.c.	* \brief Header file defining the API for ConfigFile.c.
	*/	*/


	/************************************ <lalVerbatim file="ConfigFileHV">
	Author: Prix, Reinhard
	$Id$
	************************************* </lalVerbatim> */

	/**************************************************** <lalLaTeX>
	\section{Header \texttt{ConfigFile.h}}
	\label{s:ConfigFile.h}

	Routines for general config-file reading.

	\subsection*{Synopsis}
	\begin{verbatim}
	#include <lal/ConfigFile.h>
	\end{verbatim}

	***************************************************** </lalLaTeX> */

	#ifndef _CONFIGFILE_H /* Double-include protection. */	#ifndef _CONFIGFILE_H /* Double-include protection. */
	#define _CONFIGFILE_H	#define _CONFIGFILE_H

	#include <lal/LALDatatypes.h>	#include <lal/LALDatatypes.h>
	#include <lal/StringInput.h>	#include <lal/StringInput.h>

	/* C++ protection. */	/* C++ protection. */
	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C" {	extern "C" {
	#endif	#endif

	NRCSID( CONFIGFILEH, "$Id$");	NRCSID( CONFIGFILEH, "$Id$");


	/********************************************************** <lalLaTeX>
	\subsection*{Error codes}
	</lalLaTeX>
	***************************************************** <lalErrTable> */
	/** \name Error codes */
	/@{/
	#define CONFIGFILEH_ENULL 1
	#define CONFIGFILEH_EFILE 2
	#define CONFIGFILEH_EVAR 3
	#define CONFIGFILEH_EFMT 4
	#define CONFIGFILEH_ETOKENS 5
	#define CONFIGFILEH_ENONULL 6
	#define CONFIGFILEH_EUNKNOWN 8
	#define CONFIGFILEH_EMEM 9
	#define CONFIGFILEH_EBOOL 10
	#define CONFIGFILEH_ESTRING 11

	#define CONFIGFILEH_MSGENULL "Arguments contained an unexpected n
	ull pointer."
	#define CONFIGFILEH_MSGEFILE "File error."
	#define CONFIGFILEH_MSGEVAR "Config variable not found."
	#define CONFIGFILEH_MSGEFMT "Config variable not readable using
	given format-string."
	#define CONFIGFILEH_MSGETOKENS "The input ConfigData seems corrupte
	d."
	#define CONFIGFILEH_MSGENONULL "Output pointer is not NULL"
	#define CONFIGFILEH_MSGEUNKNOWN "Unknown config-file entry f
	ound"
	#define CONFIGFILEH_MSGEMEM "Out of memory"
	#define CONFIGFILEH_MSGEBOOL "Illegal BOOLEAN entry"
	#define CONFIGFILEH_MSGESTRING "Malformed quoted string"
	/@}/
	/*************************************************** </lalErrTable> */

	/** Levels of strictness for config-file parsing. */	/** Levels of strictness for config-file parsing. */
	typedef enum {	typedef enum {
	CONFIGFILE_IGNORE = 0, /*< ignore missing config-variable or unpar sed config-entries /	CONFIGFILE_IGNORE = 0, /*< ignore missing config-variable or unpar sed config-entries /
	CONFIGFILE_WARN, /*< issue a warning but don't report an err or. /	CONFIGFILE_WARN, /*< issue a warning but don't report an err or. /
	CONFIGFILE_ERROR, /*< issue an error-message and report a LAL -error /	CONFIGFILE_ERROR, /*< issue an error-message and report a LAL -error /
	CONFIGFILE_LAST	CONFIGFILE_LAST
	} ConfigStrictness;	} ConfigStrictness;

	/** This structure defines a config-variable to be read in using the	/** This structure defines a config-variable to be read in using the
	* general-purpose reading function LALReadConfigVariable(). */	* general-purpose reading function LALReadConfigVariable(). */

	skipping to change at line 116	skipping to change at line 76
	* ASCII data-file in a pre-parsed form, namely stripped from all comments ('#', ';'+),	* ASCII data-file in a pre-parsed form, namely stripped from all comments ('#', ';'+),
	* spurious whitespaces, and separated into lines (taking into account line -continuation	* spurious whitespaces, and separated into lines (taking into account line -continuation
	* by '\' at the end of lines).	* by '\' at the end of lines).
	* This is used as the input structure in the config-variable reading routi nes.	* This is used as the input structure in the config-variable reading routi nes.
	*/	*/
	typedef struct {	typedef struct {
	TokenList lines; /< list of pre-parsed data-file lines /	TokenList lines; /< list of pre-parsed data-file lines /
	BOOLEAN wasRead; /< keep track of successfully read lines for stric tness-checking /	BOOLEAN wasRead; /< keep track of successfully read lines for stric tness-checking /
	} LALParsedDataFile;	} LALParsedDataFile;


	/********************************************************** <lalLaTeX>
	\vfill{\footnotesize\input{ConfigFileHV}}
	\newpage\input{ConfigFileC}
	\newpage\input{ConfigFileTestC}
	******************************************************* </lalLaTeX> */

	/* Function prototypes */	/* Function prototypes */

	void LALParseDataFile (LALStatus , LALParsedDataFile *cfgdata, const CHAR
	*fname);
	void LALDestroyParsedDataFile (LALStatus , LALParsedDataFile *cfgdata);

	int XLALParseDataFile (LALParsedDataFile *cfgdata, const CHAR fname);	int XLALParseDataFile (LALParsedDataFile *cfgdata, const CHAR fname);
	int XLALDestroyParsedDataFile (LALParsedDataFile **cfgdata);	int XLALDestroyParsedDataFile (LALParsedDataFile **cfgdata);

	int XLALConfigSectionExists(const LALParsedDataFile , const CHAR );	int XLALConfigSectionExists(const LALParsedDataFile , const CHAR );


	void
	LALReadConfigBOOLVariable (LALStatus *,
	BOOLEAN *varp,
	const LALParsedDataFile *cfgdata,
	const CHAR *varName,
	BOOLEAN *wasRead);
	int	int
	XLALReadConfigBOOLVariable (BOOLEAN *varp,	XLALReadConfigBOOLVariable (BOOLEAN *varp,
	const LALParsedDataFile *cfgdata,	const LALParsedDataFile *cfgdata,
	const CHAR *secName,	const CHAR *secName,
	const CHAR *varName,	const CHAR *varName,
	BOOLEAN *wasRead);	BOOLEAN *wasRead);

	void
	LALReadConfigINT4Variable (LALStatus *,
	INT4 *varp,
	const LALParsedDataFile *cfgdata,
	const CHAR *varName,
	BOOLEAN *wasRead);
	int	int
	XLALReadConfigINT4Variable (INT4 *varp,	XLALReadConfigINT4Variable (INT4 *varp,
	const LALParsedDataFile *cfgdata,	const LALParsedDataFile *cfgdata,
	const CHAR *secName,	const CHAR *secName,
	const CHAR *varName,	const CHAR *varName,
	BOOLEAN *wasRead);	BOOLEAN *wasRead);


	void
	LALReadConfigREAL8Variable (LALStatus *,
	REAL8 *varp,
	const LALParsedDataFile *cfgdata,
	const CHAR *varName,
	BOOLEAN *wasRead);
	int	int
	XLALReadConfigREAL8Variable (REAL8 *varp,	XLALReadConfigREAL8Variable (REAL8 *varp,
	const LALParsedDataFile *cfgdata,	const LALParsedDataFile *cfgdata,
	const CHAR *secName,	const CHAR *secName,
	const CHAR *varName,	const CHAR *varName,
	BOOLEAN *wasRead);	BOOLEAN *wasRead);


	void
	LALReadConfigSTRINGVariable (LALStatus *,
	CHAR **varp,
	const LALParsedDataFile *cfgdata,
	const CHAR *varName,
	BOOLEAN *wasRead);
	int	int
	XLALReadConfigSTRINGVariable (CHAR **varp,	XLALReadConfigSTRINGVariable (CHAR **varp,
	const LALParsedDataFile *cfgdata,	const LALParsedDataFile *cfgdata,
	const CHAR *secName,	const CHAR *secName,
	const CHAR *varName,	const CHAR *varName,
	BOOLEAN *wasRead);	BOOLEAN *wasRead);


	void
	LALReadConfigSTRINGNVariable (LALStatus *,
	CHARVector *varp,
	const LALParsedDataFile *cfgdata,
	const CHAR *varName,
	BOOLEAN *wasRead);
	int	int
	XLALReadConfigSTRINGNVariable (CHARVector *varp,	XLALReadConfigSTRINGNVariable (CHARVector *varp,
	const LALParsedDataFile *cfgdata,	const LALParsedDataFile *cfgdata,
	const CHAR *secName,	const CHAR *secName,
	const CHAR *varName,	const CHAR *varName,
	BOOLEAN *wasRead);	BOOLEAN *wasRead);


	void
	LALReadConfigVariable (LALStatus *,
	void *varp,
	const LALParsedDataFile *cfgdata,
	const LALConfigVar *param,
	BOOLEAN *wasRead);
	int	int
	XLALReadConfigVariable (void *varp,	XLALReadConfigVariable (void *varp,
	const LALParsedDataFile *cfgdata,	const LALParsedDataFile *cfgdata,
	const LALConfigVar *param,	const LALConfigVar *param,
	BOOLEAN *wasRead);	BOOLEAN *wasRead);


	void LALCheckConfigReadComplete (LALStatus , const LALParsedDataFile cfgd
	ata, ConfigStrictness strict);

	int XLALCheckConfigReadComplete (const LALParsedDataFile *cfgdata, ConfigSt rictness strict);	int XLALCheckConfigReadComplete (const LALParsedDataFile *cfgdata, ConfigSt rictness strict);

		int XLALLowerCaseString (CHAR *string);


	void LALLowerCaseString (LALStatus , CHAR string);	/* ========== DEPRECATED LAL INTERFACE FUNCTIONS, which have been replaced
		by XLAL functions,
		* These functions are just wrappers around the XLAL functions
		*/


	int XLALLowerCaseString (CHAR *string);	/** \name Error codes */
		/@{/
		#define CONFIGFILEH_ENULL 1
		#define CONFIGFILEH_EFILE 2
		#define CONFIGFILEH_EVAR 3
		#define CONFIGFILEH_EFMT 4
		#define CONFIGFILEH_ETOKENS 5
		#define CONFIGFILEH_ENONULL 6
		#define CONFIGFILEH_EUNKNOWN 8
		#define CONFIGFILEH_EMEM 9
		#define CONFIGFILEH_EBOOL 10
		#define CONFIGFILEH_ESTRING 11
		#define CONFIGFILEH_EXLAL 12

		#define CONFIGFILEH_MSGENULL "Arguments contained an unexpected n
		ull pointer."
		#define CONFIGFILEH_MSGEFILE "File error."
		#define CONFIGFILEH_MSGEVAR "Config variable not found."
		#define CONFIGFILEH_MSGEFMT "Config variable not readable using
		given format-string."
		#define CONFIGFILEH_MSGETOKENS "The input ConfigData seems corrupte
		d."
		#define CONFIGFILEH_MSGENONULL "Output pointer is not NULL"
		#define CONFIGFILEH_MSGEUNKNOWN "Unknown config-file entry f
		ound"
		#define CONFIGFILEH_MSGEMEM "Out of memory"
		#define CONFIGFILEH_MSGEBOOL "Illegal BOOLEAN entry"
		#define CONFIGFILEH_MSGESTRING "Malformed quoted string"
		#define CONFIGFILEH_MSGEXLAL "Failure in XLAL function"
		/@}/

		/* Function prototypes */
		void LALParseDataFile (LALStatus , LALParsedDataFile *cfgdata, const CHAR
		*fname);
		void LALDestroyParsedDataFile (LALStatus , LALParsedDataFile *cfgdata);

		void
		LALReadConfigBOOLVariable (LALStatus *,
		BOOLEAN *varp,
		const LALParsedDataFile *cfgdata,
		const CHAR *varName,
		BOOLEAN *wasRead);

		void
		LALReadConfigINT4Variable (LALStatus *,
		INT4 *varp,
		const LALParsedDataFile *cfgdata,
		const CHAR *varName,
		BOOLEAN *wasRead);

		void
		LALReadConfigREAL8Variable (LALStatus *,
		REAL8 *varp,
		const LALParsedDataFile *cfgdata,
		const CHAR *varName,
		BOOLEAN *wasRead);

		void
		LALReadConfigSTRINGVariable (LALStatus *,
		CHAR **varp,
		const LALParsedDataFile *cfgdata,
		const CHAR *varName,
		BOOLEAN *wasRead);

		void
		LALReadConfigSTRINGNVariable (LALStatus *,
		CHARVector *varp,
		const LALParsedDataFile *cfgdata,
		const CHAR *varName,
		BOOLEAN *wasRead);

		void
		LALReadConfigVariable (LALStatus *,
		void *varp,
		const LALParsedDataFile *cfgdata,
		const LALConfigVar *param,
		BOOLEAN *wasRead);

		void LALCheckConfigReadComplete (LALStatus , const LALParsedDataFile cfgd
		ata, ConfigStrictness strict);

	/* C++ protection. */	/* C++ protection. */
	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif

	#endif /* Double-include protection. */	#endif /* Double-include protection. */

End of changes. 16 change blocks.
	104 lines changed or deleted	94 lines changed or added

	Date.h	Date.h

	skipping to change at line 29	skipping to change at line 29

	/** \file	/** \file
	* \ingroup std	* \ingroup std
	* \author Chin, D. W. and Creighton, J. D. E.	* \author Chin, D. W. and Creighton, J. D. E.
	* \brief Routines for converting between various time representations.	* \brief Routines for converting between various time representations.
	*	*
	*/	*/
	/* <lalVerbatim file="DateHV">	/* <lalVerbatim file="DateHV">

	Author: David Chin <dwchin@umich.edu> +1-734-709-9119	Author: David Chin <dwchin@umich.edu> +1-734-709-9119

	$Id$

	</lalVerbatim> */	</lalVerbatim> */

	/* <lalLaTeX>	/* <lalLaTeX>

	\section{Header \texttt{Date.h}}	\section{Header \texttt{Date.h}}
	\label{s:Date.h}	\label{s:Date.h}

	Provides routines for manipulating date and time information.	Provides routines for manipulating date and time information.


	skipping to change at line 77	skipping to change at line 76
	/* Linux */	/* Linux */
	#ifndef __USE_POSIX	#ifndef __USE_POSIX
	# define __USE_POSIX	# define __USE_POSIX
	#endif	#endif

	#include <stdio.h>	#include <stdio.h>
	#include <stdlib.h>	#include <stdlib.h>

	#include <time.h>	#include <time.h>


	#include <lal/LALRCSID.h>

	#include <lal/LALConstants.h>	#include <lal/LALConstants.h>
	#include <lal/LALAtomicDatatypes.h>	#include <lal/LALAtomicDatatypes.h>
	#include <lal/LALDatatypes.h>	#include <lal/LALDatatypes.h>

	#include <lal/LALStatusMacros.h>
	#include <lal/LALStdlib.h>	#include <lal/LALStdlib.h>

	#include <lal/DetectorSite.h>	#include <lal/DetectorSite.h>

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C"	extern "C"
	{	{
	#endif	#endif


	NRCSID (DATEH, "$Id$");

	/** The UNIX time of the GPS origin epoch.	/** The UNIX time of the GPS origin epoch.
	*	*
	* 1980 6 JAN 0h UTC is 3657 days after 1970 1 JAN 0h UTC:	* 1980 6 JAN 0h UTC is 3657 days after 1970 1 JAN 0h UTC:
	* 8 standard years of 365 days = 2920 days	* 8 standard years of 365 days = 2920 days
	* 2 leap years of 366 days = 734 days	* 2 leap years of 366 days = 734 days
	* 5 extra days.	* 5 extra days.
	* Hence 3657*86400=315964800.	* Hence 3657*86400=315964800.
	*	*
	* Note that this deliberately does not account for any leap seconds in the	* Note that this deliberately does not account for any leap seconds in the
	* interval. POSIX:2001 defines the relation between the UNIX time	* interval. POSIX:2001 defines the relation between the UNIX time

End of changes. 4 change blocks.
	6 lines changed or deleted	0 lines changed or added

	LALBarycenter.h	LALBarycenter.h

	skipping to change at line 20	skipping to change at line 20
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with with program; see the file COPYING. If not, write to the	* along with with program; see the file COPYING. If not, write to the
	* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,	* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
	* MA 02111-1307 USA	* MA 02111-1307 USA
	*/	*/


	/********************************** <lalVerbatim file="LALBarycenterHV">
	Author: Cutler, C.
	$Id$
	*********************************** </lalVerbatim> */

	/**
	* \author Curt Cutler
	* \date 2001
	* \file
	* \ingroup moduleBarycenter
	* \brief This header defines the API for LALBarycenter.c.
	*
	* $Id$
	*/

	/* <lalLaTeX>

	\section{Header \texttt{LALBarycenter.h}}
	\label{s:LALBarycenter.h}

	Provides routines for transforming from arrival time
	at detector (GPS) to pulse emission time (TDB); i.e.,
	for ``barycentering'' the measured astronomical time series.

	\subsection*{Synopsis}

	\begin{verbatim}
	#include <lal/LALBarycenter.h>
	\end{verbatim}

	\noindent This header covers the routine
	\verb@LALBarycenter.c@.

	</lalLaTeX> */

	#ifndef _LALBARYCENTER_H /* Protect against double-inclusion */	#ifndef _LALBARYCENTER_H /* Protect against double-inclusion */
	#define _LALBARYCENTER_H	#define _LALBARYCENTER_H

	#include <stdio.h>	#include <stdio.h>
	#include <math.h>	#include <math.h>
	#include <lal/LALStdio.h>	#include <lal/LALStdio.h>
	#include <lal/LALStdlib.h>	#include <lal/LALStdlib.h>
	#include <lal/LALConstants.h>	#include <lal/LALConstants.h>
	#include <lal/DetectorSite.h>	#include <lal/DetectorSite.h>

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C" {	extern "C" {
	#endif	#endif


		/** \cond DONT_DOXYGEN */
	NRCSID (LALBARYCENTERH,"$Id$");	NRCSID (LALBARYCENTERH,"$Id$");

		/** \endcond */


	/* <lalErrTable file="LALBarycenterHErrorTable"> */	/** \name Error codes */
		/@{/ /** \ingroup Barycenter_h */
	#define LALBARYCENTERH_ENULL 2	#define LALBARYCENTERH_ENULL 2
	#define LALBARYCENTERH_EOUTOFRANGEE 4	#define LALBARYCENTERH_EOUTOFRANGEE 4
	#define LALBARYCENTERH_EOUTOFRANGES 8	#define LALBARYCENTERH_EOUTOFRANGES 8
	#define LALBARYCENTERH_EBADSOURCEPOS 16	#define LALBARYCENTERH_EBADSOURCEPOS 16

	#define LALBARYCENTERH_MSGENULL "Null input to Barycenter routine."	#define LALBARYCENTERH_MSGENULL "Null input to Barycenter routine."
	#define LALBARYCENTERH_MSGEOUTOFRANGEE "tgps not in range of earth.dat fil e"	#define LALBARYCENTERH_MSGEOUTOFRANGEE "tgps not in range of earth.dat fil e"
	#define LALBARYCENTERH_MSGEOUTOFRANGES "tgps not in range of sun.dat file"	#define LALBARYCENTERH_MSGEOUTOFRANGES "tgps not in range of sun.dat file"
	#define LALBARYCENTERH_MSGEBADSOURCEPOS "source position not in standard ra nge"	#define LALBARYCENTERH_MSGEBADSOURCEPOS "source position not in standard ra nge"

		/@}/


	/* </lalErrTable> */	/**
		* \defgroup LALBarycenter_h Barycentering
	/* <lalLaTeX>	* \author Curt Cutler
	\subsection*{Error conditions}	* \date 2001
	\vspace{0.1in}	* \ingroup pulsarCommon
	\input{LALBarycenterHErrorTable}	* \brief Provides routines for transforming from arrival time at detector
	</lalLaTeX> */	(GPS) to pulse emission time (TDB); ie
		* for ``barycentering'' the measured astronomical time series.
	/* Structures. */	*
		* \heading{Synopsis}
	/* <lalLaTeX>	* \code
	\subsection*{Structures}	* #include <lal/LALInitBarycenter.h>
		* #include <lal/LALBarycenter.h>
	\begin{verbatim}	* \endcode
	struct EphemerisFilenames	*
	\end{verbatim}	*/
	\idx[Type]{EphemerisFilenames}	/@{/
	\noindent This structure contains two pointers
	to data files containing arrays of center-of-mass
	positions for the Earth and Sun, respectively.
	The tables are derived from the JPL ephemeris.

	\noindent Files tabulate positions for one calendar year
	(actually, a little more than one year, to deal
	with overlaps). The first line of each table summarizes
	what is in it. Subsequent lines give the time (GPS) and the
	Earth's position $(x,y,z)$,
	velocity $(v_x, v_y, v_z)$, and acceleration $(a_x, a_y, a_z)$
	at that instant. All in units of seconds; e.g. positions have
	units of seconds, and accelerations have units 1/sec.

	\begin{description}
	\item[\texttt{CHAR *earthEphemeris}] File containing Earth's position.

	\item[\texttt{CHAR *sunEphemeris}] File containing Sun's position.
	\end{description}

	\begin{verbatim}
	struct EphemerisData
	\end{verbatim}
	\idx[Type]{EphemerisData}
	\noindent This structure contains all information about the
	center-of-mass positions of the Earth and Sun, listed at regular
	time intervals. The fields are

	\begin{description}
	\item[\texttt{EphemerisFilenames ephiles}] Stucture giving names of
	the two files containing positions of Earth and Sun, resp., at evenly
	spaced times.

	\item[\texttt{INT4 nentriesE}] The number of entries in Earth ephemeris
	table.

	\item[\texttt{INT4 nentriesS}] The number of entries in Sun ephemeris
	table.

	\item[\texttt{REAL8 dtEtable}] The spacing in sec. between consecutive
	intants in Earth ephemeris table.

	\item[\texttt{REAL8 dtStable}] The spacing in sec. between consecutive
	intants in Sun ephemeris table.

	\item[\texttt{PosVelAcc *ephemE}] Array containing pos,vel,acc. of earth, a
	s
	extracted from earth ephem file. Units are sec, 1, 1/sec.

	\item[\texttt{PosVelAcc *ephemS}] Array containing pos,vel,acc. of sun, as
	extracted from sun ephem file. Units are sec, 1, 1/sec.
	\end{description}

	\begin{verbatim}
	struct EarthState
	\end{verbatim}
	\idx[Type]{EarthState}
	\noindent Basic output structure of LALBarycenterEarth.c.
	\begin{description}
	\item[\texttt{REAL8 einstein}] the einstein delay equiv TDB - TDT
	\item[\texttt{REAL8 deinstein}] d(einstein)/d(tgps)

	\item[\texttt{REAL8 posNow[3]}] Cartesian coords of Earth's center at tgps,
	extrapolated from JPL DE405 ephemeris; units= sec.

	\item[\texttt{REAL8 velNow[3]}] dimensionless velocity of Earth's center at
	tgps, extrapolated from JPL DE405 ephemeris

	\item[\texttt{REAL8 gastRad}] Greenwich Apparent Sidereal Time,
	in radians, at tgps. Its basically the angle thru which Earth has
	spun at given time. gast is like gmst, but has additional correction
	for short-term nutation.

	\item[\texttt{REAL8 tzeA}] variable describing effect of lunisolar precessi
	on, at tgps; see Explan. Supp. Astron. Almanac, pp.104-5.
	\item[\texttt{REAL8 zA}] variable describing effect of lunisolar precession
	, at tgps
	\item[\texttt{REAL8 thetaA}] variable describing effect of lunisolar preces
	sion, at tgps
	\item[\texttt{REAL8 delpsi}] variable describing effect of Earth nutation,
	at tgps; see Explan. Supp. Astron. Almanac, pp.120.
	\item[\texttt{REAL8 deleps}] variable describing effect of Earth nutation,
	at tgps
	\item[\texttt{REAL8 se[3]}] vector that points from Sun to Earth at instant
	tgps, in DE405 coords; units = sec
	\item[\texttt{REAL8 dse[3]}] d(se[3])/d(tgps). Dimensionless
	\item[\texttt{REAL8 rse}] length of vector se[3]; units = sec
	\item[\texttt{REAL8 drse}] d(rse)/d(tgps); dimensionless
	\end{description}

	\begin{verbatim}
	struct BarycenterInput
	\end{verbatim}
	\idx[Type]{BarycenterInput}
	\noindent Basic input structure to LALBarycenter.c.
	\begin{description}
	\item[\texttt{LIGOTimeGPS tgps}] input GPS arrival time.

	\item[\texttt{LALDetector site}] detector site info. \textbf{NOTE:}
	the \verb@site.location@ field must be modified to give the detector
	location in units of \emph{seconds} (i.e.\ divide the values normally
	stored in \verb@site.location@ by \verb@LAL_C_SI@).

	\item[\texttt{REAL8 alpha}] Source right ascension in ICRS J2000
	coords (radians).

	\item[\texttt{REAL8 delta}] Source declination in ICRS J2000 coords (radian
	s).

	\item[\texttt{REAL8 dInv}] 1/(distance to source), in 1/sec.
	\end{description}

	\begin{verbatim}
	struct EmissionTime
	\end{verbatim}
	\idx[Type]{EmissionTime}
	\noindent Basic output structure produced by LALBarycenter.c.
	\begin{description}
	\item[\texttt{ REAL8 deltaT}] $t_e$(TDB) - $t_a$(GPS) (+ constant = ``lig
	ht-travel-time from source to SSB'')

	\item[\texttt{ LIGOTimeGPS te}] pulse emission time $t_e$ in TDB (plus c
	onstant =
	``light-travel-time from source to SSB''), in format of LIGOTImeGPS structu
	re.

	\item[\texttt{ REAL8 tDot}] d(emission time in TDB)/d(arrival time in GP
	S)

	\item[\texttt{ REAL8 rDetector[3]}] Cartesian coords (0=x,1=y,2=z) of
	detector position at $t_a$ (GPS), in ICRS J2000 coords. Units = sec.

	\item[\texttt{ REAL8 vDetector[3]}] Cartesian coords (0=x,1=y,2=z) of
	detector velocity at $t_a$ (GPS), in ICRS J2000 coords. Dimensionless.
	\end{description}
	</lalLaTeX> */


	/** This structure contains two pointers to data files containing arrays	/** \brief [DEPRECATED] Used as input for LALInitBarycenter(), this structu
		re contains
		* two pointers to the ephemeris data files containing arrays
	* of center-of-mass positions for the Earth and Sun, respectively.	* of center-of-mass positions for the Earth and Sun, respectively.

		*
	* The tables are derived from the JPL ephemeris.	* The tables are derived from the JPL ephemeris.
	*	*
	* Files tabulate positions for one calendar year	* Files tabulate positions for one calendar year
	* (actually, a little more than one year, to deal	* (actually, a little more than one year, to deal
	* with overlaps). The first line of each table summarizes	* with overlaps). The first line of each table summarizes
	* what is in it. Subsequent lines give the time (GPS) and the	* what is in it. Subsequent lines give the time (GPS) and the
	* Earth's position \f$(x,y,z)\f$,	* Earth's position \f$(x,y,z)\f$,
	* velocity \f$(v_x, v_y, v_z)\f$, and acceleration \f$(a_x, a_y, a_z)\f$	* velocity \f$(v_x, v_y, v_z)\f$, and acceleration \f$(a_x, a_y, a_z)\f$
	* at that instant. All in units of seconds; e.g. positions have	* at that instant. All in units of seconds; e.g. positions have
	* units of seconds, and accelerations have units 1/sec.	* units of seconds, and accelerations have units 1/sec.

		*
		* \deprecated Use XLALInitBarycenter() instead.
	*/	*/
	typedef struct	typedef struct
	{	{
	CHAR earthEphemeris; /< File containing Earth's position. /	CHAR earthEphemeris; /< File containing Earth's position. /
	CHAR sunEphemeris; /< File containing Sun's position. /	CHAR sunEphemeris; /< File containing Sun's position. /
	}	}
	EphemerisFilenames;	EphemerisFilenames;

	/** Structure holding a REAL8 time, and a position, velocity and	/** Structure holding a REAL8 time, and a position, velocity and
	* acceleration vector. */	* acceleration vector. */

	skipping to change at line 348	skipping to change at line 197
	REAL8 tDot; /*< d(emission time in TDB)/d(arrival time in GPS) /	REAL8 tDot; /*< d(emission time in TDB)/d(arrival time in GPS) /

	REAL8 rDetector[3]; /**< Cartesian coords (0=x,1=y,2=z) of detector pos ition	REAL8 rDetector[3]; /**< Cartesian coords (0=x,1=y,2=z) of detector pos ition
	* at $t_a$ (GPS), in ICRS J2000 coords. Units = se c. */	* at $t_a$ (GPS), in ICRS J2000 coords. Units = se c. */

	REAL8 vDetector[3]; /* Cartesian coords (0=x,1=y,2=z) of detector veloc ity	REAL8 vDetector[3]; /* Cartesian coords (0=x,1=y,2=z) of detector veloc ity
	* at \f$t_a\f$ (GPS), in ICRS J2000 coords. Dimens ionless. */	* at \f$t_a\f$ (GPS), in ICRS J2000 coords. Dimens ionless. */
	}	}
	EmissionTime;	EmissionTime;


		/@}/

	/*Curt: probably best to take 1.0 OUT of tDot--ie., output tDot-1.	/*Curt: probably best to take 1.0 OUT of tDot--ie., output tDot-1.
	But most users would immediately add back the one anyway.	But most users would immediately add back the one anyway.
	*/	*/

	/*Curt: rem te is ``time pulse would arrive at a GPS clock	/*Curt: rem te is ``time pulse would arrive at a GPS clock
	way out in empty space, if you renormalized and zero-ed the latter	way out in empty space, if you renormalized and zero-ed the latter
	to give, on average, the same arrival time as the GPS clock on Earth'' */	to give, on average, the same arrival time as the GPS clock on Earth'' */

	/* Function prototypes. */	/* Function prototypes. */

	void LALBarycenterEarth(LALStatus , EarthState , const LIGOTimeGPS , con st EphemerisData );	void LALBarycenterEarth(LALStatus , EarthState , const LIGOTimeGPS , con st EphemerisData );

	void LALBarycenter(LALStatus , EmissionTime , const BarycenterInput , co nst EarthState );	void LALBarycenter(LALStatus , EmissionTime , const BarycenterInput , co nst EarthState );


	/********************************************************** <lalLaTeX>
	\vfill{\footnotesize\input{LALBarycenterHV}}
	\newpage\input{LALBarycenterC}
	******************************************************* </lalLaTeX> */

	/* <lalLaTeX>
	\section{Header \texttt{LALInitBarycenter.h}}

	This header and its associated module have been moved into the
	\verb@support@ package.

	\newpage\input{LALBarycenterTestC}
	</lalLaTeX> */

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif /* Close C++ protection */	#endif /* Close C++ protection */

	#endif /* Close double-include protection */	#endif /* Close double-include protection */

End of changes. 11 change blocks.
	204 lines changed or deleted	30 lines changed or added

	LALConfig.h	LALConfig.h
	/* include/lal/LALConfig.h. Generated from LALConfig.h.in by configure. * /	/* include/lal/LALConfig.h. Generated from LALConfig.h.in by configure. * /
	/* only include this file if LAL's config.h has not been included */	/* only include this file if LAL's config.h has not been included */
	/* $Id$ */	/* $Id$ */
	#ifndef CONFIG_H__LAL	#ifndef CONFIG_H__LAL

	#ifndef _LALCONFIG_H	#ifndef _LALCONFIG_H
	#define _LALCONFIG_H	#define _LALCONFIG_H

	/* LAL Version */	/* LAL Version */

	#define LAL_VERSION "6.4.1"	#define LAL_VERSION "6.5.0"

	/* LAL Version Major Number */	/* LAL Version Major Number */
	#define LAL_VERSION_MAJOR 6	#define LAL_VERSION_MAJOR 6

	/* LAL Version Minor Number */	/* LAL Version Minor Number */

	#define LAL_VERSION_MINOR 4	#define LAL_VERSION_MINOR 5

	/* LAL Version Micro Number */	/* LAL Version Micro Number */

	#define LAL_VERSION_MICRO 1	#define LAL_VERSION_MICRO 0

	/* LAL Version Devel Number */	/* LAL Version Devel Number */
	#define LAL_VERSION_DEVEL 0	#define LAL_VERSION_DEVEL 0

	/* LAL Configure Arguments */	/* LAL Configure Arguments */

	#define LAL_CONFIGURE_ARGS " '--enable-shared' '--prefix=/home/andrey/upstr eam-tracker/testing/lal/6.4.1' '--exec-prefix=/home/andrey/upstream-tracker /testing/lal/6.4.1' '--sysconfdir=/home/andrey/upstream-tracker/testing/lal /6.4.1' '--datadir=/home/andrey/upstream-tracker/testing/lal/6.4.1' 'CFLAGS =-w -fpermissive' 'CXXFLAGS=-w -fpermissive'"	#define LAL_CONFIGURE_ARGS " '--enable-shared' '--prefix=/home/andrey/upstr eam-tracker/testing/lal/6.5.0' '--exec-prefix=/home/andrey/upstream-tracker /testing/lal/6.5.0' '--sysconfdir=/home/andrey/upstream-tracker/testing/lal /6.5.0' '--datadir=/home/andrey/upstream-tracker/testing/lal/6.5.0' 'CFLAGS =-w -fpermissive' 'CXXFLAGS=-w -fpermissive'"

	/* LAL Configure Date */	/* LAL Configure Date */

	#define LAL_CONFIGURE_DATE "2012-05-12T12:18:22+0400"	#define LAL_CONFIGURE_DATE "2012-05-12T12:13:58+0400"

	/* LAL Install Prefix */	/* LAL Install Prefix */
	#define LAL_PREFIX "/opt/lscsoft/lal"	#define LAL_PREFIX "/opt/lscsoft/lal"

	/* Suppress debugging code */	/* Suppress debugging code */
	/* #undef LAL_NDEBUG */	/* #undef LAL_NDEBUG */

	/* Use functions rather than macros */	/* Use functions rather than macros */
	/* #undef NOLALMACROS */	/* #undef NOLALMACROS */


End of changes. 5 change blocks.
	5 lines changed or deleted	5 lines changed or added

	LALDatatypes.h	LALDatatypes.h

	skipping to change at line 26	skipping to change at line 26
	* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,	* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
	* MA 02111-1307 USA	* MA 02111-1307 USA
	*/	*/

	/** \file	/** \file
	* \ingroup std	* \ingroup std
	* \author Creighton, J. D. E., and Creighton, T. D.	* \author Creighton, J. D. E., and Creighton, T. D.
	* \date $Id$	* \date $Id$
	* \brief Provides the basic LAL datatypes.	* \brief Provides the basic LAL datatypes.
	*	*

	* \noindent This header defines the standard data types and data	* This header defines the standard data types and data
	* structures that are used throughout LAL. They fall into three general	* structures that are used throughout LAL. They fall into three general
	* categories: primitive datatypes, aggregates of primitive	* categories: primitive datatypes, aggregates of primitive
	* datatypes, and structured datatypes. The LAL status structure	* datatypes, and structured datatypes. The LAL status structure
	* is a special case of a structured datatype that is used in every	* is a special case of a structured datatype that is used in every
	* standard LAL function.	* standard LAL function.
	*	*
	* This header file is automatically included by the header	* This header file is automatically included by the header
	* <tt>LALStdlib.h</tt>. In turn, this header file starts by including the	* <tt>LALStdlib.h</tt>. In turn, this header file starts by including the
	* header <tt>LALAtomicDatatypes.h</tt>.	* header <tt>LALAtomicDatatypes.h</tt>.
	*	*

	skipping to change at line 603	skipping to change at line 603
	\end{description}	\end{description}

	</lalLaTeX> */	</lalLaTeX> */

	/** Sequence of CHAR Vectors. */	/** Sequence of CHAR Vectors. */
	typedef struct	typedef struct
	tagCHARVectorSequence	tagCHARVectorSequence
	{	{
	UINT4 length; /*< The number \a l of vectors. /	UINT4 length; /*< The number \a l of vectors. /
	UINT4 vectorLength; /*< The length \a n of each vector. /	UINT4 vectorLength; /*< The length \a n of each vector. /

	CHAR data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c]. /	CHAR data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. /
	}	}
	CHARVectorSequence;	CHARVectorSequence;

	/** Sequence of INT2 Vectors. */	/** Sequence of INT2 Vectors. */
	typedef struct	typedef struct
	tagINT2VectorSequence	tagINT2VectorSequence
	{	{
	UINT4 length; /*< The number \a l of vectors. /	UINT4 length; /*< The number \a l of vectors. /
	UINT4 vectorLength; /*< The length \a n of each vector. /	UINT4 vectorLength; /*< The length \a n of each vector. /

	INT2 data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c]. /	INT2 data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. /
	}	}
	INT2VectorSequence;	INT2VectorSequence;

	/** Sequence of UINT2 Vectors. */	/** Sequence of UINT2 Vectors. */
	typedef struct	typedef struct
	tagUINT2VectorSequence	tagUINT2VectorSequence
	{	{
	UINT4 length; /*< The number \a l of vectors. /	UINT4 length; /*< The number \a l of vectors. /
	UINT4 vectorLength; /*< The length \a n of each vector. /	UINT4 vectorLength; /*< The length \a n of each vector. /

	UINT2 data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c]. /	UINT2 data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. /
	}	}
	UINT2VectorSequence;	UINT2VectorSequence;

	/** Sequence of INT4 Vectors. */	/** Sequence of INT4 Vectors. */
	typedef struct	typedef struct
	tagINT4VectorSequence	tagINT4VectorSequence
	{	{
	UINT4 length; /*< The number \a l of vectors. /	UINT4 length; /*< The number \a l of vectors. /
	UINT4 vectorLength; /*< The length \a n of each vector. /	UINT4 vectorLength; /*< The length \a n of each vector. /

	INT4 data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c]. /	INT4 data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. /
	}	}
	INT4VectorSequence;	INT4VectorSequence;

	/** Sequence of UINT4 Vectors. */	/** Sequence of UINT4 Vectors. */
	typedef struct	typedef struct
	tagUINT4VectorSequence	tagUINT4VectorSequence
	{	{
	UINT4 length; /*< The number \a l of vectors. /	UINT4 length; /*< The number \a l of vectors. /
	UINT4 vectorLength; /*< The length \a n of each vector. /	UINT4 vectorLength; /*< The length \a n of each vector. /

	UINT4 data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c]. /	UINT4 data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. /
	}	}
	UINT4VectorSequence;	UINT4VectorSequence;

	/** Sequence of INT8 Vectors. */	/** Sequence of INT8 Vectors. */
	typedef struct	typedef struct
	tagINT8VectorSequence	tagINT8VectorSequence
	{	{
	UINT4 length; /*< The number \a l of vectors. /	UINT4 length; /*< The number \a l of vectors. /
	UINT4 vectorLength; /*< The length \a n of each vector. /	UINT4 vectorLength; /*< The length \a n of each vector. /

	INT8 data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c]. /	INT8 data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. /
	}	}
	INT8VectorSequence;	INT8VectorSequence;

	/** Sequence of UINT8 Vectors. */	/** Sequence of UINT8 Vectors. */
	typedef struct	typedef struct
	tagUINT8VectorSequence	tagUINT8VectorSequence
	{	{
	UINT4 length; /*< The number \a l of vectors. /	UINT4 length; /*< The number \a l of vectors. /
	UINT4 vectorLength; /*< The length \a n of each vector. /	UINT4 vectorLength; /*< The length \a n of each vector. /

	UINT8 data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c]. /	UINT8 data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. /
	}	}
	UINT8VectorSequence;	UINT8VectorSequence;

	/** Sequence of REAL4 Vectors. */	/** Sequence of REAL4 Vectors. */
	typedef struct	typedef struct
	tagREAL4VectorSequence	tagREAL4VectorSequence
	{	{
	UINT4 length; /*< The number \a l of vectors. /	UINT4 length; /*< The number \a l of vectors. /
	UINT4 vectorLength; /*< The length \a n of each vector. /	UINT4 vectorLength; /*< The length \a n of each vector. /

	REAL4 data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c]. /	REAL4 data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. /
	}	}
	REAL4VectorSequence;	REAL4VectorSequence;

	/** Sequence of REAL8 Vectors. */	/** Sequence of REAL8 Vectors. */
	typedef struct	typedef struct
	tagREAL8VectorSequence	tagREAL8VectorSequence
	{	{
	UINT4 length; /*< The number \a l of vectors. /	UINT4 length; /*< The number \a l of vectors. /
	UINT4 vectorLength; /*< The length \a n of each vector. /	UINT4 vectorLength; /*< The length \a n of each vector. /

	REAL8 data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c]. /	REAL8 data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. /
	}	}
	REAL8VectorSequence;	REAL8VectorSequence;

	/** Sequence of COMPLEX8 Vectors. */	/** Sequence of COMPLEX8 Vectors. */
	typedef struct	typedef struct
	tagCOMPLEX8VectorSequence	tagCOMPLEX8VectorSequence
	{	{
	UINT4 length; /*< The number \a l of vectors. /	UINT4 length; /*< The number \a l of vectors. /
	UINT4 vectorLength; /*< The length \a n of each vector. /	UINT4 vectorLength; /*< The length \a n of each vector. /

	COMPLEX8 data; /< Pointer to the data array. Element \a i of vector \ a j is \c data[ \a jn + \a i \c]. /	COMPLEX8 data; /< Pointer to the data array. Element \a i of vector \ a j is \c data[ \a jn + \a i \c ]. /
	}	}
	COMPLEX8VectorSequence;	COMPLEX8VectorSequence;

	/** Sequence of COMPLEX16 Vectors. */	/** Sequence of COMPLEX16 Vectors. */
	typedef struct	typedef struct
	tagCOMPLEX16VectorSequence	tagCOMPLEX16VectorSequence
	{	{
	UINT4 length; /*< The number \a l of vectors. /	UINT4 length; /*< The number \a l of vectors. /
	UINT4 vectorLength; /*< The length \a n of each vector. /	UINT4 vectorLength; /*< The length \a n of each vector. /

	COMPLEX16 data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c]. /	COMPLEX16 data; /< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. /
	}	}
	COMPLEX16VectorSequence;	COMPLEX16VectorSequence;

	/* <lalLaTeX>	/* <lalLaTeX>

	\vspace{2ex}	\vspace{2ex}
	\begin{verbatim}	\begin{verbatim}
	<datatype>ArraySequence	<datatype>ArraySequence
	\end{verbatim}	\end{verbatim}
	This structure stores an ordered set of $l$ elements of type	This structure stores an ordered set of $l$ elements of type

End of changes. 12 change blocks.
	12 lines changed or deleted	12 lines changed or added

	LALInitBarycenter.h	LALInitBarycenter.h

	skipping to change at line 20	skipping to change at line 20
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with with program; see the file COPYING. If not, write to the	* along with with program; see the file COPYING. If not, write to the
	* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,	* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
	* MA 02111-1307 USA	* MA 02111-1307 USA
	*/	*/


	/********************************** <lalVerbatim file="LALInitBarycenterHV"
	>
	Author: Cutler, C.
	$Id$
	*********************************** </lalVerbatim> */

	/* <lalLaTeX>

	\section{Header \texttt{LALInitBarycenter.h}}
	\label{s:LALInitBarycenter.h}

	Provides a routine for reading Earth and Sun position information from
	data files.

	\subsection*{Synopsis}

	\begin{verbatim}
	#include "LALInitBarycenter.h"
	\end{verbatim}

	\noindent This header covers the routine \verb@LALInitBarycenter.c@.
	Since it involves file I/O, it is placed in the \verb@support@
	package, and included in the \verb@lalsupport@ library.

	</lalLaTeX> */

	#ifndef _LALINITBARYCENTER_H /* Protect against double-inclusion */	#ifndef _LALINITBARYCENTER_H /* Protect against double-inclusion */
	#define _LALINITBARYCENTER_H	#define _LALINITBARYCENTER_H


	#include <lal/LALBarycenter.h>
	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C" {	extern "C" {
	#endif	#endif


		#include <lal/LALBarycenter.h>

		/** \cond DONT_DOXYGEN */

		/* exported API Function prototypes. */
		EphemerisData * XLALInitBarycenter ( const CHAR *earthEphemerisFile, const
		CHAR *sunEphemerisFile );
		void XLALDestroyEphemerisData ( EphemerisData *edat );

		/* ==================== deprecated LAL interface =========================
		=========================*/
	NRCSID (LALINITBARYCENTERH,"$Id$");	NRCSID (LALINITBARYCENTERH,"$Id$");


	/* <lalErrTable file="LALInitBarycenterHErrorTable"> */
	#define LALINITBARYCENTERH_EOPEN 1	#define LALINITBARYCENTERH_EOPEN 1
	#define LALINITBARYCENTERH_EMEM 2	#define LALINITBARYCENTERH_EMEM 2
	#define LALINITBARYCENTERH_EEPHFILE 32	#define LALINITBARYCENTERH_EEPHFILE 32

	#define LALINITBARYCENTERH_MSGEOPEN "Could not open ephemeris file"	#define LALINITBARYCENTERH_MSGEOPEN "Could not open ephemeris file"
	#define LALINITBARYCENTERH_MSGEMEM "Out of memory"	#define LALINITBARYCENTERH_MSGEMEM "Out of memory"
	#define LALINITBARYCENTERH_MSGEEPHFILE "Error in reading an ephemeris file"	#define LALINITBARYCENTERH_MSGEEPHFILE "Error in reading an ephemeris file"

	/* </lalErrTable> */

	/* <lalLaTeX>
	\subsection*{Error conditions}
	\vspace{0.1in}
	\input{LALInitBarycenterHErrorTable}
	</lalLaTeX> */

	/* Function prototypes. */

	void LALInitBarycenter(LALStatus , EphemerisData );	void LALInitBarycenter(LALStatus , EphemerisData );


	/********************************************************** <lalLaTeX>	/** \endcond */
	\vfill{\footnotesize\input{LALInitBarycenterHV}}
	\newpage\input{LALInitBarycenterC}
	******************************************************* </lalLaTeX> */

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif /* Close C++ protection */	#endif /* Close C++ protection */

	#endif /* Close double-include protection */	#endif /* Close double-include protection */

End of changes. 6 change blocks.
	41 lines changed or deleted	12 lines changed or added

	LALNoiseModels.h	LALNoiseModels.h

	skipping to change at line 266	skipping to change at line 266
	(	(
	LALStatus *status,	LALStatus *status,
	StatsREAL4VectorOut *out,	StatsREAL4VectorOut *out,
	REAL4Vector *vector	REAL4Vector *vector
	);	);

	/* <lalLaTeX>	/* <lalLaTeX>
	\newpage\input{NoisePSDTestC}	\newpage\input{NoisePSDTestC}
	</lalLaTeX> */	</lalLaTeX> */


		REAL8 XLALETBPsd( REAL8 f );

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif

	#endif /* _LALNOISEMODELS_H */	#endif /* _LALNOISEMODELS_H */

End of changes. 1 change blocks.
	0 lines changed or deleted	2 lines changed or added

	LALStdio.h	LALStdio.h

	skipping to change at line 39	skipping to change at line 39
	\label{s:LALStdio.h}	\label{s:LALStdio.h}

	Provides LAL functions similar to the non-file functions in \verb+<stdio.h> +.	Provides LAL functions similar to the non-file functions in \verb+<stdio.h> +.

	\subsection*{Synopsis}	\subsection*{Synopsis}
	\begin{verbatim}	\begin{verbatim}
	#include <lal/LALStdio.h>	#include <lal/LALStdio.h>
	#include <lal/FileIO.h>	#include <lal/FileIO.h>
	\end{verbatim}	\end{verbatim}


	\noindent This header provides the LALsnprintf function.

	\vfill{\footnotesize\input{LALStdioHV}}	\vfill{\footnotesize\input{LALStdioHV}}

	\newpage\input{LALStdC}
	</lalLaTeX>	</lalLaTeX>
	#endif /* autodoc block */	#endif /* autodoc block */

	#ifndef _LALSTDIO_H	#ifndef _LALSTDIO_H
	#define _LALSTDIO_H	#define _LALSTDIO_H

	#include <stdio.h>	#include <stdio.h>
	#include <stdarg.h>	#include <stdarg.h>
	#include <inttypes.h>	#include <inttypes.h>
	#include <lal/LALConfig.h>	#include <lal/LALConfig.h>

	skipping to change at line 119	skipping to change at line 116
	* either scanf or printf (decimal integers only) */	* either scanf or printf (decimal integers only) */
	#define LAL_INT2_FORMAT LAL_INT2_SCNd	#define LAL_INT2_FORMAT LAL_INT2_SCNd
	#define LAL_INT4_FORMAT LAL_INT4_SCNd	#define LAL_INT4_FORMAT LAL_INT4_SCNd
	#define LAL_INT8_FORMAT LAL_INT8_SCNd	#define LAL_INT8_FORMAT LAL_INT8_SCNd
	#define LAL_UINT2_FORMAT LAL_INT2_SCNu	#define LAL_UINT2_FORMAT LAL_INT2_SCNu
	#define LAL_UINT4_FORMAT LAL_INT4_SCNu	#define LAL_UINT4_FORMAT LAL_INT4_SCNu
	#define LAL_UINT8_FORMAT LAL_INT8_SCNu	#define LAL_UINT8_FORMAT LAL_INT8_SCNu
	#define LAL_REAL4_FORMAT "g"	#define LAL_REAL4_FORMAT "g"
	#define LAL_REAL8_FORMAT "lg"	#define LAL_REAL8_FORMAT "lg"


	int
	LALSnprintf( char , size_t, const char , ... );

	int
	LALVsnprintf( char , size_t, const char , va_list );

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif

	#endif /* _LALSTDIO_H */	#endif /* _LALSTDIO_H */

End of changes. 3 change blocks.
	9 lines changed or deleted	0 lines changed or added

	LALVCSInfo.h	LALVCSInfo.h

	skipping to change at line 19	skipping to change at line 19
	* This program is distributed in the hope that it will be useful, but	* This program is distributed in the hope that it will be useful, but
	* WITHOUT ANY WARRANTY; without even the implied warranty of	* WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* General Public License for more details.	* General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with with program; see the file COPYING. If not, write to the	* along with with program; see the file COPYING. If not, write to the
	* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,	* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
	* MA 02111-1307 USA	* MA 02111-1307 USA
	*	*

	* Copyright (C) 2009 Adam Mercer	* Copyright (C) 2009,2010 Adam Mercer
	*/	*/

	#ifndef _LALVCSINFO_H	#ifndef _LALVCSINFO_H
	#define _LALVCSINFO_H	#define _LALVCSINFO_H

	#include <lal/LALConfig.h>	#include <lal/LALConfig.h>

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C" {	extern "C" {
	#endif	#endif

	/* vcs information defines */	/* vcs information defines */

	#define LAL_VCS_ID "0ba4b16915434b5477282639eaef92d6faf20761"	#define LAL_NAME "LAL"
	#define LAL_VCS_DATE "2010-05-11 19:07:36 +0000"	#define LAL_VCS_ID "326f3ba0f848ba2e31e93262a1360c62aaf6baf4"
		#define LAL_VCS_DATE "2011-01-05 22:07:42 +0000"
	#define LAL_VCS_BRANCH "None"	#define LAL_VCS_BRANCH "None"

	#define LAL_VCS_TAG "lal_6_4_1_release"	#define LAL_VCS_TAG "lal_6_5_0_release"
	#define LAL_VCS_AUTHOR "Adam Mercer <adam.mercer@ligo.org>"	#define LAL_VCS_AUTHOR "Adam Mercer <adam.mercer@ligo.org>"
	#define LAL_VCS_COMMITTER "Adam Mercer <adam.mercer@ligo.org>"	#define LAL_VCS_COMMITTER "Adam Mercer <adam.mercer@ligo.org>"
	#define LAL_VCS_STATUS "CLEAN: All modifications committed"	#define LAL_VCS_STATUS "CLEAN: All modifications committed"

	/* vcs information defines - identable*/	/* vcs information defines - identable*/

	#define LAL_VCS_IDENT_ID "$" "LALId: 0ba4b16915434b5477282639eaef92d6faf207	#define LAL_VCS_IDENT_ID "$" "LALId: 326f3ba0f848ba2e31e93262a1360c62aaf6ba
	61 " "$"	f4 " "$"
	#define LAL_VCS_IDENT_DATE "$" "LALDate: 2010-05-11 19:07:36 +0000 " "$"	#define LAL_VCS_IDENT_DATE "$" "LALDate: 2011-01-05 22:07:42 +0000 " "$"
	#define LAL_VCS_IDENT_BRANCH "$" "LALBranch: None " "$"	#define LAL_VCS_IDENT_BRANCH "$" "LALBranch: None " "$"

	#define LAL_VCS_IDENT_TAG "$" "LALTag: lal_6_4_1_release " "$"	#define LAL_VCS_IDENT_TAG "$" "LALTag: lal_6_5_0_release " "$"
	#define LAL_VCS_IDENT_AUTHOR "$" "LALAuthor: Adam Mercer <adam.mercer@ligo. org> " "$"	#define LAL_VCS_IDENT_AUTHOR "$" "LALAuthor: Adam Mercer <adam.mercer@ligo. org> " "$"
	#define LAL_VCS_IDENT_COMMITTER "$" "LALCommitter: Adam Mercer <adam.mercer @ligo.org> " "$"	#define LAL_VCS_IDENT_COMMITTER "$" "LALCommitter: Adam Mercer <adam.mercer @ligo.org> " "$"
	#define LAL_VCS_IDENT_STATUS "$" "LALStatus: CLEAN: All modifications commi tted " "$"	#define LAL_VCS_IDENT_STATUS "$" "LALStatus: CLEAN: All modifications commi tted " "$"

	/* global variables for vcs information, defined in LALVCSInfo.c */	/* global variables for vcs information, defined in LALVCSInfo.c */
	extern const char *lalVCSVersion;	extern const char *lalVCSVersion;
	extern const char *lalVCSId;	extern const char *lalVCSId;
	extern const char *lalVCSDate;	extern const char *lalVCSDate;
	extern const char *lalVCSBranch;	extern const char *lalVCSBranch;
	extern const char *lalVCSTag;	extern const char *lalVCSTag;
	extern const char *lalVCSAuthor;	extern const char *lalVCSAuthor;
	extern const char *lalVCSCommitter;	extern const char *lalVCSCommitter;
	extern const char *lalVCSStatus;	extern const char *lalVCSStatus;

	/* define vcs information structure */	/* define vcs information structure */
	typedef struct tagLALVCSInfo	typedef struct tagLALVCSInfo
	{	{

		const char *name;
	const char *version;	const char *version;
	const char *vcsId;	const char *vcsId;
	const char *vcsDate;	const char *vcsDate;
	const char *vcsBranch;	const char *vcsBranch;
	const char *vcsTag;	const char *vcsTag;
	const char *vcsAuthor;	const char *vcsAuthor;
	const char *vcsCommitter;	const char *vcsCommitter;
	const char *vcsStatus;	const char *vcsStatus;
	} LALVCSInfo;	} LALVCSInfo;

	/* header and library vcs information structures */	/* header and library vcs information structures */

	extern struct tagLALVCSInfo lalLibraryVCSInfo;	extern struct tagLALVCSInfo lalVCSInfo;
	static const struct tagLALVCSInfo lalHeaderVCSInfo = { \	static const struct tagLALVCSInfo lalHeaderVCSInfo = { \

		LAL_NAME, \
	LAL_VERSION, \	LAL_VERSION, \
	LAL_VCS_ID, \	LAL_VCS_ID, \
	LAL_VCS_DATE, \	LAL_VCS_DATE, \
	LAL_VCS_BRANCH, \	LAL_VCS_BRANCH, \
	LAL_VCS_TAG, \	LAL_VCS_TAG, \
	LAL_VCS_AUTHOR, \	LAL_VCS_AUTHOR, \
	LAL_VCS_COMMITTER, \	LAL_VCS_COMMITTER, \
	LAL_VCS_STATUS \	LAL_VCS_STATUS \
	};	};


End of changes. 8 change blocks.
	9 lines changed or deleted	12 lines changed or added

	TimeDelay.h	TimeDelay.h

	skipping to change at line 31	skipping to change at line 31
	#define _TIMEDELAY_H	#define _TIMEDELAY_H

	#include <lal/Date.h>	#include <lal/Date.h>
	#include <lal/DetectorSite.h>	#include <lal/DetectorSite.h>

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C"	extern "C"
	{	{
	#endif	#endif


	NRCSID( TIMEDELAYH, "$Id$" );

	/*	/*
	* Function prototypes	* Function prototypes
	*/	*/

	double	double
	XLALArrivalTimeDiff(	XLALArrivalTimeDiff(
	const double detector1_earthfixed_xyz_metres[3],	const double detector1_earthfixed_xyz_metres[3],
	const double detector2_earthfixed_xyz_metres[3],	const double detector2_earthfixed_xyz_metres[3],
	const double source_right_ascension_radians,	const double source_right_ascension_radians,
	const double source_declination_radians,	const double source_declination_radians,

End of changes. 1 change blocks.
	2 lines changed or deleted	0 lines changed or added

	UserInput.h	UserInput.h
	/*	/*

		* Copyright (C) 2010 Reinhard Prix (xlalified)
	* Copyright (C) 2004, 2005 Reinhard Prix	* Copyright (C) 2004, 2005 Reinhard Prix
	*	*
	* This program is free software; you can redistribute it and/or modify	* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by	* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or	* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.	* (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with with program; see the file COPYING. If not, write to the	* along with with program; see the file COPYING. If not, write to the
	* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,	* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
	* MA 02111-1307 USA	* MA 02111-1307 USA
	*/	*/


	/** \defgroup UserInput	/** \defgroup UserInput User-input handling
	* \ingroup support	* \ingroup support
	* \author Reinhard Prix	* \author Reinhard Prix
	* \date $Date$	* \date $Date$
	* \brief Module for general parsing of user-input from config-file and/or command-line.	* \brief Module for general parsing of user-input from config-file and/or command-line.
	*	*

	* More documentation on how to use this module will appear here soon!!
	*/	*/

	/** \file	/** \file
	* \ingroup UserInput	* \ingroup UserInput
	* \author Reinhard Prix	* \author Reinhard Prix

	* \date $Date$
	* \brief Header file defining the API for the UserInput modules.	* \brief Header file defining the API for the UserInput modules.
	*/	*/

	#ifndef _USERINPUT_H /* Double-include protection. */	#ifndef _USERINPUT_H /* Double-include protection. */
	#define _USERINPUT_H	#define _USERINPUT_H


		#ifdef __cplusplus /* C++ protection. */
		extern "C" {
		#endif

	#include <lal/ConfigFile.h>	#include <lal/ConfigFile.h>
	#if 0	#if 0
	#include <lal/LIGOMetadataTables.h>	#include <lal/LIGOMetadataTables.h>
	#endif	#endif


	#ifdef __cplusplus /* C++ protection. */	/*----- family of short-cut macros: register _struct-pointer_ "uvar->" stru
	extern "C" {	ct User-Variables ----- */
	#endif	#define XLALregREALUserStruct(name,option,flag,help) \
		XLALRegisterREALUserVar(#name, option, flag, help, &(uvar-> name))


	NRCSID( USERINPUTH, "$Id$");	#define XLALregINTUserStruct(name,option,flag,help) \
		XLALRegisterINTUserVar(#name, option,flag, help, &(uvar-> name))

		#define XLALregBOOLUserStruct(name,option,flag,help) \
		XLALRegisterBOOLUserVar(#name, option, flag, help, &(uvar-> name))

		#define XLALregSTRINGUserStruct(name,option,flag,help) \
		XLALRegisterSTRINGUserVar(#name, option, flag, help, &(uvar-> name))

		#define XLALregLISTUserStruct(name,option,flag,help) \
		XLALRegisterLISTUserVar(#name, option, flag, help, &(uvar-> name))

		/** State-flags: variable is optional, required, help, developer or was_set
		*/
		typedef enum {
		UVAR_OPTIONAL = 0, /**< not required, and hasn't been s
		et */
		UVAR_REQUIRED = 1<<0, /**< we require the user to set this variabl
		e */
		UVAR_HELP = 1<<1, /**< special variable: trigger output of hel
		p-string */
		UVAR_DEVELOPER = 1<<2, /**< OPTIONAL and hidden in help-output at l
		alDebugLevel==0 */
		UVAR_SPECIAL = 1<<3, /*< OPTIONAL and turns off* checking of re
		quired variables (LALUserVarCheckRequired) */
		UVAR_WAS_SET = 1<<7 /**< flag that this user-var has bee
		n set by user */
		} UserVarState;

		/** Format for logging User-input: configFile- or cmdLine-style.
		* This determines the format of the string returned from LALLogUserInput()
		.
		*/
		typedef enum {
		UVAR_LOGFMT_CFGFILE, /*< return UserVars as a config-file /
		UVAR_LOGFMT_CMDLINE, /*< return UserVars as a command-line /
		UVAR_LOGFMT_PROCPARAMS, /**< return UserVars suitable for filling in proc
		ess-params struct */
		UVAR_LOGFMT_LAST
		} UserVarLogFormat;

		/* Function prototypes */
		void XLALDestroyUserVars( void );
		int XLALUserVarReadCmdline (int argc, char *argv[]);
		int XLALUserVarReadCfgfile ( const CHAR *cfgfile );
		CHAR XLALUserVarHelpString ( const CHAR progname );
		int XLALUserVarReadAllInput ( int argc, char *argv[] );
		int XLALUserVarCheckRequired( void );
		int XLALUserVarWasSet (const void *cvar);
		int XLALGetDebugLevel (int argc, char *argv[], CHAR optchar);
		CHAR * XLALUserVarGetLog ( UserVarLogFormat format );

		/* type-specific wrappers to XLALRegisterUserVar() to allow type-checking!
		*/
		int XLALRegisterREALUserVar ( const CHAR *name, CHAR optchar, UserVarState
		flag, const CHAR helpstr, REAL8 cvar );
		int XLALRegisterINTUserVar ( const CHAR *name, CHAR optchar, UserVarState f
		lag, const CHAR helpstr, INT4 cvar );
		int XLALRegisterBOOLUserVar ( const CHAR *name, CHAR optchar, UserVarState
		flag, const CHAR helpstr, BOOLEAN cvar );
		int XLALRegisterSTRINGUserVar ( const CHAR *name, CHAR optchar, UserVarStat
		e flag, const CHAR helpstr, CHAR *cvar );
		int XLALRegisterLISTUserVar ( const CHAR *name, CHAR optchar, UserVarState
		flag, const CHAR helpstr, LALStringVector *cvar);

		/* ========== Deprecated LAL interface wrappers ========== */

	/** \name Error codes */	/** \name Error codes */
	/@{/	/@{/
	#define USERINPUTH_ENULL 1	#define USERINPUTH_ENULL 1
	#define USERINPUTH_ENONULL 2	#define USERINPUTH_ENONULL 2
	#define USERINPUTH_EMEM 3	#define USERINPUTH_EMEM 3
	#define USERINPUTH_EOPT 4	#define USERINPUTH_EOPT 4
	#define USERINPUTH_ENOUVARS 5	#define USERINPUTH_ENOUVARS 5
	#define USERINPUTH_ECMDLARG 6	#define USERINPUTH_ECMDLARG 6
	#define USERINPUTH_EUNKNOWN 7	#define USERINPUTH_EUNKNOWN 7

	skipping to change at line 81	skipping to change at line 134
	#define USERINPUTH_MSGECMDLARG "Illegal command-line argument"	#define USERINPUTH_MSGECMDLARG "Illegal command-line argument"
	#define USERINPUTH_MSGEUNKNOWN "Unknown user-variable"	#define USERINPUTH_MSGEUNKNOWN "Unknown user-variable"
	#define USERINPUTH_MSGENOTSET "Required user-variable was not set"	#define USERINPUTH_MSGENOTSET "Required user-variable was not set"
	#define USERINPUTH_MSGEDEBUG "lalDebugLevel can only be read before ANY m allocs(), even hidden.."	#define USERINPUTH_MSGEDEBUG "lalDebugLevel can only be read before ANY m allocs(), even hidden.."
	#define USERINPUTH_MSGEONECONFIG "Currently one ONE config-file can be spec ified using '@'"	#define USERINPUTH_MSGEONECONFIG "Currently one ONE config-file can be spec ified using '@'"
	#define USERINPUTH_MSGERECFORMAT "Unknown format for recording user-input "	#define USERINPUTH_MSGERECFORMAT "Unknown format for recording user-input "
	#define USERINPUTH_MSGEXLAL "Failure in XLAL function"	#define USERINPUTH_MSGEXLAL "Failure in XLAL function"
	#define USERINPUTH_MSGENAMECOLL "Commandline option assigned more than once "	#define USERINPUTH_MSGENAMECOLL "Commandline option assigned more than once "

	/@}/	/@}/

	/*************************************************** </lalErrTable> */


	/----- short-cut macros to register global "uvar_" User-Variables ----- /	/----- short-cut macros to register global "uvar_" User-Variables ----- /
	#define LALregREALUserVar(status,name,option,flag,help) \	#define LALregREALUserVar(status,name,option,flag,help) \
	TRY(LALRegisterREALUserVar((status)->statusPtr, #name, option, flag, help,& (uvar_ ## name)), status)	TRY(LALRegisterREALUserVar((status)->statusPtr, #name, option, flag, help,& (uvar_ ## name)), status)

	#define LALregINTUserVar(status,name,option,flag,help) \	#define LALregINTUserVar(status,name,option,flag,help) \
	TRY(LALRegisterINTUserVar((status)->statusPtr, #name, option,flag, help,&(u var_ ## name)), status)	TRY(LALRegisterINTUserVar((status)->statusPtr, #name, option,flag, help,&(u var_ ## name)), status)

	#define LALregBOOLUserVar(status,name,option,flag,help) \	#define LALregBOOLUserVar(status,name,option,flag,help) \
	TRY(LALRegisterBOOLUserVar((status)->statusPtr, #name, option, flag, help, &(uvar_ ## name)),status)	TRY(LALRegisterBOOLUserVar((status)->statusPtr, #name, option, flag, help, &(uvar_ ## name)),status)

	#define LALregSTRINGUserVar(status,name,option,flag,help) \	#define LALregSTRINGUserVar(status,name,option,flag,help) \

	skipping to change at line 115	skipping to change at line 167

	#define LALregBOOLUserStruct(status,name,option,flag,help) \	#define LALregBOOLUserStruct(status,name,option,flag,help) \
	TRY(LALRegisterBOOLUserVar((status)->statusPtr, #name, option, flag, help, &(uvar-> name)),status)	TRY(LALRegisterBOOLUserVar((status)->statusPtr, #name, option, flag, help, &(uvar-> name)),status)

	#define LALregSTRINGUserStruct(status,name,option,flag,help) \	#define LALregSTRINGUserStruct(status,name,option,flag,help) \
	TRY(LALRegisterSTRINGUserVar((status)->statusPtr, #name, option, flag, help , &(uvar-> name)),status)	TRY(LALRegisterSTRINGUserVar((status)->statusPtr, #name, option, flag, help , &(uvar-> name)),status)

	#define LALregLISTUserStruct(status,name,option,flag,help) \	#define LALregLISTUserStruct(status,name,option,flag,help) \
	TRY(LALRegisterLISTUserVar((status)->statusPtr, #name, option, flag, help, &(uvar-> name)),status)	TRY(LALRegisterLISTUserVar((status)->statusPtr, #name, option, flag, help, &(uvar-> name)),status)


	/** State-flags: variable is optional, required, help, developer or was_set	void LALRegisterREALUserVar(LALStatus , const CHAR name, CHAR optchar, Us
	*/	erVarState flag, const CHAR helpstr, REAL8 cvar);
	typedef enum {	void LALRegisterINTUserVar (LALStatus , const CHAR name, CHAR optchar, Us
	UVAR_OPTIONAL = 0, /**< not required, and hasn't been s	erVarState flag, const CHAR helpstr, INT4 cvar);
	et */	void LALRegisterBOOLUserVar (LALStatus , const CHAR name, CHAR optchar, U
	UVAR_REQUIRED = 1<<0, /**< we require the user to set this variabl	serVarState flag, const CHAR helpstr, BOOLEAN cvar);
	e */	void LALRegisterSTRINGUserVar (LALStatus , const CHAR name, CHAR optchar,
	UVAR_HELP = 1<<1, /**< special variable: trigger output of hel	UserVarState flag, const CHAR helpstr, CHAR *cvar);
	p-string */	void LALRegisterLISTUserVar (LALStatus , const CHAR name, CHAR optchar, U
	UVAR_DEVELOPER = 1<<2, /**< OPTIONAL and hidden in help-output at l	serVarState flag, const CHAR helpstr, LALStringVector *cvar);
	alDebugLevel==0 */
	UVAR_SPECIAL = 1<<3, /*< OPTIONAL and turns off* checking of re
	quired variables (LALUserVarCheckRequired) */
	UVAR_WAS_SET = 1<<7 /**< flag that this user-var has bee
	n set by user */
	} UserVarState;

	/** Format for logging User-input: configFile- or cmdLine-style.
	* This determines the format of the string returned from LALLogUserInput()
	.
	*/
	typedef enum {
	UVAR_LOGFMT_CFGFILE, /*< return UserVars as a config-file /
	UVAR_LOGFMT_CMDLINE, /*< return UserVars as a command-line /
	UVAR_LOGFMT_PROCPARAMS, /**< return UserVars suitable for filling in proc
	ess-params struct */
	UVAR_LOGFMT_LAST
	} UserVarLogFormat;

	/* Function prototypes */
	void LALRegisterREALUserVar(LALStatus *,
	const CHAR *name,
	CHAR optchar,
	UserVarState flag,
	const CHAR *helpstr,
	REAL8 *cvar);

	void LALRegisterINTUserVar (LALStatus *,
	const CHAR *name,
	CHAR optchar,
	UserVarState flag,
	const CHAR *helpstr,
	INT4 *cvar);

	void
	LALRegisterBOOLUserVar (LALStatus *,
	const CHAR *name,
	CHAR optchar,
	UserVarState flag,
	const CHAR *helpstr,
	BOOLEAN *cvar);

	void
	LALRegisterSTRINGUserVar (LALStatus *,
	const CHAR *name,
	CHAR optchar,
	UserVarState flag,
	const CHAR *helpstr,
	CHAR **cvar);

	void
	LALRegisterLISTUserVar (LALStatus *,
	const CHAR *name,
	CHAR optchar,
	UserVarState flag,
	const CHAR *helpstr,
	LALStringVector **cvar);

	void LALDestroyUserVars (LALStatus *);	void LALDestroyUserVars (LALStatus *);

	void LALUserVarReadAllInput(LALStatus , int argc, char argv[]);	void LALUserVarReadAllInput(LALStatus , int argc, char argv[]);
	void LALUserVarReadCmdline (LALStatus , int argc, char argv[]);	void LALUserVarReadCmdline (LALStatus , int argc, char argv[]);
	void LALUserVarReadCfgfile (LALStatus , const CHAR cfgfile);	void LALUserVarReadCfgfile (LALStatus , const CHAR cfgfile);

	void LALUserVarHelpString (LALStatus , CHAR helpstring, const CHAR prog name);	void LALUserVarHelpString (LALStatus , CHAR helpstring, const CHAR prog name);
	void LALUserVarCheckRequired (LALStatus *);	void LALUserVarCheckRequired (LALStatus *);
	INT4 LALUserVarWasSet (const void *cvar);	INT4 LALUserVarWasSet (const void *cvar);

End of changes. 10 change blocks.
	76 lines changed or deleted	87 lines changed or added

	Window.h	Window.h

	skipping to change at line 79	skipping to change at line 79
	REAL8Window *XLALCreateGaussREAL8Window(UINT4 length, REAL8 beta);	REAL8Window *XLALCreateGaussREAL8Window(UINT4 length, REAL8 beta);

	void XLALDestroyREAL4Window(REAL4Window *window);	void XLALDestroyREAL4Window(REAL4Window *window);
	void XLALDestroyREAL8Window(REAL8Window *window);	void XLALDestroyREAL8Window(REAL8Window *window);

	REAL4Sequence XLALUnitaryWindowREAL4Sequence(REAL4Sequence sequence, cons t REAL4Window *window);	REAL4Sequence XLALUnitaryWindowREAL4Sequence(REAL4Sequence sequence, cons t REAL4Window *window);
	COMPLEX8Sequence XLALUnitaryWindowCOMPLEX8Sequence(COMPLEX8Sequence seque nce, const REAL4Window *window);	COMPLEX8Sequence XLALUnitaryWindowCOMPLEX8Sequence(COMPLEX8Sequence seque nce, const REAL4Window *window);
	REAL8Sequence XLALUnitaryWindowREAL8Sequence(REAL8Sequence sequence, cons t REAL8Window *window);	REAL8Sequence XLALUnitaryWindowREAL8Sequence(REAL8Sequence sequence, cons t REAL8Window *window);
	COMPLEX16Sequence XLALUnitaryWindowCOMPLEX16Sequence(COMPLEX16Sequence se quence, const REAL8Window *window);	COMPLEX16Sequence XLALUnitaryWindowCOMPLEX16Sequence(COMPLEX16Sequence se quence, const REAL8Window *window);


	/*
	* LEGACY CODE: DO NOT USE!!!
	*
	* FIXME: remove as soon as possible
	*/

	typedef enum {
	Rectangular,
	Hann,
	Welch,
	Bartlett,
	Parzen,
	Papoulis,
	Hamming,
	Kaiser,
	Creighton,
	Tukey
	} WindowType;

	typedef struct tagLALWindowParams {
	INT4 length;
	WindowType type;
	REAL4 beta;
	} LALWindowParams;

	void LALWindow(LALStatus , REAL4Vector , LALWindowParams *);
	void LALCreateREAL4Window(LALStatus , REAL4Window , LALWindowParams );

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif

	#endif /* _WINDOW_H */	#endif /* _WINDOW_H */

End of changes. 1 change blocks.
	28 lines changed or deleted	0 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/

	Calibration.h	Calibration.h

	skipping to change at line 248	skipping to change at line 248
	REAL4TimeSeries EXC ; /* timeseries containing the excitation */	REAL4TimeSeries EXC ; /* timeseries containing the excitation */
	REAL4TimeSeries StateVector; /* timeseries containing the State Vector ( IFO-SV_STATE_VECTOR) */	REAL4TimeSeries StateVector; /* timeseries containing the State Vector ( IFO-SV_STATE_VECTOR) */
	REAL4TimeSeries LAX; /* timeseries containing the Light-in-X-arm (LSC -LA_PTRX_NORM) */	REAL4TimeSeries LAX; /* timeseries containing the Light-in-X-arm (LSC -LA_PTRX_NORM) */
	REAL4TimeSeries LAY; /* timeseries containing the Light-in-Y-arm (LSC -LA_PTRY_NORM) */	REAL4TimeSeries LAY; /* timeseries containing the Light-in-Y-arm (LSC -LA_PTRY_NORM) */
	COMPLEX16 Do; /* digital filter at cal line frequency */	COMPLEX16 Do; /* digital filter at cal line frequency */
	COMPLEX16 Go; /* OLG at cal line frequency */	COMPLEX16 Go; /* OLG at cal line frequency */
	COMPLEX16 Wo; /* Whitening filter at cal line frequency */	COMPLEX16 Wo; /* Whitening filter at cal line frequency */
	REAL8 f; /* calibration line frequency */	REAL8 f; /* calibration line frequency */
	REAL4 To; /* factors integration time */	REAL4 To; /* factors integration time */
	char filter_vc_info[1024]; /* version control information in the filters file */	char filter_vc_info[1024]; /* version control information in the filters file */

		char filter_chksum[64]; /* checksum of the contents of the filters file */
	REAL8IIRFilter Cinv; / Filters for inverse of sensing function */	REAL8IIRFilter Cinv; / Filters for inverse of sensing function */
	INT4 CinvUSF; /* Upsampling factor for sensing function */	INT4 CinvUSF; /* Upsampling factor for sensing function */
	INT4 CinvDelay; /* Overall inverse sensing function delay */	INT4 CinvDelay; /* Overall inverse sensing function delay */
	REAL8IIRFilter A; / Filters for analog actuation function */	REAL8IIRFilter A; / Filters for analog actuation function */
	REAL8IIRFilter D; / Filters for analog actuation function */	REAL8IIRFilter D; / Filters for analog actuation function */
	REAL8IIRFilter AW; / Filters for analog actuation function */	REAL8IIRFilter AW; / Filters for analog actuation function */
	REAL8 gamma_fudgefactor;	REAL8 gamma_fudgefactor;
	INT4 delta;	INT4 delta;
	INT4 usefactors;	INT4 usefactors;
	INT4 wings; /* size of wings in seconds */	INT4 wings; /* size of wings in seconds */

End of changes. 1 change blocks.
	0 lines changed or deleted	1 lines changed or added

	ComplexFFT.h	ComplexFFT.h

	skipping to change at line 129	skipping to change at line 129
	* A reverse transform performs	* A reverse transform performs
	* \f[w[j] = \sum_{k=0}^{N-1} e^{+2\pi ijk/N}\,W[k]\f]	* \f[w[j] = \sum_{k=0}^{N-1} e^{+2\pi ijk/N}\,W[k]\f]
	* where N, the size of the transform, is the length of the vectors w and W .	* where N, the size of the transform, is the length of the vectors w and W .
	*	*
	* @note	* @note
	* The reverse transform of the forward transform of some data is	* The reverse transform of the forward transform of some data is
	* equal to N times the original data (we therefore call it a "reverse"	* equal to N times the original data (we therefore call it a "reverse"
	* transform rather than an "inverse" transform).	* transform rather than an "inverse" transform).
	*	*
	* @param[in] size The number of points in the complex data.	* @param[in] size The number of points in the complex data.

	* @param[in] fwdflag Set non-zero for a forward FFT plan;	* @param[in] fwdflg Set non-zero for a forward FFT plan;
	* otherwise create a reverse plan	* otherwise create a reverse plan
	* @param[in] measurelvl Measurement level for plan creation:	* @param[in] measurelvl Measurement level for plan creation:
	* - 0: no measurement, just estimate the plan;	* - 0: no measurement, just estimate the plan;
	* - 1: measure the best plan;	* - 1: measure the best plan;
	* - 2: perform a lengthy measurement of the best plan ;	* - 2: perform a lengthy measurement of the best plan ;
	* - 3: perform an exhasutive measurement of the best plan.	* - 3: perform an exhasutive measurement of the best plan.
	* @return A pointer to an allocated \c COMPLEX8FFTPlan structure is return ed	* @return A pointer to an allocated \c COMPLEX8FFTPlan structure is return ed
	* upon successful completion. Otherwise, a \c NULL pointer is returned	* upon successful completion. Otherwise, a \c NULL pointer is returned
	* and \c xlalErrno is set to indicate the error.	* and \c xlalErrno is set to indicate the error.
	* @par Errors:	* @par Errors:

	skipping to change at line 261	skipping to change at line 261
	* A reverse transform performs	* A reverse transform performs
	* \f[w[j] = \sum_{k=0}^{N-1} e^{+2\pi ijk/N}\,W[k]\f]	* \f[w[j] = \sum_{k=0}^{N-1} e^{+2\pi ijk/N}\,W[k]\f]
	* where N, the size of the transform, is the length of the vectors w and W .	* where N, the size of the transform, is the length of the vectors w and W .
	*	*
	* @note	* @note
	* The reverse transform of the forward transform of some data is	* The reverse transform of the forward transform of some data is
	* equal to N times the original data (we therefore call it a "reverse"	* equal to N times the original data (we therefore call it a "reverse"
	* transform rather than an "inverse" transform).	* transform rather than an "inverse" transform).
	*	*
	* @param[in] size The number of points in the complex data.	* @param[in] size The number of points in the complex data.

	* @param[in] fwdflag Set non-zero for a forward FFT plan;	* @param[in] fwdflg Set non-zero for a forward FFT plan;
	* otherwise create a reverse plan	* otherwise create a reverse plan
	* @param[in] measurelvl Measurement level for plan creation:	* @param[in] measurelvl Measurement level for plan creation:
	* - 0: no measurement, just estimate the plan;	* - 0: no measurement, just estimate the plan;
	* - 1: measure the best plan;	* - 1: measure the best plan;
	* - 2: perform a lengthy measurement of the best plan ;	* - 2: perform a lengthy measurement of the best plan ;
	* - 3: perform an exhasutive measurement of the best plan.	* - 3: perform an exhasutive measurement of the best plan.
	* @return A pointer to an allocated \c COMPLEX16FFTPlan structure is retur ned	* @return A pointer to an allocated \c COMPLEX16FFTPlan structure is retur ned
	* upon successful completion. Otherwise, a \c NULL pointer is returned	* upon successful completion. Otherwise, a \c NULL pointer is returned
	* and \c xlalErrno is set to indicate the error.	* and \c xlalErrno is set to indicate the error.
	* @par Errors:	* @par Errors:

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	LALDetectors.h		LALDetectors.h

	skipping to change at line 467		skipping to change at line 467
	/* Interferometric Detectors */		/* Interferometric Detectors */

	/** \name TAMA 300m Interferometric Detector constants		/** \name TAMA 300m Interferometric Detector constants
	* The following constants describe the location and geometry of the		* The following constants describe the location and geometry of the
	* TAMA 300m Interferometric Detector. */		* TAMA 300m Interferometric Detector. */
	/@{/		/@{/
	#define LAL_TAMA_300_DETECTOR_NAME "TAMA_300" /*< TAMA_300 detector name string /		#define LAL_TAMA_300_DETECTOR_NAME "TAMA_300" /*< TAMA_300 detector name string /
	#define LAL_TAMA_300_DETECTOR_PREFIX "T1" /*< TAMA_30 0 detector prefix string /		#define LAL_TAMA_300_DETECTOR_PREFIX "T1" /*< TAMA_30 0 detector prefix string /
	#define LAL_TAMA_300_DETECTOR_LONGITUDE_RAD 2.43536359469 /*< TAMA_300 vertex longitude (rad) /		#define LAL_TAMA_300_DETECTOR_LONGITUDE_RAD 2.43536359469 /*< TAMA_300 vertex longitude (rad) /
	#define LAL_TAMA_300_DETECTOR_LATITUDE_RAD 0.62267336022 /*< TAMA_300 vertex latitude (rad) /		#define LAL_TAMA_300_DETECTOR_LATITUDE_RAD 0.62267336022 /*< TAMA_300 vertex latitude (rad) /

	#define LAL_TAMA_300_DETECTOR_ELEVATION_SI 90 /*< TAMA_30 0 vertex elevation (rad) /		#define LAL_TAMA_300_DETECTOR_ELEVATION_SI 90 /*< TAMA_30 0 vertex elevation (m) /
	#define LAL_TAMA_300_DETECTOR_ARM_X_AZIMUTH_RAD 4.71238898038 /*< TAMA_300 x arm azimuth (rad) /		#define LAL_TAMA_300_DETECTOR_ARM_X_AZIMUTH_RAD 4.71238898038 /*< TAMA_300 x arm azimuth (rad) /
	#define LAL_TAMA_300_DETECTOR_ARM_Y_AZIMUTH_RAD 3.14159265359 /*< TAMA_300 y arm azimuth (rad) /		#define LAL_TAMA_300_DETECTOR_ARM_Y_AZIMUTH_RAD 3.14159265359 /*< TAMA_300 y arm azimuth (rad) /
	#define LAL_TAMA_300_DETECTOR_ARM_X_ALTITUDE_RAD 0.00000000000 /*< TAMA_300 x arm altitude (rad) /		#define LAL_TAMA_300_DETECTOR_ARM_X_ALTITUDE_RAD 0.00000000000 /*< TAMA_300 x arm altitude (rad) /
	#define LAL_TAMA_300_DETECTOR_ARM_Y_ALTITUDE_RAD 0.00000000000 /*< TAMA_300 y arm altitude (rad) /		#define LAL_TAMA_300_DETECTOR_ARM_Y_ALTITUDE_RAD 0.00000000000 /*< TAMA_300 y arm altitude (rad) /
	#define LAL_TAMA_300_DETECTOR_ARM_X_MIDPOINT_SI 150.00000000000 /*< TAMA_300 x arm midpoint (m) /		#define LAL_TAMA_300_DETECTOR_ARM_X_MIDPOINT_SI 150.00000000000 /*< TAMA_300 x arm midpoint (m) /
	#define LAL_TAMA_300_DETECTOR_ARM_Y_MIDPOINT_SI 150.00000000000 /*< TAMA_300 y arm midpoint (m) /		#define LAL_TAMA_300_DETECTOR_ARM_Y_MIDPOINT_SI 150.00000000000 /*< TAMA_300 y arm midpoint (m) /
	#define LAL_TAMA_300_VERTEX_LOCATION_X_SI -3.94640899111e+06 /*< TAMA_300 x-component of vertex location in Earth-centered frame (m ) /		#define LAL_TAMA_300_VERTEX_LOCATION_X_SI -3.94640899111e+06 /*< TAMA_300 x-component of vertex location in Earth-centered frame (m ) /
	#define LAL_TAMA_300_VERTEX_LOCATION_Y_SI 3.36625902802e+06 /*< TAMA_300 y-component of vertex location in Earth-centered frame (m ) /		#define LAL_TAMA_300_VERTEX_LOCATION_Y_SI 3.36625902802e+06 /*< TAMA_300 y-component of vertex location in Earth-centered frame (m ) /
	#define LAL_TAMA_300_VERTEX_LOCATION_Z_SI 3.69915069233e+06 /*< TAMA_300 z-component of vertex location in Earth-centered frame (m ) /		#define LAL_TAMA_300_VERTEX_LOCATION_Z_SI 3.69915069233e+06 /*< TAMA_300 z-component of vertex location in Earth-centered frame (m ) /
	#define LAL_TAMA_300_ARM_X_DIRECTION_X 0.64896940530 /*< TAMA_300 x-component of unit vector pointing along x arm in Earth-centered frame /		#define LAL_TAMA_300_ARM_X_DIRECTION_X 0.64896940530 /*< TAMA_300 x-component of unit vector pointing along x arm in Earth-centered frame /

	skipping to change at line 493		skipping to change at line 493
	/@}/		/@}/

	/** \name VIRGO 3km Interferometric Detector constants		/** \name VIRGO 3km Interferometric Detector constants
	* The following constants describe the location and geometry of the		* The following constants describe the location and geometry of the
	* VIRGO 3km Interferometric Detector. */		* VIRGO 3km Interferometric Detector. */
	/@{/		/@{/
	#define LAL_VIRGO_DETECTOR_NAME "VIRGO" /*< VIRGO detector name string /		#define LAL_VIRGO_DETECTOR_NAME "VIRGO" /*< VIRGO detector name string /
	#define LAL_VIRGO_DETECTOR_PREFIX "V1" /*< VIRGO detector prefix string /		#define LAL_VIRGO_DETECTOR_PREFIX "V1" /*< VIRGO detector prefix string /
	#define LAL_VIRGO_DETECTOR_LONGITUDE_RAD 0.18333805213 /*< VIRGO v ertex longitude (rad) /		#define LAL_VIRGO_DETECTOR_LONGITUDE_RAD 0.18333805213 /*< VIRGO v ertex longitude (rad) /
	#define LAL_VIRGO_DETECTOR_LATITUDE_RAD 0.76151183984 /*< VIRGO v ertex latitude (rad) /		#define LAL_VIRGO_DETECTOR_LATITUDE_RAD 0.76151183984 /*< VIRGO v ertex latitude (rad) /

	#define LAL_VIRGO_DETECTOR_ELEVATION_SI 51.884 /*< VIRGO vertex el evation (rad) /		#define LAL_VIRGO_DETECTOR_ELEVATION_SI 51.884 /*< VIRGO vertex el evation (m) /
	#define LAL_VIRGO_DETECTOR_ARM_X_AZIMUTH_RAD 0.33916285222 /*< VIRGO x arm azimuth (rad) /		#define LAL_VIRGO_DETECTOR_ARM_X_AZIMUTH_RAD 0.33916285222 /*< VIRGO x arm azimuth (rad) /
	#define LAL_VIRGO_DETECTOR_ARM_Y_AZIMUTH_RAD 5.05155183261 /*< VIRGO y arm azimuth (rad) /		#define LAL_VIRGO_DETECTOR_ARM_Y_AZIMUTH_RAD 5.05155183261 /*< VIRGO y arm azimuth (rad) /