Changeset 24399

Timestamp:

Jun 14, 2009, 10:30:29 AM (17 years ago)

Author:

eugene

Message:

adding ipp-2.9 build files: moving to cfitsio3100-p2 (automatic install of funpack, fpack); build/install of extsrc/gpcsw for burntool and tiltystreak

Location:

trunk

Files:

• Ohana/src/libautocode/def/autocode.c (modified) (2 diffs)
• Ohana/src/libautocode/def/cmf-ps1-v1.d (modified) (2 diffs)
• Ohana/src/libdvo/Makefile (modified) (1 diff)
• ppImage/notes.txt (modified) (1 diff)
• psModules/src/camera/pmFPAMaskWeight.c (modified) (2 diffs)
• psconfig/tagsets/ipp-2.9.dist (added)
• psconfig/tagsets/ipp-2.9.libs (added)
• psconfig/tagsets/ipp-2.9.perl (added)

trunk/Ohana/src/libautocode/def/autocode.c

@@ -7 +7 @@
 
   if (size != $SIZE) { 
-    fprintf (stderr, "ERROR: mismatch in data types $STRUCT: %d vs %d\n",
-             size, $SIZE);
-    exit (1);
+    fprintf (stderr, "WARNING: mismatch in data types $STRUCT: %d vs %d\n", size, $SIZE);
+    return (FALSE);
   }
 
@@ -26 +25 @@
 } 
 
