Merge 63c7987 into d019419

nom-tam-fits · Aug 22, 2017 · aa4fff9 · aa4fff9
2 parents d019419 + 63c7987
commit aa4fff9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/nom/tam/fits/FitsFactory.java b/src/main/java/nom/tam/fits/FitsFactory.java
@@ -56,7 +56,11 @@ protected static final class FitsSettings {
 
         private boolean useAsciiTables = true;
 
-        private boolean useHierarch = false;
+        // MBT (28-JUL-2017): change default from false to true.
+        // This is required for HIERARCH-based wide fits processing
+        // (see uk.ac.starlink.fits.WideFits).  If that gets backed out of,
+        // this could be set back to its factory setting (false).
+        private boolean useHierarch = true;
 
         private boolean checkAsciiStrings = false;
 

diff --git a/src/test/java/nom/tam/fits/test/HeaderCardTest.java b/src/test/java/nom/tam/fits/test/HeaderCardTest.java
@@ -309,6 +309,8 @@ public void testHierarch() throws Exception {
         HeaderCard hc;
         String key = "HIERARCH.TEST1.TEST2.INT";
         boolean thrown = false;
+
+        FitsFactory.setUseHierarch(false);
         try {
             hc = new HeaderCard(key, 123, "Comment");
         } catch (Exception e) {