Changeset 40291 for trunk/Ohana/src/libdvo/src/dvo_catalog_raw.c

Timestamp:

Dec 13, 2017, 10:53:48 AM (9 years ago)

Author:

eugene

Message:

merge EAM development branch changes for DR2 into trunk (add PS1_V6 dvo format; change Mcal to McalPSF, McalAPER; change opihi int vectors to 64bit)

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libdvo/src/dvo_catalog_raw.c (modified) (8 diffs)

trunk/Ohana/src/libdvo/src/dvo_catalog_raw.c

@@ -91 +91 @@
       FORMAT_CASE (PS1_V4,      PS1_V4);
       FORMAT_CASE (PS1_V5,      PS1_V5);
+      FORMAT_CASE (PS1_V6,      PS1_V6);
       FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
       FORMAT_CASE (PS1_REF,     PS1_REF);
@@ -288 +289 @@
   if (catalog[0].catformat == DVO_FORMAT_PS1_V4)          gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_V4");
   if (catalog[0].catformat == DVO_FORMAT_PS1_V5)          gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_V5");
+  if (catalog[0].catformat == DVO_FORMAT_PS1_V6)          gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_V6");
   if (catalog[0].catformat == DVO_FORMAT_PS1_V5_LOAD)     gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_V5_LOAD");
   if (catalog[0].catformat == DVO_FORMAT_PS1_REF)         gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_REF");
@@ -394 +396 @@
       FORMAT_CASE (PS1_V4,      PS1_V4);
       FORMAT_CASE (PS1_V5,      PS1_V5);
+      FORMAT_CASE (PS1_V6,      PS1_V6);
       FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
       FORMAT_CASE (PS1_REF,     PS1_REF);
@@ -448 +451 @@
       FORMAT_CASE (PS1_V4,      PS1_V4);
       FORMAT_CASE (PS1_V5,      PS1_V5);
+      FORMAT_CASE (PS1_V6,      PS1_V6);
       FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
       FORMAT_CASE (PS1_REF,     PS1_REF);
@@ -505 +509 @@
       FORMAT_CASE (PS1_V3,      PS1_V3);
       FORMAT_CASE (PS1_V5,      PS1_V5);
+      FORMAT_CASE (PS1_V6,      PS1_V6);
       FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
       FORMAT_CASE (PS1_REF,     PS1_REF);
@@ -559 +564 @@
       FORMAT_CASE (PS1_V4,      PS1_V4);
       FORMAT_CASE (PS1_V5,      PS1_V5);
+      FORMAT_CASE (PS1_V6,      PS1_V6);
       FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
       FORMAT_CASE (PS1_REF,     PS1_REF);
@@ -617 +623 @@
       FORMAT_CASE (PS1_V4,      PS1_V4);
       FORMAT_CASE (PS1_V5,      PS1_V5);
+      FORMAT_CASE (PS1_V6,      PS1_V6);
       FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
       FORMAT_CASE (PS1_REF,     PS1_REF);
@@ -671 +678 @@
       FORMAT_CASE (PS1_V4,      PS1_V4);
       FORMAT_CASE (PS1_V5,      PS1_V5);
+      FORMAT_CASE (PS1_V6,      PS1_V6);
       FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
       FORMAT_CASE (PS1_REF,     PS1_REF);