IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 33666


Ignore:
Timestamp:
Apr 3, 2012, 3:10:38 PM (14 years ago)
Author:
watersc1
Message:

ppMerge/detrend script changes to create noisemap detrends.

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippScripts/scripts/detrend_norm_apply.pl

    r27718 r33666  
    9696    'CTEMASK'          => 'MASK',
    9797    'DARKTEST'         => 'DARK',
     98    'NOISEMAP'         => 'MASK',
    9899    };
    99100

  • trunk/ippScripts/scripts/detrend_norm_calc.pl

    r27718 r33666  
    8888    'CTEMASK'          => 0,
    8989    'DARKTEST'         => 0,
     90    'NOISEMAP'         => 0,
    9091    };
    9192

  • trunk/ippScripts/scripts/detrend_process_imfile.pl

    r27718 r33666  
    8585                  'DARKTEST'         => undef,
    8686                  'CTEMASK'          => undef,
     87                  'NOISEMAP'         => undef,
    8788                  'SHUTTER'          => 'PPIMAGE.OUTPUT.DETREND',
    8889                  'FLAT_PREMASK'     => 'PPIMAGE.OUTPUT.DETREND',

  • trunk/ippScripts/scripts/detrend_resid_imfile.pl

    r27718 r33666  
    121121    'FLATMASK'         => '-mask',      # Specify the mask frame
    122122    'CTEMASK'          => '-mask',      # Specify the mask frame
     123    'NOISEMAP'         => '-noisemap',  # Specify the noisemap frame
    123124};
    124125
    … …  
    144145                  'SKYFLAT'          => 'PPIMAGE.OUTPUT.DETREND',
    145146                  'FRINGE'           => 'PPIMAGE.OUTPUT.RESID',
     147                  'NOISEMAP'         => 'PPIMAGE.OUTPUT.RESID',
    146148              };
    147149

  • trunk/ippScripts/scripts/detrend_stack.pl

    r27718 r33666  
    9595                  'SKYFLAT'          => 'PPMERGE.OUTPUT.FLAT',
    9696                  'FRINGE'           => 'PPMERGE.OUTPUT.FRINGE',
     97                  'NOISEMAP'         => 'PPMERGE.OUTPUT.FLAT',
    9798              };
    9899my $output_filerule = $FILERULES->{$det_type}; # File rule for output
    … …  
    120121                   'SKYFLAT'          => 'DETSTATS',
    121122                   'FRINGE'           => 'DETSTATS',
     123                   'NOISEMAP'         => 'DETSTATS',
    122124              };
    123125my $statrecipe = $STATRECIPES->{$det_type}; # File rule for output

  • trunk/ppMerge/src/ppMerge.c

    r24821 r33666  
    5656      case PPMERGE_TYPE_FRINGE:
    5757      case PPMERGE_TYPE_CTEMASK:
     58      case PPMERGE_TYPE_NOISEMAP:
    5859        if (!ppMergeScaleZero(config)) {
    5960            psErrorStackPrint(stderr, "Error getting scale and zero-points.");

  • trunk/ppMerge/src/ppMerge.h

    r23463 r33666  
    4444    PPMERGE_TYPE_FLAT,                  ///< Flat-field frame (dome or sky)
    4545    PPMERGE_TYPE_FRINGE,                ///< Fringe frame
     46    PPMERGE_TYPE_NOISEMAP,              ///< Noise map
    4647} ppMergeType;
    4748

  • trunk/ppMerge/src/ppMergeArguments.c

    r26500 r33666  
    289289        strcasecmp(typeStr, "FLATMASK") == 0) {
    290290      type = PPMERGE_TYPE_MASK;
     291      goto VALID;
     292    }
     293    if (strcasecmp(typeStr, "NOISEMAP") == 0) {
     294      type = PPMERGE_TYPE_NOISEMAP;
    291295      goto VALID;
    292296    }

  • trunk/ppMerge/src/ppMergeCamera.c

    r27989 r33666  
    334334        fileType = PM_FPA_FILE_IMAGE;
    335335        break;
     336      case PPMERGE_TYPE_NOISEMAP:
     337        fileType = PM_FPA_FILE_IMAGE;
     338        break;
    336339      case PPMERGE_TYPE_FRINGE:
    337340        fileType = PM_FPA_FILE_FRINGE;

  • trunk/ppMerge/src/ppMergeFiles.c

    r24795 r33666  
    221221        outSuffix = "FRINGE";
    222222        break;
     223      case PPMERGE_TYPE_NOISEMAP:
     224        outSuffix = "NOISEMAP";
     225        break;
    223226      default:
    224227        psAbort("Unknown frame type: %x", type);

  • trunk/ppMerge/src/ppMergeLoop.c

    r33093 r33666  
    125125      case PPMERGE_TYPE_DARK:
    126126      case PPMERGE_TYPE_CTEMASK:
     127      case PPMERGE_TYPE_NOISEMAP:
    127128        break;
    128129      default:
    … …  
    280281              case PPMERGE_TYPE_FLAT:
    281282              case PPMERGE_TYPE_FRINGE:
     283              case PPMERGE_TYPE_NOISEMAP:
    282284                psAssert (fileGroups->n > 0, "no valid file groups defined");
    283285                fileGroup = fileGroups->data[0];
    … …  
    324326                  case PPMERGE_TYPE_BIAS:
    325327                  case PPMERGE_TYPE_FLAT:
     328                  case PPMERGE_TYPE_NOISEMAP:
    326329                  case PPMERGE_TYPE_FRINGE: {
    327330                      psThreadJob *job = psThreadJobAlloc("PPMERGE_READOUT_COMBINE"); ///< Job to start

  • trunk/ppMerge/src/ppMergeScaleZero.c

    r26654 r33666  
    3636      case PPMERGE_TYPE_DARK:
    3737      case PPMERGE_TYPE_CTEMASK:
     38      case PPMERGE_TYPE_NOISEMAP:
    3839        // Nothing to measure
    3940        return true;
Note: See TracChangeset for help on using the changeset viewer.