Skip to content

Commit 4db8c60

Browse files
jsy1001jsy1001
committed
Correct names of OI_INSPOL Jones matrix columns.
L[XY][XY] changed to J[XY][XY], fixing issue reported by Eric Thiebaut.
1 parent 4fd58c4 commit 4db8c60

File tree

15 files changed

+166
-166
lines changed

15 files changed

+166
-166
lines changed

‎src/oifitslib/alloc_fits.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @ingroup oitable
44
* Implementation of functions to allocate storage within table structs
55
*
6-
* Copyright (C) 2007, 2015 John Young
6+
* Copyright (C) 2007, 2015-2017 John Young
77
*
88
*
99
* This file is part of OIFITSlib.
@@ -103,10 +103,10 @@ void alloc_oi_inspol(oi_inspol *pInspol, long numrec, int nwave)
103103
pInspol->record = chkmalloc(numrec * sizeof(oi_inspol_record));
104104
for (i = 0; i < numrec; i++) {
105105
pRec = &pInspol->record[i];
106-
pRec->lxx = chkmalloc(nwave * sizeof(pRec->lxx[0]));
107-
pRec->lyy = chkmalloc(nwave * sizeof(pRec->lyy[0]));
108-
pRec->lxy = chkmalloc(nwave * sizeof(pRec->lxy[0]));
109-
pRec->lyx = chkmalloc(nwave * sizeof(pRec->lyx[0]));
106+
pRec->jxx = chkmalloc(nwave * sizeof(pRec->jxx[0]));
107+
pRec->jyy = chkmalloc(nwave * sizeof(pRec->jyy[0]));
108+
pRec->jxy = chkmalloc(nwave * sizeof(pRec->jxy[0]));
109+
pRec->jyx = chkmalloc(nwave * sizeof(pRec->jyx[0]));
110110
}
111111
pInspol->numrec = numrec;
112112
pInspol->nwave = nwave;

‎src/oifitslib/exchange.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Data structure definitions and function prototypes for table-level
55
* operations on OIFITS data.
66
*
7-
* Copyright (C) 2007, 2015 John Young
7+
* Copyright (C) 2007, 2015-2017 John Young
88
*
99
*
1010
* This file is part of OIFITSlib.
@@ -150,10 +150,10 @@ typedef struct {
150150
char insname[FLEN_VALUE];
151151
double mjd_obs;
152152
double mjd_end;
153-
float complex *lxx;
154-
float complex *lyy;
155-
float complex *lxy;
156-
float complex *lyx;
153+
float complex *jxx;
154+
float complex *jyy;
155+
float complex *jxy;
156+
float complex *jyx;
157157
int sta_index;
158158
} oi_inspol_record;
159159

‎src/oifitslib/free_fits.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Implementation of functions to free storage allocated by routines
55
* in read_fits.c
66
*
7-
* Copyright (C) 2007, 2015 John Young
7+
* Copyright (C) 2007, 2015-2017 John Young
88
*
99
*
1010
* This file is part of OIFITSlib.
@@ -80,10 +80,10 @@ void free_oi_inspol(oi_inspol *pInspol)
8080
int i;
8181

8282
for (i = 0; i < pInspol->numrec; i++) {
83-
free(pInspol->record[i].lxx);
84-
free(pInspol->record[i].lyy);
85-
free(pInspol->record[i].lxy);
86-
free(pInspol->record[i].lyx);
83+
free(pInspol->record[i].jxx);
84+
free(pInspol->record[i].jyy);
85+
free(pInspol->record[i].jxy);
86+
free(pInspol->record[i].jyx);
8787
}
8888
free(pInspol->record);
8989
}

‎src/oifitslib/oifile.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @ingroup oifile
44
* Implementation of file-level API for OIFITS data.
55
*
6-
* Copyright (C) 2007, 2015 John Young
6+
* Copyright (C) 2007, 2015-2017 John Young
77
*
88
*
99
* This file is part of OIFITSlib.
@@ -1243,14 +1243,14 @@ oi_inspol *dup_oi_inspol(const oi_inspol *pInTab)
12431243
for (i = 0; i < pInTab->numrec; i++) {
12441244
pOutRec = &pOutTab->record[i];
12451245
pInRec = &pInTab->record[i];
1246-
MEMDUP(pOutRec->lxx, pInRec->lxx,
1247-
pInTab->nwave * sizeof(pInRec->lxx[0]));
1248-
MEMDUP(pOutRec->lyy, pInRec->lyy,
1249-
pInTab->nwave * sizeof(pInRec->lyy[0]));
1250-
MEMDUP(pOutRec->lxy, pInRec->lxy,
1251-
pInTab->nwave * sizeof(pInRec->lxy[0]));
1252-
MEMDUP(pOutRec->lyx, pInRec->lyx,
1253-
pInTab->nwave * sizeof(pInRec->lyx[0]));
1246+
MEMDUP(pOutRec->jxx, pInRec->jxx,
1247+
pInTab->nwave * sizeof(pInRec->jxx[0]));
1248+
MEMDUP(pOutRec->jyy, pInRec->jyy,
1249+
pInTab->nwave * sizeof(pInRec->jyy[0]));
1250+
MEMDUP(pOutRec->jxy, pInRec->jxy,
1251+
pInTab->nwave * sizeof(pInRec->jxy[0]));
1252+
MEMDUP(pOutRec->jyx, pInRec->jyx,
1253+
pInTab->nwave * sizeof(pInRec->jyx[0]));
12541254
}
12551255
return pOutTab;
12561256
}

