Changeset 36895

Timestamp:

Jun 17, 2014, 2:15:17 PM (12 years ago)

Author:

eugene

Message:

merge changes from tags/ipp-pv3-20140616

Location:

tags/ipp-pv3-cr-20140614

Files:

• . (modified) (1 prop)
• ippScripts/scripts/queuestaticsky.pl (modified) (1 prop)
• ippScripts/scripts/sc_prepare_camera.pl (modified) (1 diff, 1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/gpc1/psastro.config (modified) (1 diff, 1 prop)
• ippconfig/recipes/ppSub.config (modified) (1 prop)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 prop)
• ppStack/src/ppStackReadout.c (modified) (3 diffs, 1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects (modified) (1 prop)
• psModules/src/objects/Makefile.am (modified) (4 diffs)
• psModules/src/objects/pmSourceIO.c (modified) (4 diffs)
• psModules/src/objects/pmSourceIO.h (modified) (1 diff)
• pstamp/scripts/pstamp_checkdependent.pl (modified) (1 prop)
• pstamp/scripts/pstamp_finish.pl (modified) (1 prop)
• pstamp/scripts/pstamp_webrequest.pl (modified) (1 diff, 1 prop)
• pstamp/scripts/pstampparse.pl (modified) (1 prop)

tags/ipp-pv3-cr-20140614/ippScripts/scripts/sc_prepare_camera.pl

@@ -180 +180 @@
 #    $psastro_command   .= " -refmasklist ${remote_outroot}.masklist ${remote_outroot} "; # This is used to do edge calculations.  It should probably be smart enough to know that it can just use the masks I just specified, but it's not.
     # Uncomment when remote psastro supports this
-#    $psastro_command   .= " -kh-correct /turquoise/usr/projects/ps1/watersc1/references/khcorrect.20140606.v0.fits ";
+    $psastro_command   .= " -kh-correct /turquoise/usr/projects/ps1/watersc1/references/khcorrect.20140606.v0.fits ";
     $psastro_command   .= " -refmasklist /turquoise/usr/projects/ps1/watersc1/references/gpc1.refmask.list ";
-    $psastro_command   .= " -astrommodel /turquoise/usr/projects/ps1/watersc1/references/gpc1.20080909.asm ";
+#    $psastro_command   .= " -astrommodel /turquoise/usr/projects/ps1/watersc1/references/gpc1.20080909.asm ";
+    $psastro_command   .= " -astrommodel /turquoise/usr/projects/ps1/watersc1/references/gpc1.20140505.asm ";
     $psastro_command   .= " -recipe PSASTRO $recipe_psastro ";
     $psastro_command   .= " -tracedest ${remote_outroot}.trace -log ${remote_outroot}.log ";

tags/ipp-pv3-cr-20140614/ippconfig/gpc1/psastro.config

@@ -493 +493 @@
    ZERO.POINT.USE.MEAN             BOOL  TRUE
    PSASTRO.FIELD.PADDING           F32   0.01   # skycells are well defined, don't need large padding. 1% of 6400 is 64 pixels
-   PSASTRO.MAX.NRAW                S32   1000   # include more than MAX.NREF to account for extras like false-positives
-   PSASTRO.MAX.NREF                S32    500   # if edge skycell ~10% then try ~50 to match 
+   PSASTRO.MAX.NRAW                S32   1500   # include more than MAX.NREF to account for extras like false-positives
+   PSASTRO.MAX.NREF                S32   1000   # if edge skycell ~10% then try ~50 to match. increase to help odd bulk offsets
    PSASTRO.MIN.INST.MAG.RAW        F32   -25.0  # 
    PSASTRO.MAX.INST.MAG.RAW        F32   -5.0

tags/ipp-pv3-cr-20140614/ppStack/src/ppStackReadout.c

@@ -188 +188 @@
     psFree(stack);
 
-    psLogMsg("ppStack", PS_LOG_INFO, "initial stack image sectionNum %d", sectionNum);
+    //MEH change to trace
+    //psLogMsg("ppStack", PS_LOG_INFO, "initial stack image sectionNum %d", sectionNum);
 
     sectionNum++;
@@ -275 +276 @@
         //MEH -- apply bscale offset before norm   
         if (bscaleApplyOffset) {
-            psLogMsg("ppStack", PS_LOG_MINUTIA, "bscaleApplyOffset: %d %f", i, bscaleApplyOffset->data.F32[i]);
+            //MEH change to trace
+            //psLogMsg("ppStack", PS_LOG_INFO, "bscaleApplyOffset: %d %f", i, bscaleApplyOffset->data.F32[i]);
             psBinaryOp(ro->image, ro->image, "-", psScalarAlloc(bscaleApplyOffset->data.F32[i], PS_TYPE_F32));
         }
@@ -307 +309 @@
     psFree(stack);
 
-    psLogMsg("ppStack", PS_LOG_INFO, "final stack image sectionNum %d", sectionNum);
+    //MEH change to trace
+    //psLogMsg("ppStack", PS_LOG_INFO, "final stack image sectionNum %d", sectionNum);
 
     sectionNum++;

tags/ipp-pv3-cr-20140614/psModules/src/objects

@@ -15 +15 @@
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c
+pmSourceIO_CMF_PS1_SV3.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
-
+pmSourceIO_CMF_PS1_DV4.c

@@ -15 +15 @@
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c
+pmSourceIO_CMF_PS1_SV3.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
-
+pmSourceIO_CMF_PS1_DV4.c

tags/ipp-pv3-cr-20140614/psModules/src/objects/Makefile.am

@@ -52 +52 @@
         pmSourceIO_CMF_PS1_SV1.c \
         pmSourceIO_CMF_PS1_SV2.c \
+        pmSourceIO_CMF_PS1_SV3.c \
         pmSourceIO_CMF_PS1_DV1.c \
         pmSourceIO_CMF_PS1_DV2.c \
         pmSourceIO_CMF_PS1_DV3.c \
+        pmSourceIO_CMF_PS1_DV4.c \
         pmSourceIO_MatchedRefs.c \
         pmSourcePlots.c \
@@ -152 +154 @@
 pmSourceIO_CMF_PS1_DV2.c \
 pmSourceIO_CMF_PS1_DV3.c \
+pmSourceIO_CMF_PS1_DV4.c \
 pmSourceIO_CMF_PS1_SV1.c \
-pmSourceIO_CMF_PS1_SV2.c
+pmSourceIO_CMF_PS1_SV2.c \
+pmSourceIO_CMF_PS1_SV3.c
 
 pmSourceIO_CMF_PS1_V1.c : pmSourceIO_CMF.c.in mksource.pl
@@ -179 +183 @@
         mksource.pl pmSourceIO_CMF.c.in PS1_DV3 pmSourceIO_CMF_PS1_DV3.c
 
+pmSourceIO_CMF_PS1_DV4.c : pmSourceIO_CMF.c.in mksource.pl
+        mksource.pl pmSourceIO_CMF.c.in PS1_DV4 pmSourceIO_CMF_PS1_DV4.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
@@ -185 +192 @@
         mksource.pl pmSourceIO_CMF.c.in PS1_SV2 pmSourceIO_CMF_PS1_SV2.c
 
+pmSourceIO_CMF_PS1_SV3.c : pmSourceIO_CMF.c.in mksource.pl
+        mksource.pl pmSourceIO_CMF.c.in PS1_SV3 pmSourceIO_CMF_PS1_SV3.c
+
 # EXTRA_DIST = pmErrorCodes.h.in pmErrorCodes.dat pmErrorCodes.c.in

tags/ipp-pv3-cr-20140614/psModules/src/objects/pmSourceIO.c

@@ -365 +365 @@
 # define PM_SOURCES_WRITE(NAME,TYPE)                                    \
     if (!strcmp (exttype, NAME)) {                                      \
-        status &= pmSourcesWrite_##TYPE(file->fits, readout, sources, file->header, outhead, dataname, recipe); \
+        status = pmSourcesWrite_##TYPE(file->fits, readout, sources, file->header, outhead, dataname, recipe); \
         if (xsrcname) {                                                 \
             status &= pmSourcesWrite_##TYPE##_XSRC(file->fits, readout, sources, file->header, xsrcname, recipe); \
@@ -589 +589 @@
 
             // these are case-sensitive since the EXTYPE is case-sensitive
-            status = true;
+            status = false;
             PM_SOURCES_WRITE("SMPDATA",   SMPDATA);
             PM_SOURCES_WRITE("PS1_DEV_0", PS1_DEV_0);
@@ -601 +601 @@
             PM_SOURCES_WRITE("PS1_SV1",   CMF_PS1_SV1);
             PM_SOURCES_WRITE("PS1_SV2",   CMF_PS1_SV2);
+            PM_SOURCES_WRITE("PS1_SV3",   CMF_PS1_SV3);
             PM_SOURCES_WRITE("PS1_DV1",   CMF_PS1_DV1);
             PM_SOURCES_WRITE("PS1_DV2",   CMF_PS1_DV2);
             PM_SOURCES_WRITE("PS1_DV3",   CMF_PS1_DV3);
+            PM_SOURCES_WRITE("PS1_DV4",   CMF_PS1_DV4);
 
             psFree (outhead);
@@ -1121 +1123 @@
             PM_SOURCES_READ_PSF("PS1_SV1",   CMF_PS1_SV1);
             PM_SOURCES_READ_PSF("PS1_SV2",   CMF_PS1_SV2);
+            PM_SOURCES_READ_PSF("PS1_SV3",   CMF_PS1_SV3);
             PM_SOURCES_READ_PSF("PS1_DV1",   CMF_PS1_DV1);
             PM_SOURCES_READ_PSF("PS1_DV2",   CMF_PS1_DV2);
             PM_SOURCES_READ_PSF("PS1_DV3",   CMF_PS1_DV3);
+            PM_SOURCES_READ_PSF("PS1_DV4",   CMF_PS1_DV4);
 
             long *sourceIndex = NULL;

tags/ipp-pv3-cr-20140614/psModules/src/objects/pmSourceIO.h

@@ -40 +40 @@
 MK_PROTO(CMF_PS1_SV1);
 MK_PROTO(CMF_PS1_SV2);
+MK_PROTO(CMF_PS1_SV3);
 MK_PROTO(CMF_PS1_DV1);
 MK_PROTO(CMF_PS1_DV2);
 MK_PROTO(CMF_PS1_DV3);
+MK_PROTO(CMF_PS1_DV4);
 
 int pmSourceGetDophotType (pmSource *source);

tags/ipp-pv3-cr-20140614/pstamp/scripts/pstamp_webrequest.pl

@@ -93 +93 @@
     my $command = "$psmkreq --req_name $request_name  --output $request_file @ARGV";
 
+if (0) {
+open DEBUG, ">>/tmp/pstamp.debug.log";
+print DEBUG "\ncommand is: $command\n";
+close DEBUG;
+}
+
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);
     unless ($success) {
         print STDERR @$stderr_buf;
+        print STDERR "\ncommand was: $command\n";
         die("Unable to perform psmkreq: $error_code");
     }

@@ -15 +15 @@
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c
+pmSourceIO_CMF_PS1_SV3.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
-
+pmSourceIO_CMF_PS1_DV4.c