Changeset 37964 for trunk/psModules

Timestamp:

Mar 11, 2015, 7:26:14 PM (11 years ago)

Author:

eugene

Message:

adding cmf_ps1_dv5 (includes src_chip_x,y)

Location:

trunk/psModules/src/objects

Files:

• Makefile.am (modified) (3 diffs)
• mksource.pl (modified) (1 diff)
• pmSourceIO.c (modified) (6 diffs)
• pmSourceIO.h (modified) (1 diff)
• pmSourceIO_CMF.c.in (modified) (1 diff)

trunk/psModules/src/objects/Makefile.am

@@ -58 +58 @@
         pmSourceIO_CMF_PS1_DV3.c \
         pmSourceIO_CMF_PS1_DV4.c \
+        pmSourceIO_CMF_PS1_DV5.c \
         pmSourceIO_MatchedRefs.c \
         pmSourcePlots.c \
@@ -156 +157 @@
 pmSourceIO_CMF_PS1_DV3.c \
 pmSourceIO_CMF_PS1_DV4.c \
+pmSourceIO_CMF_PS1_DV5.c \
 pmSourceIO_CMF_PS1_SV1.c \
 pmSourceIO_CMF_PS1_SV2.c \
@@ -188 +190 @@
         mksource.pl pmSourceIO_CMF.c.in PS1_DV4 pmSourceIO_CMF_PS1_DV4.c
 
+pmSourceIO_CMF_PS1_DV5.c : pmSourceIO_CMF.c.in mksource.pl
+        mksource.pl pmSourceIO_CMF.c.in PS1_DV5 pmSourceIO_CMF_PS1_DV5.c
+
 pmSourceIO_CMF_PS1_SV1.c : pmSourceIO_CMF.c.in mksource.pl
         mksource.pl pmSourceIO_CMF.c.in PS1_SV1 pmSourceIO_CMF_PS1_SV1.c

trunk/psModules/src/objects/mksource.pl

@@ -25 +25 @@
                 "PS1_DV3", 3,
                 "PS1_DV4", 4,
+                "PS1_DV5", 5,
     );
 %cmfmodes_sv = ("PS1_SV1", 1,

trunk/psModules/src/objects/pmSourceIO.c

@@ -607 +607 @@
             PM_SOURCES_WRITE("PS1_DV3",   CMF_PS1_DV3);
             PM_SOURCES_WRITE("PS1_DV4",   CMF_PS1_DV4);
+            PM_SOURCES_WRITE("PS1_DV5",   CMF_PS1_DV5);
 
             psFree (outhead);
@@ -1130 +1131 @@
             PM_SOURCES_READ_PSF("PS1_DV3",   CMF_PS1_DV3);
             PM_SOURCES_READ_PSF("PS1_DV4",   CMF_PS1_DV4);
+            PM_SOURCES_READ_PSF("PS1_DV5",   CMF_PS1_DV5);
 
             if (!sources) {
@@ -1419 +1421 @@
         PM_SOURCES_READ_XSRC("PS1_DV3",   CMF_PS1_DV3);
         PM_SOURCES_READ_XSRC("PS1_DV4",   CMF_PS1_DV4);
+        PM_SOURCES_READ_XSRC("PS1_DV5",   CMF_PS1_DV5);
     }
     psFree(tableHeader);
@@ -1462 +1465 @@
         PM_SOURCES_READ_XFIT("PS1_DV3",   CMF_PS1_DV3);
         PM_SOURCES_READ_XFIT("PS1_DV4",   CMF_PS1_DV4);
+        PM_SOURCES_READ_XFIT("PS1_DV5",   CMF_PS1_DV5);
     }
     psFree(tableHeader);
@@ -1504 +1508 @@
         PM_SOURCES_READ_XRAD("PS1_DV3",   CMF_PS1_DV3);
         PM_SOURCES_READ_XRAD("PS1_DV4",   CMF_PS1_DV4);
+        PM_SOURCES_READ_XRAD("PS1_DV5",   CMF_PS1_DV5);
     }
     psFree(tableHeader);
@@ -1546 +1551 @@
         PM_SOURCES_READ_XGAL("PS1_DV3",   CMF_PS1_DV3);
         PM_SOURCES_READ_XGAL("PS1_DV4",   CMF_PS1_DV4);
+        PM_SOURCES_READ_XGAL("PS1_DV5",   CMF_PS1_DV5);
     }
     psFree(tableHeader);

trunk/psModules/src/objects/pmSourceIO.h

@@ -46 +46 @@
 MK_PROTO(CMF_PS1_DV3);
 MK_PROTO(CMF_PS1_DV4);
+MK_PROTO(CMF_PS1_DV5);
 
 int pmSourceGetDophotType (pmSource *source);

trunk/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -247 +247 @@
         @>PS1_V3@                 psMetadataAdd (row, PS_LIST_TAIL, "SKY_LIMIT_FLUX",   PS_DATA_F32, "Flux / pix where object hits sky",           source->skyFlux);
         @>PS1_V3@                 psMetadataAdd (row, PS_LIST_TAIL, "SKY_LIMIT_SLOPE",  PS_DATA_F32, "d(Flux/pix)/dRadius where object hits sky",  source->skySlope);
+
+        @>PS1_DV4@                psMetadataAdd (row, PS_LIST_TAIL, "SRC_CHIP_NUM",     PS_DATA_S16, "id of warp input chip",                      source->chipNum); 
+        @>PS1_DV4@                psMetadataAdd (row, PS_LIST_TAIL, "SRC_CHIP_X",       PS_DATA_S16, "x coord in warp input chip",                 source->chipX); 
+        @>PS1_DV4@                psMetadataAdd (row, PS_LIST_TAIL, "SRC_CHIP_Y",       PS_DATA_S16, "y coord in warp input chip",                 source->chipY); 
+        @>PS1_DV4@                psMetadataAdd (row, PS_LIST_TAIL, "PADDING3",         PS_DATA_S16, "more padding", 0);
 
         @PS1_DV?@                 psMetadataAdd (row, PS_LIST_TAIL, "DIFF_NPOS",        PS_DATA_S32, "nPos (n pix > 3 sigma)",                     diffStats.nGood);