From de3766ecd42eedd2a782cafbcbf27b4b6e92782f Mon Sep 17 00:00:00 2001 From: Mike Henderson Date: Tue, 1 Oct 2013 14:46:47 -0600 Subject: [PATCH] Added "CodeVersion" tag to MagEphem outputs. --- Tools/MagEphemFromSpiceKernel.c | 4 ++-- Tools/MagEphemFromTLE.c | 6 +++--- libLanlGeoMag/Lgm/Lgm_MagEphemInfo.h | 4 ++-- libLanlGeoMag/Lgm_MagEphemWrite.c | 3 ++- libLanlGeoMag/Lgm_MagEphemWriteHdf.c | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Tools/MagEphemFromSpiceKernel.c b/Tools/MagEphemFromSpiceKernel.c index 73ffb3f39..d2857c8fe 100644 --- a/Tools/MagEphemFromSpiceKernel.c +++ b/Tools/MagEphemFromSpiceKernel.c @@ -1474,7 +1474,7 @@ int N0, ii; * Open MagEphem txt file for writing and write header. */ fp_MagEphem = fopen( OutFile, "w" ); - Lgm_WriteMagEphemHeader( fp_MagEphem, ExtModel, BODY, CommonName, IdNumber, IntDesig, CmdLine, nAscend, Ascend_UTC, Ascend_U, nPerigee, Perigee_UTC, Perigee_U, nApogee, &Apogee_UTC[0], &Apogee_U[0], MagEphemInfo ); + Lgm_WriteMagEphemHeader( fp_MagEphem, argp_program_version, ExtModel, BODY, CommonName, IdNumber, IntDesig, CmdLine, nAscend, Ascend_UTC, Ascend_U, nPerigee, Perigee_UTC, Perigee_U, nApogee, &Apogee_UTC[0], &Apogee_U[0], MagEphemInfo ); printf("\t Writing to file: %s\n", OutFile ); if ( UseEop ) { @@ -1489,7 +1489,7 @@ int N0, ii; * Create variables. */ file = H5Fcreate( HdfOutFile, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT ); - Lgm_WriteMagEphemHeaderHdf( file, ExtModel, BODY, CommonName, IdNumber, IntDesig, CmdLine, nAscend, Ascend_UTC, Ascend_U, nPerigee, Perigee_UTC, Perigee_U, nApogee, &Apogee_UTC[0], &Apogee_U[0], MagEphemInfo, med ); + Lgm_WriteMagEphemHeaderHdf( file, argp_program_version, ExtModel, BODY, CommonName, IdNumber, IntDesig, CmdLine, nAscend, Ascend_UTC, Ascend_U, nPerigee, Perigee_UTC, Perigee_U, nApogee, &Apogee_UTC[0], &Apogee_U[0], MagEphemInfo, med ); diff --git a/Tools/MagEphemFromTLE.c b/Tools/MagEphemFromTLE.c index 78340d1e7..ef34dad4e 100644 --- a/Tools/MagEphemFromTLE.c +++ b/Tools/MagEphemFromTLE.c @@ -77,7 +77,7 @@ void StringSplit( char *Str, char *StrArray[], int len, int *n ); #define KP_DEFAULT 0 const char *ProgramName = "MagEphemFromTLE"; -const char *argp_program_version = "1.0.0"; +const char *argp_program_version = "1.8.0"; const char *argp_program_bug_address = ""; static char doc[] = "Computes the magnetic ephemeris of a S/C from trajectories determined from TLE files.\n\n" @@ -1425,7 +1425,7 @@ if (file >= 0 ){ * Open MagEphem txt file for writing and write header. */ fp_MagEphem = fopen( OutFile, "w" ); - Lgm_WriteMagEphemHeader( fp_MagEphem, ExtModel, BODY, CommonName, IdNumber, IntDesig, CmdLine, nAscend, Ascend_UTC, Ascend_U, nPerigee, Perigee_UTC, Perigee_U, nApogee, &Apogee_UTC[0], &Apogee_U[0], MagEphemInfo ); + Lgm_WriteMagEphemHeader( fp_MagEphem, argp_program_version, ExtModel, BODY, CommonName, IdNumber, IntDesig, CmdLine, nAscend, Ascend_UTC, Ascend_U, nPerigee, Perigee_UTC, Perigee_U, nApogee, &Apogee_UTC[0], &Apogee_U[0], MagEphemInfo ); printf("\t Writing to file: %s\n", OutFile ); if ( UseEop ) { @@ -1440,7 +1440,7 @@ if (file >= 0 ){ * Create variables. */ file = H5Fcreate( HdfOutFile, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT ); - Lgm_WriteMagEphemHeaderHdf( file, ExtModel, BODY, CommonName, IdNumber, IntDesig, CmdLine, nAscend, Ascend_UTC, Ascend_U, nPerigee, Perigee_UTC, Perigee_U, nApogee, &Apogee_UTC[0], &Apogee_U[0], MagEphemInfo, med ); + Lgm_WriteMagEphemHeaderHdf( file, argp_program_version, ExtModel, BODY, CommonName, IdNumber, IntDesig, CmdLine, nAscend, Ascend_UTC, Ascend_U, nPerigee, Perigee_UTC, Perigee_U, nApogee, &Apogee_UTC[0], &Apogee_U[0], MagEphemInfo, med ); diff --git a/libLanlGeoMag/Lgm/Lgm_MagEphemInfo.h b/libLanlGeoMag/Lgm/Lgm_MagEphemInfo.h index 9ec900f54..4a126a39b 100644 --- a/libLanlGeoMag/Lgm/Lgm_MagEphemInfo.h +++ b/libLanlGeoMag/Lgm/Lgm_MagEphemInfo.h @@ -295,8 +295,8 @@ void Lgm_ComputeLstarVersusPA( long int Date, double UTC, Lgm_Vector *u, int void ReadMagEphemInfoStruct( char *Filename, int *nPitchAngles, Lgm_MagEphemInfo *MagEphemInfo ); void WriteMagEphemInfoStruct( char *Filename, int nPitchAngles, Lgm_MagEphemInfo *MagEphemInfo ); -void Lgm_WriteMagEphemHeader( FILE *fp, char *ExtModel, int SpiceBody, char *Spacecraft, int IdNumber, char *IntDesig, char *CmdLine, int nAscend, Lgm_DateTime *Ascend_UTC, Lgm_Vector *Ascend_U, int nPerigee, Lgm_DateTime *Perigee_UTC, Lgm_Vector *Perigee_U, int nApogee, Lgm_DateTime *Apogee_UTC, Lgm_Vector *Apogee_U, Lgm_MagEphemInfo *m ); -void Lgm_WriteMagEphemHeaderHdf( hid_t file, char *ExtModel, int SpiceBody, char *Spacecraft, int IdNumber, char *IntDesig, char *CmdLine, int nAscend, Lgm_DateTime *Ascend_UTC, Lgm_Vector *Ascend_U, int nPerigee, Lgm_DateTime *Perigee_UTC, Lgm_Vector *Perigee_U, int nApogee, Lgm_DateTime *Apogee_UTC, Lgm_Vector *Apogee_U, Lgm_MagEphemInfo *m, Lgm_MagEphemData *med ); +void Lgm_WriteMagEphemHeader( FILE *fp, char *CodeVersion, char *ExtModel, int SpiceBody, char *Spacecraft, int IdNumber, char *IntDesig, char *CmdLine, int nAscend, Lgm_DateTime *Ascend_UTC, Lgm_Vector *Ascend_U, int nPerigee, Lgm_DateTime *Perigee_UTC, Lgm_Vector *Perigee_U, int nApogee, Lgm_DateTime *Apogee_UTC, Lgm_Vector *Apogee_U, Lgm_MagEphemInfo *m ); +void Lgm_WriteMagEphemHeaderHdf( hid_t file, char *argp_program_version, char *ExtModel, int SpiceBody, char *Spacecraft, int IdNumber, char *IntDesig, char *CmdLine, int nAscend, Lgm_DateTime *Ascend_UTC, Lgm_Vector *Ascend_U, int nPerigee, Lgm_DateTime *Perigee_UTC, Lgm_Vector *Perigee_U, int nApogee, Lgm_DateTime *Apogee_UTC, Lgm_Vector *Apogee_U, Lgm_MagEphemInfo *m, Lgm_MagEphemData *med ); void Lgm_WriteMagEphemData( FILE *fp, char *IntModel, char *ExtModel, double Kp, double Dst, Lgm_MagEphemInfo *m ); void Lgm_WriteMagEphemDataHdf( hid_t file, int iii, Lgm_MagEphemData *m ); diff --git a/libLanlGeoMag/Lgm_MagEphemWrite.c b/libLanlGeoMag/Lgm_MagEphemWrite.c index cf333ff56..729400bb2 100644 --- a/libLanlGeoMag/Lgm_MagEphemWrite.c +++ b/libLanlGeoMag/Lgm_MagEphemWrite.c @@ -12,7 +12,7 @@ const char *sMonth[] = { "", "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" }; -void Lgm_WriteMagEphemHeader( FILE *fp, char *ExtModel, int SpiceBody, char *Spacecraft, int IdNumber, char *IntDesig, char *CmdLine, int nAscend, Lgm_DateTime *Ascend_UTC, Lgm_Vector *Ascend_U, int nPerigee, Lgm_DateTime *Perigee_UTC, Lgm_Vector *Perigee_U, int nApogee, Lgm_DateTime *Apogee_UTC, Lgm_Vector *Apogee_U, Lgm_MagEphemInfo *m ){ +void Lgm_WriteMagEphemHeader( FILE *fp, char *CodeVersion, char *ExtModel, int SpiceBody, char *Spacecraft, int IdNumber, char *IntDesig, char *CmdLine, int nAscend, Lgm_DateTime *Ascend_UTC, Lgm_Vector *Ascend_U, int nPerigee, Lgm_DateTime *Perigee_UTC, Lgm_Vector *Perigee_U, int nApogee, Lgm_DateTime *Apogee_UTC, Lgm_Vector *Apogee_U, Lgm_MagEphemInfo *m ){ int i, Year, Month, Day, HH, MM, SS, n, tsl, n2; char Str[80], *Str2, *QDpath, QDloc[256]; @@ -1330,6 +1330,7 @@ void Lgm_WriteMagEphemHeader( FILE *fp, char *ExtModel, int SpiceBody, char *Sp } fprintf( fp, "# \"QinDentonPath\": \"%s\",\n", QDloc ); fprintf( fp, "# \"CommandLine\": \"%s\"\n", CmdLine ); + fprintf( fp, "# \"CodeVersion\": \"%s\"\n", CodeVersion ); fprintf( fp, "# },\n"); fprintf( fp, "#\n"); diff --git a/libLanlGeoMag/Lgm_MagEphemWriteHdf.c b/libLanlGeoMag/Lgm_MagEphemWriteHdf.c index 25f2feab9..25fe46c3c 100644 --- a/libLanlGeoMag/Lgm_MagEphemWriteHdf.c +++ b/libLanlGeoMag/Lgm_MagEphemWriteHdf.c @@ -4,7 +4,7 @@ //const char *sMonth[] = { "", "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" }; -void Lgm_WriteMagEphemHeaderHdf( hid_t file, char *ExtModel, int SpiceBody, char *Spacecraft, int IdNumber, char *IntDesig, char *CmdLine, int nAscend, Lgm_DateTime *Ascend_UTC, Lgm_Vector *Ascend_U, int nPerigee, Lgm_DateTime *Perigee_UTC, Lgm_Vector *Perigee_U, int nApogee, Lgm_DateTime *Apogee_UTC, Lgm_Vector *Apogee_U, Lgm_MagEphemInfo *m, Lgm_MagEphemData *med ){ +void Lgm_WriteMagEphemHeaderHdf( hid_t file, char *CodeVersion, char *ExtModel, int SpiceBody, char *Spacecraft, int IdNumber, char *IntDesig, char *CmdLine, int nAscend, Lgm_DateTime *Ascend_UTC, Lgm_Vector *Ascend_U, int nPerigee, Lgm_DateTime *Perigee_UTC, Lgm_Vector *Perigee_U, int nApogee, Lgm_DateTime *Apogee_UTC, Lgm_Vector *Apogee_U, Lgm_MagEphemInfo *m, Lgm_MagEphemData *med ){ int Rank; hsize_t Dims[4], MaxDims[4], ChunkDims[4];