Changeset 36254

Timestamp:

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

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130904/ippconfig

Files:

• . (modified) (1 prop)
• gpc1 (modified) (1 prop)
• recipes/ppSub.config (modified) (1 prop)
• recipes/psphot.config (modified) (1 diff)
• recipes/reductionClasses.mdc (modified) (1 prop)
• simtest/format.config (modified) (1 diff)

branches/eam_branches/ipp-20130904/ippconfig/recipes/psphot.config

@@ -41 +41 @@
 
 # allowed values for SKY_STAT: 
-# SAMPLE_MEAN, SAMPLE_MEDIAN, CLIPPED_MEAN, ROBUST_MEAN, ROBUST_QUARTILE, FITTED_MEAN
+# SAMPLE_MEAN, SAMPLE_MEDIAN, CLIPPED_MEAN, ROBUST_MEDIAN, ROBUST_QUARTILE, FITTED_MEAN
 
 # masking parameters (XXX EAM : rework this to use psRegion like ANALYSIS_REGION)

branches/eam_branches/ipp-20130904/ippconfig/simtest/format.config

@@ -60 +60 @@
         FPA.LATITUDE    F64     20.7070999146 # North Latitude in Degrees 
         FPA.ELEVATION   F32     3048.0 # altitude in meters
-        CELL.SATURATION F32     65535
+        CELL.SATURATION F32     1000000
         CELL.BAD        F32     0
         CELL.READDIR    S32     1