Changeset 36255 for branches/eam_branches/ipp-20130904

Timestamp:

Oct 28, 2013, 4:41:38 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130904

Files:

• pstamp/scripts (modified) (1 prop)
• pstamp/scripts/psmkreq (modified) (4 diffs)
• tools/heather/queuesliceslap2.pl (copied) (copied from trunk/tools/heather/queuesliceslap2.pl )
• tools/heathers_plots/deploy.sh (modified) (1 diff)
• tools/heathers_plots/heathers_plots.py (modified) (5 diffs)

branches/eam_branches/ipp-20130904/pstamp/scripts/psmkreq

@@ -39 +39 @@
 my $job_type     = 'stamp';
 my $req_type     = 'bycoord';
-my $stage        = 'chip';
+my $stage        = 'stack';
 my $option_mask;
 my $width        = $default_size;
 my $height       = $default_size;
+my $whole_file   = 0;
 my $project      = 'gpc1';
 my $coord_mask;
@@ -81 +82 @@
     'width=i'           => \$width,
     'height=i'          => \$height,
+    'whole-file'        => \$whole_file,
     'pixcenter'         => \$pixcenter,
     'arcseconds'        => \$arcseconds,
@@ -141 +143 @@
         pod2usage( -msg => "--ra --dec --x --y are not used with --list", -exitval =>1 )
             if defined $x or defined $y;
-    } elsif (!$pixcenter) {
-        pod2usage( -msg => "Required options for stamp requests: --ra and --dec or --list", -exitval =>1 )
-            unless (defined $ra and defined $dec);
-        # to simplify code we just use $x and $y from here
-        $x = $ra;
-        $y = $dec;
     } else {
-        pod2usage( -msg => "Required options for stamp requests: --x and --y or --list", -exitval =>1 )
-                unless (defined $x and defined $y);
+        if ($whole_file) {
+            $pixcenter = 1;
+            $x = 0;
+            $y = 0;
+            $width = 0;
+            $height = 0;
+        }
+        if (!$pixcenter) {
+            pod2usage( -msg => "Required options for stamp requests: --ra and --dec or --list", -exitval =>1 )
+                unless (defined $ra and defined $dec);
+            # to simplify code we just use $x and $y from here
+            $x = $ra;
+            $y = $dec;
+        } else {
+            pod2usage( -msg => "Required options for stamp requests: --x and --y or --list", -exitval =>1 )
+                    unless (defined $x and defined $y);
+        }
     }
 } else {
@@ -209 +220 @@
         $option_mask |= $PSTAMP_SELECT_PSF      if $psf;
         $option_mask |= $PSTAMP_SELECT_BACKMDL  if $backmdl;
-        $option_mask |= $PSTAMP_SELECT_UNCOMPRESSED   if $uncompressed;
+        $option_mask |= $PSTAMP_SELECT_UNCOMPRESSED if $uncompressed;
         $option_mask |= $PSTAMP_SELECT_UNCONV   if $unconvolved;
         $option_mask |= $PSTAMP_USE_IMFILE_ID   if $use_imfile_id;

branches/eam_branches/ipp-20130904/tools/heathers_plots/deploy.sh

@@ -1 +1 @@
 #!/bin/bash
-
+echo this only works on ippc11 for ipp user
+echo cp -f heathers_plots.py $HOME/local/bin
 cp -f heathers_plots.py $HOME/local/bin
 

branches/eam_branches/ipp-20130904/tools/heathers_plots/heathers_plots.py

@@ -38 +38 @@
  JOIN chipRun USING(chip_id) 
  JOIN rawExp USING(exp_id)
-WHERE stage = 'cam' and addRun.dvodb = 'LAP.20120706'
+WHERE stage = 'cam' and addRun.dvodb = 'LAP.20130717'
 """
 
@@ -50 +50 @@
  JOIN chipRun USING(chip_id)
  JOIN rawExp USING(exp_id)
-WHERE stage = 'cam' AND mergedvodbRun.mergedvodb = 'LAP.20120706'
+WHERE stage = 'cam' AND mergedvodbRun.mergedvodb = 'LAP.20130717'
 """
 
@@ -62 +62 @@
  JOIN stackRun USING (stack_id)
  JOIN skycell using (tess_id, skycell_id)
-WHERE stage = 'skycal' AND addRun.dvodb = 'LAP.20120706' 
+WHERE stage = 'skycal' AND addRun.dvodb = 'LAP.20130717' 
 """
 
@@ -77 +77 @@
  JOIN stackRun using (stack_id)
  JOIN skycell using (tess_id, skycell_id)
-WHERE stage = 'skycal' AND addRun.dvodb = 'LAP.20120706'"""
+WHERE stage = 'skycal' AND addRun.dvodb = 'LAP.20130717'"""
 
     def fetch_data(self, statement):
@@ -166 +166 @@
     hp = HeathersPlot()
     hp.update_cam_plot()
-    hp.update_skycal_plot()
-    hp.update_cam_merged_plot()
-    hp.update_skycal_merged_plot()
+#    hp.update_skycal_plot()
+#    hp.update_cam_merged_plot()
+#    hp.update_skycal_merged_plot()
+
+#don't make those for now since we don't do that yet