Changeset 37351 for branches/eam_branches/ipp-20140813

Timestamp:

Sep 3, 2014, 3:24:28 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20140813

Files:

• . (modified) (1 prop)
• DataStoreServer/scripts/dsreg (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/addstar/src/build_links.c (modified) (8 diffs)
• Ohana/src/addstar/src/resort_catalog.c (modified) (1 diff)
• Ohana/src/getstar (modified) (1 prop)
• ippMonitor/czartool/czartool/Plotter.pm (modified) (1 prop)
• ippScripts/Build.PL (modified) (1 diff)
• ippScripts/MANIFEST (modified) (1 diff)
• ippScripts/scripts/ipp_apply_burntool_fix.pl (copied) (copied from trunk/ippScripts/scripts/ipp_apply_burntool_fix.pl )
• ippScripts/scripts/lap_science.pl (modified) (1 diff)
• ippScripts/scripts/queuestaticsky.pl (modified) (1 prop)
• ippScripts/scripts/sc_remote_exec.pl (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/gpc1/ppStack.config (modified) (1 diff)
• ippconfig/gpc1/psastro.config (modified) (2 diffs)
• ippconfig/recipes/ppSub.config (modified) (1 prop)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 prop)
• psLib/src/math/psEllipse.c (modified) (1 diff)
• psLib/src/math/psEllipse.h (modified) (1 diff)
• psModules/src/objects (modified) (1 prop)
• psModules/src/objects/Makefile.am (modified) (3 diffs)
• psModules/src/objects/mksource.pl (modified) (1 diff)
• psModules/src/objects/pmSource.c (modified) (1 diff)
• psModules/src/objects/pmSource.h (modified) (1 diff)
• psModules/src/objects/pmSourceIO.c (modified) (6 diffs)
• psModules/src/objects/pmSourceIO.h (modified) (1 diff)
• psModules/src/objects/pmSourceIO_CMF.c.in (modified) (4 diffs)
• psphot/src/Makefile.am (modified) (2 diffs)
• psphot/src/psphot.h (modified) (1 diff)
• psphot/src/psphotChipParams.c (copied) (copied from trunk/psphot/src/psphotChipParams.c )
• psphot/src/psphotFullForceReadout.c (modified) (1 diff)
• psphot/src/psphotSetThreads.c (modified) (1 diff)
• pstamp/scripts/pstamp_checkdependent.pl (modified) (1 prop)
• pstamp/scripts/pstamp_finish.pl (modified) (1 prop)
• pstamp/scripts/pstamp_job_run.pl (modified) (4 diffs, 1 prop)
• pstamp/scripts/pstampparse.pl (modified) (1 prop)
• pstamp/scripts/request_finish.pl (modified) (1 prop)
• tools/heather/queuesliceslap2.pl (modified) (3 diffs)
• tools/heather/queuesliceslap2skycal.pl (copied) (copied from trunk/tools/heather/queuesliceslap2skycal.pl )
• tools/iasc (copied) (copied from trunk/tools/iasc )
• tools/iasc/README (copied) (copied from trunk/tools/iasc/README )
• tools/iasc/RUN.sh (copied) (copied from trunk/tools/iasc/RUN.sh )
• tools/iasc/get_smf.sh (copied) (copied from trunk/tools/iasc/get_smf.sh )
• tools/iasc/getit (copied) (copied from trunk/tools/iasc/getit )
• tools/iasc/obsolete (copied) (copied from trunk/tools/iasc/obsolete )
• tools/iasc/obsolete/check_if_smfs_have_been_published.py (copied) (copied from trunk/tools/iasc/obsolete/check_if_smfs_have_been_published.py )
• tools/iasc/postreq (copied) (copied from trunk/tools/iasc/postreq )
• tools/iasc/rename.stamp.outputs.pl (copied) (copied from trunk/tools/iasc/rename.stamp.outputs.pl )

branches/eam_branches/ipp-20140813/Ohana/src/addstar/src/build_links.c

@@ -1 +1 @@
 # include "addstar.h"
+
+# define myAbortF(FORMAT,...) { fprintf (stderr, FORMAT, __VA_ARGS__); abort(); }
 
 /* 
@@ -47 +49 @@
 
     if (N >= Nmeasure) {
-      fprintf (stderr, "overflow in init_measure_links\n");
-      abort ();
+      myAbort ("overflow in init_measure_links\n");
     }
   }
@@ -136 +137 @@
 Measure *sort_measure (Average *average, off_t Naverage, Measure *measure, off_t Nmeasure, off_t *next_meas) {
 
-  off_t i, k, n, N;
+  int i, k, n, N;
   Measure *tmpmeasure;
 
@@ -146 +147 @@
     average[i].measureOffset = N;
     for (k = 0; k < average[i].Nmeasure; k++, N++) {
-      if (n == -1) abort();
+      if (n == -1) myAbortF("invalid measureOffset for ave %d, measureOffset %d, measure %d\n", i, average[i].measureOffset, k);
       tmpmeasure[N] = measure[n]; 
-      if (measure[n].averef != i) abort();
+      if (measure[n].averef != i) myAbortF("invalid averef for ave %d, measureOffset %d, measure %d, averef %d\n", i, average[i].measureOffset, k, measure[n].averef);
       tmpmeasure[N].averef = i;
       n = next_meas[n];
@@ -175 +176 @@
       next_miss[N] = -1;
       if (N >= Nmissing) {
-        fprintf (stderr, "overflow in init_missing_links");
-        abort ();
+        myAbort ("overflow in init_missing_links");
       }
       N++;
@@ -253 +253 @@
 
     if (N >= Nlensing) {
-      fprintf (stderr, "overflow in init_lensing_links\n");
-      abort ();
+      myAbort ("overflow in init_lensing_links\n");
     }
     N++;
@@ -343 +342 @@
 Lensing *sort_lensing (Average *average, off_t Naverage, Lensing *lensing, off_t Nlensing, off_t *next_lens) {
 
-  off_t i, k, n, N;
+  int i, k, n, N;
   Lensing *tmplensing;
 
@@ -354 +353 @@
     average[i].lensingOffset = N;
     for (k = 0; k < average[i].Nlensing; k++, N++) {
-      if (n == -1) abort();
+      if (n == -1) myAbortF("invalid lensingOffset for ave %d, lensingOffset %d, lensing %d\n", i, average[i].lensingOffset, k);
       tmplensing[N] = lensing[n]; 
-      if (lensing[n].averef != i) abort();
+      if (lensing[n].averef != i) myAbortF("invalid averef for ave %d, lensingOffset %d, lensing %d, averef %d\n", i, average[i].lensingOffset, k, lensing[n].averef);
       tmplensing[N].averef = i;
       n = next_lens[n];

branches/eam_branches/ipp-20140813/Ohana/src/addstar/src/resort_catalog.c

@@ -82 +82 @@
       myAssert(average[averageSeq[i]].catID == measure[measureSeq[i]].catID, "object / detection mismatch");
 # if (1)
-      myAssert(average[averageSeq[i]].objID == measure[measureSeq[i]].objID, "object / detection mismatch");
+      // myAssert(average[averageSeq[i]].objID == measure[measureSeq[i]].objID, "object / detection mismatch");
+      // check if the objID is correct. if not, check if it is byte-swapped (this has happened) and repair if so.  
+      // otherwise, abort
+      if (average[averageSeq[i]].objID != measure[measureSeq[i]].objID) {
+        fprintf (stderr, "object / detection mismatch average.objID = %d, measure.objID = %d, catID: %d, detID: %d", 
+                 average[averageSeq[i]].objID, measure[measureSeq[i]].objID, 
+                 measure[measureSeq[i]].catID, measure[measureSeq[i]].detID);
+        int objIDalt = measure[measureSeq[i]].objID;
+        char *byte = (char *) &objIDalt;
+        char tmp;
+        tmp = byte[0]; byte[0] = byte[3]; byte[3] = tmp;
+        tmp = byte[1]; byte[1] = byte[2]; byte[2] = tmp;
+        if (average[averageSeq[i]].objID == objIDalt) {
+          fprintf (stderr, "objID is byte-swapped, repairing\n");
+          measure[measureSeq[i]].objID = average[averageSeq[i]].objID; // XXX I don't really like this...
+        } else if (measure[measureSeq[i]].objID == 0) {
+          fprintf (stderr, "objID is 0, repairing\n");
+          measure[measureSeq[i]].objID = average[averageSeq[i]].objID; // XXX I don't really like this...
+        } else {
+          myAbort ("objID is NOT byte-swapped, aborting\n");
+        }
+      }
 # else
       // for reasons I do not understand, the mini dvodbs generated on stsci1X had a handful of detections with an inconsistency between averef and objID.  

branches/eam_branches/ipp-20140813/ippScripts/Build.PL

@@ -119 +119 @@
         scripts/ipp_apply_burntool.pl
         scripts/ipp_apply_burntool_single.pl
+        scripts/ipp_apply_burntool_fix.pl
         scripts/make_burntool_pcontrol.pl
         scripts/bundle_detrends.pl

branches/eam_branches/ipp-20140813/ippScripts/MANIFEST

@@ -43 +43 @@
 scripts/ipp_apply_burntool.pl
 scripts/ipp_apply_burntool_single.pl
+scripts/ipp_apply_burntool_fix.pl
 scripts/make_burntool_pcontrol.pl
 scripts/bundle_detrends.pl

branches/eam_branches/ipp-20140813/ippScripts/scripts/lap_science.pl

@@ -1077 +1077 @@
         &my_die("Unable to perform stacktool -definebyquery: $error_code", $lap_id);
     }
-    $stacks_made .= $mdcParser->parse_list(join "", @$stdout_buf) or
+    my $stacks_made_deep .= $mdcParser->parse_list(join "", @$stdout_buf) or
         &my_die("unable to parse metadata from stacktool -definebyquery", $lap_id, "");    
 
-
+    # Append deep stacks to stacks so we can get a complete count later.
+    push @{ $stacks_made}, @{ $stacks_made_deep };
+    
     ## Determine the sass_id so we can record it in the database.
     $command = "$stacktool ";

branches/eam_branches/ipp-20140813/ippconfig/gpc1/ppStack.config

@@ -160 +160 @@
     STACK.TYPE              STR   DEEP_STACK  ## needed?
     PSF.INPUT.CLIP.SIMPLE   BOOL  True
-    PSF.INPUT.MAX           F32   7.0    # center/edge can vary 1-2 pix, prefer <6 pix but needs to be <7 pix for edges
+    PSF.INPUT.MAX           F32   10.0   # center/edge can vary 1-2 pix, prefer <6 pix but needs to be <10 pix for edges until code improved..
     PSF.INPUT.CLIP.NSIGMA   F32   100.0  # any change to inputs can greatly impact edge filling factor..
     PSF.INPUT.THRESH        F32   NAN

branches/eam_branches/ipp-20140813/ippconfig/gpc1/psastro.config

@@ -520 +520 @@
    PSASTRO.MAX.ERROR               F32   0.2  # in arcsec units, still liberal limit for well known astrometry for skycells
    PSASTRO.MIN.NSTAR               S32   10   # edges may not have many and require special treatment 
+
+   KH.CORRECT.APPLY              BOOL     FALSE
 END
 
@@ -555 +557 @@
    PSASTRO.MIN.NSTAR               S32   10   # edges may not have many and require special treatment 
 
-END
-
-
-
+   KH.CORRECT.APPLY              BOOL     FALSE
+END

branches/eam_branches/ipp-20140813/psLib/src/math/psEllipse.c

@@ -134 +134 @@
     assert (isfinite(axes.major));
     assert (isfinite(axes.minor));
+
+    return axes;
+}
+// ellipse derotation (sx, sy, sxy) -> (major, minor, theta)
+psEllipseAxes psEllipseShapeToAxesWithErrors(psEllipseShape shape, psEllipseShape shapeErrors, double maxAR, psEllipseAxes *pShapeErrors)
+{
+    psEllipseAxes axes;
+    psEllipseAxes errors;
+
+    double f1 = 1.0 / PS_SQR(shape.sy) + 1.0 / PS_SQR(shape.sx);
+    double f2 = 1.0 / PS_SQR(shape.sy) - 1.0 / PS_SQR(shape.sx);
+
+    double f32 = PS_SQR(f2) + 4*PS_SQR(shape.sxy);
+    double f3 = sqrt(f32);
+
+    double df1 = - 2.0 * shapeErrors.sy / (PS_SQR(shape.sy) * shape.sy)
+                 - 2.0 * shapeErrors.sx / (PS_SQR(shape.sx) * shape.sx);
+    double df2 = - 2.0 * shapeErrors.sy / (PS_SQR(shape.sy) * shape.sy)
+                 + 2.0 * shapeErrors.sx / (PS_SQR(shape.sx) * shape.sx);
+
+    // df3 = 0.5 * df32 / sqrt(f32) = 0.5 * df32 / f3
+    double df3 = 0.5 * (2.0*f2*df2 + 2 * 4 * shape.sxy * shapeErrors.sxy) / f3;
+
+    double f13 = f1 + f3;
+    axes.minor = sqrt (2.0 / f13);
+
+    // dminor = -0.5 * sqrt (2) * df13 * f13**-3/2  = - 0.5 * df13 * minor / f13
+    errors.minor = - 0.5 * (df1 + df3) * axes.minor / f13;
+
+    axes.theta = -0.5 * atan2 (+2.0*shape.sxy, f2);
+
+    // according to wikipedia the derivitive of atan2(y, x) is
+    //
+    //  dAtan2(y, x) = - y * dx / (x**2 + y**2)) + x * dy / (x**2 + y**2) (for x > 0 and y!=0)
+    //  where
+    //  y = 2 * sxy  dy = 2 * dsxy   x = f2 so dx = df2
+
+    // dtheta = -0.5 * dAtan2(y, x)
+
+    errors.theta = -0.5 * ( -2.0 * shape.sxy * df2  +  f2 * 2 *shapeErrors.sxy ) / 
+                            (PS_SQR(f2) + 4 * PS_SQR(shape.sxy)) ;
+
+    // long, thin objects are likely to have a poorly measured major axis
+    // the angle and minor axis are likely to be ok.
+    // restrict the axis ratio
+    double rAR2 = (f1 - f3) / (f1 + f3);
+    if (rAR2 < 1.0/PS_SQR(maxAR)) {
+        axes.major = axes.minor * maxAR;
+        errors.major = errors.minor * maxAR;
+    } else {
+        axes.major = sqrt (2.0 / (f1 - f3));
+
+        // dmajor = -0.5 * (df1 - df3) * sqrt(2) * (f1 - f3)**-3/2
+        //        = -0.5 * (df2 - df3) * major / (f1 - f3)
+        errors.major = -0.5 * axes.major * (df1 - df3) / (f1 - f3);
+    }
+
+    assert (isfinite(axes.theta));
+    assert (isfinite(axes.major));
+    assert (isfinite(axes.minor));
+
+    *pShapeErrors = errors;
 
     return axes;

branches/eam_branches/ipp-20140813/psLib/src/math/psEllipse.h

@@ -65 +65 @@
                                    );
 
+/// Convert shape to axes representation and compute errors
+psEllipseAxes psEllipseShapeToAxesWithErrors(psEllipseShape shape, ///< Shape of ellipse
+                                   psEllipseShape errors, ///<errors on shape params
+                                   double maxAR, ///< Maximum allowed axis ratio
+                                   psEllipseAxes *pShapeErrors ///< propagated errors on axes
+                                   );
+
 /// Convert axes to polarization representation
 psEllipsePol psEllipseAxesToPol(psEllipseAxes axes ///< Axes of ellipse

branches/eam_branches/ipp-20140813/psModules/src/objects

@@ -16 +16 @@
 pmSourceIO_CMF_PS1_SV2.c
 pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
 pmSourceIO_CMF_PS1_DV4.c
+

@@ -16 +16 @@
 pmSourceIO_CMF_PS1_SV2.c
 pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
 pmSourceIO_CMF_PS1_DV4.c
+

branches/eam_branches/ipp-20140813/psModules/src/objects/Makefile.am

@@ -53 +53 @@
         pmSourceIO_CMF_PS1_SV2.c \
         pmSourceIO_CMF_PS1_SV3.c \
+        pmSourceIO_CMF_PS1_SV4.c \
         pmSourceIO_CMF_PS1_DV1.c \
         pmSourceIO_CMF_PS1_DV2.c \
@@ -157 +158 @@
 pmSourceIO_CMF_PS1_SV1.c \
 pmSourceIO_CMF_PS1_SV2.c \
-pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV3.c \
+pmSourceIO_CMF_PS1_SV4.c
 
 pmSourceIO_CMF_PS1_V1.c : pmSourceIO_CMF.c.in mksource.pl
@@ -195 +197 @@
         mksource.pl pmSourceIO_CMF.c.in PS1_SV3 pmSourceIO_CMF_PS1_SV3.c
 
+pmSourceIO_CMF_PS1_SV4.c : pmSourceIO_CMF.c.in mksource.pl
+        mksource.pl pmSourceIO_CMF.c.in PS1_SV4 pmSourceIO_CMF_PS1_SV4.c
+
 # EXTRA_DIST = pmErrorCodes.h.in pmErrorCodes.dat pmErrorCodes.c.in

branches/eam_branches/ipp-20140813/psModules/src/objects/mksource.pl

@@ -29 +29 @@
                 "PS1_SV2", 2,
                 "PS1_SV3", 3,
+                "PS1_SV4", 4,
     );
 

branches/eam_branches/ipp-20140813/psModules/src/objects/pmSource.c

@@ -176 +176 @@
     source->parent = NULL;
     source->tmpPtr = NULL;
+    source->chipNum = -1;
+    source->chipX = -1000;
+    source->chipY = -1000;
     source->imageID = -1;
     source->nFrames = 0;

branches/eam_branches/ipp-20140813/psModules/src/objects/pmSource.h

@@ -127 +127 @@
     pmSource *parent;                   ///< reference to the master source from which this is derived
     psPtr *tmpPtr;                      ///< pointer that may be used to store data in a particular module. e.g. psphotKronIterate.
+    short chipNum;                      ///< camera dependent of chip suppling pixels for fullforce source
+    short chipX;                        ///< chip space X coord of fullforce source
+    short chipY;                        ///< chip space Y coord of fullforce source
     int imageID;
     psU16 nFrames;

branches/eam_branches/ipp-20140813/psModules/src/objects/pmSourceIO.c

@@ -602 +602 @@
             PM_SOURCES_WRITE("PS1_SV2",   CMF_PS1_SV2);
             PM_SOURCES_WRITE("PS1_SV3",   CMF_PS1_SV3);
+            PM_SOURCES_WRITE("PS1_SV4",   CMF_PS1_SV4);
             PM_SOURCES_WRITE("PS1_DV1",   CMF_PS1_DV1);
             PM_SOURCES_WRITE("PS1_DV2",   CMF_PS1_DV2);
@@ -1124 +1125 @@
             PM_SOURCES_READ_PSF("PS1_SV2",   CMF_PS1_SV2);
             PM_SOURCES_READ_PSF("PS1_SV3",   CMF_PS1_SV3);
+            PM_SOURCES_READ_PSF("PS1_SV4",   CMF_PS1_SV4);
             PM_SOURCES_READ_PSF("PS1_DV1",   CMF_PS1_DV1);
             PM_SOURCES_READ_PSF("PS1_DV2",   CMF_PS1_DV2);
@@ -1412 +1414 @@
         PM_SOURCES_READ_XSRC("PS1_SV2",   CMF_PS1_SV2);
         PM_SOURCES_READ_XSRC("PS1_SV3",   CMF_PS1_SV3);
+        PM_SOURCES_READ_XSRC("PS1_SV4",   CMF_PS1_SV4);
         PM_SOURCES_READ_XSRC("PS1_DV1",   CMF_PS1_DV1);
         PM_SOURCES_READ_XSRC("PS1_DV2",   CMF_PS1_DV2);
@@ -1454 +1457 @@
         PM_SOURCES_READ_XFIT("PS1_SV2",   CMF_PS1_SV2);
         PM_SOURCES_READ_XFIT("PS1_SV3",   CMF_PS1_SV3);
+        PM_SOURCES_READ_XFIT("PS1_SV4",   CMF_PS1_SV4);
         PM_SOURCES_READ_XFIT("PS1_DV1",   CMF_PS1_DV1);
         PM_SOURCES_READ_XFIT("PS1_DV2",   CMF_PS1_DV2);
@@ -1495 +1499 @@
         PM_SOURCES_READ_XRAD("PS1_SV2",   CMF_PS1_SV2);
         PM_SOURCES_READ_XRAD("PS1_SV3",   CMF_PS1_SV3);
+        PM_SOURCES_READ_XRAD("PS1_SV4",   CMF_PS1_SV4);
         PM_SOURCES_READ_XRAD("PS1_DV1",   CMF_PS1_DV1);
         PM_SOURCES_READ_XRAD("PS1_DV2",   CMF_PS1_DV2);
@@ -1536 +1541 @@
         PM_SOURCES_READ_XGAL("PS1_SV2",   CMF_PS1_SV2);
         PM_SOURCES_READ_XGAL("PS1_SV3",   CMF_PS1_SV3);
+        PM_SOURCES_READ_XGAL("PS1_SV4",   CMF_PS1_SV4);
         PM_SOURCES_READ_XGAL("PS1_DV1",   CMF_PS1_DV1);
         PM_SOURCES_READ_XGAL("PS1_DV2",   CMF_PS1_DV2);

branches/eam_branches/ipp-20140813/psModules/src/objects/pmSourceIO.h

@@ -41 +41 @@
 MK_PROTO(CMF_PS1_SV2);
 MK_PROTO(CMF_PS1_SV3);
+MK_PROTO(CMF_PS1_SV4);
 MK_PROTO(CMF_PS1_DV1);
 MK_PROTO(CMF_PS1_DV2);

branches/eam_branches/ipp-20140813/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -221 +221 @@
           @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_E2_SH_PSF",   PS_DATA_F32, "shear polarizability element (objects)",     source->lensingPSF->shear->e2); 
         }
+
+        // if lensing params exist also include the backmapped chipID and chip coordinates
+        if (source->lensingPSF && source->lensingPSF->shear) {
+            @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "SRC_CHIP_NUM",   PS_DATA_S16, "id of warp input chip",     source->chipNum); 
+            @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "SRC_CHIP_X",    PS_DATA_S16, "x coord in warp input chip",     source->chipX); 
+            @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "SRC_CHIP_Y",    PS_DATA_S16, "y coord in warp input chip",     source->chipY); 
+            @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "PADDING3",      PS_DATA_S16, "more padding", 0);
+        }
 
         @>PS1_V2,PS1_SV?,>PS1_DV1@ psMetadataAdd (row, PS_LIST_TAIL, "MOMENTS_R1",       PS_DATA_F32, "first radial moment",                        moments.Mrf);
@@ -907 +915 @@
     }
 
-    @>PS1_DV2@ pmChip *chip = readout->parent->parent;
+    @>PS1_DV2,>PS1_SV3@ pmChip *chip = readout->parent->parent;
 
     pmModelStatus badModel = PM_MODEL_STATUS_NONE;
@@ -966 +974 @@
             }
 
-            @>PS1_DV2@ psSphere ptSky = {0.0, 0.0, 0.0, 0.0};
-            @>PS1_DV2@ float posAngle = 0.0;
-            @>PS1_DV2@ float pltScale = 0.0;
-            @>PS1_DV2@ pmSourceLocalAstrometry (&ptSky, &posAngle, &pltScale, chip, xPos, yPos);
-            @>PS1_DV2@ double raPos = ptSky.r*PS_DEG_RAD;
-            @>PS1_DV2@ double decPos = ptSky.d*PS_DEG_RAD;
-            @>PS1_DV2@ posAngle *= PS_DEG_RAD;
-            @>PS1_DV2@ pltScale *= PS_DEG_RAD*3600.0;
+            @>PS1_DV2,>PS1_SV3@ psSphere ptSky = {0.0, 0.0, 0.0, 0.0};
+            @>PS1_DV2,>PS1_SV3@ float posAngle = 0.0;
+            @>PS1_DV2,>PS1_SV3@ float pltScale = 0.0;
+            @>PS1_DV2,>PS1_SV3@ pmSourceLocalAstrometry (&ptSky, &posAngle, &pltScale, chip, xPos, yPos);
+            @>PS1_DV2,>PS1_SV3@ double raPos = ptSky.r*PS_DEG_RAD;
+            @>PS1_DV2,>PS1_SV3@ double decPos = ptSky.d*PS_DEG_RAD;
+            @>PS1_DV2,>PS1_SV3@ posAngle *= PS_DEG_RAD;
+            @>PS1_DV2,>PS1_SV3@ pltScale *= PS_DEG_RAD*3600.0;
 
             float kronFlux = source->moments ? source->moments->KronFlux : NAN;
@@ -987 +995 @@
             psMetadataAddF32 (row, PS_LIST_TAIL, "X_EXT_SIG",        0, "Sigma in EXT x coordinate",                  xErr);
             psMetadataAddF32 (row, PS_LIST_TAIL, "Y_EXT_SIG",        0, "Sigma in EXT y coordinate",                  yErr);
-            @>PS1_DV2@ psMetadataAddF32 (row, PS_LIST_TAIL, "RA_EXT",           0, "EXT model ra coordinate",                    raPos);
-            @>PS1_DV2@ psMetadataAddF32 (row, PS_LIST_TAIL, "DEC_EXT",          0, "EXT model dec coordinate",                   decPos);
+            @>PS1_DV2,>PS1_SV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "RA_EXT",           0, "EXT model ra coordinate",                    raPos);
+            @>PS1_DV2,>PS1_SV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "DEC_EXT",          0, "EXT model dec coordinate",                   decPos);
             @>PS1_DV2@ float instFlux = isfinite(model->mag) ? pow(10.0, -0.4*model->mag) : NAN;
             @>PS1_DV2@ psMetadataAddF32 (row, PS_LIST_TAIL, "EXT_INST_FLUX",    0, "EXT fit instrumental counts",                instFlux);

branches/eam_branches/ipp-20140813/psphot/src/Makefile.am

@@ -97 +97 @@
 # generalized forced photometry (including Kron, Petro, and Models) of specified positions given a specified psf
 psphotFullForce_SOURCES = \
-        psphotFullForce.c             \
-        psphotFullForceArguments.c    \
+        psphotFullForce.c          \
+        psphotFullForceArguments.c \
         psphotParseCamera.c        \
         psphotImageLoop.c          \
@@ -259 +259 @@
         psphotEfficiency.c             \
         psphotSetNFrames.c             \
-        psphotSourceMemory.c
+        psphotSourceMemory.c           \
+        psphotChipParams.c
 
 # not currently used

branches/eam_branches/ipp-20140813/psphot/src/psphot.h

@@ -571 +571 @@
 bool psphotSourceMemoryReadout(pmConfig *config, const pmFPAview *view, const char *filerule, int index);
 
+bool psphotChipParams(pmConfig *config, const pmFPAview *view, const char *filerule);
+bool psphotChipParams_Threaded(psThreadJob *job);
+
 const char * psphotGetFilerule(const char *baseRule);
 extern bool psphotINpsphotStack;
 
+
 #endif

branches/eam_branches/ipp-20140813/psphot/src/psphotFullForceReadout.c

@@ -106 +106 @@
     psphotKronFlux (config, view, filerule);
 
+    psphotChipParams (config, view, filerule);
+
     // measure petro fluxes
     psphotPetroFlux (config, view, filerule);

branches/eam_branches/ipp-20140813/psphot/src/psphotSetThreads.c

@@ -87 +87 @@
     psFree(task);
 
+    task = psThreadTaskAlloc("PSPHOT_CHIP_PARAMS", 2);
+    task->function = &psphotChipParams_Threaded;
+    psThreadTaskAdd(task);
+    psFree(task);
+
     return true;
 }

branches/eam_branches/ipp-20140813/pstamp/scripts/pstamp_job_run.pl

@@ -91 +91 @@
 my $ppBackgroundStack = can_run('ppBackgroundStack') or (warn "Can't find ppBackgroundStack" and $missing_tools = 1);
 my $stack_bkg_mk_mdc = can_run('stack_bkg_mk_mdc.pl') or (warn "Can't find stack_bkg_mk_mdc.pl" and $missing_tools = 1);
+my $fpack = can_run('fpack') or (warn "Can't find fpack" and $missing_tools = 1);
+
 
 if ($missing_tools) {
@@ -146 +148 @@
     my $mask;
     my $variance;
-
-    # We need to background restore HERE
-    # and change the image file supplied to ppstamp
 
     my $fileArgs = " -file $params->{image}";
@@ -224 +223 @@
 
     # unless the stage is stack_summary we use ppstamp to make postage stamps (including -wholefile)
-    # otherwise we make copies of the input files to the outputs
+    # if stage is stack_summary we make copies of the input files to the outputs
     my $use_ppstamp = ($stage ne 'stack_summary');
 
@@ -243 +242 @@
             $exitStatus = $PS_EXIT_SYS_ERROR;
         }
-        # XXX: if stage is stack deal with EXP and NUM images if selected
+
+        # if stage is stack deal with EXP and NUM images if selected by running ppstamp again
+        if (!$exitStatus and $stage eq 'stack' and ($options & ($PSTAMP_SELECT_EXP | $PSTAMP_SELECT_NUM))) {
+            # XXX Here I am assuming that nothing relevant gets added to $argString 
+            # Need to check
+            my $roiArgs = $params->{job_args};
+
+            # XXX: define expnum and exptime input images in the params file so that we don't have to
+            # make assumptions about the file rules here
+            my $pathBase = $params->{stack_path_base};
+            $pathBase = $params->{path_base} unless defined $pathBase;
+            unless (defined $pathBase) {
+                my_die("stack path base undefined found when creating exp or expnum image", $job_id, $PS_EXIT_PROG_ERROR);
+            }
+            $pathBase .= ".unconv";
+            my $tmpBase = "$outputBase.TMP";
+            # nocompress because exp image gets corrupted if we do
+            my $command = "$ppstamp $tmpBase $roiArgs  -nocompress -stage stack";
+            # XXX: use file rules
+            # Image is the EXP (exptime) image
+            $command .= " -file $pathBase.exp.fits";
+            # treat number image as mask
+            $command .= " -mask $pathBase.num.fits" if ($options & $PSTAMP_SELECT_NUM);
+
+            $command .= " -forheader $calibfile" if $calibfile;
+
+            my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                run(command => $command, verbose => $verbose);
+
+            if (WIFEXITED($error_code)) {
+                $exitStatus = WEXITSTATUS($error_code);
+            } else {
+                print STDERR "ppstamp failed error_code: $error_code\n";
+                $exitStatus = $PS_EXIT_SYS_ERROR;
+            }
+
+            # command to compress fits files to stdout using gzip
+            my $fpack_gzip = "$fpack -g -S";
+            $fpack_gzip .= " -D" unless $save_temps;
+
+            if (!$exitStatus and ($options & $PSTAMP_SELECT_NUM)) {
+                # rename the num image if selected since it is not a mask
+                # Change .exp.mk to .num
+                my $tmpName = "$tmpBase.mk.fits";
+                my $numName = "$outputBase.num.fits";
+                # optionally fpack it while we're here unless user wants uncompressed images
+                unless ($options & $PSTAMP_SELECT_UNCOMPRESSED) {
+                    my $command = "$fpack_gzip $tmpName > $numName";
+                    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                        run(command => $command, verbose => $verbose);
+
+                    if (WIFEXITED($error_code)) {
+                        $exitStatus = WEXITSTATUS($error_code);
+                    } else {
+                        print STDERR "ppstamp failed error_code: $error_code\n";
+                        print STDERR "@$stderr_buf\n";
+                        $exitStatus = $PS_EXIT_SYS_ERROR;
+                    }
+                } elsif (!$exitStatus) {
+                    rename $tmpName, $numName 
+                        or my_die ("failed to rename $tmpName to $numName", $job_id, $PS_EXIT_UNKNOWN_ERROR);
+                }
+
+            }
+            # fpack the exp image if not -nocompress
+            unless ($exitStatus or ($options & $PSTAMP_SELECT_UNCOMPRESSED)) {
+                my $command = "$fpack_gzip $tmpBase.fits > $outputBase.exp.fits";
+                my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                    run(command => $command, verbose => $verbose);
+
+                if (WIFEXITED($error_code)) {
+                    $exitStatus = WEXITSTATUS($error_code);
+                } else {
+                    print STDERR "ppstamp failed error_code: $error_code\n";
+                    print STDERR "@$stderr_buf\n";
+                    $exitStatus = $PS_EXIT_SYS_ERROR;
+                }
+            } elsif (!$exitStatus) {
+                rename "$tmpBase.fits", "$outputBase.exp.fits"
+                    or my_die ("failed to rename $tmpBase.fits to $outputBase.exp.fits", $job_id, $PS_EXIT_UNKNOWN_ERROR);
+            }
+        }
     } else {
         $exitStatus = justCopyFiles($outputBase, \$options, $params);

branches/eam_branches/ipp-20140813/tools/heather/queuesliceslap2.pl

@@ -4 +4 @@
 
 
-$label = "LAP.ThreePi.20130717";
+#$label = "LAP.ThreePi.20130717";
+$label = "LAP.ThreePi.20130717.pole3";
+#$label = "LAP.ThreePi.20130717.pole3.CNP";
 
 @segments = (0,1,2,3,4,5,6,7,8);
@@ -11 +13 @@
 
 
-@slices = ("00","02","04","06","08",10,12,14,16,18,20,22);
-    
-$slice = $slices[0];
-$slice = $slices[1];
+@slices = ("00","02","04","06","08","10","12","14","16","18","20","22");
+ 
+foreach $slice (@slices) {
+   
+#$slice = $slices[0];
+#$slice = $slices[1];
     foreach $num (@segments) {
 
-        $dvodb = "LAP.20130717";
-        $minidvodb_group = "LAP.slice$slice.$segments[$num].cam";
+        $dvodb = "LAP.PV2.20130717";
+        $minidvodb_group = "LAP.PV2.slice$slice.$segments[$num].cam";
         $dvodb_label = "$minidvodb_group";
         $ra_min = $slice*15.0;
@@ -27 +31 @@
 
         
-        print "addtool -definebyquery  -label $label -set_dvodb $dvodb -set_minidvodb_group $minidvodb_group -set_minidvodb -set_label $dvodb_label -stage cam -uncensored -ra_min $ra_min -ra_max $ra_max -decl_min $dec_min -decl_max $dec_max -dbname gpc1 \n";
-
-
+        $com =  "addtool -definebyquery  -label $label -set_dvodb $dvodb -set_minidvodb_group $minidvodb_group -set_minidvodb -set_label $dvodb_label -stage cam -uncensored -ra_min $ra_min -ra_max $ra_max -decl_min $dec_min -decl_max $dec_max -dbname gpc1";
+        print "$com\n";
+        `$com`;
+    }
 
 }
+$com2 = "addtool -definebyquery  -label $label -set_dvodb $dvodb -set_minidvodb_group LAP.PV2.pole.cam -set_minidvodb -set_label LAP.PV2.pole.cam -stage cam -uncensored -ra_min 0 -ra_max 360 -decl_min 75 -decl_max 90 -dbname gpc1";
+print "$com2\n";
+`$com2`;

@@ -16 +16 @@
 pmSourceIO_CMF_PS1_SV2.c
 pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
 pmSourceIO_CMF_PS1_DV4.c
+