‎src/oifitslib/oifilter.c‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @ingroup oifilter
44
* Implementation of OIFITS filter.
55
*
6-
* Copyright (C) 2007, 2015 John Young
6+
* Copyright (C) 2007, 2015-2017 John Young
77
*
88
*
99
* This file is part of OIFITSlib.
@@ -861,45 +861,45 @@ void filter_oi_inspol(const oi_inspol *pInTab, const oi_filter_spec *pFilter,
861861
sizeof(oi_inspol_record));
862862
if (pFilter->target_id >= 0)
863863
pOutTab->record[nrec].target_id = 1;
864-
pOutTab->record[nrec].lxx = chkmalloc
864+
pOutTab->record[nrec].jxx = chkmalloc
865865
(
866-
pOutTab->nwave * sizeof(pOutTab->record[0].lxx[0])
866+
pOutTab->nwave * sizeof(pOutTab->record[0].jxx[0])
867867
);
868-
pOutTab->record[nrec].lyy = chkmalloc
868+
pOutTab->record[nrec].jyy = chkmalloc
869869
(
870-
pOutTab->nwave * sizeof(pOutTab->record[0].lyy[0])
870+
pOutTab->nwave * sizeof(pOutTab->record[0].jyy[0])
871871
);
872-
pOutTab->record[nrec].lxy = chkmalloc
872+
pOutTab->record[nrec].jxy = chkmalloc
873873
(
874-
pOutTab->nwave * sizeof(pOutTab->record[0].lxy[0])
874+
pOutTab->nwave * sizeof(pOutTab->record[0].jxy[0])
875875
);
876-
pOutTab->record[nrec].lyx = chkmalloc
876+
pOutTab->record[nrec].jyx = chkmalloc
877877
(
878-
pOutTab->nwave * sizeof(pOutTab->record[0].lyx[0])
878+
pOutTab->nwave * sizeof(pOutTab->record[0].jyx[0])
879879
);
880880
k = 0;
881881
g_assert(useWave != NULL);
882882
for (j = 0; j < pInTab->nwave; j++) {
883883
if (useWave[j]) {
884-
pOutTab->record[nrec].lxx[k] = pInTab->record[i].lxx[j];
885-
pOutTab->record[nrec].lyy[k] = pInTab->record[i].lyy[j];
886-
pOutTab->record[nrec].lxy[k] = pInTab->record[i].lxy[j];
887-
pOutTab->record[nrec].lyx[k] = pInTab->record[i].lyx[j];
884+
pOutTab->record[nrec].jxx[k] = pInTab->record[i].jxx[j];
885+
pOutTab->record[nrec].jyy[k] = pInTab->record[i].jyy[j];
886+
pOutTab->record[nrec].jxy[k] = pInTab->record[i].jxy[j];
887+
pOutTab->record[nrec].jyx[k] = pInTab->record[i].jyx[j];
888888
++k;
889889
}
890890
}
891891
if (nrec == 0 && k < pOutTab->nwave) {
892892
/* For 1st output record, length of vectors wasn't known when
893893
originally allocated, so reallocate */
894894
pOutTab->nwave = k;
895-
pOutTab->record[nrec].lxx = realloc(pOutTab->record[nrec].lxx,
896-
k * sizeof(pOutTab->record[0].lxx[0]));
897-
pOutTab->record[nrec].lyy = realloc(pOutTab->record[nrec].lyy,
898-
k * sizeof(pOutTab->record[0].lyy[0]));
899-
pOutTab->record[nrec].lxy = realloc(pOutTab->record[nrec].lxy,
900-
k * sizeof(pOutTab->record[0].lxy[0]));
901-
pOutTab->record[nrec].lyx = realloc(pOutTab->record[nrec].lyx,
902-
k * sizeof(pOutTab->record[0].lyx[0]));
895+
pOutTab->record[nrec].jxx = realloc(pOutTab->record[nrec].jxx,
896+
k * sizeof(pOutTab->record[0].jxx[0]));
897+
pOutTab->record[nrec].jyy = realloc(pOutTab->record[nrec].jyy,
898+
k * sizeof(pOutTab->record[0].jyy[0]));
899+
pOutTab->record[nrec].jxy = realloc(pOutTab->record[nrec].jxy,
900+
k * sizeof(pOutTab->record[0].jxy[0]));
901+
pOutTab->record[nrec].jyx = realloc(pOutTab->record[nrec].jyx,
902+
k * sizeof(pOutTab->record[0].jyx[0]));
903903
}
904904
++nrec;
905905
}

