Changeset 42759

Timestamp:

Dec 6, 2024, 1:34:41 PM (20 months ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20230313/ippconfig

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (1 diff)
• compress.mgc (copied) (copied from trunk/ippconfig/compress.mgc )
• configure.ac (modified) (1 diff)
• gentoo (copied) (copied from trunk/ippconfig/gentoo )
• o60523g0045o.2132764.wrp.2688740.skycell.1566.004.pswarp.mdc (copied) (copied from trunk/ippconfig/o60523g0045o.2132764.wrp.2688740.skycell.1566.004.pswarp.mdc )
• recipes/jpeg.mdc (modified) (3 diffs)
• recipes/reductionClasses.mdc (modified) (1 diff)

branches/eam_branches/ipp-20230313/ippconfig/Makefile.am

@@ -62 +62 @@
 ipprc.config: $(srcdir)/ipprc.config.in
 dvo.site: $(srcdir)/dvo.site.in
+
+
+TGTDIR  = $(PSCONFDIR)/$(PSCONFIG)/etc
+SRC     =       compress
+TGT     =       $(TGTDIR)/compress.mgc
+
+install: $(TGT)
+build:   $(MGC)
+
+if HAVE_LINUX
+MES = YesLINUX
+MGC = compress.mgc
+else
+MES = StillNoLINUX
+MGC = gentoo
+endif
+
+$(TGT): $(MGC)
+        cp $(MGC) $(TGT)     
+
+test: $(TGT)
+        file o60523g0045o.2132764.wrp.2688740.skycell.1566.004.pswarp.mdc
+        file -m $(TGT) o60523g0045o.2132764.wrp.2688740.skycell.1566.004.pswarp.mdc
+
+prt: 
+        @echo $(MES)

branches/eam_branches/ipp-20230313/ippconfig/configure.ac

@@ -6 +6 @@
 AM_INIT_AUTOMAKE([1.6 foreign dist-bzip2])
 AM_MAINTAINER_MODE
+
+AM_CONDITIONAL([HAVE_GENTOO], [test -f /etc/gentoo-release])
+AM_CONDITIONAL([HAVE_LINUX], [test -f /etc/os-release])
 
 AC_PROG_INSTALL

branches/eam_branches/ipp-20230313/ippconfig/recipes/jpeg.mdc

@@ +1 @@
+# This recipe file is used in a slightly different fashion from the others
+# The different programs define an output JPEG file (or files) for the binned
+# images with names based on the program and the binning level.
+
+# ppImage : PPIMAGE.JPEG1 & PPIMAGE.JPEG2
+# ppSub   : PPSUB.OUTPUT.JPEG1 & PPSUB.OUTPUT.JPEG2 & PPSUB.OUTPUT.RESID.JPEG
+# ppStack : PPSTACK.OUTPUT.JPEG1 & PPSTACK.OUTPUT.JPEG2
+# ppstamp : PPSTAMP.OUTPUT.JPEG
+
+# these names are the used to select the recipe metadata blocks below
+
+# alternate recipes can be defined by nesting those metadata blocks inside
+# additional named blocks, like the BIAS example below
+
 # JPEG options for files
 # Each METADATA entry should contain:
@@ -7 +21 @@
 # * OPTIONS: comma-separated list : -SB,+SB,+X,+Y,-X,-Y
 
+# to define the grayscale values, the image robust MEAN and STDEV are calculated
+# (if those cannot be calculated, a simple MEAN and STDEV are used)
+
+# the different SCALE.MODE values define the min and max colorscale values as:
+# RANGE    : MEAN - 2*STDEV*SCALE.MIN to MEAN + 2*STDEV*SCALE.MAX
+# FRACTION : MEAN*SCALE.MIN           to MEAN*SCALE.MAX
+# VALUE    : SCALE.MIN                to SCALE.MAX
+
+# COLORMAP values can be: greyscale, grayscale, -greyscale, -grayscale, heat, rainbow, 
+
 PPIMAGE.JPEG1           METADATA
         COLORMAP        STR     -greyscale
@@ -15 +39 @@
 END
 
+PPIMAGE.JPEG2   METADATA
+        COLORMAP        STR     -greyscale
+        SCALE.MODE      STR     RANGE
+        SCALE.MIN       F32      -5.0
+        SCALE.MAX       F32     +10.0
+        OPTIONS         STR     -SB,-X,+Y
+END
+
+ALTCOLORS               METADATA
+    PPIMAGE.JPEG1           METADATA
+            COLORMAP        STR     rainbow
+            SCALE.MODE      STR     RANGE
+            SCALE.MIN       F32      -5.0
+            SCALE.MAX       F32     +10.0
+            OPTIONS         STR     +SB,-X,+Y
+    END
+    
+    PPIMAGE.JPEG2   METADATA
+            COLORMAP        STR     rainbow
+            SCALE.MODE      STR     RANGE
+            SCALE.MIN       F32      -5.0
+            SCALE.MAX       F32     +10.0
+            OPTIONS         STR     -SB,-X,+Y
+    END
+END
+
 PPIMAGE.JPEG1.HEAT      METADATA
-        COLORMAP        STR     heat
+        COLORMAP        STR     -greyscale
         SCALE.MODE      STR     FRACTION
-        SCALE.MIN       F32     0.95
-        SCALE.MAX       F32     1.05
-        OPTIONS         STR     +SB,-X,+Y
-END
-
-PPIMAGE.JPEG2   METADATA
-        COLORMAP        STR     -greyscale
-        SCALE.MODE      STR     RANGE
-        SCALE.MIN       F32      -5.0
-        SCALE.MAX       F32     +10.0
-        OPTIONS         STR     -SB,-X,+Y
+        SCALE.MIN       F32     0.5
+        SCALE.MAX       F32     1.5
+        OPTIONS         STR     +SB,+X,+Y
 END
 

branches/eam_branches/ipp-20230313/ippconfig/recipes/reductionClasses.mdc

@@ -1 +1 @@
 # These reduction classes define recipes that go together as a group
+
+# the detrend reduction classes are used by the detrend ippScripts to select
+# the desired recipes for the different types of detrend products:
+
+## detrend_process_imfile.pl loads recipes (det_type)_PROCESS & (det_type)_JPEG_IMAGE
+## detrend_resid_imfile.pl loads either (det_type)_RESID OR (det_type)_VERIFY AND (det_type)_JPEG_RESID
+## detrend_stack.pl loads (det_type)_STACK
+
+# (det_type)_PROCESS & (det_type)_RESID are used to select PPIMAGE recipes
+# (det_type)_JPEG_IMAGE, (det_type)_JPEG_RESID are used to select JPEG recipes
+# (det_type)_STACK is used to select the PPMERGE recipe (NOTE: not ppStack)
 
 DETREND         METADATA