+$STRUCT *gfits_downsize_and_convert_$STRUCT ($STRUCT *data, int size, int nitems) {
+
+  int i;
+  unsigned char *byte, tmp;
+  $STRUCT *output;
+
+  if ($SIZE > size) { 
+    fprintf (stderr, "ERROR: uncorrectable mismatch in data types $STRUCT: %d vs %d\n", size, $SIZE);
+    exit (1);
+  }
+
+  // allocate a new array 
+  ALLOCATE (output, $STRUCT, nitems);
+  for (i = 0; i < nitems; i++) {
+    memcpy (&output[i], &data[i], $SIZE);
+  }
+
+  /* provide initial values to avoid compiler warnings for non-BYTE_SWAP arch */
+  i = tmp = 0;
+  byte = NULL;
+
+# ifdef BYTE_SWAP
+  byte = (unsigned char *) output;
+  for (i = 0; i < nitems; i++, byte += size) {
+    /** BYTE SWAP **/
+  }
+# endif  
+
+  return (output);
+} 
+
 /*** add test of EXTNAME and header-defined columns? ***/
 /* return internal structure representation */
 $STRUCT *gfits_table_get_$STRUCT (FTable *ftable, int *Ndata, int *swapped) {
 
-  $STRUCT *data;
+  $STRUCT *data, *output;
 
   *Ndata = ftable[0].header[0].Naxis[1];
   data = ($STRUCT *) ftable[0].buffer;
   if ((swapped == NULL) || (*swapped == FALSE)) {
-    gfits_convert_$STRUCT (data, sizeof ($STRUCT), *Ndata);
+    if (!gfits_convert_$STRUCT (data, sizeof ($STRUCT), *Ndata)) {
+      output = gfits_downsize_and_convert_$STRUCT (data, sizeof ($STRUCT), *Ndata);
+      free (ftable[0].buffer);
+      ftable[0].buffer = output;
+      // XXX do I need to change NX?
+    }
     gfits_table_scale_data (ftable);
     if (swapped != NULL) *swapped = TRUE;

trunk/Ohana/src/libautocode/def/cmf-ps1-v1.d

@@ -3 +3 @@
 EXTNAME CMF_PS1_V1
 TYPE    BINTABLE
-SIZE    128
+SIZE    136
 
 # elements of data structure / FITS table
@@ -11 +11 @@
 FIELD dX,        X_PSF_SIG,        float,    x coord error,         pixels
 FIELD dY,        Y_PSF_SIG,        float,    y coord error,         pixels
-FIELD RA,        RA_PSF,           float,    PSF RA coord,          degrees
-FIELD DEC,       DEC_PSF,          float,    PSF DEC coord,         degrees
+FIELD RA,        RA_PSF,           double,   PSF RA coord,          degrees
+FIELD DEC,       DEC_PSF,          double,   PSF DEC coord,         degrees
 FIELD posangle,  POSANGLE,         float,    Posangle at source,    degrees
 FIELD pltscale,  PLTSCALE,         float,    Plate Scale at source, arcsec/pixel

trunk/Ohana/src/libdvo/Makefile

@@ -118 +118 @@
 cleandef:
         cd $(AUTO) && make clean
+
+.PRECIOUS: $(ASRC)/%.c

trunk/ppImage/notes.txt

@@ -1 +1 @@
 
-ppImage pmFPAfiles:
+20090611 : adjusting things to allow the readnoise to be an image map for each cell
 
-    pmFPAfile *input = pmFPAfileDefineFromArgs (&status, config, "PPIMAGE.INPUT", "INPUT");
-    pmFPAfile *inputMask = pmFPAfileBindFromArgs(&status, input, config, "PPIMAGE.INPUT.MASK", "INPUT.MASK");
-    pmFPAfile *inputWeight = pmFPAfileBindFromArgs(&status, input, config, "PPIMAGE.INPUT.WEIGHT", "INPUT.WEIGHT");
-    pmFPAfile *output = pmFPAfileDefineOutput(config, input->fpa, "PPIMAGE.OUTPUT");
-    pmFPAfile *outMask = pmFPAfileDefineOutput(config, input->fpa, "PPIMAGE.OUTPUT.MASK");
-    pmFPAfile *outWeight = pmFPAfileDefineOutput(config, input->fpa, "PPIMAGE.OUTPUT.WEIGHT");
-    pmFPAfile *chipImage = pmFPAfileDefineChipMosaic(config, input->fpa, "PPIMAGE.CHIP");
-    pmFPAfile *chipMask = pmFPAfileDefineOutput(config, chipImage->fpa, "PPIMAGE.CHIP.MASK");
-    pmFPAfile *chipWeight = pmFPAfileDefineOutput(config, chipImage->fpa, "PPIMAGE.CHIP.WEIGHT");
-    pmFPAfile *byFPA1 = pmFPAfileDefineFPAMosaic(config, input->fpa, "PPIMAGE.OUTPUT.FPA1");
-    pmFPAfile *byFPA2 = pmFPAfileDefineFPAMosaic(config, input->fpa, "PPIMAGE.OUTPUT.FPA2");
+  * pmReadoutSetVaraince : when variance is created, we are suppling a single CELL.READNOISE value -- change this to an optional image (carried through concepts?)
 
-        pmFPAfile *psphotInput = pmFPAfileDefineFromFPA (config, chipImage->fpa, 1, 1, "PSPHOT.INPUT");
-        pmFPAfile *psphotOutput = psMetadataLookupPtr (&status, config->files, "PSPHOT.OUTPUT");
-        pmFPAfile *psastroInput = pmFPAfileDefineInput (config, psphotOutput->fpa, "PSASTRO.INPUT");
+  I need to:
 
-    pmFPAfile *bin1 = pmFPAfileDefineFromFPA (config, chipImage->fpa, options->xBin1, options->yBin1, "PPIMAGE.BIN1");
-    pmFPAfile *bin2 = pmFPAfileDefineFromFPA (config, chipImage->fpa, options->xBin2, options->yBin2, "PPIMAGE.BIN2");
-    pmFPAfile *jpg1 = pmFPAfileDefineOutput (config, byFPA1->fpa, "PPIMAGE.JPEG1");
-    pmFPAfile *jpg2 = pmFPAfileDefineOutput (config, byFPA2->fpa, "PPIMAGE.JPEG2");
+  * define a format for the readnoise map (image map in SPLIT/MEF format?)
+  * load the readnoise map
+
+  * supply the map for each cell to the pmReadoutSetVariance (pointer to ppImageMap?)
+    pmReadoutSetVariance -> add psImageMap to API (also pmReadoutGenerateVariance)
+
+  * add recipe information to define the source of the READNOISE info.
+

trunk/psModules/src/camera/pmFPAMaskWeight.c

@@ -228 +228 @@
 
         // a negative variance is non-sensical. if the image value drops below 1, the variance must be 1.
+        // XXX this calculation is wrong: limit is 1 e-, but this is in DN
         readout->variance = (psImage*)psUnaryOp(readout->variance, readout->variance, "abs");
         readout->variance = (psImage*)psBinaryOp(readout->variance, readout->variance, "max",
@@ -239 +240 @@
     }
 
+    // XXX if readnoise is based on an image map, we need to apply it here
     readout->variance = (psImage*)psBinaryOp(readout->variance, readout->variance, "+",
                                            psScalarAlloc(readnoise*readnoise/gain/gain, PS_TYPE_F32));