Skip to content

Commit b8cd6ca

Browse files
committed
DM-12268 update the way to add HeaderCard into cloned Header in cloneHeaderFrom() (FitsRead.java)
1 parent cf997a7 commit b8cd6ca

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

src/firefly/java/edu/caltech/ipac/firefly/server/visualize/ImagePlotCreator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import nom.tam.fits.FitsException;
2424
import nom.tam.fits.Header;
2525
import nom.tam.fits.HeaderCard;
26+
import nom.tam.fits.HeaderCardException;
2627

2728
import java.io.File;
2829
import java.io.IOException;
@@ -221,7 +222,7 @@ private static void initPlotTitle(PlotState state,
221222
ImagePlot plot,
222223
ActiveFitsReadGroup frGroup,
223224
String dataDesc,
224-
boolean isMultiImage) {
225+
boolean isMultiImage) throws HeaderCardException {
225226

226227
WebPlotRequest req= state.getWebPlotRequest();
227228
plot.setPlotDesc("");

src/firefly/java/edu/caltech/ipac/visualize/plot/CropAndCenter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import nom.tam.fits.ImageData;
1010
import nom.tam.util.ArrayFuncs;
1111
import nom.tam.util.BufferedDataOutputStream;
12-
import nom.tam.util.Cursor;
12+
import nom.tam.fits.HeaderCardException;
1313

1414
import java.io.File;
1515
import java.io.FileNotFoundException;
@@ -281,7 +281,7 @@ private static BasicHDU splitFITSCube(BasicHDU hdu,
281281

282282
}
283283

284-
static Header clone_header(Header header)
284+
static Header clone_header(Header header) throws HeaderCardException
285285
{
286286
return FitsRead.cloneHeaderFrom(header);
287287
}

src/firefly/java/edu/caltech/ipac/visualize/plot/FitsRead.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import nom.tam.fits.BasicHDU;
77
import nom.tam.fits.Fits;
88
import nom.tam.fits.FitsException;
9+
import nom.tam.fits.HeaderCardException;
910
import nom.tam.fits.FitsFactory;
1011
import nom.tam.fits.Header;
1112
import nom.tam.fits.HeaderCard;
@@ -1605,7 +1606,7 @@ public BasicHDU getHDU() {
16051606
}
16061607

16071608

1608-
public Header getHeader() {
1609+
public Header getHeader() throws HeaderCardException {
16091610
return cloneHeader(header);
16101611
}
16111612

@@ -1719,18 +1720,19 @@ public void freeResources() {
17191720
}
17201721

17211722

1722-
static Header cloneHeaderFrom(Header header) {
1723+
static Header cloneHeaderFrom(Header header) throws HeaderCardException {
17231724
Cursor iter = header.iterator();
17241725
Header clonedHeader = new Header();
17251726

17261727
while (iter.hasNext()) {
17271728
HeaderCard card = (HeaderCard) iter.next();
1728-
clonedHeader.addLine(card);
1729+
clonedHeader.addLine(card.copy());
17291730
}
1731+
17301732
return clonedHeader;
17311733
}
17321734

1733-
static Header cloneHeader(Header header) {
1735+
static Header cloneHeader(Header header) throws HeaderCardException {
17341736
Header clonedHeader = cloneHeaderFrom(header);
17351737

17361738
clonedHeader.resetOriginalSize();

src/firefly/java/edu/caltech/ipac/visualize/plot/FlipXY.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import nom.tam.fits.*;
1212
import nom.tam.util.ArrayFuncs;
1313
import nom.tam.fits.ImageData;
14+
import nom.tam.fits.HeaderCardException;
1415

1516
/**
1617
* This class flips the FitsRead image to either x (naxis2) or y(naxis1) direction
@@ -33,7 +34,7 @@ public class FlipXY {
3334
* @param inFitsRead - a FitsRead object
3435
* @param fipDirection - a String, "xAxis" or "yAsix"
3536
*/
36-
public FlipXY(FitsRead inFitsRead, String fipDirection) {
37+
public FlipXY(FitsRead inFitsRead, String fipDirection) throws HeaderCardException {
3738
fitsRead = inFitsRead;
3839
direction = fipDirection;
3940
inFitsHeader = inFitsRead.getHeader();

0 commit comments

Comments
 (0)