‎src/oifitslib/oitable-demo.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* @file
33
* Example program - uses oitable API to write and read a OIFITS file.
44
*
5-
* Copyright (C) 2007, 2015 John Young
5+
* Copyright (C) 2007, 2015-2017 John Young
66
*
77
*
88
* This file is part of OIFITSlib.
@@ -183,25 +183,25 @@ void demo_write(void)
183183
fscanf(fp, "target_id %d insname %70s mjd_obs %lf ",
184184
&inspol.record[irec].target_id, inspol.record[irec].insname,
185185
&inspol.record[irec].mjd_obs);
186-
fscanf(fp, "mjd_end %lf lxx ", &inspol.record[irec].mjd_end);
186+
fscanf(fp, "mjd_end %lf jxx ", &inspol.record[irec].mjd_end);
187187
for (iwave = 0; iwave < wave.nwave; iwave++) {
188188
fscanf(fp, "%f %fi ", &real, &imag);
189-
inspol.record[irec].lxx[iwave] = real + imag * I;
189+
inspol.record[irec].jxx[iwave] = real + imag * I;
190190
}
191-
fscanf(fp, "lyy ");
191+
fscanf(fp, "jyy ");
192192
for (iwave = 0; iwave < wave.nwave; iwave++) {
193193
fscanf(fp, "%f %fi ", &real, &imag);
194-
inspol.record[irec].lyy[iwave] = real + imag * I;
194+
inspol.record[irec].jyy[iwave] = real + imag * I;
195195
}
196-
fscanf(fp, "lxy ");
196+
fscanf(fp, "jxy ");
197197
for (iwave = 0; iwave < wave.nwave; iwave++) {
198198
fscanf(fp, "%f %fi ", &real, &imag);
199-
inspol.record[irec].lxy[iwave] = real + imag * I;
199+
inspol.record[irec].jxy[iwave] = real + imag * I;
200200
}
201-
fscanf(fp, "lyx ");
201+
fscanf(fp, "jyx ");
202202
for (iwave = 0; iwave < wave.nwave; iwave++) {
203203
fscanf(fp, "%f %fi ", &real, &imag);
204-
inspol.record[irec].lyx[iwave] = real + imag * I;
204+
inspol.record[irec].jyx[iwave] = real + imag * I;
205205
}
206206
fscanf(fp, "sta_index %d ", &inspol.record[irec].sta_index);
207207
}

