Changeset 40769

Timestamp:

May 30, 2019, 9:08:36 AM (7 years ago)

Author:

eugene

Message:

merge changes from trunk (pstamp fixes)

Location:

tags/ipp-ps2-20190404

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackPrepare.c (modified) (1 diff)
• pstamp/scripts/detect_query_read (modified) (1 diff)
• pstamp/scripts/dquery_job_run.pl (modified) (1 diff)
• pstamp/scripts/dqueryparse.pl (modified) (3 diffs)
• pstamp/scripts/pstamp_server_status (modified) (2 diffs)

tags/ipp-ps2-20190404/ppStack/src/ppStackPrepare.c

@@ -380 +380 @@
         psImage *P      = psImageAlloc(m,num,PS_TYPE_F32);
         
+        // XXX: we should not pass in images to this analysis which have already been rejected by the FWHM limits
         if (!psMM1DClass(options->inputSeeing,
                          options->inputSeeing->n,

tags/ipp-ps2-20190404/pstamp/scripts/detect_query_read

@@ -244 +244 @@
             $cmd .= " -dateobs_begin $dateobs_begin -dateobs_end $dateobs_end ";
             $cmd .= " -ra $ra -decl $dec -radius 1.5 -limit 1 -diff_mode 2";
+            $cmd .= " -diff_mode 2";
         }
         elsif ($colData{STAGE}[$i] eq 'diff') {

tags/ipp-ps2-20190404/pstamp/scripts/dquery_job_run.pl

@@ -133 +133 @@
     print $targetfile "$r_x $r_y\n";
     my $row = $rows[$i];
-    if ((abs($r_ra - $row->{RA1_DEG}) < 1e-8) && (abs($r_dec - $row->{DEC1_DEG}))) {
+    if ((abs($r_ra - $row->{RA1_DEG}) < 1e-8) && (abs($r_dec - $row->{DEC1_DEG}) < 1e-8)) {
         $row->{X_PXL} = $r_x;
         $row->{Y_PXL} = $r_y;

tags/ipp-ps2-20190404/pstamp/scripts/dqueryparse.pl

@@ -216 +216 @@
         }
 
+        ## 20190317 MEH hack to add to row
+        # Set common request components
+        my $option_mask |= 1;
+        $option_mask |= $PSTAMP_SELECT_IMAGE;
+        $option_mask |= $PSTAMP_SELECT_MASK;
+        $option_mask |= $PSTAMP_SELECT_VARIANCE;
+        $option_mask |= $PSTAMP_SELECT_PSF;
+
         # Set up a rowList with default values
         my @rowList;
@@ -223 +231 @@
             $rowList[$i]->{ID} = $query{$fpa_id}{ROWNUM}[$i];
             $rowList[$i]->{COORD_MASK} = 0;
+            # 20190317 MEH hack add to row  
+            $rowList[$i]->{OPTION_MASK} = $option_mask;
             # Set default values
             $query{$fpa_id}{BAD_COMPONENT}[$i] = 1;
@@ -259 +269 @@
         }
         # Set common request components
-        my $option_mask |= 1;
-        $option_mask |= $PSTAMP_SELECT_IMAGE;
-        $option_mask |= $PSTAMP_SELECT_MASK;
-        $option_mask |= $PSTAMP_SELECT_VARIANCE;
-        $option_mask |= $PSTAMP_SELECT_PSF;
+#       my $option_mask |= 1;
+#       $option_mask |= $PSTAMP_SELECT_IMAGE;
+#       $option_mask |= $PSTAMP_SELECT_MASK;
+#       $option_mask |= $PSTAMP_SELECT_VARIANCE;
+#       $option_mask |= $PSTAMP_SELECT_PSF;
 
         # magic is dead

tags/ipp-ps2-20190404/pstamp/scripts/pstamp_server_status

@@ -39 +39 @@
 # isn't necessary if the pstamp/web stuff is configured to point at the 
 # ipp build. But currently it's running out of Bill's build
-my $ipphome = "/home/panstarrs/ipp";
+
+# EAM 2017.03.08 : need to point at temporary ITC location:
+# my $ipphome = "/home/panstarrs/ipp";
+my $ipphome = "/data/ippc64.1/ippitc";
 my $status_cmd = "psstatus";
 
@@ -46 +49 @@
 chdir $rundir or die "failed to cd to $rundir";
 
-
+# print "pantasks_client: $pantasks_client\n";
 
 my $now = `date -u`;