Changeset 20741

Timestamp:

Nov 13, 2008, 4:11:45 PM (17 years ago)

Author:

eugene

Message:

adding PS1_CAL_0 output format

Location:

trunk/psModules/src/objects

Files:

• Makefile.am (modified) (1 diff)
• pmSourceIO.c (modified) (3 diffs)
• pmSourceIO.h (modified) (3 diffs)
• pmSourceIO_PS1_CAL_0.c (added)

trunk/psModules/src/objects/Makefile.am

@@ -35 +35 @@
      pmSourceIO_PS1_DEV_0.c \
      pmSourceIO_PS1_DEV_1.c \
+     pmSourceIO_PS1_CAL_0.c \
      pmSourcePlots.c \
      pmSourcePlotPSFModel.c \

trunk/psModules/src/objects/pmSourceIO.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-03 02:11:48 $
+ *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-11-14 02:11:45 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -485 +485 @@
                 status = pmSourcesWrite_PS1_DEV_1 (file->fits, sources, file->header, outhead, dataname, xsrcname);
             }
+            if (!strcmp (exttype, "PS1_CAL_0")) {
+                status = pmSourcesWrite_PS1_CAL_0 (file->fits, readout, sources, file->header, outhead, dataname, xsrcname);
+            }
             if (xsrcname) {
               if (!strcmp (exttype, "PS1_DEV_1")) {
-                status = pmSourcesWrite_PS1_DEV_1_XSRC (file->fits, sources, xsrcname, recipe);
+                  status = pmSourcesWrite_PS1_DEV_1_XSRC (file->fits, sources, xsrcname, recipe);
+              }
+              if (!strcmp (exttype, "PS1_CAL_0")) {
+                  status = pmSourcesWrite_PS1_CAL_0_XSRC (file->fits, readout, sources, file->header, xsrcname, recipe);
               }
             }
             if (xfitname) {
               if (!strcmp (exttype, "PS1_DEV_1")) {
-                status = pmSourcesWrite_PS1_DEV_1_XFIT (file->fits, sources, xfitname);
+                  status = pmSourcesWrite_PS1_DEV_1_XFIT (file->fits, sources, xfitname);
+              }
+              if (!strcmp (exttype, "PS1_CAL_0")) {
+                  status = pmSourcesWrite_PS1_CAL_0_XFIT (file->fits, readout, sources, file->header, xfitname);
               }
             }
@@ -915 +924 @@
                 sources = pmSourcesRead_PS1_DEV_1 (file->fits, hdu->header);
             }
+            if (!strcmp (exttype, "PS1_CAL_)")) {
+                sources = pmSourcesRead_PS1_CAL_0 (file->fits, hdu->header);
+            }
         }
 

trunk/psModules/src/objects/pmSourceIO.h

@@ -4 +4 @@
  * @author EAM, IfA; GLG, MHPCC
  *
- * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-07-17 22:38:15 $
+ * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-11-14 02:11:45 $
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  *
@@ -30 +30 @@
 bool pmSourcesWrite_PS1_DEV_1_XFIT (psFits *fits, psArray *sources, char *extname);
 
+bool pmSourcesWrite_PS1_CAL_0 (psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, psMetadata *tableHeader, char *extname, char *xsrcname);
+bool pmSourcesWrite_PS1_CAL_0_XSRC (psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, char *extname, psMetadata *recipe);
+bool pmSourcesWrite_PS1_CAL_0_XFIT (psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, char *extname);
+
 bool pmSource_CMF_WritePHU (const pmFPAview *view, pmFPAfile *file, pmConfig *config);
 
@@ -37 +41 @@
 psArray *pmSourcesRead_PS1_DEV_0 (psFits *fits, psMetadata *header);
 psArray *pmSourcesRead_PS1_DEV_1 (psFits *fits, psMetadata *header);
+psArray *pmSourcesRead_PS1_CAL_0 (psFits *fits, psMetadata *header);
 
 bool pmSourcesWritePSFs (psArray *sources, char *filename);