‎src/oifitslib/read_fits.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Implementation of functions to read individual FITS tables and
55
* write to data structures in memory.
66
*
7-
* Copyright (C) 2007, 2015 John Young
7+
* Copyright (C) 2007, 2015-2017 John Young
88
*
99
*
1010
* This file is part of OIFITSlib.
@@ -509,8 +509,8 @@ static STATUS read_oi_inspol_chdu(fitsfile *fptr, oi_inspol *pInspol,
509509
fits_read_key(fptr, TSTRING, "MODEL", pInspol->model, NULL, pStatus);
510510
/* get dimensions and allocate storage */
511511
fits_get_num_rows(fptr, &nrows, pStatus);
512-
/* note format specifies same repeat count for L* columns = nwave */
513-
fits_get_colnum(fptr, CASEINSEN, "LXX", &colnum, pStatus);
512+
/* note format specifies same repeat count for J* columns = nwave */
513+
fits_get_colnum(fptr, CASEINSEN, "JXX", &colnum, pStatus);
514514
fits_get_coltype(fptr, colnum, NULL, &repeat, NULL, pStatus);
515515
if (*pStatus) return *pStatus;
516516
alloc_oi_inspol(pInspol, nrows, repeat);
@@ -528,18 +528,18 @@ static STATUS read_oi_inspol_chdu(fitsfile *fptr, oi_inspol *pInspol,
528528
fits_get_colnum(fptr, CASEINSEN, "MJD_END", &colnum, pStatus);
529529
fits_read_col(fptr, TDOUBLE, colnum, irow, 1, 1, NULL,
530530
&pInspol->record[irow - 1].mjd_end, &anynull, pStatus);
531-
fits_get_colnum(fptr, CASEINSEN, "LXX", &colnum, pStatus);
531+
fits_get_colnum(fptr, CASEINSEN, "JXX", &colnum, pStatus);
532532
fits_read_col(fptr, TDOUBLE, colnum, irow, 1, pInspol->nwave, NULL,
533-
pInspol->record[irow - 1].lxx, &anynull, pStatus);
534-
fits_get_colnum(fptr, CASEINSEN, "LYY", &colnum, pStatus);
533+
pInspol->record[irow - 1].jxx, &anynull, pStatus);
534+
fits_get_colnum(fptr, CASEINSEN, "JYY", &colnum, pStatus);
535535
fits_read_col(fptr, TDOUBLE, colnum, irow, 1, pInspol->nwave, NULL,
536-
pInspol->record[irow - 1].lyy, &anynull, pStatus);
537-
fits_get_colnum(fptr, CASEINSEN, "LXY", &colnum, pStatus);
536+
pInspol->record[irow - 1].jyy, &anynull, pStatus);
537+
fits_get_colnum(fptr, CASEINSEN, "JXY", &colnum, pStatus);
538538
fits_read_col(fptr, TDOUBLE, colnum, irow, 1, pInspol->nwave,
539-
NULL, pInspol->record[irow - 1].lxy, &anynull, pStatus);
540-
fits_get_colnum(fptr, CASEINSEN, "LYX", &colnum, pStatus);
539+
NULL, pInspol->record[irow - 1].jxy, &anynull, pStatus);
540+
fits_get_colnum(fptr, CASEINSEN, "JYX", &colnum, pStatus);
541541
fits_read_col(fptr, TDOUBLE, colnum, irow, 1, pInspol->nwave, NULL,
542-
pInspol->record[irow - 1].lyx, &anynull, pStatus);
542+
pInspol->record[irow - 1].jyx, &anynull, pStatus);
543543
fits_get_colnum(fptr, CASEINSEN, "STA_INDEX", &colnum, pStatus);
544544
fits_read_col(fptr, TINT, colnum, irow, 1, 1, NULL,
545545
&pInspol->record[irow - 1].sta_index, &anynull, pStatus);

‎src/oifitslib/write_fits.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Implementation of functions to write FITS tables from data structures
55
* in memory.
66
*
7-
* Copyright (C) 2007, 2015 John Young
7+
* Copyright (C) 2007, 2015-2017 John Young
88
*
99
*
1010
* This file is part of OIFITSlib.
@@ -437,7 +437,7 @@ STATUS write_oi_inspol(fitsfile *fptr, oi_inspol inspol, int extver,
437437
const char function[] = "write_oi_inspol";
438438
const int tfields = 9;
439439
char *ttype[] = {"TARGET_ID", "INSNAME", "MJD_OBS", "MJD_END",
440-
"LXX", "LYY", "LXY", "LYX", "STA_INDEX"};
440+
"JXX", "JYY", "JXY", "JYX", "STA_INDEX"};
441441
//:TODO: follow standard in choosing repeat count for INSNAME
442442
const char *tformTpl[] = {"I", "70A", "D", "D",
443443
"?C", "?C", "?C", "?C", "I"};
@@ -488,13 +488,13 @@ STATUS write_oi_inspol(fitsfile *fptr, oi_inspol inspol, int extver,
488488
fits_write_col(fptr, TDOUBLE, 4, irow, 1, 1,
489489
&inspol.record[irow - 1].mjd_end, pStatus);
490490
fits_write_col(fptr, TCOMPLEX, 5, irow, 1, inspol.nwave,
491-
inspol.record[irow - 1].lxx, pStatus);
491+
inspol.record[irow - 1].jxx, pStatus);
492492
fits_write_col(fptr, TCOMPLEX, 6, irow, 1, inspol.nwave,
493-
inspol.record[irow - 1].lyy, pStatus);
493+
inspol.record[irow - 1].jyy, pStatus);
494494
fits_write_col(fptr, TCOMPLEX, 7, irow, 1, inspol.nwave,
495-
inspol.record[irow - 1].lxy, pStatus);
495+
inspol.record[irow - 1].jxy, pStatus);
496496
fits_write_col(fptr, TCOMPLEX, 8, irow, 1, inspol.nwave,
497-
inspol.record[irow - 1].lyx, pStatus);
497+
inspol.record[irow - 1].jyx, pStatus);
498498
fits_write_col(fptr, TINT, 9, irow, 1, 1,
499499
&inspol.record[irow - 1].sta_index, pStatus);
500500
}

0 commit comments

Comments
 (0)