Changeset 34073

Timestamp:

Jun 25, 2012, 5:25:53 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120601

Files:

• . (modified) (1 prop)
• Ohana/src/opihi/cmd.astro (modified) (1 prop)
• ippMonitor (modified) (1 prop)
• ippScripts/scripts/destreak_restore_camera.pl (modified) (1 prop)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• ippScripts/scripts/lap_science.pl (modified) (1 diff)
• ippScripts/scripts/magic_destreak.pl (modified) (1 prop)
• ippTasks/ipphosts.mhpcc.config (modified) (1 diff)
• ippTasks/pantasks.pro (modified) (1 diff)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 prop)
• ippTools/share/warptool_towarped.sql (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/magictool.c (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/gpc1/ppImage.config (modified) (3 diffs)
• ippconfig/recipes/nightly_science.config (modified) (1 diff)
• ippconfig/recipes/ppImage.config (modified) (2 diffs)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 prop)
• ppImage/src (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/detrend/pmMaskBadPixels.c (modified) (1 diff)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotStackImageLoop.c (modified) (1 prop)
• pstamp/scripts (modified) (1 prop)
• psvideophot (modified) (1 prop)

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

@@ -1329 +1329 @@
     my @clean_modes = (
         'chiptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -set_label goto_cleaned -label @LABEL@ -chip_id @CHIP_ID@',
-        'warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -set_label goto_cleaned -label @LABEL@ -warp_id @WARP_ID@',
+#       'warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -set_label goto_cleaned -label @LABEL@ -warp_id @WARP_ID@',
         'difftool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -set_label goto_cleaned -label @LABEL@ -diff_id @DIFF_ID@',
         'magictool -dbname @DBNAME@ -updaterun -set_state full -set_label @LABEL@.old -magic_id @MAGIC_ID@',

branches/eam_branches/ipp-20120601/ippTasks/ipphosts.mhpcc.config

@@ -18 +18 @@
 ipphosts METADATA
   camera STR skycell
-  count S32  86
-  sky00 STR  ipp006
-  sky01 STR  ipp006 
-  sky02 STR  ipp007
-  sky03 STR  ipp007
-  sky04 STR  ipp008
-  sky05 STR  ipp008
-  sky06 STR  ipp009
-  sky07 STR  ipp009
-  sky08 STR  ipp010
-  sky09 STR  ipp010
-  sky10 STR  ipp011
-  sky11 STR  ipp011 
-  sky12 STR  ipp012
-  sky13 STR  ipp012
-  sky14 STR  ipp013
-  sky15 STR  ipp013
-  sky16 STR  ipp014
-  sky17 STR  ipp014
-  sky18 STR  ipp015
-  sky19 STR  ipp015
-  sky20 STR  ipp016
-  sky21 STR  ipp016 
-  sky22 STR  ipp017
-  sky23 STR  ipp017
-  sky24 STR  ipp018
-  sky25 STR  ipp018
-  sky26 STR  ipp019
-  sky27 STR  ipp019
-  sky28 STR  ipp020
-  sky29 STR  ipp020
-  sky30 STR  ipp021
-  sky31 STR  ipp021 
-  sky32 STR  ipp023
-  sky33 STR  ipp024
-  sky34 STR  ipp025
-  sky35 STR  ipp027
-  sky36 STR  ipp028
-  sky37 STR  ipp030
-  sky38 STR  ipp031
-  sky39 STR  ipp032
-  sky40 STR  ipp033
-  sky41 STR  ipp034 
-  sky42 STR  ipp035
-  sky43 STR  ipp036
-  sky44 STR  ipp037
-  sky45 STR  ipp038
-  sky46 STR  ipp039
-  sky47 STR  ipp040
-  sky48 STR  ipp041
-  sky49 STR  ipp042
-  sky50 STR  ipp043
-  sky51 STR  ipp044
-  sky52 STR  ipp046 
-  sky53 STR  ipp047
-  sky54 STR  ipp048
-  sky55 STR  ipp049
-  sky56 STR  ipp050
-  sky57 STR  ipp051
-  sky58 STR  ipp052
-  sky59 STR  ipp053
-  sky60 STR  ipp054
-  sky61 STR  ipp054
-  sky62 STR  ipp055 
-  sky63 STR  ipp055
-  sky64 STR  ipp056
-  sky65 STR  ipp056
-  sky66 STR  ipp057
-  sky67 STR  ipp057
-  sky68 STR  ipp058
-  sky69 STR  ipp058
-  sky70 STR  ipp059
-  sky71 STR  ipp059
-  sky72 STR  ipp060 
-  sky73 STR  ipp060
-  sky74 STR  ipp061
-  sky75 STR  ipp061
-  sky76 STR  ipp062
-  sky77 STR  ipp062
-  sky78 STR  ipp063
-  sky79 STR  ipp063
-  sky80 STR  ipp064
-  sky81 STR  ipp064
-  sky82 STR  ipp065
-  sky83 STR  ipp065
-  sky84 STR  ipp066
-  sky85 STR  ipp066
+  count S32  30
+  sky00 STR  stsci00.0
+  sky01 STR  stsci00.1
+  sky02 STR  stsci00.2
+  sky03 STR  stsci01.0
+  sky04 STR  stsci01.1
+  sky05 STR  stsci01.2
+  sky06 STR  stsci02.0
+  sky07 STR  stsci02.1
+  sky08 STR  stsci02.2
+  sky09 STR  stsci03.0
+  sky10 STR  stsci03.1
+  sky11 STR  stsci03.2
+  sky12 STR  stsci04.0
+  sky13 STR  stsci04.1
+  sky14 STR  stsci04.2
+  sky15 STR  stsci05.0
+  sky16 STR  stsci05.1
+  sky17 STR  stsci05.2
+  sky18 STR  stsci06.0
+  sky19 STR  stsci06.1
+  sky20 STR  stsci06.2
+  sky21 STR  stsci07.0
+  sky22 STR  stsci07.1
+  sky23 STR  stsci07.2
+  sky24 STR  stsci08.0
+  sky25 STR  stsci08.1
+  sky26 STR  stsci08.2
+  sky27 STR  stsci09.0
+  sky28 STR  stsci09.1
+  sky29 STR  stsci09.2
 END
 

branches/eam_branches/ipp-20120601/ippTasks/pantasks.pro

@@ -602 +602 @@
     strsub $$varname @HOST@   $default -var $varname
   else
-    strsub $template @HOST@ $host -var $varname
+    # Replace .0 forms if we can, otherwise, use plain forms.
+    strsub $template @HOST@.0 $host -var $varname
+    strsub $$varname @HOST@   $host -var $varname
   end
 end

branches/eam_branches/ipp-20120601/ippconfig/gpc1/ppImage.config

@@ -278 +278 @@
    OVERSCAN           BOOL    TRUE            # Overscan subtraction
    NONLIN             BOOL    TRUE            # Non-linearity correction; not implemented
+   NOISEMAP           BOOL    TRUE
    BIAS               BOOL    FALSE           # Bias subtraction
    DARK               BOOL    TRUE            # Dark subtraction
@@ -287 +288 @@
    MASK.BURNTOOL      BOOL    TRUE            # Mask potential burntool trails
    PATTERN.ROW        BOOL    TRUE            # Row pattern correction
-   PATTERN.CELL       BOOL    TRUE            # Cell pattern correction
+   PATTERN.CELL      BOOL    FALSE           # Cell pattern correction
+   PATTERN.CONTINUITY BOOL    TRUE            # Cell pattern correction using edge continuity
    FRINGE             BOOL    TRUE            # Fringe subtraction
    BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
@@ -305 +307 @@
        DETTYPE STR MASKTEST
      END   
+     VIDEOMASK METADATA
+       DETTYPE STR VIDEOMASKTEST
+     END
      FLAT METADATA
        FILTER  STR FPA.FILTERID

branches/eam_branches/ipp-20120601/ippconfig/recipes/nightly_science.config

@@ -7 +7 @@
 CLEAN_MODES METADATA
   MODE           STR WARP
-  COMMAND        STR warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
+#  COMMAND        STR warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
+  COMMAND        STR true
   RETENTION_TIME U16 7
 END

branches/eam_branches/ipp-20120601/ippconfig/recipes/ppImage.config

@@ -221 +221 @@
 
 CHIP_MASKTEST METADATA
-   BASE.FITS          BOOL    FALSE           # Save base detrended image?
-   BASE.MASK.FITS     BOOL    FALSE           # Save base detrended image?
-   BASE.VARIANCE.FITS BOOL    FALSE           # Save base detrended image?
-   CHIP.FITS          BOOL    TRUE            # Save chip-mosaic-ed image? 
-   CHIP.MASK.FITS     BOOL    TRUE            # Save chip-mosaic-ed image? 
-   CHIP.VARIANCE.FITS BOOL    TRUE            # Save chip-mosaic-ed image? 
-   OVERSCAN           BOOL    TRUE            # Overscan subtraction
-   NONLIN             BOOL    FALSE           # Non-linearity correction; not implemented
-   BIAS               BOOL    TRUE            # Bias subtraction
-   DARK               BOOL    TRUE            # Dark subtraction
-   SHUTTER            BOOL    FALSE           # Shutter correction
-   FLAT               BOOL    TRUE            # Flat-field normalisation
-   MASK               BOOL    TRUE            # Mask bad pixels
-   FRINGE             BOOL    TRUE            # Fringe subtraction
-   BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
-   BIN2.FITS          BOOL    TRUE            # Save 2nd binned chip image?
-   PHOTOM             BOOL    TRUE            # Source identification and photometry
-   ASTROM.CHIP        BOOL    FALSE           # Astrometry per chip?
-   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
-   BACKGROUND         BOOL    TRUE            # Subtract background?
+  BASE.FITS          BOOL    FALSE           # Save base detrended image?
+  BASE.MASK.FITS     BOOL    FALSE           # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL    FALSE           # Save base detrended image?
+  CHIP.FITS          BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS     BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL    TRUE            # Save chip-mosaic-ed image? 
+  OVERSCAN           BOOL    TRUE            # Overscan subtraction
+  NONLIN             BOOL    FALSE           # Non-linearity correction; not implemented
+  BIAS               BOOL    TRUE            # Bias subtraction
+  DARK               BOOL    TRUE            # Dark subtraction
+  SHUTTER            BOOL    FALSE           # Shutter correction
+  FLAT               BOOL    TRUE            # Flat-field normalisation
+  MASK               BOOL    TRUE            # Mask bad pixels
+  FRINGE             BOOL    TRUE            # Fringe subtraction
+  BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS          BOOL    TRUE            # Save 2nd binned chip image?
+  PHOTOM             BOOL    TRUE            # Source identification and photometry
+  ASTROM.CHIP        BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
+  BACKGROUND         BOOL    TRUE            # Subtract background?
+  MASK.STATS         BOOL    TRUE            # Calculate Mask statistics.
  
    DETREND.CONSTRAINTS  METADATA
@@ -249 +250 @@
      MASK METADATA
        DETTYPE STR MASKTEST
-     END   
+     END
+     VIDEOMASK METADATA
+       DETTYPE STR VIDEOMASKTEST
+     END  
    END   
 END

branches/eam_branches/ipp-20120601/psModules/src/detrend/pmMaskBadPixels.c

@@ -64 +64 @@
             for (int i = 0; i < inMask->numCols; i++) {
                 int xI = i - offCol;
-                inVal[j][i] |= (maskVal & exVal[xJ][xI]);
+                inVal[j][i] |= (exVal[xJ][xI]);
             }
         }